From dc75d55f72af11bdf81b081dad8f5e84be3ed2e2 Mon Sep 17 00:00:00 2001
From: Gabe Livengood <47010459+ggliv@users.noreply.github.com>
Date: Wed, 8 Jun 2022 14:02:15 -0400
Subject: [PATCH 0001/1604] allow modfailcondition to arbitrarily trigger fail

---
 osu.Game/Rulesets/Mods/ModFailCondition.cs   | 19 +++++++++++++++++++
 osu.Game/Rulesets/Scoring/HealthProcessor.cs | 14 ++++++++++----
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModFailCondition.cs b/osu.Game/Rulesets/Mods/ModFailCondition.cs
index 4425ece513..1aab0ab880 100644
--- a/osu.Game/Rulesets/Mods/ModFailCondition.cs
+++ b/osu.Game/Rulesets/Mods/ModFailCondition.cs
@@ -19,12 +19,31 @@ namespace osu.Game.Rulesets.Mods
         public virtual bool PerformFail() => true;
 
         public virtual bool RestartOnFail => Restart.Value;
+        private HealthProcessor healthProcessorInternal;
 
         public void ApplyToHealthProcessor(HealthProcessor healthProcessor)
         {
+            healthProcessorInternal = healthProcessor;
             healthProcessor.FailConditions += FailCondition;
         }
 
+        /// <summary>
+        /// Immediately triggers a failure on the loaded <see cref="HealthProcessor"/>.
+        /// </summary>
+        protected void TriggerArbitraryFailure() => healthProcessorInternal.TriggerFailure();
+
+        /// <summary>
+        /// Determines whether <paramref name="result"/> should trigger a failure. Called every time a
+        /// judgement is applied to <paramref name="healthProcessor"/>.
+        /// </summary>
+        /// <param name="healthProcessor">The loaded <see cref="HealthProcessor"/>.</param>
+        /// <param name="result">The latest <see cref="JudgementResult"/>.</param>
+        /// <returns>Whether the fail condition has been met.</returns>
+        /// <remarks>
+        /// This method should only be used to trigger failures based on <paramref name="result"/>.
+        /// Using outside values to evaluate failure may introduce event ordering discrepancies, use
+        /// an <see cref="IApplicableMod"/> with <see cref="TriggerArbitraryFailure"/> instead.
+        /// </remarks>
         protected abstract bool FailCondition(HealthProcessor healthProcessor, JudgementResult result);
     }
 }
diff --git a/osu.Game/Rulesets/Scoring/HealthProcessor.cs b/osu.Game/Rulesets/Scoring/HealthProcessor.cs
index 0f51560476..4f5ff95477 100644
--- a/osu.Game/Rulesets/Scoring/HealthProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/HealthProcessor.cs
@@ -33,6 +33,15 @@ namespace osu.Game.Rulesets.Scoring
         /// </summary>
         public bool HasFailed { get; private set; }
 
+        /// <summary>
+        /// Immediately triggers a failure for this HealthProcessor.
+        /// </summary>
+        public void TriggerFailure()
+        {
+            if (Failed?.Invoke() != false)
+                HasFailed = true;
+        }
+
         protected override void ApplyResultInternal(JudgementResult result)
         {
             result.HealthAtJudgement = Health.Value;
@@ -44,10 +53,7 @@ namespace osu.Game.Rulesets.Scoring
             Health.Value += GetHealthIncreaseFor(result);
 
             if (meetsAnyFailCondition(result))
-            {
-                if (Failed?.Invoke() != false)
-                    HasFailed = true;
-            }
+                TriggerFailure();
         }
 
         protected override void RevertResultInternal(JudgementResult result)

From 21c5499da16eb88f12d6f5bee8d28b1557559b2f Mon Sep 17 00:00:00 2001
From: Gabe Livengood <47010459+ggliv@users.noreply.github.com>
Date: Fri, 10 Jun 2022 13:11:17 -0400
Subject: [PATCH 0002/1604] remove arbitrary from method name

---
 osu.Game/Rulesets/Mods/ModFailCondition.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModFailCondition.cs b/osu.Game/Rulesets/Mods/ModFailCondition.cs
index 1aab0ab880..9500734408 100644
--- a/osu.Game/Rulesets/Mods/ModFailCondition.cs
+++ b/osu.Game/Rulesets/Mods/ModFailCondition.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Mods
         /// <summary>
         /// Immediately triggers a failure on the loaded <see cref="HealthProcessor"/>.
         /// </summary>
-        protected void TriggerArbitraryFailure() => healthProcessorInternal.TriggerFailure();
+        protected void TriggerFailure() => healthProcessorInternal.TriggerFailure();
 
         /// <summary>
         /// Determines whether <paramref name="result"/> should trigger a failure. Called every time a
@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Mods
         /// <remarks>
         /// This method should only be used to trigger failures based on <paramref name="result"/>.
         /// Using outside values to evaluate failure may introduce event ordering discrepancies, use
-        /// an <see cref="IApplicableMod"/> with <see cref="TriggerArbitraryFailure"/> instead.
+        /// an <see cref="IApplicableMod"/> with <see cref="TriggerFailure"/> instead.
         /// </remarks>
         protected abstract bool FailCondition(HealthProcessor healthProcessor, JudgementResult result);
     }

From 6e64a8f55ef5838a5d58625668138fb3c85e34db Mon Sep 17 00:00:00 2001
From: Gabe Livengood <47010459+ggliv@users.noreply.github.com>
Date: Fri, 10 Jun 2022 13:13:35 -0400
Subject: [PATCH 0003/1604] use event to trigger failure

---
 osu.Game/Rulesets/Mods/ModFailCondition.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModFailCondition.cs b/osu.Game/Rulesets/Mods/ModFailCondition.cs
index 9500734408..63cebc9747 100644
--- a/osu.Game/Rulesets/Mods/ModFailCondition.cs
+++ b/osu.Game/Rulesets/Mods/ModFailCondition.cs
@@ -19,18 +19,18 @@ namespace osu.Game.Rulesets.Mods
         public virtual bool PerformFail() => true;
 
         public virtual bool RestartOnFail => Restart.Value;
-        private HealthProcessor healthProcessorInternal;
+        private event Action failureTriggered;
 
         public void ApplyToHealthProcessor(HealthProcessor healthProcessor)
         {
-            healthProcessorInternal = healthProcessor;
+            failureTriggered = healthProcessor.TriggerFailure;
             healthProcessor.FailConditions += FailCondition;
         }
 
         /// <summary>
         /// Immediately triggers a failure on the loaded <see cref="HealthProcessor"/>.
         /// </summary>
-        protected void TriggerFailure() => healthProcessorInternal.TriggerFailure();
+        protected void TriggerFailure() => failureTriggered?.Invoke();
 
         /// <summary>
         /// Determines whether <paramref name="result"/> should trigger a failure. Called every time a

From 579d5b51eb25e90e7bc28f284b28c5edc14fc249 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Oct 2022 20:34:41 +0900
Subject: [PATCH 0004/1604] Add and consume sample bank constants

---
 .../TestSceneAutoJuiceStream.cs               |  2 +-
 .../Editor/TestSceneSliderSplitting.cs        |  4 +-
 .../Formats/LegacyBeatmapDecoderTest.cs       | 14 +++---
 ...estSceneHitObjectSamplePointAdjustments.cs | 45 ++++++++++---------
 .../TestSceneGameplaySampleTriggerSource.cs   |  4 +-
 osu.Game/Audio/HitSampleInfo.cs               |  9 ++++
 .../ControlPoints/SampleControlPoint.cs       |  4 +-
 .../Beatmaps/Formats/LegacyBeatmapDecoder.cs  |  3 +-
 .../Beatmaps/Formats/LegacyBeatmapEncoder.cs  |  6 +--
 9 files changed, 51 insertions(+), 40 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
index 202228c9e7..e47a687f24 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                     NewCombo = i % 8 == 0,
                     Samples = new List<HitSampleInfo>(new[]
                     {
-                        new HitSampleInfo(HitSampleInfo.HIT_NORMAL, "normal", volume: 100)
+                        new HitSampleInfo(HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_NORMAL, volume: 100)
                     })
                 });
             }
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs
index 015952c59a..d642d6a5ed 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs
@@ -181,7 +181,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             {
                 if (slider is null) return;
 
-                slider.SampleControlPoint.SampleBank = "soft";
+                slider.SampleControlPoint.SampleBank = HitSampleInfo.BANK_SOFT;
                 slider.SampleControlPoint.SampleVolume = 70;
                 sample = new HitSampleInfo("hitwhistle");
                 slider.Samples.Add(sample);
@@ -207,7 +207,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddAssert("sliders have hitsounds", hasHitsounds);
 
             bool hasHitsounds() => sample is not null &&
-                                   EditorBeatmap.HitObjects.All(o => o.SampleControlPoint.SampleBank == "soft" &&
+                                   EditorBeatmap.HitObjects.All(o => o.SampleControlPoint.SampleBank == HitSampleInfo.BANK_SOFT &&
                                                                      o.SampleControlPoint.SampleVolume == 70 &&
                                                                      o.Samples.Contains(sample));
         }
diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
index fdd0167ed3..d9817802f3 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -206,17 +206,17 @@ namespace osu.Game.Tests.Beatmaps.Formats
 
                 var soundPoint = controlPoints.SamplePointAt(0);
                 Assert.AreEqual(956, soundPoint.Time);
-                Assert.AreEqual("soft", soundPoint.SampleBank);
+                Assert.AreEqual(HitSampleInfo.BANK_SOFT, soundPoint.SampleBank);
                 Assert.AreEqual(60, soundPoint.SampleVolume);
 
                 soundPoint = controlPoints.SamplePointAt(53373);
                 Assert.AreEqual(53373, soundPoint.Time);
-                Assert.AreEqual("soft", soundPoint.SampleBank);
+                Assert.AreEqual(HitSampleInfo.BANK_SOFT, soundPoint.SampleBank);
                 Assert.AreEqual(60, soundPoint.SampleVolume);
 
                 soundPoint = controlPoints.SamplePointAt(119637);
                 Assert.AreEqual(119637, soundPoint.Time);
-                Assert.AreEqual("soft", soundPoint.SampleBank);
+                Assert.AreEqual(HitSampleInfo.BANK_SOFT, soundPoint.SampleBank);
                 Assert.AreEqual(80, soundPoint.SampleVolume);
 
                 var effectPoint = controlPoints.EffectPointAt(0);
@@ -261,10 +261,10 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.That(controlPoints.EffectPointAt(2500).KiaiMode, Is.False);
                 Assert.That(controlPoints.EffectPointAt(3500).KiaiMode, Is.True);
 
-                Assert.That(controlPoints.SamplePointAt(500).SampleBank, Is.EqualTo("drum"));
-                Assert.That(controlPoints.SamplePointAt(1500).SampleBank, Is.EqualTo("drum"));
-                Assert.That(controlPoints.SamplePointAt(2500).SampleBank, Is.EqualTo("normal"));
-                Assert.That(controlPoints.SamplePointAt(3500).SampleBank, Is.EqualTo("drum"));
+                Assert.That(controlPoints.SamplePointAt(500).SampleBank, Is.EqualTo(HitSampleInfo.BANK_DRUM));
+                Assert.That(controlPoints.SamplePointAt(1500).SampleBank, Is.EqualTo(HitSampleInfo.BANK_DRUM));
+                Assert.That(controlPoints.SamplePointAt(2500).SampleBank, Is.EqualTo(HitSampleInfo.BANK_NORMAL));
+                Assert.That(controlPoints.SamplePointAt(3500).SampleBank, Is.EqualTo(HitSampleInfo.BANK_DRUM));
 
                 Assert.That(controlPoints.TimingPointAt(500).BeatLength, Is.EqualTo(500).Within(0.1));
                 Assert.That(controlPoints.TimingPointAt(1500).BeatLength, Is.EqualTo(500).Within(0.1));
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSamplePointAdjustments.cs b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSamplePointAdjustments.cs
index 6313842dfd..31939f6971 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSamplePointAdjustments.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSamplePointAdjustments.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using Humanizer;
 using NUnit.Framework;
 using osu.Framework.Testing;
+using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics.UserInterface;
@@ -41,7 +42,7 @@ namespace osu.Game.Tests.Visual.Editing
                     Position = (OsuPlayfield.BASE_SIZE - new Vector2(100, 0)) / 2,
                     SampleControlPoint = new SampleControlPoint
                     {
-                        SampleBank = "normal",
+                        SampleBank = HitSampleInfo.BANK_NORMAL,
                         SampleVolume = 80
                     }
                 });
@@ -52,7 +53,7 @@ namespace osu.Game.Tests.Visual.Editing
                     Position = (OsuPlayfield.BASE_SIZE + new Vector2(100, 0)) / 2,
                     SampleControlPoint = new SampleControlPoint
                     {
-                        SampleBank = "soft",
+                        SampleBank = HitSampleInfo.BANK_SOFT,
                         SampleVolume = 60
                     }
                 });
@@ -70,7 +71,7 @@ namespace osu.Game.Tests.Visual.Editing
         public void TestSingleSelection()
         {
             clickSamplePiece(0);
-            samplePopoverHasSingleBank("normal");
+            samplePopoverHasSingleBank(HitSampleInfo.BANK_NORMAL);
             samplePopoverHasSingleVolume(80);
 
             dismissPopover();
@@ -80,14 +81,14 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("select first object", () => EditorBeatmap.SelectedHitObjects.Add(EditorBeatmap.HitObjects.First()));
 
             clickSamplePiece(1);
-            samplePopoverHasSingleBank("soft");
+            samplePopoverHasSingleBank(HitSampleInfo.BANK_SOFT);
             samplePopoverHasSingleVolume(60);
 
             setVolumeViaPopover(90);
             hitObjectHasSampleVolume(1, 90);
 
-            setBankViaPopover("drum");
-            hitObjectHasSampleBank(1, "drum");
+            setBankViaPopover(HitSampleInfo.BANK_DRUM);
+            hitObjectHasSampleBank(1, HitSampleInfo.BANK_DRUM);
         }
 
         [Test]
@@ -136,27 +137,27 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("unify sample bank", () =>
             {
                 foreach (var h in EditorBeatmap.HitObjects)
-                    h.SampleControlPoint.SampleBank = "soft";
+                    h.SampleControlPoint.SampleBank = HitSampleInfo.BANK_SOFT;
             });
 
             AddStep("select both objects", () => EditorBeatmap.SelectedHitObjects.AddRange(EditorBeatmap.HitObjects));
             clickSamplePiece(0);
-            samplePopoverHasSingleBank("soft");
+            samplePopoverHasSingleBank(HitSampleInfo.BANK_SOFT);
 
             dismissPopover();
 
             clickSamplePiece(1);
-            samplePopoverHasSingleBank("soft");
+            samplePopoverHasSingleBank(HitSampleInfo.BANK_SOFT);
 
             setBankViaPopover(string.Empty);
-            hitObjectHasSampleBank(0, "soft");
-            hitObjectHasSampleBank(1, "soft");
-            samplePopoverHasSingleBank("soft");
+            hitObjectHasSampleBank(0, HitSampleInfo.BANK_SOFT);
+            hitObjectHasSampleBank(1, HitSampleInfo.BANK_SOFT);
+            samplePopoverHasSingleBank(HitSampleInfo.BANK_SOFT);
 
-            setBankViaPopover("drum");
-            hitObjectHasSampleBank(0, "drum");
-            hitObjectHasSampleBank(1, "drum");
-            samplePopoverHasSingleBank("drum");
+            setBankViaPopover(HitSampleInfo.BANK_DRUM);
+            hitObjectHasSampleBank(0, HitSampleInfo.BANK_DRUM);
+            hitObjectHasSampleBank(1, HitSampleInfo.BANK_DRUM);
+            samplePopoverHasSingleBank(HitSampleInfo.BANK_DRUM);
         }
 
         [Test]
@@ -172,14 +173,14 @@ namespace osu.Game.Tests.Visual.Editing
             samplePopoverHasIndeterminateBank();
 
             setBankViaPopover(string.Empty);
-            hitObjectHasSampleBank(0, "normal");
-            hitObjectHasSampleBank(1, "soft");
+            hitObjectHasSampleBank(0, HitSampleInfo.BANK_NORMAL);
+            hitObjectHasSampleBank(1, HitSampleInfo.BANK_SOFT);
             samplePopoverHasIndeterminateBank();
 
-            setBankViaPopover("normal");
-            hitObjectHasSampleBank(0, "normal");
-            hitObjectHasSampleBank(1, "normal");
-            samplePopoverHasSingleBank("normal");
+            setBankViaPopover(HitSampleInfo.BANK_NORMAL);
+            hitObjectHasSampleBank(0, HitSampleInfo.BANK_NORMAL);
+            hitObjectHasSampleBank(1, HitSampleInfo.BANK_NORMAL);
+            samplePopoverHasSingleBank(HitSampleInfo.BANK_NORMAL);
         }
 
         private void clickSamplePiece(int objectIndex) => AddStep($"click {objectIndex.ToOrdinalWords()} sample piece", () =>
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs
index b6da562bd0..6e53302624 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs
@@ -57,13 +57,13 @@ namespace osu.Game.Tests.Visual.Gameplay
                 {
                     StartTime = t += spacing,
                     Samples = new[] { new HitSampleInfo(HitSampleInfo.HIT_NORMAL) },
-                    SampleControlPoint = new SampleControlPoint { SampleBank = "soft" },
+                    SampleControlPoint = new SampleControlPoint { SampleBank = HitSampleInfo.BANK_SOFT },
                 },
                 new HitCircle
                 {
                     StartTime = t + spacing,
                     Samples = new[] { new HitSampleInfo(HitSampleInfo.HIT_WHISTLE) },
-                    SampleControlPoint = new SampleControlPoint { SampleBank = "soft" },
+                    SampleControlPoint = new SampleControlPoint { SampleBank = HitSampleInfo.BANK_SOFT },
                 },
             });
 
diff --git a/osu.Game/Audio/HitSampleInfo.cs b/osu.Game/Audio/HitSampleInfo.cs
index efa5562cb8..81cfed23f5 100644
--- a/osu.Game/Audio/HitSampleInfo.cs
+++ b/osu.Game/Audio/HitSampleInfo.cs
@@ -19,11 +19,20 @@ namespace osu.Game.Audio
         public const string HIT_FINISH = @"hitfinish";
         public const string HIT_CLAP = @"hitclap";
 
+        public const string BANK_NORMAL = @"normal";
+        public const string BANK_SOFT = @"soft";
+        public const string BANK_DRUM = @"drum";
+
         /// <summary>
         /// All valid sample addition constants.
         /// </summary>
         public static IEnumerable<string> AllAdditions => new[] { HIT_WHISTLE, HIT_FINISH, HIT_CLAP };
 
+        /// <summary>
+        /// All valid bank constants.
+        /// </summary>
+        public static IEnumerable<string> AllBanks => new[] { BANK_NORMAL, BANK_SOFT, BANK_DRUM };
+
         /// <summary>
         /// The name of the sample to load.
         /// </summary>
diff --git a/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
index c454439c5c..e7b869cfa7 100644
--- a/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Beatmaps.ControlPoints
     /// </remarks>
     public class SampleControlPoint : ControlPoint, IEquatable<SampleControlPoint>
     {
-        public const string DEFAULT_BANK = "normal";
+        public const string DEFAULT_BANK = HitSampleInfo.BANK_NORMAL;
 
         public static readonly SampleControlPoint DEFAULT = new SampleControlPoint
         {
@@ -30,7 +30,7 @@ namespace osu.Game.Beatmaps.ControlPoints
         public readonly Bindable<string> SampleBankBindable = new Bindable<string>(DEFAULT_BANK) { Default = DEFAULT_BANK };
 
         /// <summary>
-        /// The speed multiplier at this control point.
+        /// The sample bank at this control point.
         /// </summary>
         public string SampleBank
         {
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index 75500fbc4e..b3e6f50366 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -10,6 +10,7 @@ using System.Linq;
 using osu.Framework.Extensions;
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Logging;
+using osu.Game.Audio;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Legacy;
 using osu.Game.Beatmaps.Timing;
@@ -412,7 +413,7 @@ namespace osu.Game.Beatmaps.Formats
 
             string stringSampleSet = sampleSet.ToString().ToLowerInvariant();
             if (stringSampleSet == @"none")
-                stringSampleSet = @"normal";
+                stringSampleSet = HitSampleInfo.HIT_NORMAL;
 
             if (timingChange)
             {
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 03c63ff4f2..52d1ea60a5 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -547,13 +547,13 @@ namespace osu.Game.Beatmaps.Formats
         {
             switch (sampleBank?.ToLowerInvariant())
             {
-                case "normal":
+                case HitSampleInfo.BANK_NORMAL:
                     return LegacySampleBank.Normal;
 
-                case "soft":
+                case HitSampleInfo.BANK_SOFT:
                     return LegacySampleBank.Soft;
 
-                case "drum":
+                case HitSampleInfo.BANK_DRUM:
                     return LegacySampleBank.Drum;
 
                 default:

From 9222cb379f7c5cdb1ad7a25f73df28242e5b1406 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Oct 2022 20:53:18 +0900
Subject: [PATCH 0005/1604] Add sample bank suport to editor selection handler

---
 .../Components/EditorSelectionHandler.cs      | 73 ++++++++++++++++++-
 1 file changed, 72 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
index 0bdfc5b0a0..1670328e58 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
@@ -48,11 +48,40 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </summary>
         public readonly Dictionary<string, Bindable<TernaryState>> SelectionSampleStates = new Dictionary<string, Bindable<TernaryState>>();
 
+        /// <summary>
+        /// The state of each sample bank type for all selected hitobjects.
+        /// </summary>
+        public readonly Dictionary<string, Bindable<TernaryState>> SelectionBankStates = new Dictionary<string, Bindable<TernaryState>>();
+
         /// <summary>
         /// Set up ternary state bindables and bind them to selection/hitobject changes (in both directions)
         /// </summary>
         private void createStateBindables()
         {
+            foreach (string bankName in HitSampleInfo.AllBanks)
+            {
+                var bindable = new Bindable<TernaryState>
+                {
+                    Description = bankName.Titleize()
+                };
+
+                bindable.ValueChanged += state =>
+                {
+                    switch (state.NewValue)
+                    {
+                        case TernaryState.False:
+                            RemoveSampleBank(bankName);
+                            break;
+
+                        case TernaryState.True:
+                            AddSampleBank(bankName);
+                            break;
+                    }
+                };
+
+                SelectionBankStates[bankName] = bindable;
+            }
+
             foreach (string sampleName in HitSampleInfo.AllAdditions)
             {
                 var bindable = new Bindable<TernaryState>
@@ -104,12 +133,48 @@ namespace osu.Game.Screens.Edit.Compose.Components
             {
                 bindable.Value = GetStateFromSelection(SelectedItems, h => h.Samples.Any(s => s.Name == sampleName));
             }
+
+            foreach ((string bankName, var bindable) in SelectionBankStates)
+            {
+                bindable.Value = GetStateFromSelection(SelectedItems, h => h.SampleControlPoint.SampleBank == bankName);
+            }
         }
 
         #endregion
 
         #region Ternary state changes
 
+        /// <summary>
+        /// Adds a sample bank to all selected <see cref="HitObject"/>s.
+        /// </summary>
+        /// <param name="bankName">The name of the sample bank.</param>
+        public void AddSampleBank(string bankName)
+        {
+            EditorBeatmap.PerformOnSelection(h =>
+            {
+                if (h.SampleControlPoint.SampleBank == bankName)
+                    return;
+
+                h.SampleControlPoint.SampleBank = bankName;
+                EditorBeatmap.Update(h);
+            });
+        }
+
+        /// <summary>
+        /// Removes a sample bank from all selected <see cref="HitObject"/>s.
+        /// </summary>
+        /// <param name="bankName">The name of the sample bank.</param>
+        public void RemoveSampleBank(string bankName)
+        {
+            EditorBeatmap.PerformOnSelection(h =>
+            {
+                if (h.SampleControlPoint.SampleBank == bankName)
+                    h.SampleControlPoint.SampleBankBindable.SetDefault();
+
+                EditorBeatmap.Update(h);
+            });
+        }
+
         /// <summary>
         /// Adds a hit sample to all selected <see cref="HitObject"/>s.
         /// </summary>
@@ -174,11 +239,17 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 yield return new TernaryStateToggleMenuItem("New combo") { State = { BindTarget = SelectionNewComboState } };
             }
 
-            yield return new OsuMenuItem("Sound")
+            yield return new OsuMenuItem("Sample")
             {
                 Items = SelectionSampleStates.Select(kvp =>
                     new TernaryStateToggleMenuItem(kvp.Value.Description) { State = { BindTarget = kvp.Value } }).ToArray()
             };
+
+            yield return new OsuMenuItem("Bank")
+            {
+                Items = SelectionBankStates.Select(kvp =>
+                    new TernaryStateToggleMenuItem(kvp.Value.Description) { State = { BindTarget = kvp.Value } }).ToArray()
+            };
         }
 
         #endregion

From 50e24ddd872bcd8e6c5c543d8fa6fcecac0f7b3b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Oct 2022 21:35:08 +0900
Subject: [PATCH 0006/1604] Add icon and radio button logic

---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs   | 20 ++++++++-
 .../Components/ComposeBlueprintContainer.cs   | 42 ++++++++++++++++++-
 .../Components/EditorSelectionHandler.cs      | 35 +++++++++++++++-
 3 files changed, 91 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 3bed835854..8857bb2dae 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -71,6 +71,8 @@ namespace osu.Game.Rulesets.Edit
 
         private FillFlowContainer togglesCollection;
 
+        private FillFlowContainer sampleBankTogglesCollection;
+
         private IBindable<bool> hasTiming;
 
         protected HitObjectComposer(Ruleset ruleset)
@@ -146,6 +148,16 @@ namespace osu.Game.Rulesets.Edit
                                         Direction = FillDirection.Vertical,
                                         Spacing = new Vector2(0, 5),
                                     },
+                                },
+                                new EditorToolboxGroup("bank (Shift-Q~R)")
+                                {
+                                    Child = sampleBankTogglesCollection = new FillFlowContainer
+                                    {
+                                        RelativeSizeAxes = Axes.X,
+                                        AutoSizeAxes = Axes.Y,
+                                        Direction = FillDirection.Vertical,
+                                        Spacing = new Vector2(0, 5),
+                                    },
                                 }
                             }
                         },
@@ -161,6 +173,8 @@ namespace osu.Game.Rulesets.Edit
             TernaryStates = CreateTernaryButtons().ToArray();
             togglesCollection.AddRange(TernaryStates.Select(b => new DrawableTernaryButton(b)));
 
+            sampleBankTogglesCollection.AddRange(BlueprintContainer.SampleBankTernaryStates.Select(b => new DrawableTernaryButton(b)));
+
             setSelectTool();
 
             EditorBeatmap.SelectedHitObjects.CollectionChanged += selectionChanged;
@@ -213,7 +227,7 @@ namespace osu.Game.Rulesets.Edit
         /// <summary>
         /// Create all ternary states required to be displayed to the user.
         /// </summary>
-        protected virtual IEnumerable<TernaryButton> CreateTernaryButtons() => BlueprintContainer.TernaryStates;
+        protected virtual IEnumerable<TernaryButton> CreateTernaryButtons() => BlueprintContainer.MainTernaryStates;
 
         /// <summary>
         /// Construct a relevant blueprint container. This will manage hitobject selection/placement input handling and display logic.
@@ -255,7 +269,9 @@ namespace osu.Game.Rulesets.Edit
 
             if (checkRightToggleFromKey(e.Key, out int rightIndex))
             {
-                var item = togglesCollection.ElementAtOrDefault(rightIndex);
+                var item = e.ShiftPressed
+                    ? sampleBankTogglesCollection.ElementAtOrDefault(rightIndex)
+                    : togglesCollection.ElementAtOrDefault(rightIndex);
 
                 if (item is DrawableTernaryButton button)
                 {
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index ec07da43a0..5adc60f6a7 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -14,6 +14,8 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
 using osu.Game.Audio;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
@@ -55,7 +57,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [BackgroundDependencyLoader]
         private void load()
         {
-            TernaryStates = CreateTernaryButtons().ToArray();
+            MainTernaryStates = CreateTernaryButtons().ToArray();
+            SampleBankTernaryStates = createSampleBankTernaryButtons().ToArray();
 
             AddInternal(placementBlueprintContainer);
         }
@@ -172,7 +175,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <summary>
         /// A collection of states which will be displayed to the user in the toolbox.
         /// </summary>
-        public TernaryButton[] TernaryStates { get; private set; }
+        public TernaryButton[] MainTernaryStates { get; private set; }
+
+        public TernaryButton[] SampleBankTernaryStates { get; private set; }
 
         /// <summary>
         /// Create all ternary states required to be displayed to the user.
@@ -186,6 +191,39 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 yield return new TernaryButton(kvp.Value, kvp.Key.Replace("hit", string.Empty).Titleize(), () => getIconForSample(kvp.Key));
         }
 
+        private IEnumerable<TernaryButton> createSampleBankTernaryButtons()
+        {
+            foreach (var kvp in SelectionHandler.SelectionBankStates)
+                yield return new TernaryButton(kvp.Value, kvp.Key.Titleize(), () => getIconForBank(kvp.Key));
+        }
+
+        private Drawable getIconForBank(string sampleName)
+        {
+            return new Container
+            {
+                Size = new Vector2(30, 20),
+                Children = new Drawable[]
+                {
+                    new SpriteIcon
+                    {
+                        Size = new Vector2(8),
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Icon = FontAwesome.Solid.VolumeOff
+                    },
+                    new OsuSpriteText
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        X = 10,
+                        Y = -1,
+                        Font = OsuFont.Default.With(weight: FontWeight.Bold, size: 20),
+                        Text = $"{char.ToUpper(sampleName.First())}"
+                    }
+                }
+            };
+        }
+
         private Drawable getIconForSample(string sampleName)
         {
             switch (sampleName)
diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
index 1670328e58..750dedac20 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
@@ -11,6 +11,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Audio;
+using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
@@ -70,11 +71,38 @@ namespace osu.Game.Screens.Edit.Compose.Components
                     switch (state.NewValue)
                     {
                         case TernaryState.False:
-                            RemoveSampleBank(bankName);
+                            if (SelectedItems.Count == 0)
+                            {
+                                // Ensure that if this is the last selected bank, it should remain selected.
+                                if (SelectionBankStates.Values.All(b => b.Value == TernaryState.False))
+                                    bindable.Value = TernaryState.True;
+                            }
+                            else
+                            {
+                                // Never remove a sample bank.
+                                // These are basically radio buttons, not toggles.
+                                if (SelectedItems.All(h => h.SampleControlPoint.SampleBank == bankName))
+                                    bindable.Value = TernaryState.True;
+                            }
+
                             break;
 
                         case TernaryState.True:
-                            AddSampleBank(bankName);
+                            if (SelectedItems.Count == 0)
+                            {
+                                // Ensure the user can't stack multiple bank selections when there's no hitobject selection.
+                                // Note that in normal scenarios this is sorted out by the feedback from applying the bank to the selected objects.
+                                foreach (var other in SelectionBankStates.Values)
+                                {
+                                    if (other != bindable)
+                                        other.Value = TernaryState.False;
+                                }
+                            }
+                            else
+                            {
+                                AddSampleBank(bankName);
+                            }
+
                             break;
                     }
                 };
@@ -82,6 +110,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 SelectionBankStates[bankName] = bindable;
             }
 
+            // start with normal selected.
+            SelectionBankStates[SampleControlPoint.DEFAULT_BANK].Value = TernaryState.True;
+
             foreach (string sampleName in HitSampleInfo.AllAdditions)
             {
                 var bindable = new Bindable<TernaryState>

From 372a655be1637d8823d89532d24a28f283798906 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Oct 2022 21:39:51 +0900
Subject: [PATCH 0007/1604] Ensure placement uses currently selected bank

---
 .../Components/ComposeBlueprintContainer.cs   | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 5adc60f6a7..1c9ac83630 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -77,9 +77,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             // we own SelectionHandler so don't need to worry about making bindable copies (for simplicity)
             foreach (var kvp in SelectionHandler.SelectionSampleStates)
-            {
                 kvp.Value.BindValueChanged(_ => updatePlacementSamples());
-            }
+
+            foreach (var kvp in SelectionHandler.SelectionBankStates)
+                kvp.Value.BindValueChanged(_ => updatePlacementSamples());
         }
 
         protected override void TransferBlueprintFor(HitObject hitObject, DrawableHitObject drawableObject)
@@ -146,6 +147,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             foreach (var kvp in SelectionHandler.SelectionSampleStates)
                 sampleChanged(kvp.Key, kvp.Value.Value);
+
+            foreach (var kvp in SelectionHandler.SelectionBankStates)
+                bankChanged(kvp.Key, kvp.Value.Value);
         }
 
         private void sampleChanged(string sampleName, TernaryState state)
@@ -170,6 +174,18 @@ namespace osu.Game.Screens.Edit.Compose.Components
             }
         }
 
+        private void bankChanged(string bankName, TernaryState state)
+        {
+            if (currentPlacement == null) return;
+
+            switch (state)
+            {
+                case TernaryState.True:
+                    currentPlacement.HitObject.SampleControlPoint.SampleBank = bankName;
+                    break;
+            }
+        }
+
         public readonly Bindable<TernaryState> NewCombo = new Bindable<TernaryState> { Description = "New Combo" };
 
         /// <summary>

From b9f41611a7777951b8eebbb83ab5c9a6b27e1e12 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Oct 2022 21:48:18 +0900
Subject: [PATCH 0008/1604] Fix bank potentially being overwritten during
 placement

---
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index c8196b6865..132214a0bd 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -74,9 +74,13 @@ namespace osu.Game.Rulesets.Edit
         /// <param name="commitStart">Whether this call is committing a value for HitObject.StartTime and continuing with further adjustments.</param>
         protected void BeginPlacement(bool commitStart = false)
         {
+            // Store and copy the bank, since it is managed by the editor UI.
+            string bank = HitObject.SampleControlPoint.SampleBank;
+
             var nearestSampleControlPoint = beatmap.HitObjects.LastOrDefault(h => h.GetEndTime() < HitObject.StartTime)?.SampleControlPoint?.DeepClone() as SampleControlPoint;
 
             HitObject.SampleControlPoint = nearestSampleControlPoint ?? new SampleControlPoint();
+            HitObject.SampleControlPoint.SampleBank = bank;
 
             placementHandler.BeginPlacement(HitObject);
             if (commitStart)

From 677b8d09f8773626b36f0e686520fb871b53220d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Oct 2022 23:54:12 +0900
Subject: [PATCH 0009/1604] Fix huge oversight causing test failures

---
 osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index b3e6f50366..ae57ee6f5a 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -413,7 +413,7 @@ namespace osu.Game.Beatmaps.Formats
 
             string stringSampleSet = sampleSet.ToString().ToLowerInvariant();
             if (stringSampleSet == @"none")
-                stringSampleSet = HitSampleInfo.HIT_NORMAL;
+                stringSampleSet = HitSampleInfo.BANK_NORMAL;
 
             if (timingChange)
             {

From 849b50a38fe821720944fff0b560f33dceb25286 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Oct 2022 00:16:33 +0900
Subject: [PATCH 0010/1604] Use `ToUpperInvariant` for added safety
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 .../Edit/Compose/Components/ComposeBlueprintContainer.cs        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 1c9ac83630..eebc4c8e0e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -234,7 +234,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                         X = 10,
                         Y = -1,
                         Font = OsuFont.Default.With(weight: FontWeight.Bold, size: 20),
-                        Text = $"{char.ToUpper(sampleName.First())}"
+                        Text = $"{char.ToUpperInvariant(sampleName.First())}"
                     }
                 }
             };

From e1a21e0cf96df3c7deb4b4fbaf8636ef2ad7611d Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Thu, 17 Nov 2022 00:01:29 +0900
Subject: [PATCH 0011/1604] create a task to export to avoid block main thread

Code quality and remove some #nullable disable
---
 osu.Game.Tests/Skins/IO/ImportSkinTest.cs     |  7 +--
 osu.Game/Database/LegacyBeatmapExporter.cs    |  7 ++-
 osu.Game/Database/LegacyExporter.cs           | 54 ++++++++++++++++---
 osu.Game/Database/LegacyScoreExporter.cs      | 11 ++--
 osu.Game/Database/LegacyScoreImporter.cs      |  2 -
 osu.Game/Database/LegacySkinExporter.cs       |  7 ++-
 osu.Game/Database/LegacySkinImporter.cs       |  2 -
 osu.Game/Database/RealmAccess.cs              |  5 --
 .../Online/Leaderboards/LeaderboardScore.cs   |  5 +-
 .../Overlays/Settings/Sections/SkinSection.cs |  9 +++-
 osu.Game/Screens/Edit/Editor.cs               |  5 +-
 11 files changed, 78 insertions(+), 36 deletions(-)

diff --git a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
index 5c20f46787..7a5f6dbd7c 100644
--- a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
+++ b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
@@ -15,6 +15,7 @@ using osu.Framework.Platform;
 using osu.Game.Database;
 using osu.Game.Extensions;
 using osu.Game.IO;
+using osu.Game.Overlays;
 using osu.Game.Skinning;
 using SharpCompress.Archives.Zip;
 
@@ -122,7 +123,7 @@ namespace osu.Game.Tests.Skins.IO
 
             import1.PerformRead(s =>
             {
-                new LegacySkinExporter(osu.Dependencies.Get<Storage>()).ExportModelTo(s, exportStream);
+                new LegacySkinExporter(osu.Dependencies.Get<Storage>(), osu.Dependencies.Get<INotificationOverlay>()).ExportModelTo(s, exportStream);
             });
 
             string exportFilename = import1.GetDisplayString();
@@ -204,7 +205,7 @@ namespace osu.Game.Tests.Skins.IO
                 Assert.IsFalse(s.Protected);
                 Assert.AreEqual(typeof(ArgonSkin), s.CreateInstance(skinManager).GetType());
 
-                new LegacySkinExporter(osu.Dependencies.Get<Storage>()).ExportModelTo(s, exportStream);
+                new LegacySkinExporter(osu.Dependencies.Get<Storage>(), osu.Dependencies.Get<INotificationOverlay>()).ExportModelTo(s, exportStream);
 
                 Assert.Greater(exportStream.Length, 0);
             });
@@ -239,7 +240,7 @@ namespace osu.Game.Tests.Skins.IO
                 Assert.IsFalse(s.Protected);
                 Assert.AreEqual(typeof(DefaultLegacySkin), s.CreateInstance(skinManager).GetType());
 
-                new LegacySkinExporter(osu.Dependencies.Get<Storage>()).ExportModelTo(s, exportStream);
+                new LegacySkinExporter(osu.Dependencies.Get<Storage>(), osu.Dependencies.Get<INotificationOverlay>()).ExportModelTo(s, exportStream);
 
                 Assert.Greater(exportStream.Length, 0);
             });
diff --git a/osu.Game/Database/LegacyBeatmapExporter.cs b/osu.Game/Database/LegacyBeatmapExporter.cs
index d064b9ed58..3e11e898f3 100644
--- a/osu.Game/Database/LegacyBeatmapExporter.cs
+++ b/osu.Game/Database/LegacyBeatmapExporter.cs
@@ -1,10 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Platform;
 using osu.Game.Beatmaps;
+using osu.Game.Overlays;
 
 namespace osu.Game.Database
 {
@@ -12,8 +11,8 @@ namespace osu.Game.Database
     {
         protected override string FileExtension => ".osz";
 
-        public LegacyBeatmapExporter(Storage storage)
-            : base(storage)
+        public LegacyBeatmapExporter(Storage storage, INotificationOverlay? notificationOverlay)
+            : base(storage, notificationOverlay)
         {
         }
     }
diff --git a/osu.Game/Database/LegacyExporter.cs b/osu.Game/Database/LegacyExporter.cs
index 16d7441dde..ed16e4bc80 100644
--- a/osu.Game/Database/LegacyExporter.cs
+++ b/osu.Game/Database/LegacyExporter.cs
@@ -1,11 +1,12 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.IO;
+using System.Threading.Tasks;
 using osu.Framework.Platform;
 using osu.Game.Extensions;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Notifications;
 using SharpCompress.Archives.Zip;
 
 namespace osu.Game.Database
@@ -25,10 +26,17 @@ namespace osu.Game.Database
 
         private readonly Storage exportStorage;
 
-        protected LegacyExporter(Storage storage)
+        private readonly INotificationOverlay? notificationOverlay;
+
+        protected ProgressNotification Notification = null!;
+
+        private string filename = null!;
+
+        protected LegacyExporter(Storage storage, INotificationOverlay? notificationOverlay)
         {
             exportStorage = storage.GetStorageForDirectory(@"exports");
             UserFileStorage = storage.GetStorageForDirectory(@"files");
+            this.notificationOverlay = notificationOverlay;
         }
 
         /// <summary>
@@ -37,12 +45,25 @@ namespace osu.Game.Database
         /// <param name="item">The item to export.</param>
         public void Export(TModel item)
         {
-            string filename = $"{item.GetDisplayString().GetValidFilename()}{FileExtension}";
+            filename = $"{item.GetDisplayString().GetValidFilename()}{FileExtension}";
 
-            using (var stream = exportStorage.CreateFileSafely(filename))
-                ExportModelTo(item, stream);
+            Stream stream = exportStorage.CreateFileSafely(filename);
 
-            exportStorage.PresentFileExternally(filename);
+            Notification = new ProgressNotification
+            {
+                State = ProgressNotificationState.Active,
+                Text = "Exporting...",
+                CompletionText = "Export completed"
+            };
+            Notification.CompletionClickAction += () => exportStorage.PresentFileExternally(filename);
+            Notification.CancelRequested += () =>
+            {
+                stream.Dispose();
+                return true;
+            };
+
+            ExportModelTo(item, stream);
+            notificationOverlay?.Post(Notification);
         }
 
         /// <summary>
@@ -57,7 +78,24 @@ namespace osu.Game.Database
                 foreach (var file in model.Files)
                     archive.AddEntry(file.Filename, UserFileStorage.GetStream(file.File.GetStoragePath()));
 
-                archive.SaveTo(outputStream);
+                Task.Factory.StartNew(() =>
+                {
+                    archive.SaveTo(outputStream);
+                }, Notification.CancellationToken).ContinueWith(t =>
+                {
+                    if (t.IsCompletedSuccessfully)
+                    {
+                        outputStream.Dispose();
+                        Notification.State = ProgressNotificationState.Completed;
+                    }
+                    else
+                    {
+                        if (Notification.State == ProgressNotificationState.Cancelled) return;
+
+                        Notification.State = ProgressNotificationState.Cancelled;
+                        Notification.Text = "Export Failed";
+                    }
+                });
             }
         }
     }
diff --git a/osu.Game/Database/LegacyScoreExporter.cs b/osu.Game/Database/LegacyScoreExporter.cs
index 6fa02b957d..1564c7b077 100644
--- a/osu.Game/Database/LegacyScoreExporter.cs
+++ b/osu.Game/Database/LegacyScoreExporter.cs
@@ -1,12 +1,12 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.IO;
 using System.Linq;
 using osu.Framework.Platform;
 using osu.Game.Extensions;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Notifications;
 using osu.Game.Scoring;
 
 namespace osu.Game.Database
@@ -15,8 +15,8 @@ namespace osu.Game.Database
     {
         protected override string FileExtension => ".osr";
 
-        public LegacyScoreExporter(Storage storage)
-            : base(storage)
+        public LegacyScoreExporter(Storage storage, INotificationOverlay? notificationOverlay)
+            : base(storage, notificationOverlay)
         {
         }
 
@@ -28,6 +28,9 @@ namespace osu.Game.Database
 
             using (var inputStream = UserFileStorage.GetStream(file.File.GetStoragePath()))
                 inputStream.CopyTo(outputStream);
+
+            Notification.State = ProgressNotificationState.Completed;
+            outputStream.Dispose();
         }
     }
 }
diff --git a/osu.Game/Database/LegacyScoreImporter.cs b/osu.Game/Database/LegacyScoreImporter.cs
index f61241141e..131b4ffb0e 100644
--- a/osu.Game/Database/LegacyScoreImporter.cs
+++ b/osu.Game/Database/LegacyScoreImporter.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/osu.Game/Database/LegacySkinExporter.cs b/osu.Game/Database/LegacySkinExporter.cs
index 1d5364fb8d..a78d69e7b9 100644
--- a/osu.Game/Database/LegacySkinExporter.cs
+++ b/osu.Game/Database/LegacySkinExporter.cs
@@ -1,9 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Platform;
+using osu.Game.Overlays;
 using osu.Game.Skinning;
 
 namespace osu.Game.Database
@@ -12,8 +11,8 @@ namespace osu.Game.Database
     {
         protected override string FileExtension => ".osk";
 
-        public LegacySkinExporter(Storage storage)
-            : base(storage)
+        public LegacySkinExporter(Storage storage, INotificationOverlay? notificationOverlay)
+            : base(storage, notificationOverlay)
         {
         }
     }
diff --git a/osu.Game/Database/LegacySkinImporter.cs b/osu.Game/Database/LegacySkinImporter.cs
index 42b2f2e1d8..2f05ccae45 100644
--- a/osu.Game/Database/LegacySkinImporter.cs
+++ b/osu.Game/Database/LegacySkinImporter.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Skinning;
 
 namespace osu.Game.Database
diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index 1a938c12e5..5a7ead1c59 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -173,11 +173,6 @@ namespace osu.Game.Database
             if (!Filename.EndsWith(realm_extension, StringComparison.Ordinal))
                 Filename += realm_extension;
 
-#if DEBUG
-            if (!DebugUtils.IsNUnitRunning)
-                applyFilenameSchemaSuffix(ref Filename);
-#endif
-
             string newerVersionFilename = $"{Filename.Replace(realm_extension, string.Empty)}_newer_version{realm_extension}";
 
             // Attempt to recover a newer database version if available.
diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index a7b6bd044d..72f1a94ec8 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -75,6 +75,9 @@ namespace osu.Game.Online.Leaderboards
         [Resolved]
         private Storage storage { get; set; }
 
+        [Resolved]
+        private INotificationOverlay notificationOverlay { get; set; }
+
         public ITooltip<ScoreInfo> GetCustomTooltip() => new LeaderboardScoreTooltip();
         public virtual ScoreInfo TooltipContent => Score;
 
@@ -427,7 +430,7 @@ namespace osu.Game.Online.Leaderboards
 
                 if (Score.Files.Count > 0)
                 {
-                    items.Add(new OsuMenuItem("Export", MenuItemType.Standard, () => new LegacyScoreExporter(storage).Export(Score)));
+                    items.Add(new OsuMenuItem("Export", MenuItemType.Standard, () => new LegacyScoreExporter(storage, notificationOverlay).Export(Score)));
                     items.Add(new OsuMenuItem(CommonStrings.ButtonsDelete, MenuItemType.Destructive, () => dialogOverlay?.Push(new LocalScoreDeleteDialog(Score))));
                 }
 
diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index f602b73065..df6f719b1e 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -141,11 +141,16 @@ namespace osu.Game.Overlays.Settings.Sections
             [Resolved]
             private Storage storage { get; set; }
 
+            [CanBeNull]
+            private INotificationOverlay notificationOverlay;
+
             private Bindable<Skin> currentSkin;
 
             [BackgroundDependencyLoader]
-            private void load()
+            private void load(INotificationOverlay notificationOverlay)
             {
+                this.notificationOverlay = notificationOverlay;
+
                 Text = SkinSettingsStrings.ExportSkinButton;
                 Action = export;
             }
@@ -162,7 +167,7 @@ namespace osu.Game.Overlays.Settings.Sections
             {
                 try
                 {
-                    currentSkin.Value.SkinInfo.PerformRead(s => new LegacySkinExporter(storage).Export(s));
+                    currentSkin.Value.SkinInfo.PerformRead(s => new LegacySkinExporter(storage, notificationOverlay).Export(s));
                 }
                 catch (Exception e)
                 {
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index bb390dfbf3..03bdd69f34 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -93,6 +93,9 @@ namespace osu.Game.Screens.Edit
         [Resolved]
         private Storage storage { get; set; }
 
+        [Resolved]
+        private INotificationOverlay notificationOverlay { get; set; }
+
         [Resolved(canBeNull: true)]
         private IDialogOverlay dialogOverlay { get; set; }
 
@@ -938,7 +941,7 @@ namespace osu.Game.Screens.Edit
         private void exportBeatmap()
         {
             Save();
-            new LegacyBeatmapExporter(storage).Export(Beatmap.Value.BeatmapSetInfo);
+            new LegacyBeatmapExporter(storage, notificationOverlay).Export(Beatmap.Value.BeatmapSetInfo);
         }
 
         /// <summary>

From 4b29941b4705a38ea26ce4ca617caf75c3be4f1a Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Thu, 17 Nov 2022 23:38:24 +0900
Subject: [PATCH 0012/1604] add `LegacyExportManager`

---
 osu.Game.Tests/Skins/IO/ImportSkinTest.cs     |   4 +-
 osu.Game/Database/LegacyBeatmapExporter.cs    |   8 +-
 osu.Game/Database/LegacyExportManager.cs      |  55 +++++++++
 osu.Game/Database/LegacyExporter.cs           | 102 ----------------
 osu.Game/Database/LegacyModelExporter.cs      | 113 ++++++++++++++++++
 osu.Game/Database/LegacyScoreExporter.cs      |  34 +++---
 osu.Game/Database/LegacySkinExporter.cs       |   8 +-
 .../Online/Leaderboards/LeaderboardScore.cs   |   5 +-
 osu.Game/OsuGame.cs                           |   4 +
 .../Overlays/Settings/Sections/SkinSection.cs |  10 +-
 osu.Game/Screens/Edit/Editor.cs               |   9 +-
 11 files changed, 209 insertions(+), 143 deletions(-)
 create mode 100644 osu.Game/Database/LegacyExportManager.cs
 delete mode 100644 osu.Game/Database/LegacyExporter.cs
 create mode 100644 osu.Game/Database/LegacyModelExporter.cs

diff --git a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
index 7a5f6dbd7c..ef68b06476 100644
--- a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
+++ b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
@@ -121,9 +121,9 @@ namespace osu.Game.Tests.Skins.IO
             var import1 = await loadSkinIntoOsu(osu, new ImportTask(createOskWithIni("name 1", "author 1"), "custom.osk"));
             assertCorrectMetadata(import1, "name 1 [custom]", "author 1", osu);
 
-            import1.PerformRead(s =>
+            import1.PerformRead(async s =>
             {
-                new LegacySkinExporter(osu.Dependencies.Get<Storage>(), osu.Dependencies.Get<INotificationOverlay>()).ExportModelTo(s, exportStream);
+                await new LegacyExportManager().ExportAsync(s, exportStream);
             });
 
             string exportFilename = import1.GetDisplayString();
diff --git a/osu.Game/Database/LegacyBeatmapExporter.cs b/osu.Game/Database/LegacyBeatmapExporter.cs
index 3e11e898f3..140ce43fbd 100644
--- a/osu.Game/Database/LegacyBeatmapExporter.cs
+++ b/osu.Game/Database/LegacyBeatmapExporter.cs
@@ -3,16 +3,16 @@
 
 using osu.Framework.Platform;
 using osu.Game.Beatmaps;
-using osu.Game.Overlays;
+using osu.Game.Overlays.Notifications;
 
 namespace osu.Game.Database
 {
-    public class LegacyBeatmapExporter : LegacyExporter<BeatmapSetInfo>
+    public class LegacyBeatmapExporter : LegacyModelExporter<BeatmapSetInfo>
     {
         protected override string FileExtension => ".osz";
 
-        public LegacyBeatmapExporter(Storage storage, INotificationOverlay? notificationOverlay)
-            : base(storage, notificationOverlay)
+        public LegacyBeatmapExporter(Storage storage, RealmAccess realm, ProgressNotification notification)
+            : base(storage, realm, notification)
         {
         }
     }
diff --git a/osu.Game/Database/LegacyExportManager.cs b/osu.Game/Database/LegacyExportManager.cs
new file mode 100644
index 0000000000..18cd93ea35
--- /dev/null
+++ b/osu.Game/Database/LegacyExportManager.cs
@@ -0,0 +1,55 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Threading.Tasks;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Platform;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Notifications;
+using osu.Game.Scoring;
+using osu.Game.Skinning;
+
+namespace osu.Game.Database
+{
+    [ExcludeFromDynamicCompile]
+    public class LegacyExportManager : Component
+    {
+        [Resolved]
+        private RealmAccess realmAccess { get; set; } = null!;
+
+        [Resolved]
+        private Storage exportStorage { get; set; } = null!;
+
+        [Resolved]
+        private INotificationOverlay? notifications { get; set; }
+
+        public async Task ExportAsync(IHasGuidPrimaryKey item)
+        {
+            var notification = new ProgressNotification
+            {
+                State = ProgressNotificationState.Active,
+                Text = "Exporting...",
+                CompletionText = "Export completed"
+            };
+            notifications?.Post(notification);
+
+            switch (item)
+            {
+                case SkinInfo:
+                    await new LegacySkinExporter(exportStorage, realmAccess, notification).ExportASync(item);
+                    break;
+
+                case ScoreInfo:
+                    await new LegacyScoreExporter(exportStorage, realmAccess, notification).ExportASync(item, false);
+                    break;
+
+                case BeatmapSetInfo:
+                    await new LegacyBeatmapExporter(exportStorage, realmAccess, notification).ExportASync(item);
+                    break;
+            }
+        }
+    }
+}
diff --git a/osu.Game/Database/LegacyExporter.cs b/osu.Game/Database/LegacyExporter.cs
deleted file mode 100644
index ed16e4bc80..0000000000
--- a/osu.Game/Database/LegacyExporter.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System.IO;
-using System.Threading.Tasks;
-using osu.Framework.Platform;
-using osu.Game.Extensions;
-using osu.Game.Overlays;
-using osu.Game.Overlays.Notifications;
-using SharpCompress.Archives.Zip;
-
-namespace osu.Game.Database
-{
-    /// <summary>
-    /// A class which handles exporting legacy user data of a single type from osu-stable.
-    /// </summary>
-    public abstract class LegacyExporter<TModel>
-        where TModel : class, IHasNamedFiles
-    {
-        /// <summary>
-        /// The file extension for exports (including the leading '.').
-        /// </summary>
-        protected abstract string FileExtension { get; }
-
-        protected readonly Storage UserFileStorage;
-
-        private readonly Storage exportStorage;
-
-        private readonly INotificationOverlay? notificationOverlay;
-
-        protected ProgressNotification Notification = null!;
-
-        private string filename = null!;
-
-        protected LegacyExporter(Storage storage, INotificationOverlay? notificationOverlay)
-        {
-            exportStorage = storage.GetStorageForDirectory(@"exports");
-            UserFileStorage = storage.GetStorageForDirectory(@"files");
-            this.notificationOverlay = notificationOverlay;
-        }
-
-        /// <summary>
-        /// Exports an item to a legacy (.zip based) package.
-        /// </summary>
-        /// <param name="item">The item to export.</param>
-        public void Export(TModel item)
-        {
-            filename = $"{item.GetDisplayString().GetValidFilename()}{FileExtension}";
-
-            Stream stream = exportStorage.CreateFileSafely(filename);
-
-            Notification = new ProgressNotification
-            {
-                State = ProgressNotificationState.Active,
-                Text = "Exporting...",
-                CompletionText = "Export completed"
-            };
-            Notification.CompletionClickAction += () => exportStorage.PresentFileExternally(filename);
-            Notification.CancelRequested += () =>
-            {
-                stream.Dispose();
-                return true;
-            };
-
-            ExportModelTo(item, stream);
-            notificationOverlay?.Post(Notification);
-        }
-
-        /// <summary>
-        /// Exports an item to the given output stream.
-        /// </summary>
-        /// <param name="model">The item to export.</param>
-        /// <param name="outputStream">The output stream to export to.</param>
-        public virtual void ExportModelTo(TModel model, Stream outputStream)
-        {
-            using (var archive = ZipArchive.Create())
-            {
-                foreach (var file in model.Files)
-                    archive.AddEntry(file.Filename, UserFileStorage.GetStream(file.File.GetStoragePath()));
-
-                Task.Factory.StartNew(() =>
-                {
-                    archive.SaveTo(outputStream);
-                }, Notification.CancellationToken).ContinueWith(t =>
-                {
-                    if (t.IsCompletedSuccessfully)
-                    {
-                        outputStream.Dispose();
-                        Notification.State = ProgressNotificationState.Completed;
-                    }
-                    else
-                    {
-                        if (Notification.State == ProgressNotificationState.Cancelled) return;
-
-                        Notification.State = ProgressNotificationState.Cancelled;
-                        Notification.Text = "Export Failed";
-                    }
-                });
-            }
-        }
-    }
-}
diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
new file mode 100644
index 0000000000..d181226803
--- /dev/null
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -0,0 +1,113 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using osu.Framework.Platform;
+using osu.Game.Extensions;
+using osu.Game.Overlays.Notifications;
+using Realms;
+using SharpCompress.Archives.Zip;
+
+namespace osu.Game.Database
+{
+    /// <summary>
+    /// A class which handles exporting legacy user data of a single type from osu-stable.
+    /// </summary>
+    public abstract class LegacyModelExporter<TModel>
+        where TModel : RealmObject
+    {
+        /// <summary>
+        /// The file extension for exports (including the leading '.').
+        /// </summary>
+        protected abstract string FileExtension { get; }
+
+        protected readonly Storage UserFileStorage;
+
+        private readonly Storage exportStorage;
+
+        private readonly RealmAccess realmAccess;
+
+        private readonly ProgressNotification notification;
+
+        protected ProgressNotification Notification = null!;
+
+        private string filename = null!;
+
+        protected LegacyModelExporter(Storage storage, RealmAccess realm, ProgressNotification notification)
+        {
+            exportStorage = storage.GetStorageForDirectory(@"exports");
+            UserFileStorage = storage.GetStorageForDirectory(@"files");
+            this.notification = notification;
+            realmAccess = realm;
+        }
+
+        public async Task ExportASync(IHasGuidPrimaryKey uuid, bool needZipArchive = true)
+        {
+            Guid id = uuid.ID;
+            await Task.Run(() =>
+            {
+                realmAccess.Run(r =>
+                {
+                    if (r.Find<TModel>(id) is IHasNamedFiles model)
+                    {
+                        filename = $"{model.GetDisplayString().GetValidFilename()}{FileExtension}";
+                    }
+                    else
+                    {
+                        return;
+                    }
+
+                    using (var outputStream = exportStorage.CreateFileSafely(filename))
+                    {
+                        if (needZipArchive)
+                        {
+                            using (var archive = ZipArchive.Create())
+                            {
+                                float i = 0;
+
+                                foreach (var file in model.Files)
+                                {
+                                    if (notification.CancellationToken.IsCancellationRequested) return;
+                                    archive.AddEntry(file.Filename, UserFileStorage.GetStream(file.File.GetStoragePath()));
+                                    i++;
+                                    notification.Progress = i / model.Files.Count();
+                                    notification.Text = $"Exporting... ({i}/{model.Files.Count()})";
+                                }
+
+                                notification.Text = "Saving Zip Archive...";
+                                archive.SaveTo(outputStream);
+                            }
+                        }
+                        else
+                        {
+                            var file = model.Files.SingleOrDefault();
+                            if (file == null)
+                                return;
+
+                            using (var inputStream = UserFileStorage.GetStream(file.File.GetStoragePath()))
+                                inputStream.CopyTo(outputStream);
+                        }
+                    }
+                });
+            }).ContinueWith(t =>
+            {
+                if (t.IsFaulted)
+                {
+                    notification.State = ProgressNotificationState.Cancelled;
+                    return;
+                }
+
+                if (notification.CancellationToken.IsCancellationRequested)
+                {
+                    return;
+                }
+
+                notification.CompletionText = "Export Complete, Click to open the folder";
+                notification.CompletionClickAction += () => exportStorage.PresentFileExternally(filename);
+                notification.State = ProgressNotificationState.Completed;
+            });
+        }
+    }
+}
diff --git a/osu.Game/Database/LegacyScoreExporter.cs b/osu.Game/Database/LegacyScoreExporter.cs
index 1564c7b077..ffbec0530b 100644
--- a/osu.Game/Database/LegacyScoreExporter.cs
+++ b/osu.Game/Database/LegacyScoreExporter.cs
@@ -1,36 +1,32 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.IO;
-using System.Linq;
 using osu.Framework.Platform;
-using osu.Game.Extensions;
-using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Scoring;
 
 namespace osu.Game.Database
 {
-    public class LegacyScoreExporter : LegacyExporter<ScoreInfo>
+    public class LegacyScoreExporter : LegacyModelExporter<ScoreInfo>
     {
         protected override string FileExtension => ".osr";
 
-        public LegacyScoreExporter(Storage storage, INotificationOverlay? notificationOverlay)
-            : base(storage, notificationOverlay)
+        public LegacyScoreExporter(Storage storage, RealmAccess realm, ProgressNotification notification)
+            : base(storage, realm, notification)
         {
         }
 
-        public override void ExportModelTo(ScoreInfo model, Stream outputStream)
-        {
-            var file = model.Files.SingleOrDefault();
-            if (file == null)
-                return;
-
-            using (var inputStream = UserFileStorage.GetStream(file.File.GetStoragePath()))
-                inputStream.CopyTo(outputStream);
-
-            Notification.State = ProgressNotificationState.Completed;
-            outputStream.Dispose();
-        }
+        //public override void ExportModelTo(ScoreInfo model, Stream outputStream)
+        //{
+        //    var file = model.Files.SingleOrDefault();
+        //    if (file == null)
+        //        return;
+        //
+        //    using (var inputStream = UserFileStorage.GetStream(file.File.GetStoragePath()))
+        //        inputStream.CopyTo(outputStream);
+        //
+        //    Notification.State = ProgressNotificationState.Completed;
+        //    outputStream.Dispose();
+        //}
     }
 }
diff --git a/osu.Game/Database/LegacySkinExporter.cs b/osu.Game/Database/LegacySkinExporter.cs
index a78d69e7b9..a35636c248 100644
--- a/osu.Game/Database/LegacySkinExporter.cs
+++ b/osu.Game/Database/LegacySkinExporter.cs
@@ -2,17 +2,17 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Platform;
-using osu.Game.Overlays;
+using osu.Game.Overlays.Notifications;
 using osu.Game.Skinning;
 
 namespace osu.Game.Database
 {
-    public class LegacySkinExporter : LegacyExporter<SkinInfo>
+    public class LegacySkinExporter : LegacyModelExporter<SkinInfo>
     {
         protected override string FileExtension => ".osk";
 
-        public LegacySkinExporter(Storage storage, INotificationOverlay? notificationOverlay)
-            : base(storage, notificationOverlay)
+        public LegacySkinExporter(Storage storage, RealmAccess realm, ProgressNotification notification)
+            : base(storage, realm, notification)
         {
         }
     }
diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index 72f1a94ec8..e2f640a44c 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -6,6 +6,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -76,7 +77,7 @@ namespace osu.Game.Online.Leaderboards
         private Storage storage { get; set; }
 
         [Resolved]
-        private INotificationOverlay notificationOverlay { get; set; }
+        private LegacyExportManager exporter { get; set; }
 
         public ITooltip<ScoreInfo> GetCustomTooltip() => new LeaderboardScoreTooltip();
         public virtual ScoreInfo TooltipContent => Score;
@@ -430,7 +431,7 @@ namespace osu.Game.Online.Leaderboards
 
                 if (Score.Files.Count > 0)
                 {
-                    items.Add(new OsuMenuItem("Export", MenuItemType.Standard, () => new LegacyScoreExporter(storage, notificationOverlay).Export(Score)));
+                    items.Add(new OsuMenuItem("Export", MenuItemType.Standard, () => Task.Run(() => exporter.ExportAsync(Score))));
                     items.Add(new OsuMenuItem(CommonStrings.ButtonsDelete, MenuItemType.Destructive, () => dialogOverlay?.Push(new LocalScoreDeleteDialog(Score))));
                 }
 
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index a93c187e53..09647f9d1e 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -126,6 +126,9 @@ namespace osu.Game
         [Cached]
         private readonly LegacyImportManager legacyImportManager = new LegacyImportManager();
 
+        [Cached]
+        private readonly LegacyExportManager legacyExportManager = new LegacyExportManager();
+
         [Cached]
         private readonly ScreenshotManager screenshotManager = new ScreenshotManager();
 
@@ -868,6 +871,7 @@ namespace osu.Game
             }), rightFloatingOverlayContent.Add, true);
 
             loadComponentSingleFile(legacyImportManager, Add);
+            loadComponentSingleFile(legacyExportManager, Add);
 
             loadComponentSingleFile(screenshotManager, Add);
 
diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index df6f719b1e..6cd9e591e1 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -141,16 +141,14 @@ namespace osu.Game.Overlays.Settings.Sections
             [Resolved]
             private Storage storage { get; set; }
 
-            [CanBeNull]
-            private INotificationOverlay notificationOverlay;
+            [Resolved]
+            private LegacyExportManager exporter { get; set; }
 
             private Bindable<Skin> currentSkin;
 
             [BackgroundDependencyLoader]
-            private void load(INotificationOverlay notificationOverlay)
+            private void load()
             {
-                this.notificationOverlay = notificationOverlay;
-
                 Text = SkinSettingsStrings.ExportSkinButton;
                 Action = export;
             }
@@ -167,7 +165,7 @@ namespace osu.Game.Overlays.Settings.Sections
             {
                 try
                 {
-                    currentSkin.Value.SkinInfo.PerformRead(s => new LegacySkinExporter(storage, notificationOverlay).Export(s));
+                    currentSkin.Value.SkinInfo.PerformRead(s => exporter.ExportAsync(s));
                 }
                 catch (Exception e)
                 {
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 03bdd69f34..e266239f34 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -6,6 +6,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using JetBrains.Annotations;
 using osu.Framework;
 using osu.Framework.Allocation;
@@ -93,9 +94,6 @@ namespace osu.Game.Screens.Edit
         [Resolved]
         private Storage storage { get; set; }
 
-        [Resolved]
-        private INotificationOverlay notificationOverlay { get; set; }
-
         [Resolved(canBeNull: true)]
         private IDialogOverlay dialogOverlay { get; set; }
 
@@ -185,6 +183,9 @@ namespace osu.Game.Screens.Edit
         private Bindable<float> editorBackgroundDim;
         private Bindable<bool> editorHitMarkers;
 
+        [Resolved]
+        private LegacyExportManager exporter { get; set; }
+
         public Editor(EditorLoader loader = null)
         {
             this.loader = loader;
@@ -941,7 +942,7 @@ namespace osu.Game.Screens.Edit
         private void exportBeatmap()
         {
             Save();
-            new LegacyBeatmapExporter(storage, notificationOverlay).Export(Beatmap.Value.BeatmapSetInfo);
+            Task.Run(() => exporter.ExportAsync(Beatmap.Value.BeatmapSetInfo));
         }
 
         /// <summary>

From fc4a6cb125c50668765d8b43f5bcf88cb242f28c Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sat, 19 Nov 2022 01:02:35 +0900
Subject: [PATCH 0013/1604] working with test

---
 osu.Game.Tests/Skins/IO/ImportSkinTest.cs  |  31 +++---
 osu.Game/Database/LegacyBeatmapExporter.cs |   5 +-
 osu.Game/Database/LegacyExportManager.cs   |   2 +-
 osu.Game/Database/LegacyModelExporter.cs   | 106 +++++++++++----------
 osu.Game/Database/LegacyScoreExporter.cs   |  52 +++++++---
 osu.Game/Database/LegacySkinExporter.cs    |   5 +-
 6 files changed, 113 insertions(+), 88 deletions(-)

diff --git a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
index ef68b06476..0c3c459e87 100644
--- a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
+++ b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
@@ -10,12 +10,11 @@ using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Extensions;
 using osu.Framework.Platform;
 using osu.Game.Database;
 using osu.Game.Extensions;
 using osu.Game.IO;
-using osu.Game.Overlays;
+using osu.Game.Overlays.Notifications;
 using osu.Game.Skinning;
 using SharpCompress.Archives.Zip;
 
@@ -121,9 +120,9 @@ namespace osu.Game.Tests.Skins.IO
             var import1 = await loadSkinIntoOsu(osu, new ImportTask(createOskWithIni("name 1", "author 1"), "custom.osk"));
             assertCorrectMetadata(import1, "name 1 [custom]", "author 1", osu);
 
-            import1.PerformRead(async s =>
+            await import1.PerformRead(async s =>
             {
-                await new LegacyExportManager().ExportAsync(s, exportStream);
+                await new LegacySkinExporter(osu.Dependencies.Get<Storage>(), osu.Dependencies.Get<RealmAccess>(), new ProgressNotification(), exportStream).ExportASync(s);
             });
 
             string exportFilename = import1.GetDisplayString();
@@ -190,7 +189,7 @@ namespace osu.Game.Tests.Skins.IO
         });
 
         [Test]
-        public Task TestExportThenImportDefaultSkin() => runSkinTest(osu =>
+        public Task TestExportThenImportDefaultSkin() => runSkinTest(async osu =>
         {
             var skinManager = osu.Dependencies.Get<SkinManager>();
 
@@ -200,30 +199,28 @@ namespace osu.Game.Tests.Skins.IO
 
             Guid originalSkinId = skinManager.CurrentSkinInfo.Value.ID;
 
-            skinManager.CurrentSkinInfo.Value.PerformRead(s =>
+            await skinManager.CurrentSkinInfo.Value.PerformRead(async s =>
             {
                 Assert.IsFalse(s.Protected);
                 Assert.AreEqual(typeof(ArgonSkin), s.CreateInstance(skinManager).GetType());
 
-                new LegacySkinExporter(osu.Dependencies.Get<Storage>(), osu.Dependencies.Get<INotificationOverlay>()).ExportModelTo(s, exportStream);
+                await new LegacySkinExporter(osu.Dependencies.Get<Storage>(), osu.Dependencies.Get<RealmAccess>(), new ProgressNotification(), exportStream).ExportASync(s);
 
                 Assert.Greater(exportStream.Length, 0);
             });
 
-            var imported = skinManager.Import(new ImportTask(exportStream, "exported.osk"));
+            var imported = await skinManager.Import(new ImportTask(exportStream, "exported.osk"));
 
-            imported.GetResultSafely().PerformRead(s =>
+            imported.PerformRead(s =>
             {
                 Assert.IsFalse(s.Protected);
                 Assert.AreNotEqual(originalSkinId, s.ID);
                 Assert.AreEqual(typeof(ArgonSkin), s.CreateInstance(skinManager).GetType());
             });
-
-            return Task.CompletedTask;
         });
 
         [Test]
-        public Task TestExportThenImportClassicSkin() => runSkinTest(osu =>
+        public Task TestExportThenImportClassicSkin() => runSkinTest(async osu =>
         {
             var skinManager = osu.Dependencies.Get<SkinManager>();
 
@@ -235,26 +232,24 @@ namespace osu.Game.Tests.Skins.IO
 
             Guid originalSkinId = skinManager.CurrentSkinInfo.Value.ID;
 
-            skinManager.CurrentSkinInfo.Value.PerformRead(s =>
+            await skinManager.CurrentSkinInfo.Value.PerformRead(async s =>
             {
                 Assert.IsFalse(s.Protected);
                 Assert.AreEqual(typeof(DefaultLegacySkin), s.CreateInstance(skinManager).GetType());
 
-                new LegacySkinExporter(osu.Dependencies.Get<Storage>(), osu.Dependencies.Get<INotificationOverlay>()).ExportModelTo(s, exportStream);
+                await new LegacySkinExporter(osu.Dependencies.Get<Storage>(), osu.Dependencies.Get<RealmAccess>(), new ProgressNotification(), exportStream).ExportASync(s);
 
                 Assert.Greater(exportStream.Length, 0);
             });
 
-            var imported = skinManager.Import(new ImportTask(exportStream, "exported.osk"));
+            var imported = await skinManager.Import(new ImportTask(exportStream, "exported.osk"));
 
-            imported.GetResultSafely().PerformRead(s =>
+            imported.PerformRead(s =>
             {
                 Assert.IsFalse(s.Protected);
                 Assert.AreNotEqual(originalSkinId, s.ID);
                 Assert.AreEqual(typeof(DefaultLegacySkin), s.CreateInstance(skinManager).GetType());
             });
-
-            return Task.CompletedTask;
         });
 
         #endregion
diff --git a/osu.Game/Database/LegacyBeatmapExporter.cs b/osu.Game/Database/LegacyBeatmapExporter.cs
index 140ce43fbd..5505d141ee 100644
--- a/osu.Game/Database/LegacyBeatmapExporter.cs
+++ b/osu.Game/Database/LegacyBeatmapExporter.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.IO;
 using osu.Framework.Platform;
 using osu.Game.Beatmaps;
 using osu.Game.Overlays.Notifications;
@@ -11,8 +12,8 @@ namespace osu.Game.Database
     {
         protected override string FileExtension => ".osz";
 
-        public LegacyBeatmapExporter(Storage storage, RealmAccess realm, ProgressNotification notification)
-            : base(storage, realm, notification)
+        public LegacyBeatmapExporter(Storage storage, RealmAccess realm, ProgressNotification notification, Stream? stream = null)
+            : base(storage, realm, notification, stream)
         {
         }
     }
diff --git a/osu.Game/Database/LegacyExportManager.cs b/osu.Game/Database/LegacyExportManager.cs
index 18cd93ea35..08594ab020 100644
--- a/osu.Game/Database/LegacyExportManager.cs
+++ b/osu.Game/Database/LegacyExportManager.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Database
                     break;
 
                 case ScoreInfo:
-                    await new LegacyScoreExporter(exportStorage, realmAccess, notification).ExportASync(item, false);
+                    await new LegacyScoreExporter(exportStorage, realmAccess, notification).ExportASync(item);
                     break;
 
                 case BeatmapSetInfo:
diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index d181226803..a4b0f7ba9d 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Platform;
@@ -25,89 +26,92 @@ namespace osu.Game.Database
 
         protected readonly Storage UserFileStorage;
 
-        private readonly Storage exportStorage;
+        protected readonly Storage ExportStorage;
 
-        private readonly RealmAccess realmAccess;
+        protected readonly RealmAccess RealmAccess;
 
-        private readonly ProgressNotification notification;
+        protected readonly ProgressNotification Notification;
 
-        protected ProgressNotification Notification = null!;
+        protected string Filename = null!;
 
-        private string filename = null!;
+        protected Stream? OutputStream;
 
-        protected LegacyModelExporter(Storage storage, RealmAccess realm, ProgressNotification notification)
+        protected bool ShouldDisposeStream;
+
+        protected LegacyModelExporter(Storage storage, RealmAccess realm, ProgressNotification notification, Stream? stream = null)
         {
-            exportStorage = storage.GetStorageForDirectory(@"exports");
+            ExportStorage = storage.GetStorageForDirectory(@"exports");
             UserFileStorage = storage.GetStorageForDirectory(@"files");
-            this.notification = notification;
-            realmAccess = realm;
+            Notification = notification;
+            RealmAccess = realm;
+            OutputStream = stream;
+            ShouldDisposeStream = false;
         }
 
-        public async Task ExportASync(IHasGuidPrimaryKey uuid, bool needZipArchive = true)
+        public virtual async Task ExportASync(IHasGuidPrimaryKey uuid)
         {
             Guid id = uuid.ID;
             await Task.Run(() =>
             {
-                realmAccess.Run(r =>
+                RealmAccess.Run(r =>
                 {
                     if (r.Find<TModel>(id) is IHasNamedFiles model)
                     {
-                        filename = $"{model.GetDisplayString().GetValidFilename()}{FileExtension}";
+                        Filename = $"{model.GetDisplayString().GetValidFilename()}{FileExtension}";
                     }
                     else
                     {
                         return;
                     }
 
-                    using (var outputStream = exportStorage.CreateFileSafely(filename))
+                    if (OutputStream == null)
                     {
-                        if (needZipArchive)
+                        OutputStream = ExportStorage.CreateFileSafely(Filename);
+                        ShouldDisposeStream = true;
+                    }
+
+                    using (var archive = ZipArchive.Create())
+                    {
+                        float i = 0;
+
+                        foreach (var file in model.Files)
                         {
-                            using (var archive = ZipArchive.Create())
-                            {
-                                float i = 0;
+                            if (Notification.CancellationToken.IsCancellationRequested) return;
 
-                                foreach (var file in model.Files)
-                                {
-                                    if (notification.CancellationToken.IsCancellationRequested) return;
-                                    archive.AddEntry(file.Filename, UserFileStorage.GetStream(file.File.GetStoragePath()));
-                                    i++;
-                                    notification.Progress = i / model.Files.Count();
-                                    notification.Text = $"Exporting... ({i}/{model.Files.Count()})";
-                                }
-
-                                notification.Text = "Saving Zip Archive...";
-                                archive.SaveTo(outputStream);
-                            }
+                            archive.AddEntry(file.Filename, UserFileStorage.GetStream(file.File.GetStoragePath()));
+                            i++;
+                            Notification.Progress = i / model.Files.Count();
+                            Notification.Text = $"Exporting... ({i}/{model.Files.Count()})";
                         }
-                        else
-                        {
-                            var file = model.Files.SingleOrDefault();
-                            if (file == null)
-                                return;
 
-                            using (var inputStream = UserFileStorage.GetStream(file.File.GetStoragePath()))
-                                inputStream.CopyTo(outputStream);
-                        }
+                        Notification.Text = "Saving Zip Archive...";
+                        archive.SaveTo(OutputStream);
                     }
                 });
-            }).ContinueWith(t =>
+            }).ContinueWith(OnComplete);
+        }
+
+        protected void OnComplete(Task t)
+        {
+            if (ShouldDisposeStream)
             {
-                if (t.IsFaulted)
-                {
-                    notification.State = ProgressNotificationState.Cancelled;
-                    return;
-                }
+                OutputStream?.Dispose();
+            }
 
-                if (notification.CancellationToken.IsCancellationRequested)
-                {
-                    return;
-                }
+            if (t.IsFaulted)
+            {
+                Notification.State = ProgressNotificationState.Cancelled;
+                return;
+            }
 
-                notification.CompletionText = "Export Complete, Click to open the folder";
-                notification.CompletionClickAction += () => exportStorage.PresentFileExternally(filename);
-                notification.State = ProgressNotificationState.Completed;
-            });
+            if (Notification.CancellationToken.IsCancellationRequested)
+            {
+                return;
+            }
+
+            Notification.CompletionText = "Export Complete, Click to open the folder";
+            Notification.CompletionClickAction += () => ExportStorage.PresentFileExternally(Filename);
+            Notification.State = ProgressNotificationState.Completed;
         }
     }
 }
diff --git a/osu.Game/Database/LegacyScoreExporter.cs b/osu.Game/Database/LegacyScoreExporter.cs
index ffbec0530b..3004c02978 100644
--- a/osu.Game/Database/LegacyScoreExporter.cs
+++ b/osu.Game/Database/LegacyScoreExporter.cs
@@ -1,7 +1,11 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
 using osu.Framework.Platform;
+using osu.Game.Extensions;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Scoring;
 
@@ -11,22 +15,42 @@ namespace osu.Game.Database
     {
         protected override string FileExtension => ".osr";
 
-        public LegacyScoreExporter(Storage storage, RealmAccess realm, ProgressNotification notification)
-            : base(storage, realm, notification)
+        public LegacyScoreExporter(Storage storage, RealmAccess realm, ProgressNotification notification, Stream? stream = null)
+            : base(storage, realm, notification, stream)
         {
         }
 
-        //public override void ExportModelTo(ScoreInfo model, Stream outputStream)
-        //{
-        //    var file = model.Files.SingleOrDefault();
-        //    if (file == null)
-        //        return;
-        //
-        //    using (var inputStream = UserFileStorage.GetStream(file.File.GetStoragePath()))
-        //        inputStream.CopyTo(outputStream);
-        //
-        //    Notification.State = ProgressNotificationState.Completed;
-        //    outputStream.Dispose();
-        //}
+        public override async Task ExportASync(IHasGuidPrimaryKey uuid)
+        {
+            await Task.Run(() =>
+            {
+                RealmAccess.Run(r =>
+                {
+                    if (r.Find<ScoreInfo>(uuid.ID) is IHasNamedFiles model)
+                    {
+                        Filename = $"{model.GetDisplayString().GetValidFilename()}{FileExtension}";
+                    }
+                    else
+                    {
+                        return;
+                    }
+
+                    var file = model.Files.SingleOrDefault();
+                    if (file == null)
+                        return;
+
+                    if (Notification.CancellationToken.IsCancellationRequested) return;
+
+                    if (OutputStream == null)
+                    {
+                        OutputStream = ExportStorage.CreateFileSafely(Filename);
+                        ShouldDisposeStream = true;
+                    }
+
+                    using (var inputStream = UserFileStorage.GetStream(file.File.GetStoragePath()))
+                        inputStream.CopyTo(OutputStream);
+                });
+            }).ContinueWith(OnComplete);
+        }
     }
 }
diff --git a/osu.Game/Database/LegacySkinExporter.cs b/osu.Game/Database/LegacySkinExporter.cs
index a35636c248..4168763324 100644
--- a/osu.Game/Database/LegacySkinExporter.cs
+++ b/osu.Game/Database/LegacySkinExporter.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.IO;
 using osu.Framework.Platform;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Skinning;
@@ -11,8 +12,8 @@ namespace osu.Game.Database
     {
         protected override string FileExtension => ".osk";
 
-        public LegacySkinExporter(Storage storage, RealmAccess realm, ProgressNotification notification)
-            : base(storage, realm, notification)
+        public LegacySkinExporter(Storage storage, RealmAccess realm, ProgressNotification notification, Stream? stream = null)
+            : base(storage, realm, notification, stream)
         {
         }
     }

From 4e457871f3a518b05d6d95e7637c74b7ddc978fb Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sat, 19 Nov 2022 01:03:09 +0900
Subject: [PATCH 0014/1604] impossible null and remove storage

---
 osu.Game/Online/Leaderboards/LeaderboardScore.cs   | 12 ++++--------
 osu.Game/Overlays/Settings/Sections/SkinSection.cs |  8 ++------
 osu.Game/Screens/Edit/Editor.cs                    |  8 ++------
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index e2f640a44c..b374736648 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -18,7 +18,6 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
-using osu.Framework.Platform;
 using osu.Game.Database;
 using osu.Game.Extensions;
 using osu.Game.Graphics;
@@ -67,16 +66,13 @@ namespace osu.Game.Online.Leaderboards
 
         private List<ScoreComponentLabel> statisticsLabels;
 
-        [Resolved(CanBeNull = true)]
+        [Resolved(canBeNull: true)]
         private IDialogOverlay dialogOverlay { get; set; }
 
-        [Resolved(CanBeNull = true)]
+        [Resolved(canBeNull: true)]
         private SongSelect songSelect { get; set; }
 
-        [Resolved]
-        private Storage storage { get; set; }
-
-        [Resolved]
+        [Resolved(canBeNull: true)]
         private LegacyExportManager exporter { get; set; }
 
         public ITooltip<ScoreInfo> GetCustomTooltip() => new LeaderboardScoreTooltip();
@@ -431,7 +427,7 @@ namespace osu.Game.Online.Leaderboards
 
                 if (Score.Files.Count > 0)
                 {
-                    items.Add(new OsuMenuItem("Export", MenuItemType.Standard, () => Task.Run(() => exporter.ExportAsync(Score))));
+                    items.Add(new OsuMenuItem("Export", MenuItemType.Standard, () => Task.Run(() => exporter?.ExportAsync(Score))));
                     items.Add(new OsuMenuItem(CommonStrings.ButtonsDelete, MenuItemType.Destructive, () => dialogOverlay?.Push(new LocalScoreDeleteDialog(Score))));
                 }
 
diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 6cd9e591e1..e5a26c19fc 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -13,7 +13,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
 using osu.Framework.Logging;
-using osu.Framework.Platform;
 using osu.Game.Database;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Localisation;
@@ -138,10 +137,7 @@ namespace osu.Game.Overlays.Settings.Sections
             [Resolved]
             private SkinManager skins { get; set; }
 
-            [Resolved]
-            private Storage storage { get; set; }
-
-            [Resolved]
+            [Resolved(canBeNull: true)]
             private LegacyExportManager exporter { get; set; }
 
             private Bindable<Skin> currentSkin;
@@ -165,7 +161,7 @@ namespace osu.Game.Overlays.Settings.Sections
             {
                 try
                 {
-                    currentSkin.Value.SkinInfo.PerformRead(s => exporter.ExportAsync(s));
+                    currentSkin.Value.SkinInfo.PerformRead(s => exporter?.ExportAsync(s));
                 }
                 catch (Exception e)
                 {
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index e266239f34..77f14f689a 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -21,7 +21,6 @@ using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
 using osu.Framework.Logging;
-using osu.Framework.Platform;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Framework.Threading;
@@ -91,9 +90,6 @@ namespace osu.Game.Screens.Edit
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
-        [Resolved]
-        private Storage storage { get; set; }
-
         [Resolved(canBeNull: true)]
         private IDialogOverlay dialogOverlay { get; set; }
 
@@ -183,7 +179,7 @@ namespace osu.Game.Screens.Edit
         private Bindable<float> editorBackgroundDim;
         private Bindable<bool> editorHitMarkers;
 
-        [Resolved]
+        [Resolved(canBeNull: true)]
         private LegacyExportManager exporter { get; set; }
 
         public Editor(EditorLoader loader = null)
@@ -942,7 +938,7 @@ namespace osu.Game.Screens.Edit
         private void exportBeatmap()
         {
             Save();
-            Task.Run(() => exporter.ExportAsync(Beatmap.Value.BeatmapSetInfo));
+            Task.Run(() => exporter?.ExportAsync(Beatmap.Value.BeatmapSetInfo));
         }
 
         /// <summary>

From 28867fbbb1750640a30113d576500d0a82502db7 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sat, 19 Nov 2022 12:34:35 +0900
Subject: [PATCH 0015/1604] Add comment

---
 osu.Game/Database/LegacyExportManager.cs | 18 ++++++++++++++----
 osu.Game/Database/LegacyModelExporter.cs |  6 ++++++
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Database/LegacyExportManager.cs b/osu.Game/Database/LegacyExportManager.cs
index 08594ab020..19fca623c5 100644
--- a/osu.Game/Database/LegacyExportManager.cs
+++ b/osu.Game/Database/LegacyExportManager.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.IO;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -14,6 +15,9 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Database
 {
+    /// <summary>
+    /// A class which centrally manage legacy file exports.
+    /// </summary>
     [ExcludeFromDynamicCompile]
     public class LegacyExportManager : Component
     {
@@ -26,7 +30,13 @@ namespace osu.Game.Database
         [Resolved]
         private INotificationOverlay? notifications { get; set; }
 
-        public async Task ExportAsync(IHasGuidPrimaryKey item)
+        /// <summary>
+        /// Identify the model type and and automatically assigned to the corresponding exporter.
+        /// </summary>
+        /// <param name="item">The model should export.</param>
+        /// <param name="stream">The stream if requires a specific output-stream</param>
+        /// <returns></returns>
+        public async Task ExportAsync(IHasGuidPrimaryKey item, Stream? stream = null)
         {
             var notification = new ProgressNotification
             {
@@ -39,15 +49,15 @@ namespace osu.Game.Database
             switch (item)
             {
                 case SkinInfo:
-                    await new LegacySkinExporter(exportStorage, realmAccess, notification).ExportASync(item);
+                    await new LegacySkinExporter(exportStorage, realmAccess, notification, stream).ExportASync(item);
                     break;
 
                 case ScoreInfo:
-                    await new LegacyScoreExporter(exportStorage, realmAccess, notification).ExportASync(item);
+                    await new LegacyScoreExporter(exportStorage, realmAccess, notification, stream).ExportASync(item);
                     break;
 
                 case BeatmapSetInfo:
-                    await new LegacyBeatmapExporter(exportStorage, realmAccess, notification).ExportASync(item);
+                    await new LegacyBeatmapExporter(exportStorage, realmAccess, notification, stream).ExportASync(item);
                     break;
             }
         }
diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index a4b0f7ba9d..d734d3341c 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -48,6 +48,12 @@ namespace osu.Game.Database
             ShouldDisposeStream = false;
         }
 
+        /// <summary>
+        /// Export model to <see cref="OutputStream"/>
+        /// if <see cref="OutputStream"/> is null, model will export to default folder.
+        /// </summary>
+        /// <param name="uuid">The model which have Guid.</param>
+        /// <returns></returns>
         public virtual async Task ExportASync(IHasGuidPrimaryKey uuid)
         {
             Guid id = uuid.ID;

From 2653bd2f997c305d1497d74da66e33be9630cc84 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sat, 19 Nov 2022 12:57:56 +0900
Subject: [PATCH 0016/1604] Make notification cannot cancel when Saving Zip
 Archive

This operation cannot be stopped(if not dispose stream).
so make it cannot cancel
---
 osu.Game/Database/LegacyModelExporter.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index d734d3341c..9fa6f64ee4 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -56,6 +56,9 @@ namespace osu.Game.Database
         /// <returns></returns>
         public virtual async Task ExportASync(IHasGuidPrimaryKey uuid)
         {
+            bool canCancel = true;
+            Notification.CancelRequested += () => canCancel;
+
             Guid id = uuid.ID;
             await Task.Run(() =>
             {
@@ -91,6 +94,7 @@ namespace osu.Game.Database
                         }
 
                         Notification.Text = "Saving Zip Archive...";
+                        canCancel = false;
                         archive.SaveTo(OutputStream);
                     }
                 });

From 60ef88844c31459dfa94a5ffdb1fdf41530f2c96 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Mon, 21 Nov 2022 17:09:56 +0900
Subject: [PATCH 0017/1604] Recover accidentally deleted codes

---
 osu.Game/Database/RealmAccess.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index 5a7ead1c59..1a938c12e5 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -173,6 +173,11 @@ namespace osu.Game.Database
             if (!Filename.EndsWith(realm_extension, StringComparison.Ordinal))
                 Filename += realm_extension;
 
+#if DEBUG
+            if (!DebugUtils.IsNUnitRunning)
+                applyFilenameSchemaSuffix(ref Filename);
+#endif
+
             string newerVersionFilename = $"{Filename.Replace(realm_extension, string.Empty)}_newer_version{realm_extension}";
 
             // Attempt to recover a newer database version if available.

From ed53168267485ba0ca2bdc97057fd43566770cd4 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Mon, 21 Nov 2022 17:42:11 +0900
Subject: [PATCH 0018/1604] typo fix

---
 osu.Game.Tests/Skins/IO/ImportSkinTest.cs | 6 +++---
 osu.Game/Database/LegacyExportManager.cs  | 4 ++--
 osu.Game/Database/LegacyModelExporter.cs  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
index 0c3c459e87..c4dde59e3f 100644
--- a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
+++ b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
@@ -122,7 +122,7 @@ namespace osu.Game.Tests.Skins.IO
 
             await import1.PerformRead(async s =>
             {
-                await new LegacySkinExporter(osu.Dependencies.Get<Storage>(), osu.Dependencies.Get<RealmAccess>(), new ProgressNotification(), exportStream).ExportASync(s);
+                await new LegacySkinExporter(osu.Dependencies.Get<Storage>(), osu.Dependencies.Get<RealmAccess>(), new ProgressNotification(), exportStream).ExportAsync(s);
             });
 
             string exportFilename = import1.GetDisplayString();
@@ -204,7 +204,7 @@ namespace osu.Game.Tests.Skins.IO
                 Assert.IsFalse(s.Protected);
                 Assert.AreEqual(typeof(ArgonSkin), s.CreateInstance(skinManager).GetType());
 
-                await new LegacySkinExporter(osu.Dependencies.Get<Storage>(), osu.Dependencies.Get<RealmAccess>(), new ProgressNotification(), exportStream).ExportASync(s);
+                await new LegacySkinExporter(osu.Dependencies.Get<Storage>(), osu.Dependencies.Get<RealmAccess>(), new ProgressNotification(), exportStream).ExportAsync(s);
 
                 Assert.Greater(exportStream.Length, 0);
             });
@@ -237,7 +237,7 @@ namespace osu.Game.Tests.Skins.IO
                 Assert.IsFalse(s.Protected);
                 Assert.AreEqual(typeof(DefaultLegacySkin), s.CreateInstance(skinManager).GetType());
 
-                await new LegacySkinExporter(osu.Dependencies.Get<Storage>(), osu.Dependencies.Get<RealmAccess>(), new ProgressNotification(), exportStream).ExportASync(s);
+                await new LegacySkinExporter(osu.Dependencies.Get<Storage>(), osu.Dependencies.Get<RealmAccess>(), new ProgressNotification(), exportStream).ExportAsync(s);
 
                 Assert.Greater(exportStream.Length, 0);
             });
diff --git a/osu.Game/Database/LegacyExportManager.cs b/osu.Game/Database/LegacyExportManager.cs
index 19fca623c5..a694a0705e 100644
--- a/osu.Game/Database/LegacyExportManager.cs
+++ b/osu.Game/Database/LegacyExportManager.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Database
             switch (item)
             {
                 case SkinInfo:
-                    await new LegacySkinExporter(exportStorage, realmAccess, notification, stream).ExportASync(item);
+                    await new LegacySkinExporter(exportStorage, realmAccess, notification, stream).ExportAsync(item);
                     break;
 
                 case ScoreInfo:
@@ -57,7 +57,7 @@ namespace osu.Game.Database
                     break;
 
                 case BeatmapSetInfo:
-                    await new LegacyBeatmapExporter(exportStorage, realmAccess, notification, stream).ExportASync(item);
+                    await new LegacyBeatmapExporter(exportStorage, realmAccess, notification, stream).ExportAsync(item);
                     break;
             }
         }
diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index 9fa6f64ee4..01ebbdcaff 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -54,11 +54,11 @@ namespace osu.Game.Database
         /// </summary>
         /// <param name="uuid">The model which have Guid.</param>
         /// <returns></returns>
-        public virtual async Task ExportASync(IHasGuidPrimaryKey uuid)
         {
             bool canCancel = true;
             Notification.CancelRequested += () => canCancel;
 
+        public virtual async Task ExportAsync(IHasGuidPrimaryKey uuid)
             Guid id = uuid.ID;
             await Task.Run(() =>
             {

From e37d30a3733871eb39622d6f5ea95d6cfe22a5a6 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Mon, 21 Nov 2022 18:58:01 +0900
Subject: [PATCH 0019/1604] refactor based on reviews

removed LegacyExportManager

Separated the method of CreateZip method and the default export method
---
 osu.Game.Tests/Skins/IO/ImportSkinTest.cs     |   7 +-
 osu.Game/Database/LegacyBeatmapExporter.cs    |  11 +-
 osu.Game/Database/LegacyExportManager.cs      |  65 ---------
 osu.Game/Database/LegacyModelExporter.cs      | 128 +++++++++---------
 osu.Game/Database/LegacyScoreExporter.cs      |  33 ++---
 osu.Game/Database/LegacySkinExporter.cs       |  11 +-
 .../Online/Leaderboards/LeaderboardScore.cs   |  13 +-
 osu.Game/OsuGame.cs                           |   4 -
 .../Overlays/Settings/Sections/SkinSection.cs |  13 +-
 osu.Game/Screens/Edit/Editor.cs               |  12 +-
 10 files changed, 113 insertions(+), 184 deletions(-)
 delete mode 100644 osu.Game/Database/LegacyExportManager.cs

diff --git a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
index c4dde59e3f..703c63b91a 100644
--- a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
+++ b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
@@ -14,7 +14,6 @@ using osu.Framework.Platform;
 using osu.Game.Database;
 using osu.Game.Extensions;
 using osu.Game.IO;
-using osu.Game.Overlays.Notifications;
 using osu.Game.Skinning;
 using SharpCompress.Archives.Zip;
 
@@ -122,7 +121,7 @@ namespace osu.Game.Tests.Skins.IO
 
             await import1.PerformRead(async s =>
             {
-                await new LegacySkinExporter(osu.Dependencies.Get<Storage>(), osu.Dependencies.Get<RealmAccess>(), new ProgressNotification(), exportStream).ExportAsync(s);
+                await new LegacySkinExporter(osu.Dependencies.Get<Storage>(), osu.Dependencies.Get<RealmAccess>()).ExportToStreamAsync(s, exportStream);
             });
 
             string exportFilename = import1.GetDisplayString();
@@ -204,7 +203,7 @@ namespace osu.Game.Tests.Skins.IO
                 Assert.IsFalse(s.Protected);
                 Assert.AreEqual(typeof(ArgonSkin), s.CreateInstance(skinManager).GetType());
 
-                await new LegacySkinExporter(osu.Dependencies.Get<Storage>(), osu.Dependencies.Get<RealmAccess>(), new ProgressNotification(), exportStream).ExportAsync(s);
+                await new LegacySkinExporter(osu.Dependencies.Get<Storage>(), osu.Dependencies.Get<RealmAccess>()).ExportToStreamAsync(s, exportStream);
 
                 Assert.Greater(exportStream.Length, 0);
             });
@@ -237,7 +236,7 @@ namespace osu.Game.Tests.Skins.IO
                 Assert.IsFalse(s.Protected);
                 Assert.AreEqual(typeof(DefaultLegacySkin), s.CreateInstance(skinManager).GetType());
 
-                await new LegacySkinExporter(osu.Dependencies.Get<Storage>(), osu.Dependencies.Get<RealmAccess>(), new ProgressNotification(), exportStream).ExportAsync(s);
+                await new LegacySkinExporter(osu.Dependencies.Get<Storage>(), osu.Dependencies.Get<RealmAccess>()).ExportToStreamAsync(s, exportStream);
 
                 Assert.Greater(exportStream.Length, 0);
             });
diff --git a/osu.Game/Database/LegacyBeatmapExporter.cs b/osu.Game/Database/LegacyBeatmapExporter.cs
index 5505d141ee..22bccbcda6 100644
--- a/osu.Game/Database/LegacyBeatmapExporter.cs
+++ b/osu.Game/Database/LegacyBeatmapExporter.cs
@@ -1,20 +1,19 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.IO;
 using osu.Framework.Platform;
 using osu.Game.Beatmaps;
-using osu.Game.Overlays.Notifications;
+using osu.Game.Overlays;
 
 namespace osu.Game.Database
 {
     public class LegacyBeatmapExporter : LegacyModelExporter<BeatmapSetInfo>
     {
-        protected override string FileExtension => ".osz";
-
-        public LegacyBeatmapExporter(Storage storage, RealmAccess realm, ProgressNotification notification, Stream? stream = null)
-            : base(storage, realm, notification, stream)
+        public LegacyBeatmapExporter(Storage storage, RealmAccess realm, INotificationOverlay? notifications = null)
+            : base(storage, realm, notifications)
         {
         }
+
+        protected override string FileExtension => ".osz";
     }
 }
diff --git a/osu.Game/Database/LegacyExportManager.cs b/osu.Game/Database/LegacyExportManager.cs
deleted file mode 100644
index a694a0705e..0000000000
--- a/osu.Game/Database/LegacyExportManager.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System.IO;
-using System.Threading.Tasks;
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Platform;
-using osu.Framework.Testing;
-using osu.Game.Beatmaps;
-using osu.Game.Overlays;
-using osu.Game.Overlays.Notifications;
-using osu.Game.Scoring;
-using osu.Game.Skinning;
-
-namespace osu.Game.Database
-{
-    /// <summary>
-    /// A class which centrally manage legacy file exports.
-    /// </summary>
-    [ExcludeFromDynamicCompile]
-    public class LegacyExportManager : Component
-    {
-        [Resolved]
-        private RealmAccess realmAccess { get; set; } = null!;
-
-        [Resolved]
-        private Storage exportStorage { get; set; } = null!;
-
-        [Resolved]
-        private INotificationOverlay? notifications { get; set; }
-
-        /// <summary>
-        /// Identify the model type and and automatically assigned to the corresponding exporter.
-        /// </summary>
-        /// <param name="item">The model should export.</param>
-        /// <param name="stream">The stream if requires a specific output-stream</param>
-        /// <returns></returns>
-        public async Task ExportAsync(IHasGuidPrimaryKey item, Stream? stream = null)
-        {
-            var notification = new ProgressNotification
-            {
-                State = ProgressNotificationState.Active,
-                Text = "Exporting...",
-                CompletionText = "Export completed"
-            };
-            notifications?.Post(notification);
-
-            switch (item)
-            {
-                case SkinInfo:
-                    await new LegacySkinExporter(exportStorage, realmAccess, notification, stream).ExportAsync(item);
-                    break;
-
-                case ScoreInfo:
-                    await new LegacyScoreExporter(exportStorage, realmAccess, notification, stream).ExportASync(item);
-                    break;
-
-                case BeatmapSetInfo:
-                    await new LegacyBeatmapExporter(exportStorage, realmAccess, notification, stream).ExportAsync(item);
-                    break;
-            }
-        }
-    }
-}
diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index 01ebbdcaff..83167e7319 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -5,8 +5,10 @@ using System;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
+using osu.Framework.Graphics;
 using osu.Framework.Platform;
 using osu.Game.Extensions;
+using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
 using Realms;
 using SharpCompress.Archives.Zip;
@@ -16,112 +18,106 @@ namespace osu.Game.Database
     /// <summary>
     /// A class which handles exporting legacy user data of a single type from osu-stable.
     /// </summary>
-    public abstract class LegacyModelExporter<TModel>
-        where TModel : RealmObject
+    public abstract class LegacyModelExporter<TModel> : Component
+        where TModel : RealmObject, IHasNamedFiles, IHasGuidPrimaryKey
     {
         /// <summary>
         /// The file extension for exports (including the leading '.').
         /// </summary>
         protected abstract string FileExtension { get; }
 
-        protected readonly Storage UserFileStorage;
+        protected Storage UserFileStorage;
+        protected Storage ExportStorage;
 
-        protected readonly Storage ExportStorage;
+        protected RealmAccess RealmAccess;
 
-        protected readonly RealmAccess RealmAccess;
-
-        protected readonly ProgressNotification Notification;
+        private readonly ProgressNotification notification;
 
         protected string Filename = null!;
 
-        protected Stream? OutputStream;
+        private bool canCancel = true;
 
-        protected bool ShouldDisposeStream;
-
-        protected LegacyModelExporter(Storage storage, RealmAccess realm, ProgressNotification notification, Stream? stream = null)
+        protected LegacyModelExporter(Storage storage, RealmAccess realm, INotificationOverlay? notifications = null)
         {
             ExportStorage = storage.GetStorageForDirectory(@"exports");
             UserFileStorage = storage.GetStorageForDirectory(@"files");
-            Notification = notification;
             RealmAccess = realm;
-            OutputStream = stream;
-            ShouldDisposeStream = false;
+
+            notification = new ProgressNotification
+            {
+                State = ProgressNotificationState.Active,
+                Text = "Exporting...",
+                CompletionText = "Export completed"
+            };
+            notification.CancelRequested += () => canCancel;
+
+            notifications?.Post(notification);
         }
 
-        /// <summary>
-        /// Export model to <see cref="OutputStream"/>
-        /// if <see cref="OutputStream"/> is null, model will export to default folder.
-        /// </summary>
-        /// <param name="uuid">The model which have Guid.</param>
-        /// <returns></returns>
+        public async Task ExportAsync(RealmObject item)
         {
-            bool canCancel = true;
-            Notification.CancelRequested += () => canCancel;
+            if (item is TModel model)
+            {
+                Filename = $"{model.GetDisplayString().GetValidFilename()}{FileExtension}";
 
-        public virtual async Task ExportAsync(IHasGuidPrimaryKey uuid)
+                using (var stream = ExportStorage.CreateFileSafely(Filename))
+                {
+                    await ExportToStreamAsync(model, stream);
+                }
+            }
+        }
+
+        public virtual async Task ExportToStreamAsync(TModel uuid, Stream stream)
+        {
             Guid id = uuid.ID;
             await Task.Run(() =>
             {
                 RealmAccess.Run(r =>
                 {
-                    if (r.Find<TModel>(id) is IHasNamedFiles model)
-                    {
-                        Filename = $"{model.GetDisplayString().GetValidFilename()}{FileExtension}";
-                    }
-                    else
-                    {
-                        return;
-                    }
-
-                    if (OutputStream == null)
-                    {
-                        OutputStream = ExportStorage.CreateFileSafely(Filename);
-                        ShouldDisposeStream = true;
-                    }
-
-                    using (var archive = ZipArchive.Create())
-                    {
-                        float i = 0;
-
-                        foreach (var file in model.Files)
-                        {
-                            if (Notification.CancellationToken.IsCancellationRequested) return;
-
-                            archive.AddEntry(file.Filename, UserFileStorage.GetStream(file.File.GetStoragePath()));
-                            i++;
-                            Notification.Progress = i / model.Files.Count();
-                            Notification.Text = $"Exporting... ({i}/{model.Files.Count()})";
-                        }
-
-                        Notification.Text = "Saving Zip Archive...";
-                        canCancel = false;
-                        archive.SaveTo(OutputStream);
-                    }
+                    TModel model = r.Find<TModel>(id);
+                    createZipArchive(model, stream);
                 });
             }).ContinueWith(OnComplete);
         }
 
+        private void createZipArchive(TModel model, Stream outputStream)
+        {
+            using (var archive = ZipArchive.Create())
+            {
+                float i = 0;
+
+                foreach (var file in model.Files)
+                {
+                    if (notification.CancellationToken.IsCancellationRequested) return;
+
+                    archive.AddEntry(file.Filename, UserFileStorage.GetStream(file.File.GetStoragePath()));
+                    i++;
+                    notification.Progress = i / model.Files.Count();
+                    notification.Text = $"Exporting... ({i}/{model.Files.Count()})";
+                }
+
+                notification.Text = "Saving Zip Archive...";
+                canCancel = false;
+                archive.SaveTo(outputStream);
+            }
+        }
+
         protected void OnComplete(Task t)
         {
-            if (ShouldDisposeStream)
-            {
-                OutputStream?.Dispose();
-            }
-
             if (t.IsFaulted)
             {
-                Notification.State = ProgressNotificationState.Cancelled;
+                notification.State = ProgressNotificationState.Cancelled;
                 return;
             }
 
-            if (Notification.CancellationToken.IsCancellationRequested)
+            if (notification.CancellationToken.IsCancellationRequested)
             {
                 return;
             }
 
-            Notification.CompletionText = "Export Complete, Click to open the folder";
-            Notification.CompletionClickAction += () => ExportStorage.PresentFileExternally(Filename);
-            Notification.State = ProgressNotificationState.Completed;
+            notification.CompletionText = "Export Complete, Click to open the folder";
+            notification.CompletionClickAction += () => ExportStorage.PresentFileExternally(Filename);
+            notification.State = ProgressNotificationState.Completed;
         }
     }
 }
diff --git a/osu.Game/Database/LegacyScoreExporter.cs b/osu.Game/Database/LegacyScoreExporter.cs
index 3004c02978..e00bc2a0ca 100644
--- a/osu.Game/Database/LegacyScoreExporter.cs
+++ b/osu.Game/Database/LegacyScoreExporter.cs
@@ -6,49 +6,36 @@ using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Platform;
 using osu.Game.Extensions;
-using osu.Game.Overlays.Notifications;
+using osu.Game.Overlays;
 using osu.Game.Scoring;
 
 namespace osu.Game.Database
 {
     public class LegacyScoreExporter : LegacyModelExporter<ScoreInfo>
     {
-        protected override string FileExtension => ".osr";
-
-        public LegacyScoreExporter(Storage storage, RealmAccess realm, ProgressNotification notification, Stream? stream = null)
-            : base(storage, realm, notification, stream)
+        public LegacyScoreExporter(Storage storage, RealmAccess realm, INotificationOverlay? notifications = null)
+            : base(storage, realm, notifications)
         {
         }
 
-        public override async Task ExportASync(IHasGuidPrimaryKey uuid)
+        protected override string FileExtension => ".osr";
+
+        public override async Task ExportToStreamAsync(ScoreInfo uuid, Stream stream)
         {
             await Task.Run(() =>
             {
                 RealmAccess.Run(r =>
                 {
-                    if (r.Find<ScoreInfo>(uuid.ID) is IHasNamedFiles model)
-                    {
-                        Filename = $"{model.GetDisplayString().GetValidFilename()}{FileExtension}";
-                    }
-                    else
-                    {
-                        return;
-                    }
+                    ScoreInfo model = r.Find<ScoreInfo>(uuid.ID);
+
+                    Filename = $"{model.GetDisplayString().GetValidFilename()}{FileExtension}";
 
                     var file = model.Files.SingleOrDefault();
                     if (file == null)
                         return;
 
-                    if (Notification.CancellationToken.IsCancellationRequested) return;
-
-                    if (OutputStream == null)
-                    {
-                        OutputStream = ExportStorage.CreateFileSafely(Filename);
-                        ShouldDisposeStream = true;
-                    }
-
                     using (var inputStream = UserFileStorage.GetStream(file.File.GetStoragePath()))
-                        inputStream.CopyTo(OutputStream);
+                        inputStream.CopyTo(stream);
                 });
             }).ContinueWith(OnComplete);
         }
diff --git a/osu.Game/Database/LegacySkinExporter.cs b/osu.Game/Database/LegacySkinExporter.cs
index 4168763324..6e65963f29 100644
--- a/osu.Game/Database/LegacySkinExporter.cs
+++ b/osu.Game/Database/LegacySkinExporter.cs
@@ -1,20 +1,19 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.IO;
 using osu.Framework.Platform;
-using osu.Game.Overlays.Notifications;
+using osu.Game.Overlays;
 using osu.Game.Skinning;
 
 namespace osu.Game.Database
 {
     public class LegacySkinExporter : LegacyModelExporter<SkinInfo>
     {
-        protected override string FileExtension => ".osk";
-
-        public LegacySkinExporter(Storage storage, RealmAccess realm, ProgressNotification notification, Stream? stream = null)
-            : base(storage, realm, notification, stream)
+        public LegacySkinExporter(Storage storage, RealmAccess realm, INotificationOverlay? notifications = null)
+            : base(storage, realm, notifications)
         {
         }
+
+        protected override string FileExtension => ".osk";
     }
 }
diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index b374736648..0a9f2a81bd 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -34,6 +34,7 @@ using osuTK.Graphics;
 using osu.Game.Online.API;
 using osu.Game.Resources.Localisation.Web;
 using osu.Game.Utils;
+using osu.Framework.Platform;
 
 namespace osu.Game.Online.Leaderboards
 {
@@ -72,8 +73,14 @@ namespace osu.Game.Online.Leaderboards
         [Resolved(canBeNull: true)]
         private SongSelect songSelect { get; set; }
 
-        [Resolved(canBeNull: true)]
-        private LegacyExportManager exporter { get; set; }
+        [Resolved]
+        private Storage storage { get; set; }
+
+        [Resolved]
+        private RealmAccess realm { get; set; }
+
+        [Resolved]
+        private INotificationOverlay notifications { get; set; }
 
         public ITooltip<ScoreInfo> GetCustomTooltip() => new LeaderboardScoreTooltip();
         public virtual ScoreInfo TooltipContent => Score;
@@ -427,7 +434,7 @@ namespace osu.Game.Online.Leaderboards
 
                 if (Score.Files.Count > 0)
                 {
-                    items.Add(new OsuMenuItem("Export", MenuItemType.Standard, () => Task.Run(() => exporter?.ExportAsync(Score))));
+                    items.Add(new OsuMenuItem("Export", MenuItemType.Standard, () => Task.Run(() => new LegacyScoreExporter(storage, realm, notifications).ExportAsync(Score))));
                     items.Add(new OsuMenuItem(CommonStrings.ButtonsDelete, MenuItemType.Destructive, () => dialogOverlay?.Push(new LocalScoreDeleteDialog(Score))));
                 }
 
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 09647f9d1e..a93c187e53 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -126,9 +126,6 @@ namespace osu.Game
         [Cached]
         private readonly LegacyImportManager legacyImportManager = new LegacyImportManager();
 
-        [Cached]
-        private readonly LegacyExportManager legacyExportManager = new LegacyExportManager();
-
         [Cached]
         private readonly ScreenshotManager screenshotManager = new ScreenshotManager();
 
@@ -871,7 +868,6 @@ namespace osu.Game
             }), rightFloatingOverlayContent.Add, true);
 
             loadComponentSingleFile(legacyImportManager, Add);
-            loadComponentSingleFile(legacyExportManager, Add);
 
             loadComponentSingleFile(screenshotManager, Add);
 
diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index e5a26c19fc..46e760283d 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -13,6 +13,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
 using osu.Framework.Logging;
+using osu.Framework.Platform;
 using osu.Game.Database;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Localisation;
@@ -137,8 +138,14 @@ namespace osu.Game.Overlays.Settings.Sections
             [Resolved]
             private SkinManager skins { get; set; }
 
-            [Resolved(canBeNull: true)]
-            private LegacyExportManager exporter { get; set; }
+            [Resolved]
+            private Storage storage { get; set; }
+
+            [Resolved]
+            private RealmAccess realm { get; set; }
+
+            [Resolved]
+            private INotificationOverlay notifications { get; set; }
 
             private Bindable<Skin> currentSkin;
 
@@ -161,7 +168,7 @@ namespace osu.Game.Overlays.Settings.Sections
             {
                 try
                 {
-                    currentSkin.Value.SkinInfo.PerformRead(s => exporter?.ExportAsync(s));
+                    currentSkin.Value.SkinInfo.PerformRead(s => new LegacySkinExporter(storage, realm, notifications).ExportAsync(s));
                 }
                 catch (Exception e)
                 {
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 77f14f689a..e53c550a1a 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -21,6 +21,7 @@ using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
 using osu.Framework.Logging;
+using osu.Framework.Platform;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Framework.Threading;
@@ -90,6 +91,12 @@ namespace osu.Game.Screens.Edit
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
+        [Resolved]
+        private Storage storage { get; set; }
+
+        [Resolved]
+        private RealmAccess realm { get; set; }
+
         [Resolved(canBeNull: true)]
         private IDialogOverlay dialogOverlay { get; set; }
 
@@ -179,9 +186,6 @@ namespace osu.Game.Screens.Edit
         private Bindable<float> editorBackgroundDim;
         private Bindable<bool> editorHitMarkers;
 
-        [Resolved(canBeNull: true)]
-        private LegacyExportManager exporter { get; set; }
-
         public Editor(EditorLoader loader = null)
         {
             this.loader = loader;
@@ -938,7 +942,7 @@ namespace osu.Game.Screens.Edit
         private void exportBeatmap()
         {
             Save();
-            Task.Run(() => exporter?.ExportAsync(Beatmap.Value.BeatmapSetInfo));
+            Task.Run(() => new LegacyBeatmapExporter(storage, realm, notifications).ExportAsync(Beatmap.Value.BeatmapSetInfo));
         }
 
         /// <summary>

From 9c6421a462d67e30d9bf9d4b2cdf9171765ae97e Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Mon, 21 Nov 2022 19:00:10 +0900
Subject: [PATCH 0020/1604] log the error

---
 osu.Game/Database/LegacyModelExporter.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index 83167e7319..9769a6d42a 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -6,6 +6,7 @@ using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Graphics;
+using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Extensions;
 using osu.Game.Overlays;
@@ -107,6 +108,8 @@ namespace osu.Game.Database
             if (t.IsFaulted)
             {
                 notification.State = ProgressNotificationState.Cancelled;
+                Logger.Error(t.Exception, "An error occurred while exporting");
+
                 return;
             }
 

From 564f136945c0f3fef744014c5762f44145e325ae Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Mon, 21 Nov 2022 19:04:05 +0900
Subject: [PATCH 0021/1604] add xmldoc

---
 osu.Game/Database/LegacyModelExporter.cs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index 9769a6d42a..47068a8d2b 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -55,6 +55,11 @@ namespace osu.Game.Database
             notifications?.Post(notification);
         }
 
+        /// <summary>
+        /// Export the model to default folder.
+        /// </summary>
+        /// <param name="item">The model should export.</param>
+        /// <returns></returns>
         public async Task ExportAsync(RealmObject item)
         {
             if (item is TModel model)
@@ -68,6 +73,12 @@ namespace osu.Game.Database
             }
         }
 
+        /// <summary>
+        /// Export te model corresponding to uuid to given stream.
+        /// </summary>
+        /// <param name="uuid">The medel which have <see cref="IHasGuidPrimaryKey"/>.</param>
+        /// <param name="stream">The stream to export.</param>
+        /// <returns></returns>
         public virtual async Task ExportToStreamAsync(TModel uuid, Stream stream)
         {
             Guid id = uuid.ID;

From 162f0bb95e1c525ce926935fafbcf98f3a76bdac Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Mon, 21 Nov 2022 19:05:26 +0900
Subject: [PATCH 0022/1604] filename can be private

---
 osu.Game/Database/LegacyModelExporter.cs | 8 ++++----
 osu.Game/Database/LegacyScoreExporter.cs | 2 --
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index 47068a8d2b..3780f2b9cc 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Database
 
         private readonly ProgressNotification notification;
 
-        protected string Filename = null!;
+        private string filename = "";
 
         private bool canCancel = true;
 
@@ -64,9 +64,9 @@ namespace osu.Game.Database
         {
             if (item is TModel model)
             {
-                Filename = $"{model.GetDisplayString().GetValidFilename()}{FileExtension}";
+                filename = $"{model.GetDisplayString().GetValidFilename()}{FileExtension}";
 
-                using (var stream = ExportStorage.CreateFileSafely(Filename))
+                using (var stream = ExportStorage.CreateFileSafely(filename))
                 {
                     await ExportToStreamAsync(model, stream);
                 }
@@ -130,7 +130,7 @@ namespace osu.Game.Database
             }
 
             notification.CompletionText = "Export Complete, Click to open the folder";
-            notification.CompletionClickAction += () => ExportStorage.PresentFileExternally(Filename);
+            notification.CompletionClickAction += () => ExportStorage.PresentFileExternally(filename);
             notification.State = ProgressNotificationState.Completed;
         }
     }
diff --git a/osu.Game/Database/LegacyScoreExporter.cs b/osu.Game/Database/LegacyScoreExporter.cs
index e00bc2a0ca..ae0fbf8d19 100644
--- a/osu.Game/Database/LegacyScoreExporter.cs
+++ b/osu.Game/Database/LegacyScoreExporter.cs
@@ -28,8 +28,6 @@ namespace osu.Game.Database
                 {
                     ScoreInfo model = r.Find<ScoreInfo>(uuid.ID);
 
-                    Filename = $"{model.GetDisplayString().GetValidFilename()}{FileExtension}";
-
                     var file = model.Files.SingleOrDefault();
                     if (file == null)
                         return;

From c509c5be40a449b872053e129358dd747b7e72f1 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Mon, 21 Nov 2022 19:45:30 +0900
Subject: [PATCH 0023/1604] impossible null

---
 osu.Game/Online/Leaderboards/LeaderboardScore.cs   | 2 +-
 osu.Game/Overlays/Settings/Sections/SkinSection.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index 0a9f2a81bd..27c3e0ce47 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -79,7 +79,7 @@ namespace osu.Game.Online.Leaderboards
         [Resolved]
         private RealmAccess realm { get; set; }
 
-        [Resolved]
+        [Resolved(canBeNull: true)]
         private INotificationOverlay notifications { get; set; }
 
         public ITooltip<ScoreInfo> GetCustomTooltip() => new LeaderboardScoreTooltip();
diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 46e760283d..eb51c18e31 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -144,7 +144,7 @@ namespace osu.Game.Overlays.Settings.Sections
             [Resolved]
             private RealmAccess realm { get; set; }
 
-            [Resolved]
+            [Resolved(canBeNull: true)]
             private INotificationOverlay notifications { get; set; }
 
             private Bindable<Skin> currentSkin;

From 6adac853e85f7ebf81f61fa90a3d3afc8f556d0a Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 27 Nov 2022 09:58:54 +0900
Subject: [PATCH 0024/1604] Spite sync method `ExportToStream`

`uuid` to `model`
---
 osu.Game/Database/LegacyModelExporter.cs | 14 ++++++++------
 osu.Game/Database/LegacyScoreExporter.cs | 21 ++++++---------------
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index 3780f2b9cc..3523d18f29 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -74,24 +74,26 @@ namespace osu.Game.Database
         }
 
         /// <summary>
-        /// Export te model corresponding to uuid to given stream.
+        /// Export te model corresponding to model to given stream.
         /// </summary>
-        /// <param name="uuid">The medel which have <see cref="IHasGuidPrimaryKey"/>.</param>
+        /// <param name="model">The medel which have <see cref="IHasGuidPrimaryKey"/>.</param>
         /// <param name="stream">The stream to export.</param>
         /// <returns></returns>
-        public virtual async Task ExportToStreamAsync(TModel uuid, Stream stream)
+        public async Task ExportToStreamAsync(TModel model, Stream stream)
         {
-            Guid id = uuid.ID;
+            Guid id = model.ID;
             await Task.Run(() =>
             {
                 RealmAccess.Run(r =>
                 {
-                    TModel model = r.Find<TModel>(id);
-                    createZipArchive(model, stream);
+                    TModel refetchModel = r.Find<TModel>(id);
+                    ExportToStream(refetchModel, stream);
                 });
             }).ContinueWith(OnComplete);
         }
 
+        protected virtual void ExportToStream(TModel model, Stream outputStream) => createZipArchive(model, outputStream);
+
         private void createZipArchive(TModel model, Stream outputStream)
         {
             using (var archive = ZipArchive.Create())
diff --git a/osu.Game/Database/LegacyScoreExporter.cs b/osu.Game/Database/LegacyScoreExporter.cs
index ae0fbf8d19..eb46bc6db2 100644
--- a/osu.Game/Database/LegacyScoreExporter.cs
+++ b/osu.Game/Database/LegacyScoreExporter.cs
@@ -3,7 +3,6 @@
 
 using System.IO;
 using System.Linq;
-using System.Threading.Tasks;
 using osu.Framework.Platform;
 using osu.Game.Extensions;
 using osu.Game.Overlays;
@@ -20,22 +19,14 @@ namespace osu.Game.Database
 
         protected override string FileExtension => ".osr";
 
-        public override async Task ExportToStreamAsync(ScoreInfo uuid, Stream stream)
+        protected override void ExportToStream(ScoreInfo model, Stream stream)
         {
-            await Task.Run(() =>
-            {
-                RealmAccess.Run(r =>
-                {
-                    ScoreInfo model = r.Find<ScoreInfo>(uuid.ID);
+            var file = model.Files.SingleOrDefault();
+            if (file == null)
+                return;
 
-                    var file = model.Files.SingleOrDefault();
-                    if (file == null)
-                        return;
-
-                    using (var inputStream = UserFileStorage.GetStream(file.File.GetStoragePath()))
-                        inputStream.CopyTo(stream);
-                });
-            }).ContinueWith(OnComplete);
+            using (var inputStream = UserFileStorage.GetStream(file.File.GetStoragePath()))
+                inputStream.CopyTo(stream);
         }
     }
 }

From 19afce67767b95e67aaf06ea1df8c5b291797ddd Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Fri, 9 Dec 2022 23:41:07 +0900
Subject: [PATCH 0025/1604] Fix overwriting existing files

https://github.com/ppy/osu/pull/21468
---
 osu.Game/Database/LegacyModelExporter.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index 3523d18f29..5c4b7a4578 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
@@ -11,6 +12,7 @@ using osu.Framework.Platform;
 using osu.Game.Extensions;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
+using osu.Game.Utils;
 using Realms;
 using SharpCompress.Archives.Zip;
 
@@ -64,7 +66,11 @@ namespace osu.Game.Database
         {
             if (item is TModel model)
             {
-                filename = $"{model.GetDisplayString().GetValidFilename()}{FileExtension}";
+                string itemFilename = item.GetDisplayString().GetValidFilename();
+
+                IEnumerable<string> existingExports = ExportStorage.GetFiles("", $"{itemFilename}*{FileExtension}");
+
+                string filename = NamingUtils.GetNextBestFilename(existingExports, $"{itemFilename}{FileExtension}");
 
                 using (var stream = ExportStorage.CreateFileSafely(filename))
                 {

From 405985ec5b09769ca5d9031eadc2c8ad801b399d Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Fri, 9 Dec 2022 23:57:03 +0900
Subject: [PATCH 0026/1604] remove Component

exportStorage to private
notification should post when export instead of class being constructed
---
 osu.Game/Database/LegacyModelExporter.cs | 25 ++++++++++++------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index 5c4b7a4578..ae092d15e8 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -6,7 +6,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using osu.Framework.Graphics;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Extensions;
@@ -21,7 +20,7 @@ namespace osu.Game.Database
     /// <summary>
     /// A class which handles exporting legacy user data of a single type from osu-stable.
     /// </summary>
-    public abstract class LegacyModelExporter<TModel> : Component
+    public abstract class LegacyModelExporter<TModel>
         where TModel : RealmObject, IHasNamedFiles, IHasGuidPrimaryKey
     {
         /// <summary>
@@ -30,22 +29,23 @@ namespace osu.Game.Database
         protected abstract string FileExtension { get; }
 
         protected Storage UserFileStorage;
-        protected Storage ExportStorage;
+        private readonly Storage exportStorage;
 
         protected RealmAccess RealmAccess;
 
         private readonly ProgressNotification notification;
 
-        private string filename = "";
-
         private bool canCancel = true;
 
+        private readonly INotificationOverlay? notifications;
+
         protected LegacyModelExporter(Storage storage, RealmAccess realm, INotificationOverlay? notifications = null)
         {
-            ExportStorage = storage.GetStorageForDirectory(@"exports");
+            exportStorage = storage.GetStorageForDirectory(@"exports");
             UserFileStorage = storage.GetStorageForDirectory(@"files");
             RealmAccess = realm;
 
+            this.notifications = notifications;
             notification = new ProgressNotification
             {
                 State = ProgressNotificationState.Active,
@@ -53,8 +53,6 @@ namespace osu.Game.Database
                 CompletionText = "Export completed"
             };
             notification.CancelRequested += () => canCancel;
-
-            notifications?.Post(notification);
         }
 
         /// <summary>
@@ -66,13 +64,15 @@ namespace osu.Game.Database
         {
             if (item is TModel model)
             {
+                notifications?.Post(notification);
+
                 string itemFilename = item.GetDisplayString().GetValidFilename();
-
-                IEnumerable<string> existingExports = ExportStorage.GetFiles("", $"{itemFilename}*{FileExtension}");
-
+                IEnumerable<string> existingExports = exportStorage.GetFiles("", $"{itemFilename}*{FileExtension}");
                 string filename = NamingUtils.GetNextBestFilename(existingExports, $"{itemFilename}{FileExtension}");
 
-                using (var stream = ExportStorage.CreateFileSafely(filename))
+                notification.CompletionClickAction += () => exportStorage.PresentFileExternally(filename);
+
+                using (var stream = exportStorage.CreateFileSafely(filename))
                 {
                     await ExportToStreamAsync(model, stream);
                 }
@@ -138,7 +138,6 @@ namespace osu.Game.Database
             }
 
             notification.CompletionText = "Export Complete, Click to open the folder";
-            notification.CompletionClickAction += () => ExportStorage.PresentFileExternally(filename);
             notification.State = ProgressNotificationState.Completed;
         }
     }

From 951302fe61374cb8b4cc1dedf830c6d8fe748ae6 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sat, 10 Dec 2022 00:43:03 +0900
Subject: [PATCH 0027/1604] ExportAsync use TModel

---
 osu.Game/Database/LegacyModelExporter.cs | 27 +++++++++++-------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index ae092d15e8..ad61338c8b 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -58,24 +58,21 @@ namespace osu.Game.Database
         /// <summary>
         /// Export the model to default folder.
         /// </summary>
-        /// <param name="item">The model should export.</param>
+        /// <param name="model">The model should export.</param>
         /// <returns></returns>
-        public async Task ExportAsync(RealmObject item)
+        public async Task ExportAsync(TModel model)
         {
-            if (item is TModel model)
+            notifications?.Post(notification);
+
+            string itemFilename = model.GetDisplayString().GetValidFilename();
+            IEnumerable<string> existingExports = exportStorage.GetFiles("", $"{itemFilename}*{FileExtension}");
+            string filename = NamingUtils.GetNextBestFilename(existingExports, $"{itemFilename}{FileExtension}");
+
+            notification.CompletionClickAction += () => exportStorage.PresentFileExternally(filename);
+
+            using (var stream = exportStorage.CreateFileSafely(filename))
             {
-                notifications?.Post(notification);
-
-                string itemFilename = item.GetDisplayString().GetValidFilename();
-                IEnumerable<string> existingExports = exportStorage.GetFiles("", $"{itemFilename}*{FileExtension}");
-                string filename = NamingUtils.GetNextBestFilename(existingExports, $"{itemFilename}{FileExtension}");
-
-                notification.CompletionClickAction += () => exportStorage.PresentFileExternally(filename);
-
-                using (var stream = exportStorage.CreateFileSafely(filename))
-                {
-                    await ExportToStreamAsync(model, stream);
-                }
+                await ExportToStreamAsync(model, stream);
             }
         }
 

From fa30f3348ff11e68c42b9b63082b5409ee479746 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 11 Dec 2022 16:53:11 +0900
Subject: [PATCH 0028/1604] `onComplete` should private

---
 osu.Game/Database/LegacyModelExporter.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index ad61338c8b..4ea56c0056 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -92,7 +92,7 @@ namespace osu.Game.Database
                     TModel refetchModel = r.Find<TModel>(id);
                     ExportToStream(refetchModel, stream);
                 });
-            }).ContinueWith(OnComplete);
+            }).ContinueWith(onComplete);
         }
 
         protected virtual void ExportToStream(TModel model, Stream outputStream) => createZipArchive(model, outputStream);
@@ -119,7 +119,7 @@ namespace osu.Game.Database
             }
         }
 
-        protected void OnComplete(Task t)
+        private void onComplete(Task t)
         {
             if (t.IsFaulted)
             {

From 2d5763340944ab99fcffb81f3c2915a441befa6e Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 11 Dec 2022 16:54:20 +0900
Subject: [PATCH 0029/1604] rename method name and add xmldoc

---
 osu.Game/Database/LegacyModelExporter.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index 4ea56c0056..cf41ffc780 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -95,9 +95,14 @@ namespace osu.Game.Database
             }).ContinueWith(onComplete);
         }
 
-        protected virtual void ExportToStream(TModel model, Stream outputStream) => createZipArchive(model, outputStream);
+        protected virtual void ExportToStream(TModel model, Stream outputStream) => exportZipArchive(model, outputStream);
 
-        private void createZipArchive(TModel model, Stream outputStream)
+        /// <summary>
+        /// Exports an item to Stream as a legacy (.zip based) package.
+        /// </summary>
+        /// <param name="model">The item to export.</param>
+        /// <param name="outputStream">The output stream to export to.</param>
+        private void exportZipArchive(TModel model, Stream outputStream)
         {
             using (var archive = ZipArchive.Create())
             {

From a87bcccc42b2e69d619087b46b324499bfdd058a Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 11 Dec 2022 16:55:44 +0900
Subject: [PATCH 0030/1604] xmldoc

---
 osu.Game/Database/LegacyModelExporter.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index cf41ffc780..18e840fedd 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -95,6 +95,12 @@ namespace osu.Game.Database
             }).ContinueWith(onComplete);
         }
 
+        /// <summary>
+        /// Exports an item to Stream.
+        /// Override if custom export method is required.
+        /// </summary>
+        /// <param name="model">The item to export.</param>
+        /// <param name="outputStream">The output stream to export to.</param>
         protected virtual void ExportToStream(TModel model, Stream outputStream) => exportZipArchive(model, outputStream);
 
         /// <summary>

From e02b8cb199ebdc13f18aaae292febbfb9c75ec89 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 11 Dec 2022 18:30:24 +0900
Subject: [PATCH 0031/1604] Group export methods into their respective managers

---
 osu.Game/Beatmaps/BeatmapManager.cs           |  9 ++
 osu.Game/Database/LegacyBeatmapExporter.cs    |  5 +-
 osu.Game/Database/LegacyModelExporter.cs      | 82 +++++++++----------
 osu.Game/Database/LegacyScoreExporter.cs      |  8 +-
 osu.Game/Database/LegacySkinExporter.cs       |  5 +-
 .../Online/Leaderboards/LeaderboardScore.cs   | 18 ++--
 .../Overlays/Settings/Sections/SkinSection.cs | 12 +--
 osu.Game/Scoring/ScoreManager.cs              |  8 ++
 osu.Game/Screens/Edit/Editor.cs               | 11 +--
 osu.Game/Skinning/SkinManager.cs              |  9 ++
 10 files changed, 80 insertions(+), 87 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 965cc43815..34780082da 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -42,6 +42,8 @@ namespace osu.Game.Beatmaps
 
         private readonly WorkingBeatmapCache workingBeatmapCache;
 
+        private readonly LegacyBeatmapExporter beatmapExporter;
+
         public Action<(BeatmapSetInfo beatmapSet, bool isBatch)>? ProcessBeatmap { private get; set; }
 
         public BeatmapManager(Storage storage, RealmAccess realm, IAPIProvider? api, AudioManager audioManager, IResourceStore<byte[]> gameResources, GameHost? host = null,
@@ -66,6 +68,11 @@ namespace osu.Game.Beatmaps
             beatmapImporter.PostNotification = obj => PostNotification?.Invoke(obj);
 
             workingBeatmapCache = CreateWorkingBeatmapCache(audioManager, gameResources, userResources, defaultBeatmap, host);
+
+            beatmapExporter = new LegacyBeatmapExporter(storage, realm)
+            {
+                PostNotification = obj => PostNotification?.Invoke(obj)
+            };
         }
 
         protected virtual WorkingBeatmapCache CreateWorkingBeatmapCache(AudioManager audioManager, IResourceStore<byte[]> resources, IResourceStore<byte[]> storage, WorkingBeatmap? defaultBeatmap,
@@ -446,6 +453,8 @@ namespace osu.Game.Beatmaps
         public Task<Live<BeatmapSetInfo>?> ImportAsUpdate(ProgressNotification notification, ImportTask importTask, BeatmapSetInfo original) =>
             beatmapImporter.ImportAsUpdate(notification, importTask, original);
 
+        public void Export(BeatmapSetInfo beatmap) => Task.Run(() => beatmapExporter.ExportAsync(beatmap));
+
         private void updateHashAndMarkDirty(BeatmapSetInfo setInfo)
         {
             setInfo.Hash = beatmapImporter.ComputeHash(setInfo);
diff --git a/osu.Game/Database/LegacyBeatmapExporter.cs b/osu.Game/Database/LegacyBeatmapExporter.cs
index 22bccbcda6..6349ebde2c 100644
--- a/osu.Game/Database/LegacyBeatmapExporter.cs
+++ b/osu.Game/Database/LegacyBeatmapExporter.cs
@@ -3,14 +3,13 @@
 
 using osu.Framework.Platform;
 using osu.Game.Beatmaps;
-using osu.Game.Overlays;
 
 namespace osu.Game.Database
 {
     public class LegacyBeatmapExporter : LegacyModelExporter<BeatmapSetInfo>
     {
-        public LegacyBeatmapExporter(Storage storage, RealmAccess realm, INotificationOverlay? notifications = null)
-            : base(storage, realm, notifications)
+        public LegacyBeatmapExporter(Storage storage, RealmAccess realm)
+            : base(storage, realm)
         {
         }
 
diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index 18e840fedd..5150651b15 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -9,7 +9,6 @@ using System.Threading.Tasks;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Extensions;
-using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Utils;
 using Realms;
@@ -33,26 +32,16 @@ namespace osu.Game.Database
 
         protected RealmAccess RealmAccess;
 
-        private readonly ProgressNotification notification;
-
         private bool canCancel = true;
 
-        private readonly INotificationOverlay? notifications;
+        private string filename = string.Empty;
+        public Action<Notification>? PostNotification { get; set; }
 
-        protected LegacyModelExporter(Storage storage, RealmAccess realm, INotificationOverlay? notifications = null)
+        protected LegacyModelExporter(Storage storage, RealmAccess realm)
         {
             exportStorage = storage.GetStorageForDirectory(@"exports");
             UserFileStorage = storage.GetStorageForDirectory(@"files");
             RealmAccess = realm;
-
-            this.notifications = notifications;
-            notification = new ProgressNotification
-            {
-                State = ProgressNotificationState.Active,
-                Text = "Exporting...",
-                CompletionText = "Export completed"
-            };
-            notification.CancelRequested += () => canCancel;
         }
 
         /// <summary>
@@ -62,13 +51,9 @@ namespace osu.Game.Database
         /// <returns></returns>
         public async Task ExportAsync(TModel model)
         {
-            notifications?.Post(notification);
-
             string itemFilename = model.GetDisplayString().GetValidFilename();
             IEnumerable<string> existingExports = exportStorage.GetFiles("", $"{itemFilename}*{FileExtension}");
-            string filename = NamingUtils.GetNextBestFilename(existingExports, $"{itemFilename}{FileExtension}");
-
-            notification.CompletionClickAction += () => exportStorage.PresentFileExternally(filename);
+            filename = NamingUtils.GetNextBestFilename(existingExports, $"{itemFilename}{FileExtension}");
 
             using (var stream = exportStorage.CreateFileSafely(filename))
             {
@@ -77,22 +62,50 @@ namespace osu.Game.Database
         }
 
         /// <summary>
-        /// Export te model corresponding to model to given stream.
+        /// Export model to stream.
         /// </summary>
         /// <param name="model">The medel which have <see cref="IHasGuidPrimaryKey"/>.</param>
         /// <param name="stream">The stream to export.</param>
         /// <returns></returns>
         public async Task ExportToStreamAsync(TModel model, Stream stream)
         {
+            ProgressNotification notification = new ProgressNotification
+            {
+                State = ProgressNotificationState.Active,
+                Text = "Exporting...",
+                CompletionText = "Export completed"
+            };
+            notification.CompletionClickAction += () => exportStorage.PresentFileExternally(filename);
+            notification.CancelRequested += () => canCancel;
+            PostNotification?.Invoke(notification);
+            canCancel = true;
+
             Guid id = model.ID;
             await Task.Run(() =>
             {
                 RealmAccess.Run(r =>
                 {
                     TModel refetchModel = r.Find<TModel>(id);
-                    ExportToStream(refetchModel, stream);
+                    ExportToStream(refetchModel, stream, notification);
                 });
-            }).ContinueWith(onComplete);
+            }).ContinueWith(t =>
+            {
+                if (t.IsFaulted)
+                {
+                    notification.State = ProgressNotificationState.Cancelled;
+                    Logger.Error(t.Exception, "An error occurred while exporting");
+
+                    return;
+                }
+
+                if (notification.CancellationToken.IsCancellationRequested)
+                {
+                    return;
+                }
+
+                notification.CompletionText = "Export Complete, Click to open the folder";
+                notification.State = ProgressNotificationState.Completed;
+            });
         }
 
         /// <summary>
@@ -101,14 +114,16 @@ namespace osu.Game.Database
         /// </summary>
         /// <param name="model">The item to export.</param>
         /// <param name="outputStream">The output stream to export to.</param>
-        protected virtual void ExportToStream(TModel model, Stream outputStream) => exportZipArchive(model, outputStream);
+        /// <param name="notification">The notification will displayed to the user</param>
+        protected virtual void ExportToStream(TModel model, Stream outputStream, ProgressNotification notification) => exportZipArchive(model, outputStream, notification);
 
         /// <summary>
         /// Exports an item to Stream as a legacy (.zip based) package.
         /// </summary>
         /// <param name="model">The item to export.</param>
         /// <param name="outputStream">The output stream to export to.</param>
-        private void exportZipArchive(TModel model, Stream outputStream)
+        /// <param name="notification">The notification will displayed to the user</param>
+        private void exportZipArchive(TModel model, Stream outputStream, ProgressNotification notification)
         {
             using (var archive = ZipArchive.Create())
             {
@@ -129,24 +144,5 @@ namespace osu.Game.Database
                 archive.SaveTo(outputStream);
             }
         }
-
-        private void onComplete(Task t)
-        {
-            if (t.IsFaulted)
-            {
-                notification.State = ProgressNotificationState.Cancelled;
-                Logger.Error(t.Exception, "An error occurred while exporting");
-
-                return;
-            }
-
-            if (notification.CancellationToken.IsCancellationRequested)
-            {
-                return;
-            }
-
-            notification.CompletionText = "Export Complete, Click to open the folder";
-            notification.State = ProgressNotificationState.Completed;
-        }
     }
 }
diff --git a/osu.Game/Database/LegacyScoreExporter.cs b/osu.Game/Database/LegacyScoreExporter.cs
index eb46bc6db2..1a30d823e1 100644
--- a/osu.Game/Database/LegacyScoreExporter.cs
+++ b/osu.Game/Database/LegacyScoreExporter.cs
@@ -5,21 +5,21 @@ using System.IO;
 using System.Linq;
 using osu.Framework.Platform;
 using osu.Game.Extensions;
-using osu.Game.Overlays;
+using osu.Game.Overlays.Notifications;
 using osu.Game.Scoring;
 
 namespace osu.Game.Database
 {
     public class LegacyScoreExporter : LegacyModelExporter<ScoreInfo>
     {
-        public LegacyScoreExporter(Storage storage, RealmAccess realm, INotificationOverlay? notifications = null)
-            : base(storage, realm, notifications)
+        public LegacyScoreExporter(Storage storage, RealmAccess realm)
+            : base(storage, realm)
         {
         }
 
         protected override string FileExtension => ".osr";
 
-        protected override void ExportToStream(ScoreInfo model, Stream stream)
+        protected override void ExportToStream(ScoreInfo model, Stream stream, ProgressNotification notification)
         {
             var file = model.Files.SingleOrDefault();
             if (file == null)
diff --git a/osu.Game/Database/LegacySkinExporter.cs b/osu.Game/Database/LegacySkinExporter.cs
index 6e65963f29..52d0e56cbf 100644
--- a/osu.Game/Database/LegacySkinExporter.cs
+++ b/osu.Game/Database/LegacySkinExporter.cs
@@ -2,15 +2,14 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Platform;
-using osu.Game.Overlays;
 using osu.Game.Skinning;
 
 namespace osu.Game.Database
 {
     public class LegacySkinExporter : LegacyModelExporter<SkinInfo>
     {
-        public LegacySkinExporter(Storage storage, RealmAccess realm, INotificationOverlay? notifications = null)
-            : base(storage, realm, notifications)
+        public LegacySkinExporter(Storage storage, RealmAccess realm)
+            : base(storage, realm)
         {
         }
 
diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index f0457de2dc..e5edf90d1a 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -6,7 +6,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -18,7 +17,6 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
-using osu.Game.Database;
 using osu.Game.Extensions;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -34,7 +32,6 @@ using osuTK.Graphics;
 using osu.Game.Online.API;
 using osu.Game.Resources.Localisation.Web;
 using osu.Game.Utils;
-using osu.Framework.Platform;
 
 namespace osu.Game.Online.Leaderboards
 {
@@ -73,18 +70,11 @@ namespace osu.Game.Online.Leaderboards
         [Resolved(canBeNull: true)]
         private SongSelect songSelect { get; set; }
 
-        [Resolved]
-        private Storage storage { get; set; }
-
-        [Resolved]
-        private RealmAccess realm { get; set; }
-
-        [Resolved(canBeNull: true)]
-        private INotificationOverlay notifications { get; set; }
-
         public ITooltip<ScoreInfo> GetCustomTooltip() => new LeaderboardScoreTooltip();
         public virtual ScoreInfo TooltipContent => Score;
 
+        private ScoreManager scoreManager = null!;
+
         public LeaderboardScore(ScoreInfo score, int? rank, bool isOnlineScope = true)
         {
             Score = score;
@@ -103,6 +93,8 @@ namespace osu.Game.Online.Leaderboards
 
             statisticsLabels = GetStatistics(Score).Select(s => new ScoreComponentLabel(s)).ToList();
 
+            this.scoreManager = scoreManager;
+
             ClickableAvatar innerAvatar;
 
             Children = new Drawable[]
@@ -434,7 +426,7 @@ namespace osu.Game.Online.Leaderboards
 
                 if (Score.Files.Count > 0)
                 {
-                    items.Add(new OsuMenuItem("Export", MenuItemType.Standard, () => Task.Run(() => new LegacyScoreExporter(storage, realm, notifications).ExportAsync(Score))));
+                    items.Add(new OsuMenuItem("Export", MenuItemType.Standard, () => scoreManager.Export(Score)));
                     items.Add(new OsuMenuItem(CommonStrings.ButtonsDelete, MenuItemType.Destructive, () => dialogOverlay?.Push(new LocalScoreDeleteDialog(Score))));
                 }
 
diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 9400e803c8..6d338df2fe 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -13,7 +13,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
 using osu.Framework.Logging;
-using osu.Framework.Platform;
 using osu.Game.Database;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Localisation;
@@ -138,15 +137,6 @@ namespace osu.Game.Overlays.Settings.Sections
             [Resolved]
             private SkinManager skins { get; set; }
 
-            [Resolved]
-            private Storage storage { get; set; }
-
-            [Resolved]
-            private RealmAccess realm { get; set; }
-
-            [Resolved(canBeNull: true)]
-            private INotificationOverlay notifications { get; set; }
-
             private Bindable<Skin> currentSkin;
 
             [BackgroundDependencyLoader]
@@ -168,7 +158,7 @@ namespace osu.Game.Overlays.Settings.Sections
             {
                 try
                 {
-                    currentSkin.Value.SkinInfo.PerformRead(s => new LegacySkinExporter(storage, realm, notifications).ExportAsync(s));
+                    skins.ExporCurrenttSkin();
                 }
                 catch (Exception e)
                 {
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index b2944ad219..525ff58778 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -27,6 +27,7 @@ namespace osu.Game.Scoring
     {
         private readonly OsuConfigManager configManager;
         private readonly ScoreImporter scoreImporter;
+        private readonly LegacyScoreExporter scoreExporter;
 
         public ScoreManager(RulesetStore rulesets, Func<BeatmapManager> beatmaps, Storage storage, RealmAccess realm, IAPIProvider api,
                             OsuConfigManager configManager = null)
@@ -38,6 +39,11 @@ namespace osu.Game.Scoring
             {
                 PostNotification = obj => PostNotification?.Invoke(obj)
             };
+
+            scoreExporter = new LegacyScoreExporter(storage, realm)
+            {
+                PostNotification = obj => PostNotification?.Invoke(obj)
+            };
         }
 
         public Score GetScore(ScoreInfo score) => scoreImporter.GetScore(score);
@@ -177,6 +183,8 @@ namespace osu.Game.Scoring
 
         public Task<IEnumerable<Live<ScoreInfo>>> Import(ProgressNotification notification, params ImportTask[] tasks) => scoreImporter.Import(notification, tasks);
 
+        public void Export(ScoreInfo score) => Task.Run(() => scoreExporter.ExportAsync(score));
+
         public Task<Live<ScoreInfo>> ImportAsUpdate(ProgressNotification notification, ImportTask task, ScoreInfo original) => scoreImporter.ImportAsUpdate(notification, task, original);
 
         public Live<ScoreInfo> Import(ScoreInfo item, ArchiveReader archive = null, bool batchImport = false, CancellationToken cancellationToken = default) =>
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 342ee2e219..69bcda69c1 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -6,7 +6,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using osu.Framework;
 using osu.Framework.Allocation;
@@ -21,7 +20,6 @@ using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
 using osu.Framework.Logging;
-using osu.Framework.Platform;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Framework.Threading;
@@ -30,7 +28,6 @@ using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Configuration;
-using osu.Game.Database;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
@@ -89,12 +86,6 @@ namespace osu.Game.Screens.Edit
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
-        [Resolved]
-        private Storage storage { get; set; }
-
-        [Resolved]
-        private RealmAccess realm { get; set; }
-
         [Resolved(canBeNull: true)]
         private IDialogOverlay dialogOverlay { get; set; }
 
@@ -958,7 +949,7 @@ namespace osu.Game.Screens.Edit
         private void exportBeatmap()
         {
             Save();
-            Task.Run(() => new LegacyBeatmapExporter(storage, realm, notifications).ExportAsync(Beatmap.Value.BeatmapSetInfo));
+            beatmapManager.Export(Beatmap.Value.BeatmapSetInfo);
         }
 
         /// <summary>
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 4a5277f3bf..65a602b764 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -58,6 +58,8 @@ namespace osu.Game.Skinning
 
         private readonly SkinImporter skinImporter;
 
+        private readonly LegacySkinExporter skinExporter;
+
         private readonly IResourceStore<byte[]> userFiles;
 
         private Skin argonSkin { get; }
@@ -109,6 +111,11 @@ namespace osu.Game.Skinning
 
                 SourceChanged?.Invoke();
             };
+
+            skinExporter = new LegacySkinExporter(storage, realm)
+            {
+                PostNotification = obj => PostNotification?.Invoke(obj)
+            };
         }
 
         public void SelectRandomSkin()
@@ -280,6 +287,8 @@ namespace osu.Game.Skinning
 
         public Task<Live<SkinInfo>> Import(ImportTask task, bool batchImport = false, CancellationToken cancellationToken = default) => skinImporter.Import(task, batchImport, cancellationToken);
 
+        public void ExporCurrenttSkin() => CurrentSkinInfo.Value.PerformRead(s => skinExporter.ExportAsync(s));
+
         #endregion
 
         public void Delete([CanBeNull] Expression<Func<SkinInfo, bool>> filter = null, bool silent = false)

From 3d6d3b40257c17184311f1442b850747d1b3b287 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Thu, 15 Dec 2022 20:59:11 +0900
Subject: [PATCH 0032/1604] fix weird async logic

---
 osu.Game/Beatmaps/BeatmapManager.cs | 2 +-
 osu.Game/Scoring/ScoreManager.cs    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 34780082da..56b87eaf11 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -453,7 +453,7 @@ namespace osu.Game.Beatmaps
         public Task<Live<BeatmapSetInfo>?> ImportAsUpdate(ProgressNotification notification, ImportTask importTask, BeatmapSetInfo original) =>
             beatmapImporter.ImportAsUpdate(notification, importTask, original);
 
-        public void Export(BeatmapSetInfo beatmap) => Task.Run(() => beatmapExporter.ExportAsync(beatmap));
+        public Task Export(BeatmapSetInfo beatmap) => beatmapExporter.ExportAsync(beatmap);
 
         private void updateHashAndMarkDirty(BeatmapSetInfo setInfo)
         {
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 525ff58778..f52172a200 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -183,7 +183,7 @@ namespace osu.Game.Scoring
 
         public Task<IEnumerable<Live<ScoreInfo>>> Import(ProgressNotification notification, params ImportTask[] tasks) => scoreImporter.Import(notification, tasks);
 
-        public void Export(ScoreInfo score) => Task.Run(() => scoreExporter.ExportAsync(score));
+        public Task Export(ScoreInfo score) => scoreExporter.ExportAsync(score);
 
         public Task<Live<ScoreInfo>> ImportAsUpdate(ProgressNotification notification, ImportTask task, ScoreInfo original) => scoreImporter.ImportAsUpdate(notification, task, original);
 

From c9cffc82484f32c70395509111149d5b0123b539 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Thu, 15 Dec 2022 21:01:38 +0900
Subject: [PATCH 0033/1604] use resolved attribute

---
 osu.Game/Online/Leaderboards/LeaderboardScore.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index e5edf90d1a..e4ea277756 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -73,7 +73,8 @@ namespace osu.Game.Online.Leaderboards
         public ITooltip<ScoreInfo> GetCustomTooltip() => new LeaderboardScoreTooltip();
         public virtual ScoreInfo TooltipContent => Score;
 
-        private ScoreManager scoreManager = null!;
+        [Resolved]
+        private ScoreManager scoreManager { get; set; } = null!;
 
         public LeaderboardScore(ScoreInfo score, int? rank, bool isOnlineScope = true)
         {
@@ -87,14 +88,12 @@ namespace osu.Game.Online.Leaderboards
         }
 
         [BackgroundDependencyLoader]
-        private void load(IAPIProvider api, OsuColour colour, ScoreManager scoreManager)
+        private void load(IAPIProvider api, OsuColour colour)
         {
             var user = Score.User;
 
             statisticsLabels = GetStatistics(Score).Select(s => new ScoreComponentLabel(s)).ToList();
 
-            this.scoreManager = scoreManager;
-
             ClickableAvatar innerAvatar;
 
             Children = new Drawable[]

From 6900d0120a70287ef531a4c0facd398508a76b06 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Thu, 15 Dec 2022 21:39:48 +0900
Subject: [PATCH 0034/1604] change abstract implement

---
 osu.Game/Database/LegacyBeatmapExporter.cs |  2 +-
 osu.Game/Database/LegacyModelExporter.cs   | 21 ++++++++++++++++-----
 osu.Game/Database/LegacySkinExporter.cs    |  2 +-
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Database/LegacyBeatmapExporter.cs b/osu.Game/Database/LegacyBeatmapExporter.cs
index 6349ebde2c..107b91a234 100644
--- a/osu.Game/Database/LegacyBeatmapExporter.cs
+++ b/osu.Game/Database/LegacyBeatmapExporter.cs
@@ -6,7 +6,7 @@ using osu.Game.Beatmaps;
 
 namespace osu.Game.Database
 {
-    public class LegacyBeatmapExporter : LegacyModelExporter<BeatmapSetInfo>
+    public class LegacyBeatmapExporter : LegacyArchiveExporter<BeatmapSetInfo>
     {
         public LegacyBeatmapExporter(Storage storage, RealmAccess realm)
             : base(storage, realm)
diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index 5150651b15..6b5f8e7e96 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Database
 
         protected RealmAccess RealmAccess;
 
-        private bool canCancel = true;
+        protected bool CanCancel = true;
 
         private string filename = string.Empty;
         public Action<Notification>? PostNotification { get; set; }
@@ -76,9 +76,9 @@ namespace osu.Game.Database
                 CompletionText = "Export completed"
             };
             notification.CompletionClickAction += () => exportStorage.PresentFileExternally(filename);
-            notification.CancelRequested += () => canCancel;
+            notification.CancelRequested += () => CanCancel;
             PostNotification?.Invoke(notification);
-            canCancel = true;
+            CanCancel = true;
 
             Guid id = model.ID;
             await Task.Run(() =>
@@ -115,7 +115,18 @@ namespace osu.Game.Database
         /// <param name="model">The item to export.</param>
         /// <param name="outputStream">The output stream to export to.</param>
         /// <param name="notification">The notification will displayed to the user</param>
-        protected virtual void ExportToStream(TModel model, Stream outputStream, ProgressNotification notification) => exportZipArchive(model, outputStream, notification);
+        protected abstract void ExportToStream(TModel model, Stream outputStream, ProgressNotification notification);
+    }
+
+    public abstract class LegacyArchiveExporter<TModel> : LegacyModelExporter<TModel>
+        where TModel : RealmObject, IHasNamedFiles, IHasGuidPrimaryKey
+    {
+        protected LegacyArchiveExporter(Storage storage, RealmAccess realm)
+            : base(storage, realm)
+        {
+        }
+
+        protected override void ExportToStream(TModel model, Stream outputStream, ProgressNotification notification) => exportZipArchive(model, outputStream, notification);
 
         /// <summary>
         /// Exports an item to Stream as a legacy (.zip based) package.
@@ -140,7 +151,7 @@ namespace osu.Game.Database
                 }
 
                 notification.Text = "Saving Zip Archive...";
-                canCancel = false;
+                CanCancel = false;
                 archive.SaveTo(outputStream);
             }
         }
diff --git a/osu.Game/Database/LegacySkinExporter.cs b/osu.Game/Database/LegacySkinExporter.cs
index 52d0e56cbf..d3e6a2f0f4 100644
--- a/osu.Game/Database/LegacySkinExporter.cs
+++ b/osu.Game/Database/LegacySkinExporter.cs
@@ -6,7 +6,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Database
 {
-    public class LegacySkinExporter : LegacyModelExporter<SkinInfo>
+    public class LegacySkinExporter : LegacyArchiveExporter<SkinInfo>
     {
         public LegacySkinExporter(Storage storage, RealmAccess realm)
             : base(storage, realm)

From 6ef5b2733f01a4ebd2ccd733a4e6c80c6158698f Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Thu, 15 Dec 2022 21:41:15 +0900
Subject: [PATCH 0035/1604] Export instead of ExportCurrentSkin

---
 osu.Game/Overlays/Settings/Sections/SkinSection.cs | 2 +-
 osu.Game/Skinning/SkinManager.cs                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 6d338df2fe..1a64416b3e 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -158,7 +158,7 @@ namespace osu.Game.Overlays.Settings.Sections
             {
                 try
                 {
-                    skins.ExporCurrenttSkin();
+                    skins.CurrentSkinInfo.Value.PerformRead(s => skins.ExportSkin(s));
                 }
                 catch (Exception e)
                 {
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 65a602b764..d4e7d252ac 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -287,7 +287,7 @@ namespace osu.Game.Skinning
 
         public Task<Live<SkinInfo>> Import(ImportTask task, bool batchImport = false, CancellationToken cancellationToken = default) => skinImporter.Import(task, batchImport, cancellationToken);
 
-        public void ExporCurrenttSkin() => CurrentSkinInfo.Value.PerformRead(s => skinExporter.ExportAsync(s));
+        public Task ExportSkin(SkinInfo skin) => skinExporter.ExportAsync(skin);
 
         #endregion
 

From ec251664a7c4a2bbb6b022a046cf35960bd2497b Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Thu, 15 Dec 2022 22:45:36 +0900
Subject: [PATCH 0036/1604] use ThrowIfCancellationRequested instead of
 CancelRequested

---
 osu.Game/Database/LegacyModelExporter.cs | 70 ++++++++++++++----------
 1 file changed, 42 insertions(+), 28 deletions(-)

diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index 6b5f8e7e96..0ebcfaa07e 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -32,8 +32,6 @@ namespace osu.Game.Database
 
         protected RealmAccess RealmAccess;
 
-        protected bool CanCancel = true;
-
         private string filename = string.Empty;
         public Action<Notification>? PostNotification { get; set; }
 
@@ -54,10 +52,16 @@ namespace osu.Game.Database
             string itemFilename = model.GetDisplayString().GetValidFilename();
             IEnumerable<string> existingExports = exportStorage.GetFiles("", $"{itemFilename}*{FileExtension}");
             filename = NamingUtils.GetNextBestFilename(existingExports, $"{itemFilename}{FileExtension}");
+            bool success;
 
             using (var stream = exportStorage.CreateFileSafely(filename))
             {
-                await ExportToStreamAsync(model, stream);
+                success = await ExportToStreamAsync(model, stream);
+            }
+
+            if (!success)
+            {
+                exportStorage.Delete(filename);
             }
         }
 
@@ -66,8 +70,8 @@ namespace osu.Game.Database
         /// </summary>
         /// <param name="model">The medel which have <see cref="IHasGuidPrimaryKey"/>.</param>
         /// <param name="stream">The stream to export.</param>
-        /// <returns></returns>
-        public async Task ExportToStreamAsync(TModel model, Stream stream)
+        /// <returns>Whether the export was successful</returns>
+        public async Task<bool> ExportToStreamAsync(TModel model, Stream stream)
         {
             ProgressNotification notification = new ProgressNotification
             {
@@ -76,35 +80,33 @@ namespace osu.Game.Database
                 CompletionText = "Export completed"
             };
             notification.CompletionClickAction += () => exportStorage.PresentFileExternally(filename);
-            notification.CancelRequested += () => CanCancel;
             PostNotification?.Invoke(notification);
-            CanCancel = true;
 
             Guid id = model.ID;
-            await Task.Run(() =>
+            return await Task.Run(() =>
             {
                 RealmAccess.Run(r =>
                 {
                     TModel refetchModel = r.Find<TModel>(id);
                     ExportToStream(refetchModel, stream, notification);
                 });
-            }).ContinueWith(t =>
+            }, notification.CancellationToken).ContinueWith(t =>
             {
+                if (t.IsCanceled)
+                {
+                    return false;
+                }
+
                 if (t.IsFaulted)
                 {
                     notification.State = ProgressNotificationState.Cancelled;
                     Logger.Error(t.Exception, "An error occurred while exporting");
-
-                    return;
-                }
-
-                if (notification.CancellationToken.IsCancellationRequested)
-                {
-                    return;
+                    return false;
                 }
 
                 notification.CompletionText = "Export Complete, Click to open the folder";
                 notification.State = ProgressNotificationState.Completed;
+                return true;
             });
         }
 
@@ -121,6 +123,8 @@ namespace osu.Game.Database
     public abstract class LegacyArchiveExporter<TModel> : LegacyModelExporter<TModel>
         where TModel : RealmObject, IHasNamedFiles, IHasGuidPrimaryKey
     {
+        private bool canCancel = true;
+
         protected LegacyArchiveExporter(Storage storage, RealmAccess realm)
             : base(storage, realm)
         {
@@ -136,23 +140,33 @@ namespace osu.Game.Database
         /// <param name="notification">The notification will displayed to the user</param>
         private void exportZipArchive(TModel model, Stream outputStream, ProgressNotification notification)
         {
-            using (var archive = ZipArchive.Create())
+            try
             {
-                float i = 0;
+                notification.CancelRequested += () => canCancel;
 
-                foreach (var file in model.Files)
+                using (var archive = ZipArchive.Create())
                 {
-                    if (notification.CancellationToken.IsCancellationRequested) return;
+                    float i = 0;
 
-                    archive.AddEntry(file.Filename, UserFileStorage.GetStream(file.File.GetStoragePath()));
-                    i++;
-                    notification.Progress = i / model.Files.Count();
-                    notification.Text = $"Exporting... ({i}/{model.Files.Count()})";
+                    foreach (var file in model.Files)
+                    {
+                        notification.CancellationToken.ThrowIfCancellationRequested();
+
+                        archive.AddEntry(file.Filename, UserFileStorage.GetStream(file.File.GetStoragePath()));
+                        i++;
+                        notification.Progress = i / model.Files.Count();
+                        notification.Text = $"Exporting... ({i}/{model.Files.Count()})";
+                    }
+
+                    notification.Text = "Saving Zip Archive...";
+                    canCancel = false;
+                    archive.SaveTo(outputStream);
                 }
-
-                notification.Text = "Saving Zip Archive...";
-                CanCancel = false;
-                archive.SaveTo(outputStream);
+            }
+            catch (OperationCanceledException)
+            {
+                Logger.Log("Export operat canceled");
+                throw;
             }
         }
     }

From f5226bd50b02068e42116940e12c1f47bbf158ce Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Thu, 15 Dec 2022 23:12:25 +0900
Subject: [PATCH 0037/1604] use ZipWriter

Export directly to stream instead of creating a archive
so we can cancel this anytime
---
 osu.Game/Database/LegacyModelExporter.cs | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index 0ebcfaa07e..9e0c1e0c6d 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -12,7 +12,9 @@ using osu.Game.Extensions;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Utils;
 using Realms;
-using SharpCompress.Archives.Zip;
+using SharpCompress.Common;
+using SharpCompress.Writers;
+using SharpCompress.Writers.Zip;
 
 namespace osu.Game.Database
 {
@@ -123,8 +125,6 @@ namespace osu.Game.Database
     public abstract class LegacyArchiveExporter<TModel> : LegacyModelExporter<TModel>
         where TModel : RealmObject, IHasNamedFiles, IHasGuidPrimaryKey
     {
-        private bool canCancel = true;
-
         protected LegacyArchiveExporter(Storage storage, RealmAccess realm)
             : base(storage, realm)
         {
@@ -142,9 +142,7 @@ namespace osu.Game.Database
         {
             try
             {
-                notification.CancelRequested += () => canCancel;
-
-                using (var archive = ZipArchive.Create())
+                using (var writer = new ZipWriter(outputStream, new ZipWriterOptions(CompressionType.Deflate)))
                 {
                     float i = 0;
 
@@ -152,15 +150,11 @@ namespace osu.Game.Database
                     {
                         notification.CancellationToken.ThrowIfCancellationRequested();
 
-                        archive.AddEntry(file.Filename, UserFileStorage.GetStream(file.File.GetStoragePath()));
+                        writer.Write(file.Filename, UserFileStorage.GetStream(file.File.GetStoragePath()));
                         i++;
                         notification.Progress = i / model.Files.Count();
                         notification.Text = $"Exporting... ({i}/{model.Files.Count()})";
                     }
-
-                    notification.Text = "Saving Zip Archive...";
-                    canCancel = false;
-                    archive.SaveTo(outputStream);
                 }
             }
             catch (OperationCanceledException)

From dadadaff65057cd16210ae9ba05634e308b5ec53 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Thu, 15 Dec 2022 23:20:29 +0900
Subject: [PATCH 0038/1604] remove try catch

---
 osu.Game/Database/LegacyModelExporter.cs | 26 ++++++++----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index 9e0c1e0c6d..824460cdc9 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -140,28 +140,20 @@ namespace osu.Game.Database
         /// <param name="notification">The notification will displayed to the user</param>
         private void exportZipArchive(TModel model, Stream outputStream, ProgressNotification notification)
         {
-            try
+            using (var writer = new ZipWriter(outputStream, new ZipWriterOptions(CompressionType.Deflate)))
             {
-                using (var writer = new ZipWriter(outputStream, new ZipWriterOptions(CompressionType.Deflate)))
+                float i = 0;
+
+                foreach (var file in model.Files)
                 {
-                    float i = 0;
+                    notification.CancellationToken.ThrowIfCancellationRequested();
 
-                    foreach (var file in model.Files)
-                    {
-                        notification.CancellationToken.ThrowIfCancellationRequested();
-
-                        writer.Write(file.Filename, UserFileStorage.GetStream(file.File.GetStoragePath()));
-                        i++;
-                        notification.Progress = i / model.Files.Count();
-                        notification.Text = $"Exporting... ({i}/{model.Files.Count()})";
-                    }
+                    writer.Write(file.Filename, UserFileStorage.GetStream(file.File.GetStoragePath()));
+                    i++;
+                    notification.Progress = i / model.Files.Count();
+                    notification.Text = $"Exporting... ({i}/{model.Files.Count()})";
                 }
             }
-            catch (OperationCanceledException)
-            {
-                Logger.Log("Export operat canceled");
-                throw;
-            }
         }
     }
 }

From cd8420bc66c56aa7e686a579ebd9a18634861b45 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Thu, 15 Dec 2022 23:34:40 +0900
Subject: [PATCH 0039/1604] Handle the case where the file cannot be found

---
 osu.Game/Database/LegacyModelExporter.cs | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index 824460cdc9..531a6f48da 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -143,12 +143,33 @@ namespace osu.Game.Database
             using (var writer = new ZipWriter(outputStream, new ZipWriterOptions(CompressionType.Deflate)))
             {
                 float i = 0;
+                bool fileMissing = false;
 
                 foreach (var file in model.Files)
                 {
                     notification.CancellationToken.ThrowIfCancellationRequested();
 
-                    writer.Write(file.Filename, UserFileStorage.GetStream(file.File.GetStoragePath()));
+                    using (var stream = UserFileStorage.GetStream(file.File.GetStoragePath()))
+                    {
+                        // Sometimes we cannot find the file(probably deleted by the user), so we handle this and post a error.
+                        if (stream == null)
+                        {
+                            // Only pop up once to prevent spam.
+                            if (!fileMissing)
+                            {
+                                PostNotification?.Invoke(new SimpleErrorNotification
+                                {
+                                    Text = "Some of your files are missing, they will not be included in the archive"
+                                });
+                                fileMissing = true;
+                            }
+                        }
+                        else
+                        {
+                            writer.Write(file.Filename, stream);
+                        }
+                    }
+
                     i++;
                     notification.Progress = i / model.Files.Count();
                     notification.Text = $"Exporting... ({i}/{model.Files.Count()})";

From 5912dfd443effad317f5085aba57f4b380868d6e Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Thu, 15 Dec 2022 23:42:49 +0900
Subject: [PATCH 0040/1604] using declaration

reshaper
---
 osu.Game/Database/LegacyModelExporter.cs | 49 ++++++++++++------------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index 531a6f48da..d896e4bce6 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -140,40 +140,39 @@ namespace osu.Game.Database
         /// <param name="notification">The notification will displayed to the user</param>
         private void exportZipArchive(TModel model, Stream outputStream, ProgressNotification notification)
         {
-            using (var writer = new ZipWriter(outputStream, new ZipWriterOptions(CompressionType.Deflate)))
+            using var writer = new ZipWriter(outputStream, new ZipWriterOptions(CompressionType.Deflate));
+
+            float i = 0;
+            bool fileMissing = false;
+
+            foreach (var file in model.Files)
             {
-                float i = 0;
-                bool fileMissing = false;
+                notification.CancellationToken.ThrowIfCancellationRequested();
 
-                foreach (var file in model.Files)
+                using (var stream = UserFileStorage.GetStream(file.File.GetStoragePath()))
                 {
-                    notification.CancellationToken.ThrowIfCancellationRequested();
-
-                    using (var stream = UserFileStorage.GetStream(file.File.GetStoragePath()))
+                    // Sometimes we cannot find the file(probably deleted by the user), so we handle this and post a error.
+                    if (stream == null)
                     {
-                        // Sometimes we cannot find the file(probably deleted by the user), so we handle this and post a error.
-                        if (stream == null)
+                        // Only pop up once to prevent spam.
+                        if (!fileMissing)
                         {
-                            // Only pop up once to prevent spam.
-                            if (!fileMissing)
+                            PostNotification?.Invoke(new SimpleErrorNotification
                             {
-                                PostNotification?.Invoke(new SimpleErrorNotification
-                                {
-                                    Text = "Some of your files are missing, they will not be included in the archive"
-                                });
-                                fileMissing = true;
-                            }
-                        }
-                        else
-                        {
-                            writer.Write(file.Filename, stream);
+                                Text = "Some of your files are missing, they will not be included in the archive"
+                            });
+                            fileMissing = true;
                         }
                     }
-
-                    i++;
-                    notification.Progress = i / model.Files.Count();
-                    notification.Text = $"Exporting... ({i}/{model.Files.Count()})";
+                    else
+                    {
+                        writer.Write(file.Filename, stream);
+                    }
                 }
+
+                i++;
+                notification.Progress = i / model.Files.Count();
+                notification.Text = $"Exporting... ({i}/{model.Files.Count()})";
             }
         }
     }

From b37f1cce3fc4bfd3c5408a8fe32a4fdc796f3b8d Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Tue, 20 Dec 2022 23:46:05 +0900
Subject: [PATCH 0041/1604] Added ability to report chat

---
 .../Visual/Online/TestSceneChatOverlay.cs     |  38 +++++++
 osu.Game/Overlays/Chat/ChatReportReason.cs    |  36 ++++++
 osu.Game/Overlays/Chat/DrawableUsername.cs    |  16 ++-
 osu.Game/Overlays/Chat/ReportChatPopover.cs   | 106 ++++++++++++++++++
 osu.Game/Overlays/ChatOverlay.cs              |   3 +-
 5 files changed, 197 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game/Overlays/Chat/ChatReportReason.cs
 create mode 100644 osu.Game/Overlays/Chat/ReportChatPopover.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
index 8cc4eabcd7..44d739a6e3 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
@@ -30,6 +30,8 @@ using osu.Game.Overlays.Chat.Listing;
 using osu.Game.Overlays.Chat.ChannelList;
 using osuTK;
 using osuTK.Input;
+using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Tests.Visual.Online
 {
@@ -530,6 +532,42 @@ namespace osu.Game.Tests.Visual.Online
             });
         }
 
+        [Test]
+        public void TestChatReport()
+        {
+            AddStep("Show overlay with channel", () =>
+            {
+                chatOverlay.Show();
+                channelManager.CurrentChannel.Value = channelManager.JoinChannel(testChannel1);
+            });
+
+            AddAssert("Overlay is visible", () => chatOverlay.State.Value == Visibility.Visible);
+            waitForChannel1Visible();
+
+            AddStep("Right click username", () =>
+            {
+                var username = this.ChildrenOfType<DrawableUsername>().First();
+                InputManager.MoveMouseTo(username);
+                InputManager.Click(MouseButton.Right);
+            });
+
+            AddStep("Click report", () =>
+            {
+                var btn = this.ChildrenOfType<OsuSpriteText>().First(x => x.Text == "Report");
+                InputManager.MoveMouseTo(btn);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddStep("Try to report", () =>
+            {
+                var btn = this.ChildrenOfType<ReportChatPopover>().Single().ChildrenOfType<RoundedButton>().Single();
+                InputManager.MoveMouseTo(btn);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddAssert("Report message sended", () => channelManager.CurrentChannel.Value.Messages.Any(x => x.Content.Contains("!report")));
+        }
+
         private void joinTestChannel(int i)
         {
             AddStep($"Join test channel {i}", () => channelManager.JoinChannel(testChannels[i]));
diff --git a/osu.Game/Overlays/Chat/ChatReportReason.cs b/osu.Game/Overlays/Chat/ChatReportReason.cs
new file mode 100644
index 0000000000..55593d29ad
--- /dev/null
+++ b/osu.Game/Overlays/Chat/ChatReportReason.cs
@@ -0,0 +1,36 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.ComponentModel;
+using osu.Framework.Localisation;
+using osu.Game.Resources.Localisation.Web;
+
+namespace osu.Game.Overlays.Chat
+{
+    public enum ChatReportReason
+    {
+        [Description("Insulting People")]
+        [LocalisableDescription(typeof(UsersStrings), nameof(UsersStrings.ReportOptionsInsults))]
+        Insults,
+
+        [Description("Spam")]
+        [LocalisableDescription(typeof(UsersStrings), nameof(UsersStrings.ReportOptionsSpam))]
+        Spam,
+
+        [Description("Cheating")]
+        [LocalisableDescription(typeof(UsersStrings), nameof(UsersStrings.ReportOptionsCheating))]
+        FoulPlay,
+
+        [Description("Unwanted Content")]
+        [LocalisableDescription(typeof(UsersStrings), nameof(UsersStrings.ReportOptionsUnwantedContent))]
+        UnwantedContent,
+
+        [Description("Nonsense")]
+        [LocalisableDescription(typeof(UsersStrings), nameof(UsersStrings.ReportOptionsNonsense))]
+        Nonsense,
+
+        [Description("Other")]
+        [LocalisableDescription(typeof(UsersStrings), nameof(UsersStrings.ReportOptionsOther))]
+        Other
+    }
+}
diff --git a/osu.Game/Overlays/Chat/DrawableUsername.cs b/osu.Game/Overlays/Chat/DrawableUsername.cs
index 6bae498a6c..f70175f081 100644
--- a/osu.Game/Overlays/Chat/DrawableUsername.cs
+++ b/osu.Game/Overlays/Chat/DrawableUsername.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -25,7 +26,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Chat
 {
-    public partial class DrawableUsername : OsuClickableContainer, IHasContextMenu
+    public partial class DrawableUsername : OsuClickableContainer, IHasContextMenu, IHasPopover
     {
         public Color4 AccentColour { get; }
 
@@ -152,12 +153,20 @@ namespace osu.Game.Overlays.Chat
                 };
 
                 if (!user.Equals(api.LocalUser.Value))
+                {
                     items.Add(new OsuMenuItem("Start Chat", MenuItemType.Standard, openUserChannel));
+                    items.Add(new OsuMenuItem("Report", MenuItemType.Destructive, this.ShowPopover));
+                }
 
                 return items.ToArray();
             }
         }
 
+        private void report(ChatReportReason reason, string comments)
+        {
+            chatManager?.PostMessage($"!report {user.Username} ({reason.GetDescription()}): {comments}");
+        }
+
         private void openUserChannel()
         {
             chatManager?.OpenPrivateChannel(user);
@@ -221,5 +230,10 @@ namespace osu.Game.Overlays.Chat
             Color4Extensions.FromHex("812a96"),
             Color4Extensions.FromHex("992861"),
         };
+
+        public Popover GetPopover() => new ReportChatPopover(user)
+        {
+            Action = report
+        };
     }
 }
diff --git a/osu.Game/Overlays/Chat/ReportChatPopover.cs b/osu.Game/Overlays/Chat/ReportChatPopover.cs
new file mode 100644
index 0000000000..cf5e456874
--- /dev/null
+++ b/osu.Game/Overlays/Chat/ReportChatPopover.cs
@@ -0,0 +1,106 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Resources.Localisation.Web;
+using osuTK;
+
+namespace osu.Game.Overlays.Chat
+{
+    public partial class ReportChatPopover : OsuPopover
+    {
+        public Action<ChatReportReason, string>? Action;
+
+        private readonly APIUser? user;
+
+        private OsuEnumDropdown<ChatReportReason> reasonDropdown = null!;
+        private OsuTextBox commentsTextBox = null!;
+
+        public ReportChatPopover(APIUser? user)
+        {
+            this.user = user;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours, AudioManager audio)
+        {
+            Child = new ReverseChildIDFillFlowContainer<Drawable>
+            {
+                Direction = FillDirection.Vertical,
+                Width = 500,
+                AutoSizeAxes = Axes.Y,
+                Spacing = new Vector2(7),
+                Children = new Drawable[]
+                {
+                    new SpriteIcon
+                    {
+                        Origin = Anchor.TopCentre,
+                        Anchor = Anchor.TopCentre,
+                        Icon = FontAwesome.Solid.ExclamationTriangle,
+                        Size = new Vector2(36),
+                    },
+                    new OsuSpriteText
+                    {
+                        Origin = Anchor.TopCentre,
+                        Anchor = Anchor.TopCentre,
+                        Text = ReportStrings.UserTitle(user?.Username ?? @"Someone"),
+                        Font = OsuFont.Torus.With(size: 25),
+                        Margin = new MarginPadding { Bottom = 10 }
+                    },
+                    new OsuSpriteText
+                    {
+                        Origin = Anchor.TopCentre,
+                        Anchor = Anchor.TopCentre,
+                        Text = UsersStrings.ReportReason,
+                    },
+                    new Container
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Height = 40,
+                        Child = reasonDropdown = new OsuEnumDropdown<ChatReportReason>
+                        {
+                            RelativeSizeAxes = Axes.X
+                        }
+                    },
+                    new OsuSpriteText
+                    {
+                        Origin = Anchor.TopCentre,
+                        Anchor = Anchor.TopCentre,
+                        Text = UsersStrings.ReportComments,
+                    },
+                    commentsTextBox = new OsuTextBox
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        PlaceholderText = UsersStrings.ReportPlaceholder,
+                    },
+                    new RoundedButton
+                    {
+                        Origin = Anchor.TopCentre,
+                        Anchor = Anchor.TopCentre,
+                        Width = 200,
+                        BackgroundColour = colours.Red3,
+                        Text = UsersStrings.ReportActionsSend,
+                        Action = () =>
+                        {
+                            Action?.Invoke(reasonDropdown.Current.Value, commentsTextBox.Text);
+                            this.HidePopover();
+                        },
+                        Margin = new MarginPadding { Bottom = 5, Top = 10 },
+                    }
+                }
+            };
+        }
+    }
+}
diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index c539cdc5ec..c3a6ed0175 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -9,6 +9,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
@@ -122,7 +123,7 @@ namespace osu.Game.Overlays
                                     RelativeSizeAxes = Axes.Y,
                                     Width = side_bar_width,
                                 },
-                                new Container
+                                new PopoverContainer
                                 {
                                     RelativeSizeAxes = Axes.Both,
                                     Anchor = Anchor.TopRight,

From ffa32307c3ef8c9917a210a31871b9000cf80246 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Wed, 21 Dec 2022 01:37:16 +0900
Subject: [PATCH 0042/1604] abstract ReportPopover

---
 .../Graphics/UserInterfaceV2/ReportPopover.cs | 114 ++++++++++++++++++
 osu.Game/Overlays/Chat/ReportChatPopover.cs   |  94 +--------------
 .../Overlays/Comments/ReportCommentPopover.cs |  98 +--------------
 3 files changed, 119 insertions(+), 187 deletions(-)
 create mode 100644 osu.Game/Graphics/UserInterfaceV2/ReportPopover.cs

diff --git a/osu.Game/Graphics/UserInterfaceV2/ReportPopover.cs b/osu.Game/Graphics/UserInterfaceV2/ReportPopover.cs
new file mode 100644
index 0000000000..44af108ab1
--- /dev/null
+++ b/osu.Game/Graphics/UserInterfaceV2/ReportPopover.cs
@@ -0,0 +1,114 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using osu.Framework.Allocation;
+using osu.Framework.Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Resources.Localisation.Web;
+using osuTK;
+
+namespace osu.Game.Graphics.UserInterfaceV2
+{
+    public abstract partial class ReportPopover<T> : OsuPopover
+        where T : struct, Enum
+    {
+        public Action<T, string>? Action;
+
+        private OsuEnumDropdown<T> reasonDropdown = null!;
+        private OsuTextBox commentsTextBox = null!;
+        private RoundedButton submitButton = null!;
+
+        public bool CanSubmitEmptyReason = false;
+        public LocalisableString Header;
+
+        protected ReportPopover(LocalisableString headerString)
+        {
+            Header = headerString;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            Child = new ReverseChildIDFillFlowContainer<Drawable>
+            {
+                Direction = FillDirection.Vertical,
+                Width = 500,
+                AutoSizeAxes = Axes.Y,
+                Spacing = new Vector2(7),
+                Children = new Drawable[]
+                {
+                    new SpriteIcon
+                    {
+                        Origin = Anchor.TopCentre,
+                        Anchor = Anchor.TopCentre,
+                        Icon = FontAwesome.Solid.ExclamationTriangle,
+                        Size = new Vector2(36),
+                    },
+                    new OsuSpriteText
+                    {
+                        Origin = Anchor.TopCentre,
+                        Anchor = Anchor.TopCentre,
+                        Text = Header,
+                        Font = OsuFont.Torus.With(size: 25),
+                        Margin = new MarginPadding { Bottom = 10 }
+                    },
+                    new OsuSpriteText
+                    {
+                        Origin = Anchor.TopCentre,
+                        Anchor = Anchor.TopCentre,
+                        Text = UsersStrings.ReportReason,
+                    },
+                    new Container
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Height = 40,
+                        Child = reasonDropdown = new OsuEnumDropdown<T>
+                        {
+                            RelativeSizeAxes = Axes.X
+                        }
+                    },
+                    new OsuSpriteText
+                    {
+                        Origin = Anchor.TopCentre,
+                        Anchor = Anchor.TopCentre,
+                        Text = UsersStrings.ReportComments,
+                    },
+                    commentsTextBox = new OsuTextBox
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        PlaceholderText = UsersStrings.ReportPlaceholder,
+                    },
+                    submitButton = new RoundedButton
+                    {
+                        Origin = Anchor.TopCentre,
+                        Anchor = Anchor.TopCentre,
+                        Width = 200,
+                        BackgroundColour = colours.Red3,
+                        Text = UsersStrings.ReportActionsSend,
+                        Action = () =>
+                        {
+                            Action?.Invoke(reasonDropdown.Current.Value, commentsTextBox.Text);
+                            this.HidePopover();
+                        },
+                        Margin = new MarginPadding { Bottom = 5, Top = 10 },
+                    }
+                }
+            };
+
+            if (!CanSubmitEmptyReason)
+            {
+                commentsTextBox.Current.BindValueChanged(e =>
+                {
+                    submitButton.Enabled.Value = !string.IsNullOrWhiteSpace(e.NewValue);
+                }, true);
+            }
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Chat/ReportChatPopover.cs b/osu.Game/Overlays/Chat/ReportChatPopover.cs
index cf5e456874..79c3922795 100644
--- a/osu.Game/Overlays/Chat/ReportChatPopover.cs
+++ b/osu.Game/Overlays/Chat/ReportChatPopover.cs
@@ -1,106 +1,18 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
-using osu.Framework.Allocation;
-using osu.Framework.Audio;
-using osu.Framework.Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Resources.Localisation.Web;
-using osuTK;
 
 namespace osu.Game.Overlays.Chat
 {
-    public partial class ReportChatPopover : OsuPopover
+    public partial class ReportChatPopover : ReportPopover<ChatReportReason>
     {
-        public Action<ChatReportReason, string>? Action;
-
-        private readonly APIUser? user;
-
-        private OsuEnumDropdown<ChatReportReason> reasonDropdown = null!;
-        private OsuTextBox commentsTextBox = null!;
-
         public ReportChatPopover(APIUser? user)
+            : base(ReportStrings.UserTitle(user?.Username ?? @"Someone"))
         {
-            this.user = user;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours, AudioManager audio)
-        {
-            Child = new ReverseChildIDFillFlowContainer<Drawable>
-            {
-                Direction = FillDirection.Vertical,
-                Width = 500,
-                AutoSizeAxes = Axes.Y,
-                Spacing = new Vector2(7),
-                Children = new Drawable[]
-                {
-                    new SpriteIcon
-                    {
-                        Origin = Anchor.TopCentre,
-                        Anchor = Anchor.TopCentre,
-                        Icon = FontAwesome.Solid.ExclamationTriangle,
-                        Size = new Vector2(36),
-                    },
-                    new OsuSpriteText
-                    {
-                        Origin = Anchor.TopCentre,
-                        Anchor = Anchor.TopCentre,
-                        Text = ReportStrings.UserTitle(user?.Username ?? @"Someone"),
-                        Font = OsuFont.Torus.With(size: 25),
-                        Margin = new MarginPadding { Bottom = 10 }
-                    },
-                    new OsuSpriteText
-                    {
-                        Origin = Anchor.TopCentre,
-                        Anchor = Anchor.TopCentre,
-                        Text = UsersStrings.ReportReason,
-                    },
-                    new Container
-                    {
-                        RelativeSizeAxes = Axes.X,
-                        Height = 40,
-                        Child = reasonDropdown = new OsuEnumDropdown<ChatReportReason>
-                        {
-                            RelativeSizeAxes = Axes.X
-                        }
-                    },
-                    new OsuSpriteText
-                    {
-                        Origin = Anchor.TopCentre,
-                        Anchor = Anchor.TopCentre,
-                        Text = UsersStrings.ReportComments,
-                    },
-                    commentsTextBox = new OsuTextBox
-                    {
-                        RelativeSizeAxes = Axes.X,
-                        PlaceholderText = UsersStrings.ReportPlaceholder,
-                    },
-                    new RoundedButton
-                    {
-                        Origin = Anchor.TopCentre,
-                        Anchor = Anchor.TopCentre,
-                        Width = 200,
-                        BackgroundColour = colours.Red3,
-                        Text = UsersStrings.ReportActionsSend,
-                        Action = () =>
-                        {
-                            Action?.Invoke(reasonDropdown.Current.Value, commentsTextBox.Text);
-                            this.HidePopover();
-                        },
-                        Margin = new MarginPadding { Bottom = 5, Top = 10 },
-                    }
-                }
-            };
+            CanSubmitEmptyReason = true;
         }
     }
 }
diff --git a/osu.Game/Overlays/Comments/ReportCommentPopover.cs b/osu.Game/Overlays/Comments/ReportCommentPopover.cs
index f3b2a2f97c..e688dad755 100644
--- a/osu.Game/Overlays/Comments/ReportCommentPopover.cs
+++ b/osu.Game/Overlays/Comments/ReportCommentPopover.cs
@@ -1,111 +1,17 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
-using osu.Framework.Allocation;
-using osu.Framework.Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Resources.Localisation.Web;
-using osuTK;
 
 namespace osu.Game.Overlays.Comments
 {
-    public partial class ReportCommentPopover : OsuPopover
+    public partial class ReportCommentPopover : ReportPopover<CommentReportReason>
     {
-        public Action<CommentReportReason, string>? Action;
-
-        private readonly Comment? comment;
-
-        private OsuEnumDropdown<CommentReportReason> reasonDropdown = null!;
-        private OsuTextBox commentsTextBox = null!;
-        private RoundedButton submitButton = null!;
-
         public ReportCommentPopover(Comment? comment)
+            : base(ReportStrings.CommentTitle(comment?.User?.Username ?? comment?.LegacyName ?? @"Someone"))
         {
-            this.comment = comment;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            Child = new ReverseChildIDFillFlowContainer<Drawable>
-            {
-                Direction = FillDirection.Vertical,
-                Width = 500,
-                AutoSizeAxes = Axes.Y,
-                Spacing = new Vector2(7),
-                Children = new Drawable[]
-                {
-                    new SpriteIcon
-                    {
-                        Origin = Anchor.TopCentre,
-                        Anchor = Anchor.TopCentre,
-                        Icon = FontAwesome.Solid.ExclamationTriangle,
-                        Size = new Vector2(36),
-                    },
-                    new OsuSpriteText
-                    {
-                        Origin = Anchor.TopCentre,
-                        Anchor = Anchor.TopCentre,
-                        Text = ReportStrings.CommentTitle(comment?.User?.Username ?? comment?.LegacyName ?? @"Someone"),
-                        Font = OsuFont.Torus.With(size: 25),
-                        Margin = new MarginPadding { Bottom = 10 }
-                    },
-                    new OsuSpriteText
-                    {
-                        Origin = Anchor.TopCentre,
-                        Anchor = Anchor.TopCentre,
-                        Text = UsersStrings.ReportReason,
-                    },
-                    new Container
-                    {
-                        RelativeSizeAxes = Axes.X,
-                        Height = 40,
-                        Child = reasonDropdown = new OsuEnumDropdown<CommentReportReason>
-                        {
-                            RelativeSizeAxes = Axes.X
-                        }
-                    },
-                    new OsuSpriteText
-                    {
-                        Origin = Anchor.TopCentre,
-                        Anchor = Anchor.TopCentre,
-                        Text = UsersStrings.ReportComments,
-                    },
-                    commentsTextBox = new OsuTextBox
-                    {
-                        RelativeSizeAxes = Axes.X,
-                        PlaceholderText = UsersStrings.ReportPlaceholder,
-                    },
-                    submitButton = new RoundedButton
-                    {
-                        Origin = Anchor.TopCentre,
-                        Anchor = Anchor.TopCentre,
-                        Width = 200,
-                        BackgroundColour = colours.Red3,
-                        Text = UsersStrings.ReportActionsSend,
-                        Action = () =>
-                        {
-                            Action?.Invoke(reasonDropdown.Current.Value, commentsTextBox.Text);
-                            this.HidePopover();
-                        },
-                        Margin = new MarginPadding { Bottom = 5, Top = 10 },
-                    }
-                }
-            };
-
-            commentsTextBox.Current.BindValueChanged(e =>
-            {
-                submitButton.Enabled.Value = !string.IsNullOrWhiteSpace(e.NewValue);
-            }, true);
         }
     }
 }

From 1b2c821346da690e932b4d74fda4ac9307d99bb3 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Wed, 21 Dec 2022 15:44:02 +0900
Subject: [PATCH 0043/1604] showpopover directly

---
 .../Visual/Online/TestSceneChatOverlay.cs         | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
index 44d739a6e3..3a6cbdfb0f 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
@@ -12,6 +12,7 @@ using JetBrains.Annotations;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
@@ -544,19 +545,7 @@ namespace osu.Game.Tests.Visual.Online
             AddAssert("Overlay is visible", () => chatOverlay.State.Value == Visibility.Visible);
             waitForChannel1Visible();
 
-            AddStep("Right click username", () =>
-            {
-                var username = this.ChildrenOfType<DrawableUsername>().First();
-                InputManager.MoveMouseTo(username);
-                InputManager.Click(MouseButton.Right);
-            });
-
-            AddStep("Click report", () =>
-            {
-                var btn = this.ChildrenOfType<OsuSpriteText>().First(x => x.Text == "Report");
-                InputManager.MoveMouseTo(btn);
-                InputManager.Click(MouseButton.Left);
-            });
+            AddStep("Show report popover", () => this.ChildrenOfType<DrawableUsername>().First().ShowPopover());
 
             AddStep("Try to report", () =>
             {

From bbb22479a8aefd1b040d236dde395c0220ed4bc4 Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Sun, 25 Dec 2022 21:32:47 +0100
Subject: [PATCH 0044/1604] Add "ModBubbles" for the osu ruleset.

---
 .../Mods/TestSceneOsuModBubbles.cs            |  19 ++
 osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs   | 228 ++++++++++++++++++
 osu.Game.Rulesets.Osu/OsuRuleset.cs           |   3 +-
 osu.Game/Rulesets/Mods/ModFlashlight.cs       |   3 +
 4 files changed, 252 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModBubbles.cs
 create mode 100644 osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModBubbles.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModBubbles.cs
new file mode 100644
index 0000000000..e72a1f79f5
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModBubbles.cs
@@ -0,0 +1,19 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using NUnit.Framework;
+using osu.Game.Rulesets.Osu.Mods;
+
+namespace osu.Game.Rulesets.Osu.Tests.Mods
+{
+    public partial class TestSceneOsuModBubbles : OsuModTestScene
+    {
+        [Test]
+        public void TestOsuModBubbles() => CreateModTest(new ModTestData
+        {
+            Mod = new OsuModBubbles(),
+            Autoplay = true,
+            PassCondition = () => true
+        });
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
new file mode 100644
index 0000000000..c51ebde383
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
@@ -0,0 +1,228 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Effects;
+using osu.Framework.Graphics.Performance;
+using osu.Framework.Graphics.Pooling;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Localisation;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Objects.Pooling;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.UI;
+using osu.Game.Scoring;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Mods
+{
+    public partial class OsuModBubbles : ModWithVisibilityAdjustment, IApplicableToDrawableRuleset<OsuHitObject>, IApplicableToScoreProcessor
+    {
+        public override string Name => "Bubbles";
+
+        public override string Acronym => "BB";
+
+        public override LocalisableString Description => "Dont let their popping distract you!";
+
+        public override double ScoreMultiplier => 1;
+
+        public override ModType Type => ModType.Fun;
+
+        // Compatibility with these seems potentially feasible in the future, blocked for now because they dont work as one would expect
+        public override Type[] IncompatibleMods => new[] { typeof(OsuModBarrelRoll), typeof(OsuModMagnetised), typeof(OsuModRepel) };
+
+        private PlayfieldAdjustmentContainer adjustmentContainer = null!;
+        private BubbleContainer bubbleContainer = null!;
+
+        private readonly Bindable<int> currentCombo = new BindableInt();
+
+        private float maxSize;
+        private float bubbleRadius;
+        private double bubbleFade;
+
+        public ScoreRank AdjustRank(ScoreRank rank, double accuracy) => rank;
+
+        public void ApplyToScoreProcessor(ScoreProcessor scoreProcessor)
+        {
+            currentCombo.BindTo(scoreProcessor.Combo);
+            currentCombo.BindValueChanged(combo =>
+                maxSize = Math.Min(1.75f, (float)(1.25 + 0.005 * combo.NewValue)), true);
+        }
+
+        public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
+        {
+            // Multiplying by 2 results in an initial size that is too large, hence 1.85 has been chosen
+            bubbleRadius = (float)(drawableRuleset.Beatmap.HitObjects.OfType<HitCircle>().First().Radius * 1.85f);
+            bubbleFade = drawableRuleset.Beatmap.HitObjects.OfType<HitCircle>().First().TimeFadeIn * 2;
+
+            // We want to hide the judgements since they are obscured by the BubbleDrawable (due to layering)
+            drawableRuleset.Playfield.DisplayJudgements.Value = false;
+
+            adjustmentContainer = drawableRuleset.CreatePlayfieldAdjustmentContainer();
+
+            adjustmentContainer.Add(bubbleContainer = new BubbleContainer());
+            drawableRuleset.KeyBindingInputManager.Add(adjustmentContainer);
+        }
+
+        protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state) => applyBubbleState(hitObject);
+
+        protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state) => applyBubbleState(hitObject);
+
+        private void applyBubbleState(DrawableHitObject drawableObject)
+        {
+            if (drawableObject is not DrawableOsuHitObject drawableOsuObject || !drawableObject.Judged) return;
+
+            OsuHitObject hitObject = drawableOsuObject.HitObject;
+
+            switch (drawableOsuObject)
+            {
+                //Needs to be done explicitly to avoid being handled by DrawableHitCircle below
+                case DrawableSliderHead:
+                    addBubbleContainer(hitObject.Position);
+                    break;
+
+                //Stack leniency causes placement issues if this isn't handled as such.
+                case DrawableHitCircle hitCircle:
+                    addBubbleContainer(hitCircle.Position);
+                    break;
+
+                case DrawableSpinnerTick:
+                case DrawableSlider:
+                    return;
+
+                default:
+                    addBubbleContainer(hitObject.Position);
+                    break;
+            }
+
+            void addBubbleContainer(Vector2 position) => bubbleContainer.Add(new BubbleLifeTimeEntry
+                {
+                    LifetimeStart = bubbleContainer.Time.Current,
+                    Colour = drawableOsuObject.AccentColour.Value,
+                    Position = position,
+                    InitialSize = new Vector2(bubbleRadius),
+                    MaxSize = maxSize,
+                    FadeTime = bubbleFade,
+                    IsHit = drawableOsuObject.IsHit
+                }
+            );
+        }
+
+        #region Pooled Bubble drawable
+
+        //LifetimeEntry flow is necessary to allow for correct rewind behaviour, can probably be made generic later if more mods are made requiring it
+        //Todo: find solution to bubbles rewinding in "groups"
+        private sealed partial class BubbleContainer : PooledDrawableWithLifetimeContainer<BubbleLifeTimeEntry, BubbleObject>
+        {
+            protected override bool RemoveRewoundEntry => true;
+
+            private readonly DrawablePool<BubbleObject> pool;
+
+            public BubbleContainer()
+            {
+                RelativeSizeAxes = Axes.Both;
+                AddInternal(pool = new DrawablePool<BubbleObject>(10, 1000));
+            }
+
+            protected override BubbleObject GetDrawable(BubbleLifeTimeEntry entry) => pool.Get(d => d.Apply(entry));
+        }
+
+        private sealed partial class BubbleObject : PoolableDrawableWithLifetime<BubbleLifeTimeEntry>
+        {
+            private readonly BubbleDrawable bubbleDrawable;
+
+            public BubbleObject()
+            {
+                InternalChild = bubbleDrawable = new BubbleDrawable();
+            }
+
+            protected override void OnApply(BubbleLifeTimeEntry entry)
+            {
+                base.OnApply(entry);
+                if (IsLoaded)
+                    apply(entry);
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+                apply(Entry);
+            }
+
+            private void apply(BubbleLifeTimeEntry? entry)
+            {
+                if (entry == null)
+                    return;
+
+                ApplyTransformsAt(float.MinValue, true);
+                ClearTransforms(true);
+
+                Position = entry.Position;
+
+                bubbleDrawable.Animate(entry);
+
+                LifetimeEnd = bubbleDrawable.LatestTransformEndTime;
+            }
+        }
+
+        private partial class BubbleDrawable : CompositeDrawable
+        {
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                InternalChild = new Circle
+                {
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
+                    Masking = true,
+                    EdgeEffect = new EdgeEffectParameters
+                    {
+                        Colour = Colour4.Black.Opacity(0.05f),
+                        Type = EdgeEffectType.Shadow,
+                        Radius = 5
+                    }
+                };
+            }
+
+            public void Animate(BubbleLifeTimeEntry entry)
+            {
+                Size = entry.InitialSize;
+                this
+                    .ScaleTo(entry.MaxSize, entry.FadeTime * 6, Easing.OutSine)
+                    .FadeColour(entry.IsHit ? entry.Colour : Colour4.Black, entry.FadeTime, Easing.OutSine)
+                    .Delay(entry.FadeTime)
+                    .FadeColour(entry.IsHit ? entry.Colour.Darken(.4f) : Colour4.Black, entry.FadeTime * 5, Easing.OutSine)
+                    .Then()
+                    .ScaleTo(entry.MaxSize * 1.5f, entry.FadeTime, Easing.OutSine)
+                    .FadeTo(0, entry.FadeTime, Easing.OutQuint);
+            }
+        }
+
+        private class BubbleLifeTimeEntry : LifetimeEntry
+        {
+            public Vector2 InitialSize { get; set; }
+
+            public float MaxSize { get; set; }
+
+            public Vector2 Position { get; set; }
+
+            public Colour4 Colour { get; set; }
+
+            // FadeTime is based on the approach rate of the beatmap.
+            public double FadeTime { get; set; }
+
+            // Whether the corresponding HitObject was hit
+            public bool IsHit { get; set; }
+        }
+
+        #endregion
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 79a566e33c..0df1e4dfca 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -202,7 +202,8 @@ namespace osu.Game.Rulesets.Osu
                         new OsuModNoScope(),
                         new MultiMod(new OsuModMagnetised(), new OsuModRepel()),
                         new ModAdaptiveSpeed(),
-                        new OsuModFreezeFrame()
+                        new OsuModFreezeFrame(),
+                        new OsuModBubbles()
                     };
 
                 case ModType.System:
diff --git a/osu.Game/Rulesets/Mods/ModFlashlight.cs b/osu.Game/Rulesets/Mods/ModFlashlight.cs
index 45fa55c7f2..2c9ef357b5 100644
--- a/osu.Game/Rulesets/Mods/ModFlashlight.cs
+++ b/osu.Game/Rulesets/Mods/ModFlashlight.cs
@@ -83,6 +83,9 @@ namespace osu.Game.Rulesets.Mods
 
             flashlight.Combo.BindTo(Combo);
             drawableRuleset.KeyBindingInputManager.Add(flashlight);
+
+            // Stop flashlight from being drawn underneath other mods that generate HitObjects.
+            drawableRuleset.KeyBindingInputManager.ChangeChildDepth(flashlight, -1);
         }
 
         protected abstract Flashlight CreateFlashlight();

From 8a108b143e10bf80162eb0109aad7a68ae9692fc Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Sun, 25 Dec 2022 21:33:10 +0100
Subject: [PATCH 0045/1604] Address mod incompatibilities

---
 osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs |  3 +++
 osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs    | 17 +++++++++++------
 osu.Game.Rulesets.Osu/Mods/OsuModMagnetised.cs |  2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModRepel.cs      |  2 +-
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
index 9e71f657ce..2394cf92fc 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
@@ -10,6 +11,8 @@ namespace osu.Game.Rulesets.Osu.Mods
 {
     public class OsuModBarrelRoll : ModBarrelRoll<OsuHitObject>, IApplicableToDrawableHitObject
     {
+        public override Type[] IncompatibleMods => new[] { typeof(OsuModBubbles) };
+
         public void ApplyToDrawableHitObject(DrawableHitObject d)
         {
             d.OnUpdate += _ =>
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
index c51ebde383..2e4d574148 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
@@ -86,12 +86,12 @@ namespace osu.Game.Rulesets.Osu.Mods
             {
                 //Needs to be done explicitly to avoid being handled by DrawableHitCircle below
                 case DrawableSliderHead:
-                    addBubbleContainer(hitObject.Position);
+                    addBubbleContainer(hitObject.Position, drawableOsuObject);
                     break;
 
                 //Stack leniency causes placement issues if this isn't handled as such.
                 case DrawableHitCircle hitCircle:
-                    addBubbleContainer(hitCircle.Position);
+                    addBubbleContainer(hitCircle.Position, drawableOsuObject);
                     break;
 
                 case DrawableSpinnerTick:
@@ -99,19 +99,24 @@ namespace osu.Game.Rulesets.Osu.Mods
                     return;
 
                 default:
-                    addBubbleContainer(hitObject.Position);
+                    addBubbleContainer(hitObject.Position, drawableOsuObject);
                     break;
             }
+        }
 
-            void addBubbleContainer(Vector2 position) => bubbleContainer.Add(new BubbleLifeTimeEntry
+        private void addBubbleContainer(Vector2 position, DrawableHitObject hitObject)
+        {
+            bubbleContainer.Add
+            (
+                new BubbleLifeTimeEntry
                 {
                     LifetimeStart = bubbleContainer.Time.Current,
-                    Colour = drawableOsuObject.AccentColour.Value,
+                    Colour = hitObject.AccentColour.Value,
                     Position = position,
                     InitialSize = new Vector2(bubbleRadius),
                     MaxSize = maxSize,
                     FadeTime = bubbleFade,
-                    IsHit = drawableOsuObject.IsHit
+                    IsHit = hitObject.IsHit
                 }
             );
         }
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModMagnetised.cs b/osu.Game.Rulesets.Osu/Mods/OsuModMagnetised.cs
index 38d90eb121..c8c4cd6a14 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModMagnetised.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModMagnetised.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override ModType Type => ModType.Fun;
         public override LocalisableString Description => "No need to chase the circles – your cursor is a magnet!";
         public override double ScoreMultiplier => 0.5;
-        public override Type[] IncompatibleMods => new[] { typeof(OsuModAutopilot), typeof(OsuModWiggle), typeof(OsuModTransform), typeof(ModAutoplay), typeof(OsuModRelax), typeof(OsuModRepel) };
+        public override Type[] IncompatibleMods => new[] { typeof(OsuModAutopilot), typeof(OsuModWiggle), typeof(OsuModTransform), typeof(ModAutoplay), typeof(OsuModRelax), typeof(OsuModRepel), typeof(OsuModBubbles) };
 
         [SettingSource("Attraction strength", "How strong the pull is.", 0)]
         public BindableFloat AttractionStrength { get; } = new BindableFloat(0.5f)
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModRepel.cs b/osu.Game.Rulesets.Osu/Mods/OsuModRepel.cs
index 31a6b69d6b..28d459cedb 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModRepel.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModRepel.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override ModType Type => ModType.Fun;
         public override LocalisableString Description => "Hit objects run away!";
         public override double ScoreMultiplier => 1;
-        public override Type[] IncompatibleMods => new[] { typeof(OsuModAutopilot), typeof(OsuModWiggle), typeof(OsuModTransform), typeof(ModAutoplay), typeof(OsuModMagnetised) };
+        public override Type[] IncompatibleMods => new[] { typeof(OsuModAutopilot), typeof(OsuModWiggle), typeof(OsuModTransform), typeof(ModAutoplay), typeof(OsuModMagnetised), typeof(OsuModBubbles) };
 
         [SettingSource("Repulsion strength", "How strong the repulsion is.", 0)]
         public BindableFloat RepulsionStrength { get; } = new BindableFloat(0.5f)

From ca84b885dcc6695cb7da3549757f7e6338bc37de Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Wed, 11 Jan 2023 17:51:41 +0100
Subject: [PATCH 0046/1604] Add more detail to bubbles

---
 osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs | 58 ++++++++++++++++-----
 1 file changed, 45 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
index 2e4d574148..f5e7e035b2 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
@@ -12,6 +12,7 @@ using osu.Framework.Graphics.Performance;
 using osu.Framework.Graphics.Pooling;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Localisation;
+using osu.Game.Graphics;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Pooling;
@@ -21,6 +22,7 @@ using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
@@ -178,21 +180,38 @@ namespace osu.Game.Rulesets.Osu.Mods
             }
         }
 
-        private partial class BubbleDrawable : CompositeDrawable
+        private partial class BubbleDrawable : CompositeDrawable, IHasAccentColour
         {
+            public Color4 AccentColour { get; set; }
+
+            private Circle outerCircle = null!;
+            private Circle innerCircle = null!;
+
             [BackgroundDependencyLoader]
             private void load()
             {
-                InternalChild = new Circle
+                InternalChildren = new Drawable[]
                 {
-                    Origin = Anchor.Centre,
-                    RelativeSizeAxes = Axes.Both,
-                    Masking = true,
-                    EdgeEffect = new EdgeEffectParameters
+                    outerCircle = new Circle
                     {
-                        Colour = Colour4.Black.Opacity(0.05f),
-                        Type = EdgeEffectType.Shadow,
-                        Radius = 5
+                        Origin = Anchor.Centre,
+                        RelativeSizeAxes = Axes.Both,
+                        Masking = true,
+                        MaskingSmoothness = 2,
+                        BorderThickness = 0,
+                        BorderColour = Colour4.Transparent,
+                        EdgeEffect = new EdgeEffectParameters
+                        {
+                            Type = EdgeEffectType.Shadow,
+                            Radius = 3,
+                            Colour = Colour4.Black.Opacity(0.05f)
+                        }
+                    },
+                    innerCircle = new Circle
+                    {
+                        Origin = Anchor.Centre,
+                        RelativeSizeAxes = Axes.Both,
+                        Scale = new Vector2(0.5f)
                     }
                 };
             }
@@ -202,12 +221,25 @@ namespace osu.Game.Rulesets.Osu.Mods
                 Size = entry.InitialSize;
                 this
                     .ScaleTo(entry.MaxSize, entry.FadeTime * 6, Easing.OutSine)
-                    .FadeColour(entry.IsHit ? entry.Colour : Colour4.Black, entry.FadeTime, Easing.OutSine)
-                    .Delay(entry.FadeTime)
-                    .FadeColour(entry.IsHit ? entry.Colour.Darken(.4f) : Colour4.Black, entry.FadeTime * 5, Easing.OutSine)
                     .Then()
                     .ScaleTo(entry.MaxSize * 1.5f, entry.FadeTime, Easing.OutSine)
-                    .FadeTo(0, entry.FadeTime, Easing.OutQuint);
+                    .FadeTo(0, entry.FadeTime, Easing.OutExpo);
+
+                animateCircles(entry);
+            }
+
+            private void animateCircles(BubbleLifeTimeEntry entry)
+            {
+                innerCircle.FadeColour(entry.IsHit ? entry.Colour.Darken(0.2f) : Colour4.Black)
+                           .FadeColour(entry.IsHit ? entry.Colour.Lighten(0.2f) : Colour4.Black, entry.FadeTime * 7);
+
+                innerCircle.FadeTo(0.5f, entry.FadeTime * 7, Easing.InExpo)
+                           .ScaleTo(1.1f, entry.FadeTime * 7, Easing.InSine);
+
+                outerCircle
+                    .FadeColour(entry.IsHit ? entry.Colour : Colour4.Black, entry.FadeTime, Easing.OutSine)
+                    .Delay(entry.FadeTime)
+                    .FadeColour(entry.IsHit ? entry.Colour.Darken(.4f) : Colour4.Black, entry.FadeTime * 5, Easing.OutSine);
             }
         }
 

From ff5a12fcb4be833fdeb21b406b2ec9e19f88f8ff Mon Sep 17 00:00:00 2001
From: ansel <79257300125@ya.ru>
Date: Mon, 16 Jan 2023 20:39:38 +0300
Subject: [PATCH 0047/1604] Localise login form

---
 osu.Game/Localisation/LoginPanelStrings.cs | 54 ++++++++++++++++++++++
 osu.Game/Overlays/Login/LoginForm.cs       | 13 +++---
 osu.Game/Overlays/Login/LoginPanel.cs      |  7 +--
 osu.Game/Overlays/Login/UserAction.cs      | 10 ++--
 4 files changed, 69 insertions(+), 15 deletions(-)
 create mode 100644 osu.Game/Localisation/LoginPanelStrings.cs

diff --git a/osu.Game/Localisation/LoginPanelStrings.cs b/osu.Game/Localisation/LoginPanelStrings.cs
new file mode 100644
index 0000000000..6dfb48fbdc
--- /dev/null
+++ b/osu.Game/Localisation/LoginPanelStrings.cs
@@ -0,0 +1,54 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Localisation;
+
+namespace osu.Game.Localisation
+{
+    public static class LoginPanelStrings
+    {
+        private const string prefix = @"osu.Game.Resources.Localisation.LoginPanel";
+
+        /// <summary>
+        /// "Do not disturb"
+        /// </summary>
+        public static LocalisableString DoNotDisturb => new TranslatableString(getKey(@"do_not_disturb"), @"Do not disturb");
+
+        /// <summary>
+        /// "Appear offline"
+        /// </summary>
+        public static LocalisableString AppearOffline => new TranslatableString(getKey(@"appear_offline"), @"Appear offline");
+
+        /// <summary>
+        /// "Sign out"
+        /// </summary>
+        public static LocalisableString SignOut => new TranslatableString(getKey(@"sign_out"), @"Sign out");
+
+        /// <summary>
+        /// "Signed in"
+        /// </summary>
+        public static LocalisableString SignedIn => new TranslatableString(getKey(@"signed_in"), @"Signed in");
+
+        /// <summary>
+        /// "ACCOUNT"
+        /// </summary>
+        public static LocalisableString Account => new TranslatableString(getKey(@"account"), @"ACCOUNT");
+
+        /// <summary>
+        /// "Remember username"
+        /// </summary>
+        public static LocalisableString RememberUsername => new TranslatableString(getKey(@"remember_username"), @"Remember username");
+
+        /// <summary>
+        /// "Stay signed in"
+        /// </summary>
+        public static LocalisableString StaySignedIn => new TranslatableString(getKey(@"stay_signed_in"), @"Stay signed in");
+
+        /// <summary>
+        /// "Register"
+        /// </summary>
+        public static LocalisableString Register => new TranslatableString(getKey(@"register"), @"Register");
+
+        private static string getKey(string key) => $@"{prefix}:{key}";
+    }
+}
diff --git a/osu.Game/Overlays/Login/LoginForm.cs b/osu.Game/Overlays/Login/LoginForm.cs
index af145c418c..9f9b8d9342 100644
--- a/osu.Game/Overlays/Login/LoginForm.cs
+++ b/osu.Game/Overlays/Login/LoginForm.cs
@@ -16,6 +16,7 @@ using osu.Game.Online.API;
 using osu.Game.Overlays.Settings;
 using osu.Game.Resources.Localisation.Web;
 using osuTK;
+using osu.Game.Localisation;
 
 namespace osu.Game.Overlays.Login
 {
@@ -47,7 +48,7 @@ namespace osu.Game.Overlays.Login
             RelativeSizeAxes = Axes.X;
 
             ErrorTextFlowContainer errorText;
-            LinkFlowContainer forgottenPaswordLink;
+            LinkFlowContainer forgottenPasswordLink;
 
             Children = new Drawable[]
             {
@@ -71,15 +72,15 @@ namespace osu.Game.Overlays.Login
                 },
                 new SettingsCheckbox
                 {
-                    LabelText = "Remember username",
+                    LabelText = LoginPanelStrings.RememberUsername,
                     Current = config.GetBindable<bool>(OsuSetting.SaveUsername),
                 },
                 new SettingsCheckbox
                 {
-                    LabelText = "Stay signed in",
+                    LabelText = LoginPanelStrings.StaySignedIn,
                     Current = config.GetBindable<bool>(OsuSetting.SavePassword),
                 },
-                forgottenPaswordLink = new LinkFlowContainer
+                forgottenPasswordLink = new LinkFlowContainer
                 {
                     Padding = new MarginPadding { Left = SettingsPanel.CONTENT_MARGINS },
                     RelativeSizeAxes = Axes.X,
@@ -105,7 +106,7 @@ namespace osu.Game.Overlays.Login
                 },
                 new SettingsButton
                 {
-                    Text = "Register",
+                    Text = LoginPanelStrings.Register,
                     Action = () =>
                     {
                         RequestHide?.Invoke();
@@ -114,7 +115,7 @@ namespace osu.Game.Overlays.Login
                 }
             };
 
-            forgottenPaswordLink.AddLink(LayoutStrings.PopupLoginLoginForgot, $"{api.WebsiteRootUrl}/home/password-reset");
+            forgottenPasswordLink.AddLink(LayoutStrings.PopupLoginLoginForgot, $"{api.WebsiteRootUrl}/home/password-reset");
 
             password.OnCommit += (_, _) => performLogin();
 
diff --git a/osu.Game/Overlays/Login/LoginPanel.cs b/osu.Game/Overlays/Login/LoginPanel.cs
index 44f2f3273a..fb9987bd82 100644
--- a/osu.Game/Overlays/Login/LoginPanel.cs
+++ b/osu.Game/Overlays/Login/LoginPanel.cs
@@ -6,6 +6,7 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
@@ -81,7 +82,7 @@ namespace osu.Game.Overlays.Login
                     {
                         new OsuSpriteText
                         {
-                            Text = "ACCOUNT",
+                            Text = LoginPanelStrings.Account,
                             Margin = new MarginPadding { Bottom = 5 },
                             Font = OsuFont.GetFont(weight: FontWeight.Bold),
                         },
@@ -115,7 +116,7 @@ namespace osu.Game.Overlays.Login
                         },
                     };
 
-                    linkFlow.AddLink("cancel", api.Logout, string.Empty);
+                    linkFlow.AddLink(Resources.Localisation.Web.CommonStrings.ButtonsCancel.ToLower(), api.Logout, string.Empty);
                     break;
 
                 case APIState.Online:
@@ -140,7 +141,7 @@ namespace osu.Game.Overlays.Login
                                         {
                                             Anchor = Anchor.Centre,
                                             Origin = Anchor.Centre,
-                                            Text = "Signed in",
+                                            Text = LoginPanelStrings.SignedIn,
                                             Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold),
                                             Margin = new MarginPadding { Top = 5, Bottom = 5 },
                                         },
diff --git a/osu.Game/Overlays/Login/UserAction.cs b/osu.Game/Overlays/Login/UserAction.cs
index 7a18e38109..813968a053 100644
--- a/osu.Game/Overlays/Login/UserAction.cs
+++ b/osu.Game/Overlays/Login/UserAction.cs
@@ -1,11 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
-using System.ComponentModel;
 using osu.Framework.Localisation;
 using osu.Game.Resources.Localisation.Web;
+using osu.Game.Localisation;
 
 namespace osu.Game.Overlays.Login
 {
@@ -14,13 +12,13 @@ namespace osu.Game.Overlays.Login
         [LocalisableDescription(typeof(UsersStrings), nameof(UsersStrings.StatusOnline))]
         Online,
 
-        [Description(@"Do not disturb")]
+        [LocalisableDescription(typeof(LoginPanelStrings), nameof(LoginPanelStrings.DoNotDisturb))]
         DoNotDisturb,
 
-        [Description(@"Appear offline")]
+        [LocalisableDescription(typeof(LoginPanelStrings), nameof(LoginPanelStrings.AppearOffline))]
         AppearOffline,
 
-        [Description(@"Sign out")]
+        [LocalisableDescription(typeof(LoginPanelStrings), nameof(LoginPanelStrings.SignOut))]
         SignOut,
     }
 }

From 4c341db33f12a05a1ec6e4abbf60fd4294b0a70d Mon Sep 17 00:00:00 2001
From: ansel <79257300125@ya.ru>
Date: Mon, 16 Jan 2023 21:31:01 +0300
Subject: [PATCH 0048/1604] Localise registration window

---
 .../Localisation/AccountCreationStrings.cs    | 77 +++++++++++++++++++
 .../Overlays/AccountCreation/ScreenEntry.cs   | 19 ++---
 .../Overlays/AccountCreation/ScreenWarning.cs |  5 +-
 .../Overlays/AccountCreation/ScreenWelcome.cs |  9 +--
 4 files changed, 94 insertions(+), 16 deletions(-)
 create mode 100644 osu.Game/Localisation/AccountCreationStrings.cs

diff --git a/osu.Game/Localisation/AccountCreationStrings.cs b/osu.Game/Localisation/AccountCreationStrings.cs
new file mode 100644
index 0000000000..4e702ea7cc
--- /dev/null
+++ b/osu.Game/Localisation/AccountCreationStrings.cs
@@ -0,0 +1,77 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Localisation;
+
+namespace osu.Game.Localisation
+{
+    public static class AccountCreationStrings
+    {
+        private const string prefix = @"osu.Game.Resources.Localisation.AccountCreation";
+
+        /// <summary>
+        /// "New Player Registration"
+        /// </summary>
+        public static LocalisableString NewPlayerRegistration => new TranslatableString(getKey(@"new_player_registration"), @"New Player Registration");
+
+        /// <summary>
+        /// "let&#39;s get you started"
+        /// </summary>
+        public static LocalisableString LetsGetYouStarted => new TranslatableString(getKey(@"lets_get_you_started"), @"let's get you started");
+
+        /// <summary>
+        /// "Let&#39;s create an account!"
+        /// </summary>
+        public static LocalisableString LetsCreateAnAccount => new TranslatableString(getKey(@"lets_create_an_account"), @"Let's create an account!");
+
+        /// <summary>
+        /// "Help, I can&#39;t access my account!"
+        /// </summary>
+        public static LocalisableString HelpICantAccess => new TranslatableString(getKey(@"help_icant_access"), @"Help, I can't access my account!");
+
+        /// <summary>
+        /// "I understand. This account isn&#39;t for me."
+        /// </summary>
+        public static LocalisableString AccountIsntForMe => new TranslatableString(getKey(@"account_isnt_for_me"), @"I understand. This account isn't for me.");
+
+        /// <summary>
+        /// "email address"
+        /// </summary>
+        public static LocalisableString EmailAddress => new TranslatableString(getKey(@"email_address"), @"email address");
+
+        /// <summary>
+        /// "This will be your public presence. No profanity, no impersonation. Avoid exposing your own personal details, too!"
+        /// </summary>
+        public static LocalisableString ThisWillBeYourPublic => new TranslatableString(getKey(@"this_will_be_your_public"),
+            @"This will be your public presence. No profanity, no impersonation. Avoid exposing your own personal details, too!");
+
+        /// <summary>
+        /// "Will be used for notifications, account verification and in the case you forget your password. No spam, ever."
+        /// </summary>
+        public static LocalisableString EmailUsage =>
+            new TranslatableString(getKey(@"email_usage"), @"Will be used for notifications, account verification and in the case you forget your password. No spam, ever.");
+
+        /// <summary>
+        /// " Make sure to get it right!"
+        /// </summary>
+        public static LocalisableString MakeSureToGetIt => new TranslatableString(getKey(@"make_sure_to_get_it"), @" Make sure to get it right!");
+
+        /// <summary>
+        /// "At least "
+        /// </summary>
+        public static LocalisableString BeforeCharactersLong => new TranslatableString(getKey(@"before_characters_long"), @"At least ");
+
+        /// <summary>
+        /// "8 characters long"
+        /// </summary>
+        public static LocalisableString CharactersLong => new TranslatableString(getKey(@"characters_long"), @"8 characters long");
+
+        /// <summary>
+        /// ". Choose something long but also something you will remember, like a line from your favourite song."
+        /// </summary>
+        public static LocalisableString AfterCharactersLong =>
+            new TranslatableString(getKey(@"after_characters_long"), @". Choose something long but also something you will remember, like a line from your favourite song.");
+
+        private static string getKey(string key) => $@"{prefix}:{key}";
+    }
+}
diff --git a/osu.Game/Overlays/AccountCreation/ScreenEntry.cs b/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
index 2e20f83e9e..6718b72805 100644
--- a/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
+++ b/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
@@ -17,6 +17,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Localisation;
 using osu.Game.Online.API;
 using osu.Game.Overlays.Settings;
 using osu.Game.Resources.Localisation.Web;
@@ -71,7 +72,7 @@ namespace osu.Game.Overlays.AccountCreation
                             Anchor = Anchor.TopCentre,
                             Origin = Anchor.TopCentre,
                             Font = OsuFont.GetFont(size: 20),
-                            Text = "Let's create an account!",
+                            Text = AccountCreationStrings.LetsCreateAnAccount
                         },
                         usernameTextBox = new OsuTextBox
                         {
@@ -86,7 +87,7 @@ namespace osu.Game.Overlays.AccountCreation
                         },
                         emailTextBox = new OsuTextBox
                         {
-                            PlaceholderText = "email address",
+                            PlaceholderText = AccountCreationStrings.EmailAddress,
                             RelativeSizeAxes = Axes.X,
                             TabbableContentContainer = this
                         },
@@ -118,7 +119,7 @@ namespace osu.Game.Overlays.AccountCreation
                                     AutoSizeAxes = Axes.Y,
                                     Child = new SettingsButton
                                     {
-                                        Text = "Register",
+                                        Text = LoginPanelStrings.Register,
                                         Margin = new MarginPadding { Vertical = 20 },
                                         Action = performRegistration
                                     }
@@ -132,14 +133,14 @@ namespace osu.Game.Overlays.AccountCreation
 
             textboxes = new[] { usernameTextBox, emailTextBox, passwordTextBox };
 
-            usernameDescription.AddText("This will be your public presence. No profanity, no impersonation. Avoid exposing your own personal details, too!");
+            usernameDescription.AddText(AccountCreationStrings.ThisWillBeYourPublic);
 
-            emailAddressDescription.AddText("Will be used for notifications, account verification and in the case you forget your password. No spam, ever.");
-            emailAddressDescription.AddText(" Make sure to get it right!", cp => cp.Font = cp.Font.With(Typeface.Torus, weight: FontWeight.Bold));
+            emailAddressDescription.AddText(AccountCreationStrings.EmailUsage);
+            emailAddressDescription.AddText(AccountCreationStrings.MakeSureToGetIt, cp => cp.Font = cp.Font.With(Typeface.Torus, weight: FontWeight.Bold));
 
-            passwordDescription.AddText("At least ");
-            characterCheckText = passwordDescription.AddText("8 characters long");
-            passwordDescription.AddText(". Choose something long but also something you will remember, like a line from your favourite song.");
+            passwordDescription.AddText(AccountCreationStrings.BeforeCharactersLong);
+            characterCheckText = passwordDescription.AddText(AccountCreationStrings.CharactersLong);
+            passwordDescription.AddText(AccountCreationStrings.AfterCharactersLong);
 
             passwordTextBox.Current.BindValueChanged(_ => updateCharacterCheckTextColour(), true);
             characterCheckText.DrawablePartsRecreated += _ => updateCharacterCheckTextColour();
diff --git a/osu.Game/Overlays/AccountCreation/ScreenWarning.cs b/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
index a833a871f9..f5807b49b5 100644
--- a/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
+++ b/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
@@ -17,6 +17,7 @@ using osu.Game.Overlays.Settings;
 using osu.Game.Screens.Menu;
 using osuTK;
 using osuTK.Graphics;
+using osu.Game.Localisation;
 
 namespace osu.Game.Overlays.AccountCreation
 {
@@ -101,13 +102,13 @@ namespace osu.Game.Overlays.AccountCreation
                         },
                         new SettingsButton
                         {
-                            Text = "Help, I can't access my account!",
+                            Text = AccountCreationStrings.HelpICantAccess,
                             Margin = new MarginPadding { Top = 50 },
                             Action = () => game?.OpenUrlExternally(help_centre_url)
                         },
                         new DangerousSettingsButton
                         {
-                            Text = "I understand. This account isn't for me.",
+                            Text = AccountCreationStrings.AccountIsntForMe,
                             Action = () => this.Push(new ScreenEntry())
                         },
                         furtherAssistance = new LinkFlowContainer(cp => cp.Font = cp.Font.With(size: 12))
diff --git a/osu.Game/Overlays/AccountCreation/ScreenWelcome.cs b/osu.Game/Overlays/AccountCreation/ScreenWelcome.cs
index 4becb225f8..a81b1019fe 100644
--- a/osu.Game/Overlays/AccountCreation/ScreenWelcome.cs
+++ b/osu.Game/Overlays/AccountCreation/ScreenWelcome.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -12,6 +10,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays.Settings;
 using osu.Game.Screens.Menu;
 using osuTK;
+using osu.Game.Localisation;
 
 namespace osu.Game.Overlays.AccountCreation
 {
@@ -46,18 +45,18 @@ namespace osu.Game.Overlays.AccountCreation
                         Anchor = Anchor.TopCentre,
                         Origin = Anchor.TopCentre,
                         Font = OsuFont.GetFont(size: 24, weight: FontWeight.Light),
-                        Text = "New Player Registration",
+                        Text = AccountCreationStrings.NewPlayerRegistration,
                     },
                     new OsuSpriteText
                     {
                         Anchor = Anchor.TopCentre,
                         Origin = Anchor.TopCentre,
                         Font = OsuFont.GetFont(size: 12),
-                        Text = "let's get you started",
+                        Text = AccountCreationStrings.LetsGetYouStarted,
                     },
                     new SettingsButton
                     {
-                        Text = "Let's create an account!",
+                        Text = AccountCreationStrings.LetsCreateAnAccount,
                         Margin = new MarginPadding { Vertical = 120 },
                         Action = () => this.Push(new ScreenWarning())
                     }

From bb3668c76901f5d2109697748b91627fdcb54878 Mon Sep 17 00:00:00 2001
From: ansel <79257300125@ya.ru>
Date: Mon, 16 Jan 2023 22:24:03 +0300
Subject: [PATCH 0049/1604] Reuse existing

---
 osu.Game/Localisation/AccountCreationStrings.cs  | 5 -----
 osu.Game/Localisation/LoginPanelStrings.cs       | 5 -----
 osu.Game/Overlays/AccountCreation/ScreenEntry.cs | 2 +-
 osu.Game/Overlays/Login/UserAction.cs            | 2 +-
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Localisation/AccountCreationStrings.cs b/osu.Game/Localisation/AccountCreationStrings.cs
index 4e702ea7cc..0b27944a61 100644
--- a/osu.Game/Localisation/AccountCreationStrings.cs
+++ b/osu.Game/Localisation/AccountCreationStrings.cs
@@ -34,11 +34,6 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString AccountIsntForMe => new TranslatableString(getKey(@"account_isnt_for_me"), @"I understand. This account isn't for me.");
 
-        /// <summary>
-        /// "email address"
-        /// </summary>
-        public static LocalisableString EmailAddress => new TranslatableString(getKey(@"email_address"), @"email address");
-
         /// <summary>
         /// "This will be your public presence. No profanity, no impersonation. Avoid exposing your own personal details, too!"
         /// </summary>
diff --git a/osu.Game/Localisation/LoginPanelStrings.cs b/osu.Game/Localisation/LoginPanelStrings.cs
index 6dfb48fbdc..535d86fbc5 100644
--- a/osu.Game/Localisation/LoginPanelStrings.cs
+++ b/osu.Game/Localisation/LoginPanelStrings.cs
@@ -19,11 +19,6 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString AppearOffline => new TranslatableString(getKey(@"appear_offline"), @"Appear offline");
 
-        /// <summary>
-        /// "Sign out"
-        /// </summary>
-        public static LocalisableString SignOut => new TranslatableString(getKey(@"sign_out"), @"Sign out");
-
         /// <summary>
         /// "Signed in"
         /// </summary>
diff --git a/osu.Game/Overlays/AccountCreation/ScreenEntry.cs b/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
index 6718b72805..fc450c7a91 100644
--- a/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
+++ b/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
@@ -87,7 +87,7 @@ namespace osu.Game.Overlays.AccountCreation
                         },
                         emailTextBox = new OsuTextBox
                         {
-                            PlaceholderText = AccountCreationStrings.EmailAddress,
+                            PlaceholderText = ModelValidationStrings.UserAttributesUserEmail.ToLower(),
                             RelativeSizeAxes = Axes.X,
                             TabbableContentContainer = this
                         },
diff --git a/osu.Game/Overlays/Login/UserAction.cs b/osu.Game/Overlays/Login/UserAction.cs
index 813968a053..d4d639f2fb 100644
--- a/osu.Game/Overlays/Login/UserAction.cs
+++ b/osu.Game/Overlays/Login/UserAction.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Overlays.Login
         [LocalisableDescription(typeof(LoginPanelStrings), nameof(LoginPanelStrings.AppearOffline))]
         AppearOffline,
 
-        [LocalisableDescription(typeof(LoginPanelStrings), nameof(LoginPanelStrings.SignOut))]
+        [LocalisableDescription(typeof(UserVerificationStrings), nameof(UserVerificationStrings.BoxInfoLogoutLink))]
         SignOut,
     }
 }

From ad32d99daabe400402e59d4046de6de1e95a1d43 Mon Sep 17 00:00:00 2001
From: ansel <79257300125@ya.ru>
Date: Mon, 16 Jan 2023 23:08:29 +0300
Subject: [PATCH 0050/1604] Localise caps lock warning

---
 osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs | 3 ++-
 osu.Game/Localisation/CommonStrings.cs                | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs b/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
index 63c98d7838..9de9eceb07 100644
--- a/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
@@ -16,6 +16,7 @@ using osu.Framework.Input;
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
 using osu.Framework.Platform;
+using osu.Game.Localisation;
 
 namespace osu.Game.Graphics.UserInterface
 {
@@ -112,7 +113,7 @@ namespace osu.Game.Graphics.UserInterface
 
         private partial class CapsWarning : SpriteIcon, IHasTooltip
         {
-            public LocalisableString TooltipText => "caps lock is active";
+            public LocalisableString TooltipText => CommonStrings.CapsLockIsActive;
 
             public CapsWarning()
             {
diff --git a/osu.Game/Localisation/CommonStrings.cs b/osu.Game/Localisation/CommonStrings.cs
index 10178915a2..a68f08efcc 100644
--- a/osu.Game/Localisation/CommonStrings.cs
+++ b/osu.Game/Localisation/CommonStrings.cs
@@ -154,6 +154,11 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString Exit => new TranslatableString(getKey(@"exit"), @"Exit");
 
+        /// <summary>
+        /// "caps lock is active"
+        /// </summary>
+        public static LocalisableString CapsLockIsActive => new TranslatableString(getKey(@"caps_lock_is_active"), @"caps lock is active");
+
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
-}
+}
\ No newline at end of file

From df74bccaaa7345e2b016516b799e85dc790a184c Mon Sep 17 00:00:00 2001
From: ansel <79257300125@ya.ru>
Date: Tue, 17 Jan 2023 13:31:03 +0300
Subject: [PATCH 0051/1604] Replace 2 strings with one formattable

---
 osu.Game/Localisation/AccountCreationStrings.cs  | 11 +++--------
 osu.Game/Overlays/AccountCreation/ScreenEntry.cs | 10 +++++++---
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Localisation/AccountCreationStrings.cs b/osu.Game/Localisation/AccountCreationStrings.cs
index 0b27944a61..6acfaaa9ac 100644
--- a/osu.Game/Localisation/AccountCreationStrings.cs
+++ b/osu.Game/Localisation/AccountCreationStrings.cs
@@ -52,21 +52,16 @@ namespace osu.Game.Localisation
         public static LocalisableString MakeSureToGetIt => new TranslatableString(getKey(@"make_sure_to_get_it"), @" Make sure to get it right!");
 
         /// <summary>
-        /// "At least "
+        /// "At least {0}. Choose something long but also something you will remember, like a line from your favourite song."
         /// </summary>
-        public static LocalisableString BeforeCharactersLong => new TranslatableString(getKey(@"before_characters_long"), @"At least ");
+        public static LocalisableString PasswordRequirements(string arg0) => new TranslatableString(getKey(@"password_requirements"),
+            @"At least {0}. Choose something long but also something you will remember, like a line from your favourite song.", arg0);
 
         /// <summary>
         /// "8 characters long"
         /// </summary>
         public static LocalisableString CharactersLong => new TranslatableString(getKey(@"characters_long"), @"8 characters long");
 
-        /// <summary>
-        /// ". Choose something long but also something you will remember, like a line from your favourite song."
-        /// </summary>
-        public static LocalisableString AfterCharactersLong =>
-            new TranslatableString(getKey(@"after_characters_long"), @". Choose something long but also something you will remember, like a line from your favourite song.");
-
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
 }
diff --git a/osu.Game/Overlays/AccountCreation/ScreenEntry.cs b/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
index fc450c7a91..192b95b963 100644
--- a/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
+++ b/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
@@ -10,6 +10,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Localisation;
 using osu.Framework.Utils;
 using osu.Framework.Platform;
 using osu.Framework.Screens;
@@ -52,7 +53,7 @@ namespace osu.Game.Overlays.AccountCreation
         private OsuGame game { get; set; }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(LocalisationManager localisationManager)
         {
             InternalChildren = new Drawable[]
             {
@@ -138,9 +139,12 @@ namespace osu.Game.Overlays.AccountCreation
             emailAddressDescription.AddText(AccountCreationStrings.EmailUsage);
             emailAddressDescription.AddText(AccountCreationStrings.MakeSureToGetIt, cp => cp.Font = cp.Font.With(Typeface.Torus, weight: FontWeight.Bold));
 
-            passwordDescription.AddText(AccountCreationStrings.BeforeCharactersLong);
+            string[] passwordReq = localisationManager.GetLocalisedBindableString(AccountCreationStrings.PasswordRequirements("{}")).Value.Split("{}");
+            if (passwordReq.Length != 2) passwordReq = AccountCreationStrings.PasswordRequirements("{}").ToString().Split("{}");
+
+            passwordDescription.AddText(passwordReq[0]);
             characterCheckText = passwordDescription.AddText(AccountCreationStrings.CharactersLong);
-            passwordDescription.AddText(AccountCreationStrings.AfterCharactersLong);
+            passwordDescription.AddText(passwordReq[1]);
 
             passwordTextBox.Current.BindValueChanged(_ => updateCharacterCheckTextColour(), true);
             characterCheckText.DrawablePartsRecreated += _ => updateCharacterCheckTextColour();

From 7c81f1e75bb40981a55f16a3544d9521280bf49c Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Fri, 27 Jan 2023 11:21:11 +0100
Subject: [PATCH 0052/1604] Remove unnecessary BDL from bubble drawable

Improve animation duration formula
---
 osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs | 85 +++++++++------------
 1 file changed, 38 insertions(+), 47 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
index f5e7e035b2..6613d84e0e 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Linq;
-using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -12,7 +11,6 @@ using osu.Framework.Graphics.Performance;
 using osu.Framework.Graphics.Pooling;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Localisation;
-using osu.Game.Graphics;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Pooling;
@@ -22,7 +20,6 @@ using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
@@ -63,7 +60,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         {
             // Multiplying by 2 results in an initial size that is too large, hence 1.85 has been chosen
             bubbleRadius = (float)(drawableRuleset.Beatmap.HitObjects.OfType<HitCircle>().First().Radius * 1.85f);
-            bubbleFade = drawableRuleset.Beatmap.HitObjects.OfType<HitCircle>().First().TimeFadeIn * 2;
+            bubbleFade = drawableRuleset.Beatmap.HitObjects.OfType<HitCircle>().First().TimePreempt * 2;
 
             // We want to hide the judgements since they are obscured by the BubbleDrawable (due to layering)
             drawableRuleset.Playfield.DisplayJudgements.Value = false;
@@ -125,8 +122,8 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         #region Pooled Bubble drawable
 
-        //LifetimeEntry flow is necessary to allow for correct rewind behaviour, can probably be made generic later if more mods are made requiring it
-        //Todo: find solution to bubbles rewinding in "groups"
+        // LifetimeEntry flow is necessary to allow for correct rewind behaviour, can probably be made generic later if more mods are made requiring it
+        // Todo: find solution to bubbles rewinding in "groups"
         private sealed partial class BubbleContainer : PooledDrawableWithLifetimeContainer<BubbleLifeTimeEntry, BubbleObject>
         {
             protected override bool RemoveRewoundEntry => true;
@@ -166,8 +163,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             private void apply(BubbleLifeTimeEntry? entry)
             {
-                if (entry == null)
-                    return;
+                if (entry == null) return;
 
                 ApplyTransformsAt(float.MinValue, true);
                 ClearTransforms(true);
@@ -180,38 +176,36 @@ namespace osu.Game.Rulesets.Osu.Mods
             }
         }
 
-        private partial class BubbleDrawable : CompositeDrawable, IHasAccentColour
+        private partial class BubbleDrawable : CircularContainer
         {
-            public Color4 AccentColour { get; set; }
+            private readonly Circle innerCircle;
+            private readonly Box colourBox;
 
-            private Circle outerCircle = null!;
-            private Circle innerCircle = null!;
-
-            [BackgroundDependencyLoader]
-            private void load()
+            public BubbleDrawable()
             {
-                InternalChildren = new Drawable[]
+                Anchor = Anchor.Centre;
+                Origin = Anchor.Centre;
+
+                Masking = true;
+                MaskingSmoothness = 2;
+                BorderThickness = 0;
+                BorderColour = Colour4.Transparent;
+                EdgeEffect = new EdgeEffectParameters
                 {
-                    outerCircle = new Circle
-                    {
-                        Origin = Anchor.Centre,
-                        RelativeSizeAxes = Axes.Both,
-                        Masking = true,
-                        MaskingSmoothness = 2,
-                        BorderThickness = 0,
-                        BorderColour = Colour4.Transparent,
-                        EdgeEffect = new EdgeEffectParameters
-                        {
-                            Type = EdgeEffectType.Shadow,
-                            Radius = 3,
-                            Colour = Colour4.Black.Opacity(0.05f)
-                        }
-                    },
+                    Type = EdgeEffectType.Shadow,
+                    Radius = 3,
+                    Colour = Colour4.Black.Opacity(0.05f)
+                };
+
+                Children = new Drawable[]
+                {
+                    colourBox = new Box { RelativeSizeAxes = Axes.Both, },
                     innerCircle = new Circle
                     {
+                        Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
                         RelativeSizeAxes = Axes.Both,
-                        Scale = new Vector2(0.5f)
+                        Size = new Vector2(0.5f),
                     }
                 };
             }
@@ -219,27 +213,24 @@ namespace osu.Game.Rulesets.Osu.Mods
             public void Animate(BubbleLifeTimeEntry entry)
             {
                 Size = entry.InitialSize;
-                this
-                    .ScaleTo(entry.MaxSize, entry.FadeTime * 6, Easing.OutSine)
+
+                this.ScaleTo(entry.MaxSize, getAnimationTime() * 0.8f, Easing.OutSine)
                     .Then()
-                    .ScaleTo(entry.MaxSize * 1.5f, entry.FadeTime, Easing.OutSine)
-                    .FadeTo(0, entry.FadeTime, Easing.OutExpo);
+                    .ScaleTo(entry.MaxSize * 1.5f, getAnimationTime() * 0.2f, Easing.OutSine)
+                    .FadeTo(0, getAnimationTime() * 0.2f, Easing.OutExpo);
 
-                animateCircles(entry);
-            }
+                colourBox.FadeColour(entry.IsHit ? entry.Colour : Colour4.Black, getAnimationTime() * 0.1f, Easing.OutSine)
+                         .Then()
+                         .FadeColour(entry.IsHit ? entry.Colour.Darken(0.4f) : Colour4.Black, getAnimationTime() * 0.9f, Easing.OutSine);
 
-            private void animateCircles(BubbleLifeTimeEntry entry)
-            {
                 innerCircle.FadeColour(entry.IsHit ? entry.Colour.Darken(0.2f) : Colour4.Black)
-                           .FadeColour(entry.IsHit ? entry.Colour.Lighten(0.2f) : Colour4.Black, entry.FadeTime * 7);
+                           .FadeColour(entry.IsHit ? entry.Colour.Lighten(0.2f) : Colour4.Black, getAnimationTime());
 
-                innerCircle.FadeTo(0.5f, entry.FadeTime * 7, Easing.InExpo)
-                           .ScaleTo(1.1f, entry.FadeTime * 7, Easing.InSine);
+                innerCircle.FadeTo(0.5f, getAnimationTime(), Easing.InExpo)
+                           .ScaleTo(2.2f, getAnimationTime(), Easing.InSine);
 
-                outerCircle
-                    .FadeColour(entry.IsHit ? entry.Colour : Colour4.Black, entry.FadeTime, Easing.OutSine)
-                    .Delay(entry.FadeTime)
-                    .FadeColour(entry.IsHit ? entry.Colour.Darken(.4f) : Colour4.Black, entry.FadeTime * 5, Easing.OutSine);
+                // The absolute length of the bubble's animation, can be used in fractions for animations of partial length
+                double getAnimationTime() => 2000 + 450 / (450 / entry.FadeTime);
             }
         }
 

From c3090dea5f7bea51e2662cd82fc292d65c56d7ca Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Sat, 28 Jan 2023 00:30:30 +0100
Subject: [PATCH 0053/1604] Simplify animations

---
 osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs | 28 +++++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
index 6613d84e0e..479741b5b9 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
@@ -214,23 +214,29 @@ namespace osu.Game.Rulesets.Osu.Mods
             {
                 Size = entry.InitialSize;
 
-                this.ScaleTo(entry.MaxSize, getAnimationTime() * 0.8f, Easing.OutSine)
+                //We want to fade to a darker colour to avoid colours such as white hiding the "ripple" effect.
+                var colourDarker = entry.Colour.Darken(0.1f);
+
+                this.ScaleTo(entry.MaxSize, getAnimationDuration() * 0.8f, Easing.OutSine)
                     .Then()
-                    .ScaleTo(entry.MaxSize * 1.5f, getAnimationTime() * 0.2f, Easing.OutSine)
-                    .FadeTo(0, getAnimationTime() * 0.2f, Easing.OutExpo);
+                    .ScaleTo(entry.MaxSize * 1.5f, getAnimationDuration() * 0.2f, Easing.OutSine)
+                    .FadeTo(0, getAnimationDuration() * 0.2f, Easing.OutExpo);
 
-                colourBox.FadeColour(entry.IsHit ? entry.Colour : Colour4.Black, getAnimationTime() * 0.1f, Easing.OutSine)
-                         .Then()
-                         .FadeColour(entry.IsHit ? entry.Colour.Darken(0.4f) : Colour4.Black, getAnimationTime() * 0.9f, Easing.OutSine);
+                innerCircle.ScaleTo(2f, getAnimationDuration() * 0.8f, Easing.OutCubic);
 
-                innerCircle.FadeColour(entry.IsHit ? entry.Colour.Darken(0.2f) : Colour4.Black)
-                           .FadeColour(entry.IsHit ? entry.Colour.Lighten(0.2f) : Colour4.Black, getAnimationTime());
+                if (!entry.IsHit)
+                {
+                    colourBox.Colour = Colour4.Black;
+                    innerCircle.Colour = Colour4.Black;
 
-                innerCircle.FadeTo(0.5f, getAnimationTime(), Easing.InExpo)
-                           .ScaleTo(2.2f, getAnimationTime(), Easing.InSine);
+                    return;
+                }
+
+                colourBox.FadeColour(colourDarker, getAnimationDuration() * 0.2f, Easing.OutQuint);
+                innerCircle.FadeColour(colourDarker);
 
                 // The absolute length of the bubble's animation, can be used in fractions for animations of partial length
-                double getAnimationTime() => 2000 + 450 / (450 / entry.FadeTime);
+                double getAnimationDuration() => 1700 + Math.Pow(entry.FadeTime, 1.15f);
             }
         }
 

From 66da4c0288fd63d87fa7b4ea3547da39796e74e7 Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Sat, 28 Jan 2023 17:38:24 +0100
Subject: [PATCH 0054/1604] Add colouration to the sliders to better match the
 vibrancy of the mod

---
 osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs | 27 +++++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
index 479741b5b9..0101427f7a 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
@@ -16,6 +16,7 @@ using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Pooling;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Skinning.Default;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
@@ -77,6 +78,12 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         private void applyBubbleState(DrawableHitObject drawableObject)
         {
+            if (drawableObject is DrawableSlider slider)
+            {
+                slider.Body.OnSkinChanged += () => applySliderState(slider);
+                applySliderState(slider);
+            }
+
             if (drawableObject is not DrawableOsuHitObject drawableOsuObject || !drawableObject.Judged) return;
 
             OsuHitObject hitObject = drawableOsuObject.HitObject;
@@ -93,9 +100,9 @@ namespace osu.Game.Rulesets.Osu.Mods
                     addBubbleContainer(hitCircle.Position, drawableOsuObject);
                     break;
 
-                case DrawableSpinnerTick:
                 case DrawableSlider:
-                    return;
+                case DrawableSpinnerTick:
+                    break;
 
                 default:
                     addBubbleContainer(hitObject.Position, drawableOsuObject);
@@ -103,6 +110,9 @@ namespace osu.Game.Rulesets.Osu.Mods
             }
         }
 
+        private void applySliderState(DrawableSlider slider) =>
+            ((PlaySliderBody)slider.Body.Drawable).BorderColour = slider.AccentColour.Value;
+
         private void addBubbleContainer(Vector2 position, DrawableHitObject hitObject)
         {
             bubbleContainer.Add
@@ -217,12 +227,12 @@ namespace osu.Game.Rulesets.Osu.Mods
                 //We want to fade to a darker colour to avoid colours such as white hiding the "ripple" effect.
                 var colourDarker = entry.Colour.Darken(0.1f);
 
-                this.ScaleTo(entry.MaxSize, getAnimationDuration() * 0.8f, Easing.OutSine)
+                this.ScaleTo(entry.MaxSize, getAnimationDuration() * 0.8f)
                     .Then()
-                    .ScaleTo(entry.MaxSize * 1.5f, getAnimationDuration() * 0.2f, Easing.OutSine)
-                    .FadeTo(0, getAnimationDuration() * 0.2f, Easing.OutExpo);
+                    .ScaleTo(entry.MaxSize * 1.5f, getAnimationDuration() * 0.2f, Easing.OutQuint)
+                    .FadeTo(0, getAnimationDuration() * 0.2f, Easing.OutQuint);
 
-                innerCircle.ScaleTo(2f, getAnimationDuration() * 0.8f, Easing.OutCubic);
+                innerCircle.ScaleTo(2f, getAnimationDuration() * 0.8f, Easing.OutQuint);
 
                 if (!entry.IsHit)
                 {
@@ -232,11 +242,12 @@ namespace osu.Game.Rulesets.Osu.Mods
                     return;
                 }
 
-                colourBox.FadeColour(colourDarker, getAnimationDuration() * 0.2f, Easing.OutQuint);
+                colourBox.FadeColour(colourDarker, getAnimationDuration() * 0.2f, Easing.OutQuint
+                );
                 innerCircle.FadeColour(colourDarker);
 
                 // The absolute length of the bubble's animation, can be used in fractions for animations of partial length
-                double getAnimationDuration() => 1700 + Math.Pow(entry.FadeTime, 1.15f);
+                double getAnimationDuration() => 1700 + Math.Pow(entry.FadeTime, 1.07f);
             }
         }
 

From 3bdf83bf44e63000d2a4c23c7467a1aa24b87724 Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Sat, 28 Jan 2023 22:44:57 +0100
Subject: [PATCH 0055/1604] Redo the drawable structure of bubbledrawable to
 run and look better

---
 osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs | 50 ++++++++++-----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
index 0101427f7a..2c90bfa399 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
@@ -5,6 +5,7 @@ using System;
 using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Performance;
@@ -93,7 +94,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                 //Needs to be done explicitly to avoid being handled by DrawableHitCircle below
                 case DrawableSliderHead:
                     addBubbleContainer(hitObject.Position, drawableOsuObject);
-                    break;
+                    return;
 
                 //Stack leniency causes placement issues if this isn't handled as such.
                 case DrawableHitCircle hitCircle:
@@ -188,7 +189,6 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         private partial class BubbleDrawable : CircularContainer
         {
-            private readonly Circle innerCircle;
             private readonly Box colourBox;
 
             public BubbleDrawable()
@@ -196,55 +196,55 @@ namespace osu.Game.Rulesets.Osu.Mods
                 Anchor = Anchor.Centre;
                 Origin = Anchor.Centre;
 
-                Masking = true;
                 MaskingSmoothness = 2;
                 BorderThickness = 0;
-                BorderColour = Colour4.Transparent;
+                BorderColour = Colour4.White;
+                Masking = true;
                 EdgeEffect = new EdgeEffectParameters
                 {
                     Type = EdgeEffectType.Shadow,
                     Radius = 3,
                     Colour = Colour4.Black.Opacity(0.05f)
                 };
-
-                Children = new Drawable[]
-                {
-                    colourBox = new Box { RelativeSizeAxes = Axes.Both, },
-                    innerCircle = new Circle
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        RelativeSizeAxes = Axes.Both,
-                        Size = new Vector2(0.5f),
-                    }
-                };
+                Child = colourBox = new Box { RelativeSizeAxes = Axes.Both, };
             }
 
             public void Animate(BubbleLifeTimeEntry entry)
             {
                 Size = entry.InitialSize;
+                BorderThickness = Width / 3.5f;
 
                 //We want to fade to a darker colour to avoid colours such as white hiding the "ripple" effect.
-                var colourDarker = entry.Colour.Darken(0.1f);
+                ColourInfo colourDarker = entry.Colour.Darken(0.1f);
 
+                // Main bubble scaling based on combo
                 this.ScaleTo(entry.MaxSize, getAnimationDuration() * 0.8f)
                     .Then()
+                    // Pop at the end of the bubbles life time
                     .ScaleTo(entry.MaxSize * 1.5f, getAnimationDuration() * 0.2f, Easing.OutQuint)
-                    .FadeTo(0, getAnimationDuration() * 0.2f, Easing.OutQuint);
-
-                innerCircle.ScaleTo(2f, getAnimationDuration() * 0.8f, Easing.OutQuint);
+                    .FadeTo(0, getAnimationDuration() * 0.2f, Easing.OutCirc);
 
                 if (!entry.IsHit)
                 {
-                    colourBox.Colour = Colour4.Black;
-                    innerCircle.Colour = Colour4.Black;
+                    Colour = Colour4.Black;
+                    BorderColour = Colour4.Black;
 
                     return;
                 }
 
-                colourBox.FadeColour(colourDarker, getAnimationDuration() * 0.2f, Easing.OutQuint
-                );
-                innerCircle.FadeColour(colourDarker);
+                colourBox.FadeColour(colourDarker);
+
+                this.TransformTo(nameof(BorderColour), colourDarker, getAnimationDuration() * 0.3f, Easing.OutQuint);
+
+                // Ripple effect utilises the border to reduce drawable count
+                this.TransformTo(nameof(BorderThickness), 2f, getAnimationDuration() * 0.3f, Easing.OutQuint)
+
+                    // Avoids transparency overlap issues during the bubble "pop"
+                    .Then().Schedule(() =>
+                    {
+                        BorderThickness = 0;
+                        BorderColour = Colour4.Transparent;
+                    });
 
                 // The absolute length of the bubble's animation, can be used in fractions for animations of partial length
                 double getAnimationDuration() => 1700 + Math.Pow(entry.FadeTime, 1.07f);

From abcb564a74efeb3bb9e43ee1686f402297d416b5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 6 Feb 2023 17:32:17 +0900
Subject: [PATCH 0056/1604] Code quality pass of `OsuModBubbles`

---
 osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs | 24 ++++++---------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
index 2c90bfa399..3606434042 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
@@ -29,15 +29,15 @@ namespace osu.Game.Rulesets.Osu.Mods
     {
         public override string Name => "Bubbles";
 
-        public override string Acronym => "BB";
+        public override string Acronym => "BU";
 
-        public override LocalisableString Description => "Dont let their popping distract you!";
+        public override LocalisableString Description => "Don't let their popping distract you!";
 
         public override double ScoreMultiplier => 1;
 
         public override ModType Type => ModType.Fun;
 
-        // Compatibility with these seems potentially feasible in the future, blocked for now because they dont work as one would expect
+        // Compatibility with these seems potentially feasible in the future, blocked for now because they don't work as one would expect
         public override Type[] IncompatibleMods => new[] { typeof(OsuModBarrelRoll), typeof(OsuModMagnetised), typeof(OsuModRepel) };
 
         private PlayfieldAdjustmentContainer adjustmentContainer = null!;
@@ -87,26 +87,14 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             if (drawableObject is not DrawableOsuHitObject drawableOsuObject || !drawableObject.Judged) return;
 
-            OsuHitObject hitObject = drawableOsuObject.HitObject;
-
             switch (drawableOsuObject)
             {
-                //Needs to be done explicitly to avoid being handled by DrawableHitCircle below
-                case DrawableSliderHead:
-                    addBubbleContainer(hitObject.Position, drawableOsuObject);
-                    return;
-
-                //Stack leniency causes placement issues if this isn't handled as such.
-                case DrawableHitCircle hitCircle:
-                    addBubbleContainer(hitCircle.Position, drawableOsuObject);
-                    break;
-
                 case DrawableSlider:
                 case DrawableSpinnerTick:
                     break;
 
                 default:
-                    addBubbleContainer(hitObject.Position, drawableOsuObject);
+                    addBubbleForObject(drawableOsuObject);
                     break;
             }
         }
@@ -114,7 +102,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         private void applySliderState(DrawableSlider slider) =>
             ((PlaySliderBody)slider.Body.Drawable).BorderColour = slider.AccentColour.Value;
 
-        private void addBubbleContainer(Vector2 position, DrawableHitObject hitObject)
+        private void addBubbleForObject(DrawableOsuHitObject hitObject)
         {
             bubbleContainer.Add
             (
@@ -122,7 +110,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                 {
                     LifetimeStart = bubbleContainer.Time.Current,
                     Colour = hitObject.AccentColour.Value,
-                    Position = position,
+                    Position = hitObject.HitObject.Position,
                     InitialSize = new Vector2(bubbleRadius),
                     MaxSize = maxSize,
                     FadeTime = bubbleFade,

From f0d4b9f0ca339c79c74fba39f1d9a97de37f5f6e Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Mon, 6 Feb 2023 17:00:47 +0100
Subject: [PATCH 0057/1604] Add inline comment for colour border override

---
 osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
index 3606434042..41430bb323 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
@@ -99,6 +99,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             }
         }
 
+        // Makes the slider border coloured on all skins
         private void applySliderState(DrawableSlider slider) =>
             ((PlaySliderBody)slider.Body.Drawable).BorderColour = slider.AccentColour.Value;
 

From 5e0c4aa904f28435bb2ffad3967f2f4fe2b08802 Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Wed, 8 Feb 2023 11:12:14 +0100
Subject: [PATCH 0058/1604] Refactor pooling for bubbles, tweak the animations
 a tad, add some clarifying comments

---
 osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs | 231 ++++++++++----------
 1 file changed, 114 insertions(+), 117 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
index 41430bb323..8cf9c619d7 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
@@ -8,13 +8,11 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
-using osu.Framework.Graphics.Performance;
 using osu.Framework.Graphics.Pooling;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Localisation;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Objects.Pooling;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Skinning.Default;
@@ -41,7 +39,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override Type[] IncompatibleMods => new[] { typeof(OsuModBarrelRoll), typeof(OsuModMagnetised), typeof(OsuModRepel) };
 
         private PlayfieldAdjustmentContainer adjustmentContainer = null!;
-        private BubbleContainer bubbleContainer = null!;
+        private Container bubbleContainer = null!;
 
         private readonly Bindable<int> currentCombo = new BindableInt();
 
@@ -49,6 +47,10 @@ namespace osu.Game.Rulesets.Osu.Mods
         private float bubbleRadius;
         private double bubbleFade;
 
+        private readonly DrawablePool<BubbleDrawable> bubblePool = new DrawablePool<BubbleDrawable>(100);
+
+        private DrawableOsuHitObject lastJudgedHitobject = null!;
+
         public ScoreRank AdjustRank(ScoreRank rank, double accuracy) => rank;
 
         public void ApplyToScoreProcessor(ScoreProcessor scoreProcessor)
@@ -56,6 +58,63 @@ namespace osu.Game.Rulesets.Osu.Mods
             currentCombo.BindTo(scoreProcessor.Combo);
             currentCombo.BindValueChanged(combo =>
                 maxSize = Math.Min(1.75f, (float)(1.25 + 0.005 * combo.NewValue)), true);
+
+            scoreProcessor.NewJudgement += result =>
+            {
+                if (result.HitObject is not OsuHitObject osuHitObject) return;
+
+                DrawableOsuHitObject drawableOsuHitObject = lastJudgedHitobject;
+
+                switch (result.HitObject)
+                {
+                    case Slider:
+                    case SpinnerTick:
+                        break;
+
+                    default:
+                        addBubble();
+                        break;
+                }
+
+                void addBubble()
+                {
+                    BubbleDrawable bubble = bubblePool.Get();
+                    bubble.Info = new BubbleInfo
+                    {
+                        InitialSize = new Vector2(bubbleRadius),
+                        MaxSize = maxSize,
+                        Position = getPosition(),
+                        FadeTime = bubbleFade,
+                        Colour = drawableOsuHitObject.AccentColour.Value,
+                        IsHit = drawableOsuHitObject.IsHit,
+                    };
+                    bubbleContainer.Add(bubble);
+                }
+
+                Vector2 getPosition()
+                {
+                    switch (drawableOsuHitObject)
+                    {
+                        // SliderHeads are derived from HitCircles,
+                        // so we must handle them before to avoid them using the wrong positioning logic
+                        case DrawableSliderHead:
+                            return osuHitObject.Position;
+
+                        // Using hitobject position will cause issues with HitCircle placement due to stack leniency.
+                        case DrawableHitCircle:
+                            return drawableOsuHitObject.Position;
+
+                        default:
+                            return osuHitObject.Position;
+                    }
+                }
+            };
+
+            scoreProcessor.JudgementReverted += _ =>
+            {
+                bubbleContainer.LastOrDefault()?.FinishTransforms();
+                bubbleContainer.LastOrDefault()?.Expire();
+            };
         }
 
         public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
@@ -69,178 +128,116 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             adjustmentContainer = drawableRuleset.CreatePlayfieldAdjustmentContainer();
 
-            adjustmentContainer.Add(bubbleContainer = new BubbleContainer());
+            adjustmentContainer.Add(bubbleContainer = new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+            });
             drawableRuleset.KeyBindingInputManager.Add(adjustmentContainer);
         }
 
         protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state) => applyBubbleState(hitObject);
-
         protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state) => applyBubbleState(hitObject);
 
         private void applyBubbleState(DrawableHitObject drawableObject)
         {
+            DrawableOsuHitObject osuHitObject = (DrawableOsuHitObject)drawableObject;
+
             if (drawableObject is DrawableSlider slider)
             {
                 slider.Body.OnSkinChanged += () => applySliderState(slider);
                 applySliderState(slider);
             }
 
-            if (drawableObject is not DrawableOsuHitObject drawableOsuObject || !drawableObject.Judged) return;
+            if (osuHitObject == lastJudgedHitobject || !osuHitObject.Judged) return;
 
-            switch (drawableOsuObject)
+            switch (osuHitObject)
             {
                 case DrawableSlider:
                 case DrawableSpinnerTick:
                     break;
 
                 default:
-                    addBubbleForObject(drawableOsuObject);
+                    lastJudgedHitobject = osuHitObject;
                     break;
             }
         }
 
-        // Makes the slider border coloured on all skins
+        // Makes the slider border coloured on all skins (for aesthetics)
         private void applySliderState(DrawableSlider slider) =>
             ((PlaySliderBody)slider.Body.Drawable).BorderColour = slider.AccentColour.Value;
 
-        private void addBubbleForObject(DrawableOsuHitObject hitObject)
-        {
-            bubbleContainer.Add
-            (
-                new BubbleLifeTimeEntry
-                {
-                    LifetimeStart = bubbleContainer.Time.Current,
-                    Colour = hitObject.AccentColour.Value,
-                    Position = hitObject.HitObject.Position,
-                    InitialSize = new Vector2(bubbleRadius),
-                    MaxSize = maxSize,
-                    FadeTime = bubbleFade,
-                    IsHit = hitObject.IsHit
-                }
-            );
-        }
-
         #region Pooled Bubble drawable
 
-        // LifetimeEntry flow is necessary to allow for correct rewind behaviour, can probably be made generic later if more mods are made requiring it
-        // Todo: find solution to bubbles rewinding in "groups"
-        private sealed partial class BubbleContainer : PooledDrawableWithLifetimeContainer<BubbleLifeTimeEntry, BubbleObject>
-        {
-            protected override bool RemoveRewoundEntry => true;
-
-            private readonly DrawablePool<BubbleObject> pool;
-
-            public BubbleContainer()
-            {
-                RelativeSizeAxes = Axes.Both;
-                AddInternal(pool = new DrawablePool<BubbleObject>(10, 1000));
-            }
-
-            protected override BubbleObject GetDrawable(BubbleLifeTimeEntry entry) => pool.Get(d => d.Apply(entry));
-        }
-
-        private sealed partial class BubbleObject : PoolableDrawableWithLifetime<BubbleLifeTimeEntry>
-        {
-            private readonly BubbleDrawable bubbleDrawable;
-
-            public BubbleObject()
-            {
-                InternalChild = bubbleDrawable = new BubbleDrawable();
-            }
-
-            protected override void OnApply(BubbleLifeTimeEntry entry)
-            {
-                base.OnApply(entry);
-                if (IsLoaded)
-                    apply(entry);
-            }
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-                apply(Entry);
-            }
-
-            private void apply(BubbleLifeTimeEntry? entry)
-            {
-                if (entry == null) return;
-
-                ApplyTransformsAt(float.MinValue, true);
-                ClearTransforms(true);
-
-                Position = entry.Position;
-
-                bubbleDrawable.Animate(entry);
-
-                LifetimeEnd = bubbleDrawable.LatestTransformEndTime;
-            }
-        }
-
-        private partial class BubbleDrawable : CircularContainer
+        private partial class BubbleDrawable : PoolableDrawable
         {
             private readonly Box colourBox;
+            private readonly CircularContainer content;
+
+            public BubbleInfo Info { get; set; }
 
             public BubbleDrawable()
             {
-                Anchor = Anchor.Centre;
                 Origin = Anchor.Centre;
-
-                MaskingSmoothness = 2;
-                BorderThickness = 0;
-                BorderColour = Colour4.White;
-                Masking = true;
-                EdgeEffect = new EdgeEffectParameters
+                InternalChild = content = new CircularContainer
                 {
-                    Type = EdgeEffectType.Shadow,
-                    Radius = 3,
-                    Colour = Colour4.Black.Opacity(0.05f)
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
+                    MaskingSmoothness = 2,
+                    BorderThickness = 0,
+                    BorderColour = Colour4.White,
+                    Masking = true,
+                    EdgeEffect = new EdgeEffectParameters
+                    {
+                        Type = EdgeEffectType.Shadow,
+                        Radius = 3,
+                        Colour = Colour4.Black.Opacity(0.05f),
+                    },
+                    Child = colourBox = new Box { RelativeSizeAxes = Axes.Both, }
                 };
-                Child = colourBox = new Box { RelativeSizeAxes = Axes.Both, };
             }
 
-            public void Animate(BubbleLifeTimeEntry entry)
+            protected override void PrepareForUse()
             {
-                Size = entry.InitialSize;
-                BorderThickness = Width / 3.5f;
+                Alpha = 1;
+                Colour = Colour4.White;
+                Scale = new Vector2(1);
+                Position = Info.Position;
+                Size = Info.InitialSize;
+                content.BorderThickness = Info.InitialSize.X / 3.5f;
+                content.BorderColour = Colour4.White;
 
                 //We want to fade to a darker colour to avoid colours such as white hiding the "ripple" effect.
-                ColourInfo colourDarker = entry.Colour.Darken(0.1f);
+                ColourInfo colourDarker = Info.Colour.Darken(0.1f);
 
                 // Main bubble scaling based on combo
-                this.ScaleTo(entry.MaxSize, getAnimationDuration() * 0.8f)
+                this.ScaleTo(Info.MaxSize, getAnimationDuration() * 0.8f)
                     .Then()
                     // Pop at the end of the bubbles life time
-                    .ScaleTo(entry.MaxSize * 1.5f, getAnimationDuration() * 0.2f, Easing.OutQuint)
-                    .FadeTo(0, getAnimationDuration() * 0.2f, Easing.OutCirc);
+                    .ScaleTo(Info.MaxSize * 1.5f, getAnimationDuration() * 0.2f, Easing.OutQuint)
+                    .FadeOutFromOne(getAnimationDuration() * 0.2f, Easing.OutCirc).Expire();
 
-                if (!entry.IsHit)
+                if (Info.IsHit)
                 {
-                    Colour = Colour4.Black;
-                    BorderColour = Colour4.Black;
+                    colourBox.FadeColour(colourDarker);
+
+                    content.TransformTo(nameof(BorderColour), colourDarker, getAnimationDuration() * 0.3f, Easing.OutQuint);
+                    // Ripple effect utilises the border to reduce drawable count
+                    content.TransformTo(nameof(BorderThickness), 2f, getAnimationDuration() * 0.3f, Easing.OutQuint)
+                           // Avoids transparency overlap issues during the bubble "pop"
+                           .Then().Schedule(() => content.BorderThickness = 0);
 
                     return;
                 }
 
-                colourBox.FadeColour(colourDarker);
-
-                this.TransformTo(nameof(BorderColour), colourDarker, getAnimationDuration() * 0.3f, Easing.OutQuint);
-
-                // Ripple effect utilises the border to reduce drawable count
-                this.TransformTo(nameof(BorderThickness), 2f, getAnimationDuration() * 0.3f, Easing.OutQuint)
-
-                    // Avoids transparency overlap issues during the bubble "pop"
-                    .Then().Schedule(() =>
-                    {
-                        BorderThickness = 0;
-                        BorderColour = Colour4.Transparent;
-                    });
+                Colour = Colour4.Black;
 
                 // The absolute length of the bubble's animation, can be used in fractions for animations of partial length
-                double getAnimationDuration() => 1700 + Math.Pow(entry.FadeTime, 1.07f);
+                double getAnimationDuration() => 1700 + Math.Pow(Info.FadeTime, 1.07f);
             }
         }
 
-        private class BubbleLifeTimeEntry : LifetimeEntry
+        private struct BubbleInfo
         {
             public Vector2 InitialSize { get; set; }
 

From 6ff6e06a69256987d7a409a154c021df9988df30 Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Sun, 12 Feb 2023 11:37:07 +0100
Subject: [PATCH 0059/1604] Simplify bubble container structure, modify some
 comments

---
 osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
index 8cf9c619d7..3e3fce5c27 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
@@ -38,8 +38,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         // Compatibility with these seems potentially feasible in the future, blocked for now because they don't work as one would expect
         public override Type[] IncompatibleMods => new[] { typeof(OsuModBarrelRoll), typeof(OsuModMagnetised), typeof(OsuModRepel) };
 
-        private PlayfieldAdjustmentContainer adjustmentContainer = null!;
-        private Container bubbleContainer = null!;
+        private PlayfieldAdjustmentContainer bubbleContainer = null!;
 
         private readonly Bindable<int> currentCombo = new BindableInt();
 
@@ -119,20 +118,17 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
         {
-            // Multiplying by 2 results in an initial size that is too large, hence 1.85 has been chosen
-            bubbleRadius = (float)(drawableRuleset.Beatmap.HitObjects.OfType<HitCircle>().First().Radius * 1.85f);
+            // Multiplying by 2 results in an initial size that is too large, hence 1.90 has been chosen
+            // Also avoids the HitObject bleeding around the edges of the bubble drawable at minimum size
+            bubbleRadius = (float)(drawableRuleset.Beatmap.HitObjects.OfType<HitCircle>().First().Radius * 1.90f);
             bubbleFade = drawableRuleset.Beatmap.HitObjects.OfType<HitCircle>().First().TimePreempt * 2;
 
             // We want to hide the judgements since they are obscured by the BubbleDrawable (due to layering)
             drawableRuleset.Playfield.DisplayJudgements.Value = false;
 
-            adjustmentContainer = drawableRuleset.CreatePlayfieldAdjustmentContainer();
+            bubbleContainer = drawableRuleset.CreatePlayfieldAdjustmentContainer();
 
-            adjustmentContainer.Add(bubbleContainer = new Container
-            {
-                RelativeSizeAxes = Axes.Both,
-            });
-            drawableRuleset.KeyBindingInputManager.Add(adjustmentContainer);
+            drawableRuleset.KeyBindingInputManager.Add(bubbleContainer);
         }
 
         protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state) => applyBubbleState(hitObject);

From d100a4a4915b3c67c48cf790822e93da90dc02be Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Tue, 14 Feb 2023 10:12:37 +0100
Subject: [PATCH 0060/1604] Make `lastJudgedHitObject` nullable, and fix typo
 in name.

---
 osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs | 23 ++++++++-------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
index 3e3fce5c27..40c235911c 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
@@ -2,8 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
@@ -48,7 +50,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         private readonly DrawablePool<BubbleDrawable> bubblePool = new DrawablePool<BubbleDrawable>(100);
 
-        private DrawableOsuHitObject lastJudgedHitobject = null!;
+        private DrawableOsuHitObject? lastJudgedHitObject;
 
         public ScoreRank AdjustRank(ScoreRank rank, double accuracy) => rank;
 
@@ -60,9 +62,11 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             scoreProcessor.NewJudgement += result =>
             {
-                if (result.HitObject is not OsuHitObject osuHitObject) return;
+                if (result.HitObject is not OsuHitObject osuHitObject || lastJudgedHitObject.IsNull()) return;
 
-                DrawableOsuHitObject drawableOsuHitObject = lastJudgedHitobject;
+                Debug.Assert(result.HitObject == lastJudgedHitObject.HitObject);
+
+                DrawableOsuHitObject drawableOsuHitObject = lastJudgedHitObject;
 
                 switch (result.HitObject)
                 {
@@ -144,18 +148,9 @@ namespace osu.Game.Rulesets.Osu.Mods
                 applySliderState(slider);
             }
 
-            if (osuHitObject == lastJudgedHitobject || !osuHitObject.Judged) return;
+            if (osuHitObject == lastJudgedHitObject || !osuHitObject.Judged) return;
 
-            switch (osuHitObject)
-            {
-                case DrawableSlider:
-                case DrawableSpinnerTick:
-                    break;
-
-                default:
-                    lastJudgedHitobject = osuHitObject;
-                    break;
-            }
+            lastJudgedHitObject = osuHitObject;
         }
 
         // Makes the slider border coloured on all skins (for aesthetics)

From 2d49b5f9d66150598260451250c11736bdad87bc Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Tue, 14 Feb 2023 14:03:48 +0100
Subject: [PATCH 0061/1604] Move bubbles to ruleset overlays container

---
 osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
index 40c235911c..732626b177 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
@@ -132,7 +132,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             bubbleContainer = drawableRuleset.CreatePlayfieldAdjustmentContainer();
 
-            drawableRuleset.KeyBindingInputManager.Add(bubbleContainer);
+            drawableRuleset.Overlays.Add(bubbleContainer);
         }
 
         protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state) => applyBubbleState(hitObject);

From 92c61c73396939363b3c6bd7ffffb083e3c74116 Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Tue, 14 Feb 2023 16:31:34 +0100
Subject: [PATCH 0062/1604] move logic for bubble invoking to
 `ApplyToDrawableHitobject()`` method

---
 osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs | 85 +++++++++------------
 1 file changed, 34 insertions(+), 51 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
index 732626b177..4a8c11e7ff 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
@@ -2,10 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
@@ -25,7 +23,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
-    public partial class OsuModBubbles : ModWithVisibilityAdjustment, IApplicableToDrawableRuleset<OsuHitObject>, IApplicableToScoreProcessor
+    public partial class OsuModBubbles : Mod, IApplicableToDrawableRuleset<OsuHitObject>, IApplicableToDrawableHitObject, IApplicableToScoreProcessor
     {
         public override string Name => "Bubbles";
 
@@ -50,8 +48,6 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         private readonly DrawablePool<BubbleDrawable> bubblePool = new DrawablePool<BubbleDrawable>(100);
 
-        private DrawableOsuHitObject? lastJudgedHitObject;
-
         public ScoreRank AdjustRank(ScoreRank rank, double accuracy) => rank;
 
         public void ApplyToScoreProcessor(ScoreProcessor scoreProcessor)
@@ -60,15 +56,41 @@ namespace osu.Game.Rulesets.Osu.Mods
             currentCombo.BindValueChanged(combo =>
                 maxSize = Math.Min(1.75f, (float)(1.25 + 0.005 * combo.NewValue)), true);
 
-            scoreProcessor.NewJudgement += result =>
+            scoreProcessor.JudgementReverted += _ =>
             {
-                if (result.HitObject is not OsuHitObject osuHitObject || lastJudgedHitObject.IsNull()) return;
+                bubbleContainer.LastOrDefault()?.ClearTransforms();
+                bubbleContainer.LastOrDefault()?.Expire();
+            };
+        }
 
-                Debug.Assert(result.HitObject == lastJudgedHitObject.HitObject);
+        public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
+        {
+            // Multiplying by 2 results in an initial size that is too large, hence 1.90 has been chosen
+            // Also avoids the HitObject bleeding around the edges of the bubble drawable at minimum size
+            bubbleRadius = (float)(drawableRuleset.Beatmap.HitObjects.OfType<HitCircle>().First().Radius * 1.90f);
+            bubbleFade = drawableRuleset.Beatmap.HitObjects.OfType<HitCircle>().First().TimePreempt * 2;
 
-                DrawableOsuHitObject drawableOsuHitObject = lastJudgedHitObject;
+            // We want to hide the judgements since they are obscured by the BubbleDrawable (due to layering)
+            drawableRuleset.Playfield.DisplayJudgements.Value = false;
 
-                switch (result.HitObject)
+            bubbleContainer = drawableRuleset.CreatePlayfieldAdjustmentContainer();
+
+            drawableRuleset.Overlays.Add(bubbleContainer);
+        }
+
+        public void ApplyToDrawableHitObject(DrawableHitObject drawableObject)
+        {
+            if (drawableObject is DrawableSlider slider)
+            {
+                applySliderState(slider);
+                slider.Body.OnSkinChanged += () => applySliderState(slider);
+            }
+
+            drawableObject.OnNewResult += (drawable, _) =>
+            {
+                if (drawable is not DrawableOsuHitObject drawableOsuHitObject) return;
+
+                switch (drawableOsuHitObject.HitObject)
                 {
                     case Slider:
                     case SpinnerTick:
@@ -101,56 +123,17 @@ namespace osu.Game.Rulesets.Osu.Mods
                         // SliderHeads are derived from HitCircles,
                         // so we must handle them before to avoid them using the wrong positioning logic
                         case DrawableSliderHead:
-                            return osuHitObject.Position;
+                            return drawableOsuHitObject.HitObject.Position;
 
                         // Using hitobject position will cause issues with HitCircle placement due to stack leniency.
                         case DrawableHitCircle:
                             return drawableOsuHitObject.Position;
 
                         default:
-                            return osuHitObject.Position;
+                            return drawableOsuHitObject.HitObject.Position;
                     }
                 }
             };
-
-            scoreProcessor.JudgementReverted += _ =>
-            {
-                bubbleContainer.LastOrDefault()?.FinishTransforms();
-                bubbleContainer.LastOrDefault()?.Expire();
-            };
-        }
-
-        public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
-        {
-            // Multiplying by 2 results in an initial size that is too large, hence 1.90 has been chosen
-            // Also avoids the HitObject bleeding around the edges of the bubble drawable at minimum size
-            bubbleRadius = (float)(drawableRuleset.Beatmap.HitObjects.OfType<HitCircle>().First().Radius * 1.90f);
-            bubbleFade = drawableRuleset.Beatmap.HitObjects.OfType<HitCircle>().First().TimePreempt * 2;
-
-            // We want to hide the judgements since they are obscured by the BubbleDrawable (due to layering)
-            drawableRuleset.Playfield.DisplayJudgements.Value = false;
-
-            bubbleContainer = drawableRuleset.CreatePlayfieldAdjustmentContainer();
-
-            drawableRuleset.Overlays.Add(bubbleContainer);
-        }
-
-        protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state) => applyBubbleState(hitObject);
-        protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state) => applyBubbleState(hitObject);
-
-        private void applyBubbleState(DrawableHitObject drawableObject)
-        {
-            DrawableOsuHitObject osuHitObject = (DrawableOsuHitObject)drawableObject;
-
-            if (drawableObject is DrawableSlider slider)
-            {
-                slider.Body.OnSkinChanged += () => applySliderState(slider);
-                applySliderState(slider);
-            }
-
-            if (osuHitObject == lastJudgedHitObject || !osuHitObject.Judged) return;
-
-            lastJudgedHitObject = osuHitObject;
         }
 
         // Makes the slider border coloured on all skins (for aesthetics)

From 5db624159b1230e7ca522e9ab6cdec8194e8a0fa Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Tue, 14 Feb 2023 18:06:43 +0100
Subject: [PATCH 0063/1604] Change bubble rewind removal to be in
 `ApplyToDrawableHitObject` method.

---
 osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
index 4a8c11e7ff..f521dfb1f8 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
@@ -55,12 +55,6 @@ namespace osu.Game.Rulesets.Osu.Mods
             currentCombo.BindTo(scoreProcessor.Combo);
             currentCombo.BindValueChanged(combo =>
                 maxSize = Math.Min(1.75f, (float)(1.25 + 0.005 * combo.NewValue)), true);
-
-            scoreProcessor.JudgementReverted += _ =>
-            {
-                bubbleContainer.LastOrDefault()?.ClearTransforms();
-                bubbleContainer.LastOrDefault()?.Expire();
-            };
         }
 
         public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
@@ -134,6 +128,16 @@ namespace osu.Game.Rulesets.Osu.Mods
                     }
                 }
             };
+
+            drawableObject.OnRevertResult += (drawable, _) =>
+            {
+                if (drawable.HitObject is SpinnerTick or Slider) return;
+
+                BubbleDrawable? lastBubble = bubbleContainer.OfType<BubbleDrawable>().LastOrDefault();
+
+                lastBubble?.ClearTransforms();
+                lastBubble?.Expire();
+            };
         }
 
         // Makes the slider border coloured on all skins (for aesthetics)

From 82292d61621e49a158c576879ae56f47a9e52a84 Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Wed, 15 Feb 2023 09:30:12 +0100
Subject: [PATCH 0064/1604] Make colouring for bubble more intuitive and remove
 unnecessary alpha assignment

---
 osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
index f521dfb1f8..2a4208065d 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
@@ -177,8 +177,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             protected override void PrepareForUse()
             {
-                Alpha = 1;
-                Colour = Colour4.White;
+                Colour = Info.IsHit ? Colour4.White : Colour4.Black;
                 Scale = new Vector2(1);
                 Position = Info.Position;
                 Size = Info.InitialSize;
@@ -204,12 +203,8 @@ namespace osu.Game.Rulesets.Osu.Mods
                     content.TransformTo(nameof(BorderThickness), 2f, getAnimationDuration() * 0.3f, Easing.OutQuint)
                            // Avoids transparency overlap issues during the bubble "pop"
                            .Then().Schedule(() => content.BorderThickness = 0);
-
-                    return;
                 }
 
-                Colour = Colour4.Black;
-
                 // The absolute length of the bubble's animation, can be used in fractions for animations of partial length
                 double getAnimationDuration() => 1700 + Math.Pow(Info.FadeTime, 1.07f);
             }

From e9a7d90273c57dbd7dfb30ff32b9ca21dc9b6d39 Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Wed, 15 Feb 2023 09:33:18 +0100
Subject: [PATCH 0065/1604] make transform duration for bubble a method instead
 of a variable

---
 osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
index 2a4208065d..a88bf6b813 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
@@ -187,26 +187,26 @@ namespace osu.Game.Rulesets.Osu.Mods
                 //We want to fade to a darker colour to avoid colours such as white hiding the "ripple" effect.
                 ColourInfo colourDarker = Info.Colour.Darken(0.1f);
 
+                // The absolute length of the bubble's animation, can be used in fractions for animations of partial length
+                double getAnimationDuration = 1700 + Math.Pow(Info.FadeTime, 1.07f);
+
                 // Main bubble scaling based on combo
-                this.ScaleTo(Info.MaxSize, getAnimationDuration() * 0.8f)
+                this.ScaleTo(Info.MaxSize, getAnimationDuration * 0.8f)
                     .Then()
                     // Pop at the end of the bubbles life time
-                    .ScaleTo(Info.MaxSize * 1.5f, getAnimationDuration() * 0.2f, Easing.OutQuint)
-                    .FadeOutFromOne(getAnimationDuration() * 0.2f, Easing.OutCirc).Expire();
+                    .ScaleTo(Info.MaxSize * 1.5f, getAnimationDuration * 0.2f, Easing.OutQuint)
+                    .FadeOutFromOne(getAnimationDuration * 0.2f, Easing.OutCirc).Expire();
 
                 if (Info.IsHit)
                 {
                     colourBox.FadeColour(colourDarker);
 
-                    content.TransformTo(nameof(BorderColour), colourDarker, getAnimationDuration() * 0.3f, Easing.OutQuint);
+                    content.TransformTo(nameof(BorderColour), colourDarker, getAnimationDuration * 0.3f, Easing.OutQuint);
                     // Ripple effect utilises the border to reduce drawable count
-                    content.TransformTo(nameof(BorderThickness), 2f, getAnimationDuration() * 0.3f, Easing.OutQuint)
+                    content.TransformTo(nameof(BorderThickness), 2f, getAnimationDuration * 0.3f, Easing.OutQuint)
                            // Avoids transparency overlap issues during the bubble "pop"
                            .Then().Schedule(() => content.BorderThickness = 0);
                 }
-
-                // The absolute length of the bubble's animation, can be used in fractions for animations of partial length
-                double getAnimationDuration() => 1700 + Math.Pow(Info.FadeTime, 1.07f);
             }
         }
 

From 1d1c794ccfde23743574d8579da648cf42f4e4d4 Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Wed, 15 Feb 2023 09:37:47 +0100
Subject: [PATCH 0066/1604] Invert pointless nested `if`  statement

---
 osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
index a88bf6b813..d75c82dc85 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
@@ -197,16 +197,15 @@ namespace osu.Game.Rulesets.Osu.Mods
                     .ScaleTo(Info.MaxSize * 1.5f, getAnimationDuration * 0.2f, Easing.OutQuint)
                     .FadeOutFromOne(getAnimationDuration * 0.2f, Easing.OutCirc).Expire();
 
-                if (Info.IsHit)
-                {
-                    colourBox.FadeColour(colourDarker);
+                if (!Info.IsHit) return;
 
-                    content.TransformTo(nameof(BorderColour), colourDarker, getAnimationDuration * 0.3f, Easing.OutQuint);
-                    // Ripple effect utilises the border to reduce drawable count
-                    content.TransformTo(nameof(BorderThickness), 2f, getAnimationDuration * 0.3f, Easing.OutQuint)
-                           // Avoids transparency overlap issues during the bubble "pop"
-                           .Then().Schedule(() => content.BorderThickness = 0);
-                }
+                colourBox.FadeColour(colourDarker);
+
+                content.TransformTo(nameof(BorderColour), colourDarker, getAnimationDuration * 0.3f, Easing.OutQuint);
+                // Ripple effect utilises the border to reduce drawable count
+                content.TransformTo(nameof(BorderThickness), 2f, getAnimationDuration * 0.3f, Easing.OutQuint)
+                       // Avoids transparency overlap issues during the bubble "pop"
+                       .Then().Schedule(() => content.BorderThickness = 0);
             }
         }
 

From 297963b461cfdfd6083784ab0c4561c43c1d4a93 Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Wed, 15 Feb 2023 10:00:46 +0100
Subject: [PATCH 0067/1604] Remove BubbleInfo struct and consume
 `DrawableOsuHitObject`s directly

---
 osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs | 102 +++++++++-----------
 1 file changed, 46 insertions(+), 56 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
index d75c82dc85..981932c580 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
@@ -2,8 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
@@ -98,35 +101,14 @@ namespace osu.Game.Rulesets.Osu.Mods
                 void addBubble()
                 {
                     BubbleDrawable bubble = bubblePool.Get();
-                    bubble.Info = new BubbleInfo
-                    {
-                        InitialSize = new Vector2(bubbleRadius),
-                        MaxSize = maxSize,
-                        Position = getPosition(),
-                        FadeTime = bubbleFade,
-                        Colour = drawableOsuHitObject.AccentColour.Value,
-                        IsHit = drawableOsuHitObject.IsHit,
-                    };
+
+                    bubble.DrawableOsuHitObject = drawableOsuHitObject;
+                    bubble.InitialSize = new Vector2(bubbleRadius);
+                    bubble.FadeTime = bubbleFade;
+                    bubble.MaxSize = maxSize;
+
                     bubbleContainer.Add(bubble);
                 }
-
-                Vector2 getPosition()
-                {
-                    switch (drawableOsuHitObject)
-                    {
-                        // SliderHeads are derived from HitCircles,
-                        // so we must handle them before to avoid them using the wrong positioning logic
-                        case DrawableSliderHead:
-                            return drawableOsuHitObject.HitObject.Position;
-
-                        // Using hitobject position will cause issues with HitCircle placement due to stack leniency.
-                        case DrawableHitCircle:
-                            return drawableOsuHitObject.Position;
-
-                        default:
-                            return drawableOsuHitObject.HitObject.Position;
-                    }
-                }
             };
 
             drawableObject.OnRevertResult += (drawable, _) =>
@@ -148,11 +130,15 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         private partial class BubbleDrawable : PoolableDrawable
         {
+            public DrawableOsuHitObject? DrawableOsuHitObject { get; set; }
+
+            public Vector2 InitialSize { get; set; }
+            public double FadeTime { get; set; }
+            public float MaxSize { get; set; }
+
             private readonly Box colourBox;
             private readonly CircularContainer content;
 
-            public BubbleInfo Info { get; set; }
-
             public BubbleDrawable()
             {
                 Origin = Anchor.Centre;
@@ -177,27 +163,30 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             protected override void PrepareForUse()
             {
-                Colour = Info.IsHit ? Colour4.White : Colour4.Black;
+                Debug.Assert(DrawableOsuHitObject.IsNotNull());
+
+                Colour = DrawableOsuHitObject.IsHit ? Colour4.White : Colour4.Black;
+                Alpha = 1;
                 Scale = new Vector2(1);
-                Position = Info.Position;
-                Size = Info.InitialSize;
-                content.BorderThickness = Info.InitialSize.X / 3.5f;
+                Position = getPosition();
+                Size = InitialSize;
+                content.BorderThickness = InitialSize.X / 3.5f;
                 content.BorderColour = Colour4.White;
 
                 //We want to fade to a darker colour to avoid colours such as white hiding the "ripple" effect.
-                ColourInfo colourDarker = Info.Colour.Darken(0.1f);
+                ColourInfo colourDarker = DrawableOsuHitObject.AccentColour.Value.Darken(0.1f);
 
                 // The absolute length of the bubble's animation, can be used in fractions for animations of partial length
-                double getAnimationDuration = 1700 + Math.Pow(Info.FadeTime, 1.07f);
+                double getAnimationDuration = 1700 + Math.Pow(FadeTime, 1.07f);
 
                 // Main bubble scaling based on combo
-                this.ScaleTo(Info.MaxSize, getAnimationDuration * 0.8f)
+                this.ScaleTo(MaxSize, getAnimationDuration * 0.8f)
                     .Then()
                     // Pop at the end of the bubbles life time
-                    .ScaleTo(Info.MaxSize * 1.5f, getAnimationDuration * 0.2f, Easing.OutQuint)
-                    .FadeOutFromOne(getAnimationDuration * 0.2f, Easing.OutCirc).Expire();
+                    .ScaleTo(MaxSize * 1.5f, getAnimationDuration * 0.2f, Easing.OutQuint)
+                    .FadeOut(getAnimationDuration * 0.2f, Easing.OutCirc).Expire();
 
-                if (!Info.IsHit) return;
+                if (!DrawableOsuHitObject.IsHit) return;
 
                 colourBox.FadeColour(colourDarker);
 
@@ -206,26 +195,27 @@ namespace osu.Game.Rulesets.Osu.Mods
                 content.TransformTo(nameof(BorderThickness), 2f, getAnimationDuration * 0.3f, Easing.OutQuint)
                        // Avoids transparency overlap issues during the bubble "pop"
                        .Then().Schedule(() => content.BorderThickness = 0);
+
+                Vector2 getPosition()
+                {
+                    switch (DrawableOsuHitObject)
+                    {
+                        // SliderHeads are derived from HitCircles,
+                        // so we must handle them before to avoid them using the wrong positioning logic
+                        case DrawableSliderHead:
+                            return DrawableOsuHitObject.HitObject.Position;
+
+                        // Using hitobject position will cause issues with HitCircle placement due to stack leniency.
+                        case DrawableHitCircle:
+                            return DrawableOsuHitObject.Position;
+
+                        default:
+                            return DrawableOsuHitObject.HitObject.Position;
+                    }
+                }
             }
         }
 
-        private struct BubbleInfo
-        {
-            public Vector2 InitialSize { get; set; }
-
-            public float MaxSize { get; set; }
-
-            public Vector2 Position { get; set; }
-
-            public Colour4 Colour { get; set; }
-
-            // FadeTime is based on the approach rate of the beatmap.
-            public double FadeTime { get; set; }
-
-            // Whether the corresponding HitObject was hit
-            public bool IsHit { get; set; }
-        }
-
         #endregion
     }
 }

From 8fc35b159f87a10a087c79c469d981ff9750bc95 Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Wed, 15 Feb 2023 10:04:50 +0100
Subject: [PATCH 0068/1604] Remove dysfunctional slider colouring

---
 osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
index 981932c580..4edf726f26 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
@@ -18,7 +18,6 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
-using osu.Game.Rulesets.Osu.Skinning.Default;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
@@ -77,12 +76,6 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public void ApplyToDrawableHitObject(DrawableHitObject drawableObject)
         {
-            if (drawableObject is DrawableSlider slider)
-            {
-                applySliderState(slider);
-                slider.Body.OnSkinChanged += () => applySliderState(slider);
-            }
-
             drawableObject.OnNewResult += (drawable, _) =>
             {
                 if (drawable is not DrawableOsuHitObject drawableOsuHitObject) return;
@@ -122,10 +115,6 @@ namespace osu.Game.Rulesets.Osu.Mods
             };
         }
 
-        // Makes the slider border coloured on all skins (for aesthetics)
-        private void applySliderState(DrawableSlider slider) =>
-            ((PlaySliderBody)slider.Body.Drawable).BorderColour = slider.AccentColour.Value;
-
         #region Pooled Bubble drawable
 
         private partial class BubbleDrawable : PoolableDrawable

From 74e7cc205601bc4edb9d88e12afb8c63f8e967d2 Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Wed, 15 Feb 2023 22:18:02 +0000
Subject: [PATCH 0069/1604] feat: implement new design of key counter

---
 .../Visual/Gameplay/TestSceneKeyCounter.cs    | 39 +++++++---
 osu.Game/Screens/Play/ArgonKeyCounter.cs      | 76 +++++++++++++++++++
 .../Screens/Play/ArgonKeyCounterDisplay.cs    | 42 ++++++++++
 3 files changed, 147 insertions(+), 10 deletions(-)
 create mode 100644 osu.Game/Screens/Play/ArgonKeyCounter.cs
 create mode 100644 osu.Game/Screens/Play/ArgonKeyCounterDisplay.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
index 975a5c9465..41add82245 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
@@ -8,6 +8,7 @@ using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Utils;
 using osu.Game.Screens.Play;
+using osuTK;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Gameplay
@@ -18,24 +19,44 @@ namespace osu.Game.Tests.Visual.Gameplay
         public TestSceneKeyCounter()
         {
             DefaultKeyCounter testCounter;
+            KeyCounterDisplay kc;
+            KeyCounterDisplay argonKc;
 
-            KeyCounterDisplay kc = new DefaultKeyCounterDisplay
+            Children = new Drawable[]
             {
-                Origin = Anchor.Centre,
-                Anchor = Anchor.Centre,
-                Children = new[]
+                kc = new DefaultKeyCounterDisplay
                 {
-                    testCounter = new DefaultKeyCounter(new KeyCounterKeyboardTrigger(Key.X)),
-                    new DefaultKeyCounter(new KeyCounterKeyboardTrigger(Key.X)),
-                    new DefaultKeyCounter(new KeyCounterMouseTrigger(MouseButton.Left)),
-                    new DefaultKeyCounter(new KeyCounterMouseTrigger(MouseButton.Right)),
+                    Origin = Anchor.Centre,
+                    Anchor = Anchor.Centre,
+                    Position = new Vector2(0, -50),
+                    Children = new[]
+                    {
+                        testCounter = new DefaultKeyCounter(new KeyCounterKeyboardTrigger(Key.X)),
+                        new DefaultKeyCounter(new KeyCounterKeyboardTrigger(Key.X)),
+                        new DefaultKeyCounter(new KeyCounterMouseTrigger(MouseButton.Left)),
+                        new DefaultKeyCounter(new KeyCounterMouseTrigger(MouseButton.Right)),
+                    },
                 },
+                argonKc = new ArgonKeyCounterDisplay
+                {
+                    Origin = Anchor.Centre,
+                    Anchor = Anchor.Centre,
+                    Position = new Vector2(0, 50),
+                    Children = new[]
+                    {
+                        new ArgonKeyCounter(new KeyCounterKeyboardTrigger(Key.X)),
+                        new ArgonKeyCounter(new KeyCounterKeyboardTrigger(Key.X)),
+                        new ArgonKeyCounter(new KeyCounterMouseTrigger(MouseButton.Left)),
+                        new ArgonKeyCounter(new KeyCounterMouseTrigger(MouseButton.Right)),
+                    },
+                }
             };
 
             AddStep("Add random", () =>
             {
                 Key key = (Key)((int)Key.A + RNG.Next(26));
                 kc.Add(kc.CreateKeyCounter(new KeyCounterKeyboardTrigger(key)));
+                argonKc.Add(argonKc.CreateKeyCounter(new KeyCounterKeyboardTrigger(key)));
             });
 
             Key testKey = ((KeyCounterKeyboardTrigger)kc.Children.First().Trigger).Key;
@@ -52,8 +73,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("Disable counting", () => testCounter.IsCounting = false);
             addPressKeyStep();
             AddAssert($"Check {testKey} count has not changed", () => testCounter.CountPresses == 2);
-
-            Add(kc);
         }
     }
 }
diff --git a/osu.Game/Screens/Play/ArgonKeyCounter.cs b/osu.Game/Screens/Play/ArgonKeyCounter.cs
new file mode 100644
index 0000000000..a275a7e017
--- /dev/null
+++ b/osu.Game/Screens/Play/ArgonKeyCounter.cs
@@ -0,0 +1,76 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osuTK;
+
+namespace osu.Game.Screens.Play
+{
+    public partial class ArgonKeyCounter : KeyCounter
+    {
+        private Circle inputIndicator = null!;
+        private OsuSpriteText countText = null!;
+
+        // These values were taken from Figma
+        private const float line_height = 3;
+        private const float name_font_size = 10;
+        private const float count_font_size = 14;
+
+        // Make things look bigger without using Scale
+        private const float scale_factor = 1.5f;
+
+        public ArgonKeyCounter(InputTrigger trigger)
+            : base(trigger)
+        {
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            Children = new Drawable[]
+            {
+                inputIndicator = new Circle
+                {
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.TopCentre,
+                    RelativeSizeAxes = Axes.X,
+                    Height = line_height * scale_factor,
+                    Alpha = 0.5f
+                },
+                new OsuSpriteText
+                {
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.BottomLeft,
+                    Position = new Vector2(0, -13) * scale_factor,
+                    Font = OsuFont.Torus.With(size: name_font_size * scale_factor, weight: FontWeight.Bold),
+                    Colour = colours.Blue0,
+                    Text = Name
+                },
+                countText = new OsuSpriteText
+                {
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.BottomLeft,
+                    Font = OsuFont.Torus.With(size: count_font_size * scale_factor, weight: FontWeight.Bold),
+                    Text = "0"
+                },
+            };
+
+            // Values from Figma didn't match visually
+            // So these were just eyeballed
+            Height = 30 * scale_factor;
+            Width = 35 * scale_factor;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            IsLit.BindValueChanged(e => inputIndicator.Alpha = e.NewValue ? 1 : 0.5f, true);
+            PressesCount.BindValueChanged(e => countText.Text = e.NewValue.ToString(@"#,0"), true);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/ArgonKeyCounterDisplay.cs b/osu.Game/Screens/Play/ArgonKeyCounterDisplay.cs
new file mode 100644
index 0000000000..da34a64a4c
--- /dev/null
+++ b/osu.Game/Screens/Play/ArgonKeyCounterDisplay.cs
@@ -0,0 +1,42 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osuTK;
+
+namespace osu.Game.Screens.Play
+{
+    public partial class ArgonKeyCounterDisplay : KeyCounterDisplay
+    {
+        private const int duration = 100;
+
+        public new IReadOnlyList<ArgonKeyCounter> Children
+        {
+            get => (IReadOnlyList<ArgonKeyCounter>)base.Children;
+            set => base.Children = value;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            KeyFlow.Direction = FillDirection.Horizontal;
+            KeyFlow.AutoSizeAxes = Axes.Both;
+            KeyFlow.Spacing = new Vector2(2);
+
+            InternalChildren = new[]
+            {
+                KeyFlow
+            };
+        }
+
+        protected override bool CheckType(KeyCounter key) => key is ArgonKeyCounter;
+
+        protected override void UpdateVisibility()
+            => KeyFlow.FadeTo(AlwaysVisible.Value || ConfigVisibility.Value ? 1 : 0, duration);
+
+        public override KeyCounter CreateKeyCounter(KeyCounter.InputTrigger trigger) => new ArgonKeyCounter(trigger);
+    }
+}

From d5bc8e2941fc0a6d948fda24546cc976b12165fa Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Thu, 16 Feb 2023 11:12:30 +0100
Subject: [PATCH 0070/1604] Code cleanup pass:

Make bubble transform logic more sane.

Extract bubble `getPosition()` method.

Address poorly named variables.
---
 osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs | 47 +++++++++++----------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
index 4edf726f26..0fc27c8f1d 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         private readonly Bindable<int> currentCombo = new BindableInt();
 
         private float maxSize;
-        private float bubbleRadius;
+        private float bubbleSize;
         private double bubbleFade;
 
         private readonly DrawablePool<BubbleDrawable> bubblePool = new DrawablePool<BubbleDrawable>(100);
@@ -63,7 +63,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         {
             // Multiplying by 2 results in an initial size that is too large, hence 1.90 has been chosen
             // Also avoids the HitObject bleeding around the edges of the bubble drawable at minimum size
-            bubbleRadius = (float)(drawableRuleset.Beatmap.HitObjects.OfType<HitCircle>().First().Radius * 1.90f);
+            bubbleSize = (float)(drawableRuleset.Beatmap.HitObjects.OfType<HitCircle>().First().Radius * 1.90f);
             bubbleFade = drawableRuleset.Beatmap.HitObjects.OfType<HitCircle>().First().TimePreempt * 2;
 
             // We want to hide the judgements since they are obscured by the BubbleDrawable (due to layering)
@@ -96,7 +96,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                     BubbleDrawable bubble = bubblePool.Get();
 
                     bubble.DrawableOsuHitObject = drawableOsuHitObject;
-                    bubble.InitialSize = new Vector2(bubbleRadius);
+                    bubble.InitialSize = new Vector2(bubbleSize);
                     bubble.FadeTime = bubbleFade;
                     bubble.MaxSize = maxSize;
 
@@ -122,9 +122,11 @@ namespace osu.Game.Rulesets.Osu.Mods
             public DrawableOsuHitObject? DrawableOsuHitObject { get; set; }
 
             public Vector2 InitialSize { get; set; }
-            public double FadeTime { get; set; }
+
             public float MaxSize { get; set; }
 
+            public double FadeTime { get; set; }
+
             private readonly Box colourBox;
             private readonly CircularContainer content;
 
@@ -155,12 +157,9 @@ namespace osu.Game.Rulesets.Osu.Mods
                 Debug.Assert(DrawableOsuHitObject.IsNotNull());
 
                 Colour = DrawableOsuHitObject.IsHit ? Colour4.White : Colour4.Black;
-                Alpha = 1;
                 Scale = new Vector2(1);
-                Position = getPosition();
+                Position = getPosition(DrawableOsuHitObject);
                 Size = InitialSize;
-                content.BorderThickness = InitialSize.X / 3.5f;
-                content.BorderColour = Colour4.White;
 
                 //We want to fade to a darker colour to avoid colours such as white hiding the "ripple" effect.
                 ColourInfo colourDarker = DrawableOsuHitObject.AccentColour.Value.Darken(0.1f);
@@ -169,7 +168,8 @@ namespace osu.Game.Rulesets.Osu.Mods
                 double getAnimationDuration = 1700 + Math.Pow(FadeTime, 1.07f);
 
                 // Main bubble scaling based on combo
-                this.ScaleTo(MaxSize, getAnimationDuration * 0.8f)
+                this.FadeTo(1)
+                    .ScaleTo(MaxSize, getAnimationDuration * 0.8f)
                     .Then()
                     // Pop at the end of the bubbles life time
                     .ScaleTo(MaxSize * 1.5f, getAnimationDuration * 0.2f, Easing.OutQuint)
@@ -177,6 +177,9 @@ namespace osu.Game.Rulesets.Osu.Mods
 
                 if (!DrawableOsuHitObject.IsHit) return;
 
+                content.BorderThickness = InitialSize.X / 3.5f;
+                content.BorderColour = Colour4.White;
+
                 colourBox.FadeColour(colourDarker);
 
                 content.TransformTo(nameof(BorderColour), colourDarker, getAnimationDuration * 0.3f, Easing.OutQuint);
@@ -184,23 +187,23 @@ namespace osu.Game.Rulesets.Osu.Mods
                 content.TransformTo(nameof(BorderThickness), 2f, getAnimationDuration * 0.3f, Easing.OutQuint)
                        // Avoids transparency overlap issues during the bubble "pop"
                        .Then().Schedule(() => content.BorderThickness = 0);
+            }
 
-                Vector2 getPosition()
+            private Vector2 getPosition(DrawableOsuHitObject drawableOsuHitObject)
+            {
+                switch (drawableOsuHitObject)
                 {
-                    switch (DrawableOsuHitObject)
-                    {
-                        // SliderHeads are derived from HitCircles,
-                        // so we must handle them before to avoid them using the wrong positioning logic
-                        case DrawableSliderHead:
-                            return DrawableOsuHitObject.HitObject.Position;
+                    // SliderHeads are derived from HitCircles,
+                    // so we must handle them before to avoid them using the wrong positioning logic
+                    case DrawableSliderHead:
+                        return drawableOsuHitObject.HitObject.Position;
 
-                        // Using hitobject position will cause issues with HitCircle placement due to stack leniency.
-                        case DrawableHitCircle:
-                            return DrawableOsuHitObject.Position;
+                    // Using hitobject position will cause issues with HitCircle placement due to stack leniency.
+                    case DrawableHitCircle:
+                        return drawableOsuHitObject.Position;
 
-                        default:
-                            return DrawableOsuHitObject.HitObject.Position;
-                    }
+                    default:
+                        return drawableOsuHitObject.HitObject.Position;
                 }
             }
         }

From eac0aa79a3bcaf23982b590144ec5471cc4f952c Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Fri, 17 Feb 2023 21:52:10 +0900
Subject: [PATCH 0071/1604] cancellationToken pass, notification adujust

---
 osu.Game/Database/LegacyModelExporter.cs | 73 ++++++++++++++----------
 osu.Game/Database/LegacyScoreExporter.cs |  3 +-
 2 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index d896e4bce6..1475f29f89 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
@@ -32,33 +33,52 @@ namespace osu.Game.Database
         protected Storage UserFileStorage;
         private readonly Storage exportStorage;
 
-        protected RealmAccess RealmAccess;
+        private readonly RealmAccess realmAccess;
 
         private string filename = string.Empty;
         public Action<Notification>? PostNotification { get; set; }
 
+        /// <summary>
+        /// Construct exporter.
+        /// Create a new exporter for each export, otherwise it will cause confusing notifications.
+        /// </summary>
+        /// <param name="storage">Storage for storing exported files. Basically it is used to provide export stream</param>
+        /// <param name="realm">The RealmAccess used to provide the exported file.</param>
         protected LegacyModelExporter(Storage storage, RealmAccess realm)
         {
             exportStorage = storage.GetStorageForDirectory(@"exports");
             UserFileStorage = storage.GetStorageForDirectory(@"files");
-            RealmAccess = realm;
+            realmAccess = realm;
         }
 
         /// <summary>
         /// Export the model to default folder.
         /// </summary>
         /// <param name="model">The model should export.</param>
+        /// <param name="cancellationToken">
+        /// The Cancellation token that can cancel the exporting.
+        /// If specified CancellationToken, then use it. Otherwise use PostNotification's CancellationToken.
+        /// </param>
         /// <returns></returns>
-        public async Task ExportAsync(TModel model)
+        public async Task ExportAsync(TModel model, CancellationToken? cancellationToken = null)
         {
             string itemFilename = model.GetDisplayString().GetValidFilename();
             IEnumerable<string> existingExports = exportStorage.GetFiles("", $"{itemFilename}*{FileExtension}");
             filename = NamingUtils.GetNextBestFilename(existingExports, $"{itemFilename}{FileExtension}");
             bool success;
 
+            ProgressNotification notification = new ProgressNotification
+            {
+                State = ProgressNotificationState.Active,
+                Text = "Exporting...",
+                CompletionText = "Export completed"
+            };
+            notification.CompletionClickAction += () => exportStorage.PresentFileExternally(filename);
+            PostNotification?.Invoke(notification);
+
             using (var stream = exportStorage.CreateFileSafely(filename))
             {
-                success = await ExportToStreamAsync(model, stream);
+                success = await ExportToStreamAsync(model, stream, notification, cancellationToken ?? notification.CancellationToken);
             }
 
             if (!success)
@@ -72,44 +92,34 @@ namespace osu.Game.Database
         /// </summary>
         /// <param name="model">The medel which have <see cref="IHasGuidPrimaryKey"/>.</param>
         /// <param name="stream">The stream to export.</param>
+        /// <param name="notification">The notification will displayed to the user</param>
+        /// <param name="cancellationToken">The Cancellation token that can cancel the exporting.</param>
         /// <returns>Whether the export was successful</returns>
-        public async Task<bool> ExportToStreamAsync(TModel model, Stream stream)
+        public async Task<bool> ExportToStreamAsync(TModel model, Stream stream, ProgressNotification? notification = null, CancellationToken cancellationToken = default)
         {
-            ProgressNotification notification = new ProgressNotification
-            {
-                State = ProgressNotificationState.Active,
-                Text = "Exporting...",
-                CompletionText = "Export completed"
-            };
-            notification.CompletionClickAction += () => exportStorage.PresentFileExternally(filename);
-            PostNotification?.Invoke(notification);
+            ProgressNotification notify = notification ?? new ProgressNotification();
 
             Guid id = model.ID;
             return await Task.Run(() =>
             {
-                RealmAccess.Run(r =>
+                realmAccess.Run(r =>
                 {
                     TModel refetchModel = r.Find<TModel>(id);
-                    ExportToStream(refetchModel, stream, notification);
+                    ExportToStream(refetchModel, stream, notify, cancellationToken);
                 });
-            }, notification.CancellationToken).ContinueWith(t =>
+            }, cancellationToken).ContinueWith(t =>
             {
-                if (t.IsCanceled)
-                {
-                    return false;
-                }
-
                 if (t.IsFaulted)
                 {
-                    notification.State = ProgressNotificationState.Cancelled;
+                    notify.State = ProgressNotificationState.Cancelled;
                     Logger.Error(t.Exception, "An error occurred while exporting");
                     return false;
                 }
 
-                notification.CompletionText = "Export Complete, Click to open the folder";
-                notification.State = ProgressNotificationState.Completed;
+                notify.CompletionText = "Export Complete, Click to open the folder";
+                notify.State = ProgressNotificationState.Completed;
                 return true;
-            });
+            }, cancellationToken);
         }
 
         /// <summary>
@@ -119,7 +129,8 @@ namespace osu.Game.Database
         /// <param name="model">The item to export.</param>
         /// <param name="outputStream">The output stream to export to.</param>
         /// <param name="notification">The notification will displayed to the user</param>
-        protected abstract void ExportToStream(TModel model, Stream outputStream, ProgressNotification notification);
+        /// <param name="cancellationToken">The Cancellation token that can cancel the exporting.</param>
+        protected abstract void ExportToStream(TModel model, Stream outputStream, ProgressNotification notification, CancellationToken cancellationToken = default);
     }
 
     public abstract class LegacyArchiveExporter<TModel> : LegacyModelExporter<TModel>
@@ -130,15 +141,17 @@ namespace osu.Game.Database
         {
         }
 
-        protected override void ExportToStream(TModel model, Stream outputStream, ProgressNotification notification) => exportZipArchive(model, outputStream, notification);
+        protected override void ExportToStream(TModel model, Stream outputStream, ProgressNotification notification, CancellationToken cancellationToken = default)
+            => exportZipArchive(model, outputStream, notification, cancellationToken);
 
         /// <summary>
         /// Exports an item to Stream as a legacy (.zip based) package.
         /// </summary>
-        /// <param name="model">The item to export.</param>
+        /// <param name="model">The model will be exported.</param>
         /// <param name="outputStream">The output stream to export to.</param>
         /// <param name="notification">The notification will displayed to the user</param>
-        private void exportZipArchive(TModel model, Stream outputStream, ProgressNotification notification)
+        /// <param name="cancellationToken">The Cancellation token that can cancel the exporting.</param>
+        private void exportZipArchive(TModel model, Stream outputStream, ProgressNotification notification, CancellationToken cancellationToken = default)
         {
             using var writer = new ZipWriter(outputStream, new ZipWriterOptions(CompressionType.Deflate));
 
@@ -147,7 +160,7 @@ namespace osu.Game.Database
 
             foreach (var file in model.Files)
             {
-                notification.CancellationToken.ThrowIfCancellationRequested();
+                cancellationToken.ThrowIfCancellationRequested();
 
                 using (var stream = UserFileStorage.GetStream(file.File.GetStoragePath()))
                 {
diff --git a/osu.Game/Database/LegacyScoreExporter.cs b/osu.Game/Database/LegacyScoreExporter.cs
index 1a30d823e1..b3a9276d5e 100644
--- a/osu.Game/Database/LegacyScoreExporter.cs
+++ b/osu.Game/Database/LegacyScoreExporter.cs
@@ -3,6 +3,7 @@
 
 using System.IO;
 using System.Linq;
+using System.Threading;
 using osu.Framework.Platform;
 using osu.Game.Extensions;
 using osu.Game.Overlays.Notifications;
@@ -19,7 +20,7 @@ namespace osu.Game.Database
 
         protected override string FileExtension => ".osr";
 
-        protected override void ExportToStream(ScoreInfo model, Stream stream, ProgressNotification notification)
+        protected override void ExportToStream(ScoreInfo model, Stream stream, ProgressNotification notification, CancellationToken cancellationToken = default)
         {
             var file = model.Files.SingleOrDefault();
             if (file == null)

From 29d6483e172597216df72e884ff8f9096985820d Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Fri, 17 Feb 2023 22:19:24 +0900
Subject: [PATCH 0072/1604] ConfigureAwait for awaited task

---
 osu.Game/Database/LegacyModelExporter.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index 1475f29f89..ff0e3de20a 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Database
 
             using (var stream = exportStorage.CreateFileSafely(filename))
             {
-                success = await ExportToStreamAsync(model, stream, notification, cancellationToken ?? notification.CancellationToken);
+                success = await ExportToStreamAsync(model, stream, notification, cancellationToken ?? notification.CancellationToken).ConfigureAwait(false);
             }
 
             if (!success)
@@ -119,7 +119,7 @@ namespace osu.Game.Database
                 notify.CompletionText = "Export Complete, Click to open the folder";
                 notify.State = ProgressNotificationState.Completed;
                 return true;
-            }, cancellationToken);
+            }, cancellationToken).ConfigureAwait(false);
         }
 
         /// <summary>

From 843d841f5a4687caccde1dc0a5d3570ee653875f Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Fri, 17 Feb 2023 22:23:50 +0900
Subject: [PATCH 0073/1604] GetFilename and something other

https://github.com/ppy/osu/pull/21739
---
 osu.Game/Database/LegacyModelExporter.cs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index ff0e3de20a..644b486c2d 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -32,10 +32,10 @@ namespace osu.Game.Database
 
         protected Storage UserFileStorage;
         private readonly Storage exportStorage;
+        protected virtual string GetFilename(TModel item) => item.GetDisplayString();
 
         private readonly RealmAccess realmAccess;
 
-        private string filename = string.Empty;
         public Action<Notification>? PostNotification { get; set; }
 
         /// <summary>
@@ -62,9 +62,12 @@ namespace osu.Game.Database
         /// <returns></returns>
         public async Task ExportAsync(TModel model, CancellationToken? cancellationToken = null)
         {
-            string itemFilename = model.GetDisplayString().GetValidFilename();
-            IEnumerable<string> existingExports = exportStorage.GetFiles("", $"{itemFilename}*{FileExtension}");
-            filename = NamingUtils.GetNextBestFilename(existingExports, $"{itemFilename}{FileExtension}");
+            string itemFilename = GetFilename(model).GetValidFilename();
+            IEnumerable<string> existingExports =
+                exportStorage
+                    .GetFiles(string.Empty, $"{itemFilename}*{FileExtension}")
+                    .Concat(exportStorage.GetDirectories(string.Empty));
+            string filename = NamingUtils.GetNextBestFilename(existingExports, $"{itemFilename}{FileExtension}");
             bool success;
 
             ProgressNotification notification = new ProgressNotification

From 309e9b24e28135dc9ef9e341292ddb7137efaa33 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 19 Feb 2023 01:18:27 +0900
Subject: [PATCH 0074/1604] split LegacyArchiveExporter

---
 osu.Game/Database/LegacyArchiveExporter.cs | 73 ++++++++++++++++++++++
 osu.Game/Database/LegacyModelExporter.cs   | 60 ------------------
 2 files changed, 73 insertions(+), 60 deletions(-)
 create mode 100644 osu.Game/Database/LegacyArchiveExporter.cs

diff --git a/osu.Game/Database/LegacyArchiveExporter.cs b/osu.Game/Database/LegacyArchiveExporter.cs
new file mode 100644
index 0000000000..f87f373624
--- /dev/null
+++ b/osu.Game/Database/LegacyArchiveExporter.cs
@@ -0,0 +1,73 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.IO;
+using System.Linq;
+using System.Threading;
+using osu.Framework.Platform;
+using osu.Game.Extensions;
+using osu.Game.Overlays.Notifications;
+using Realms;
+using SharpCompress.Common;
+using SharpCompress.Writers;
+using SharpCompress.Writers.Zip;
+
+namespace osu.Game.Database
+{
+    public abstract class LegacyArchiveExporter<TModel> : LegacyModelExporter<TModel>
+        where TModel : RealmObject, IHasNamedFiles, IHasGuidPrimaryKey
+    {
+        protected LegacyArchiveExporter(Storage storage, RealmAccess realm)
+            : base(storage, realm)
+        {
+        }
+
+        protected override void ExportToStream(TModel model, Stream outputStream, ProgressNotification notification, CancellationToken cancellationToken = default)
+            => exportZipArchive(model, outputStream, notification, cancellationToken);
+
+        /// <summary>
+        /// Exports an item to Stream as a legacy (.zip based) package.
+        /// </summary>
+        /// <param name="model">The model will be exported.</param>
+        /// <param name="outputStream">The output stream to export to.</param>
+        /// <param name="notification">The notification will displayed to the user</param>
+        /// <param name="cancellationToken">The Cancellation token that can cancel the exporting.</param>
+        private void exportZipArchive(TModel model, Stream outputStream, ProgressNotification notification, CancellationToken cancellationToken = default)
+        {
+            using var writer = new ZipWriter(outputStream, new ZipWriterOptions(CompressionType.Deflate));
+
+            float i = 0;
+            bool fileMissing = false;
+
+            foreach (var file in model.Files)
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+
+                using (var stream = UserFileStorage.GetStream(file.File.GetStoragePath()))
+                {
+                    // Sometimes we cannot find the file(probably deleted by the user), so we handle this and post a error.
+                    if (stream == null)
+                    {
+                        // Only pop up once to prevent spam.
+                        if (!fileMissing)
+                        {
+                            PostNotification?.Invoke(new SimpleErrorNotification
+                            {
+                                Text = "Some of your files are missing, they will not be included in the archive"
+                            });
+                            fileMissing = true;
+                        }
+                    }
+                    else
+                    {
+                        writer.Write(file.Filename, stream);
+                    }
+                }
+
+                i++;
+                notification.Progress = i / model.Files.Count();
+                notification.Text = $"Exporting... ({i}/{model.Files.Count()})";
+            }
+        }
+    }
+}
diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index 644b486c2d..69277879dc 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -13,9 +13,6 @@ using osu.Game.Extensions;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Utils;
 using Realms;
-using SharpCompress.Common;
-using SharpCompress.Writers;
-using SharpCompress.Writers.Zip;
 
 namespace osu.Game.Database
 {
@@ -135,61 +132,4 @@ namespace osu.Game.Database
         /// <param name="cancellationToken">The Cancellation token that can cancel the exporting.</param>
         protected abstract void ExportToStream(TModel model, Stream outputStream, ProgressNotification notification, CancellationToken cancellationToken = default);
     }
-
-    public abstract class LegacyArchiveExporter<TModel> : LegacyModelExporter<TModel>
-        where TModel : RealmObject, IHasNamedFiles, IHasGuidPrimaryKey
-    {
-        protected LegacyArchiveExporter(Storage storage, RealmAccess realm)
-            : base(storage, realm)
-        {
-        }
-
-        protected override void ExportToStream(TModel model, Stream outputStream, ProgressNotification notification, CancellationToken cancellationToken = default)
-            => exportZipArchive(model, outputStream, notification, cancellationToken);
-
-        /// <summary>
-        /// Exports an item to Stream as a legacy (.zip based) package.
-        /// </summary>
-        /// <param name="model">The model will be exported.</param>
-        /// <param name="outputStream">The output stream to export to.</param>
-        /// <param name="notification">The notification will displayed to the user</param>
-        /// <param name="cancellationToken">The Cancellation token that can cancel the exporting.</param>
-        private void exportZipArchive(TModel model, Stream outputStream, ProgressNotification notification, CancellationToken cancellationToken = default)
-        {
-            using var writer = new ZipWriter(outputStream, new ZipWriterOptions(CompressionType.Deflate));
-
-            float i = 0;
-            bool fileMissing = false;
-
-            foreach (var file in model.Files)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-
-                using (var stream = UserFileStorage.GetStream(file.File.GetStoragePath()))
-                {
-                    // Sometimes we cannot find the file(probably deleted by the user), so we handle this and post a error.
-                    if (stream == null)
-                    {
-                        // Only pop up once to prevent spam.
-                        if (!fileMissing)
-                        {
-                            PostNotification?.Invoke(new SimpleErrorNotification
-                            {
-                                Text = "Some of your files are missing, they will not be included in the archive"
-                            });
-                            fileMissing = true;
-                        }
-                    }
-                    else
-                    {
-                        writer.Write(file.Filename, stream);
-                    }
-                }
-
-                i++;
-                notification.Progress = i / model.Files.Count();
-                notification.Text = $"Exporting... ({i}/{model.Files.Count()})";
-            }
-        }
-    }
 }

From d61160374255aff4b4564207afd2c6aeca93405f Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 19 Feb 2023 01:45:09 +0900
Subject: [PATCH 0075/1604] catch OperationCanceledException

---
 osu.Game/Database/LegacyModelExporter.cs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index 69277879dc..e17805f417 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -76,9 +76,16 @@ namespace osu.Game.Database
             notification.CompletionClickAction += () => exportStorage.PresentFileExternally(filename);
             PostNotification?.Invoke(notification);
 
-            using (var stream = exportStorage.CreateFileSafely(filename))
+            try
             {
-                success = await ExportToStreamAsync(model, stream, notification, cancellationToken ?? notification.CancellationToken).ConfigureAwait(false);
+                using (var stream = exportStorage.CreateFileSafely(filename))
+                {
+                    success = await ExportToStreamAsync(model, stream, notification, cancellationToken ?? notification.CancellationToken).ConfigureAwait(false);
+                }
+            }
+            catch (OperationCanceledException)
+            {
+                success = false;
             }
 
             if (!success)

From 30985f192ee462a7e08a5a12792906b16f2229b0 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 19 Feb 2023 02:06:07 +0900
Subject: [PATCH 0076/1604] catch ObjectDisposedException

---
 osu.Game/Database/LegacyArchiveExporter.cs | 52 +++++++++++++---------
 1 file changed, 32 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Database/LegacyArchiveExporter.cs b/osu.Game/Database/LegacyArchiveExporter.cs
index f87f373624..2f75e36fee 100644
--- a/osu.Game/Database/LegacyArchiveExporter.cs
+++ b/osu.Game/Database/LegacyArchiveExporter.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.IO;
 using System.Linq;
 using System.Threading;
@@ -39,34 +40,45 @@ namespace osu.Game.Database
             float i = 0;
             bool fileMissing = false;
 
-            foreach (var file in model.Files)
+            try
             {
-                cancellationToken.ThrowIfCancellationRequested();
-
-                using (var stream = UserFileStorage.GetStream(file.File.GetStoragePath()))
+                foreach (var file in model.Files)
                 {
-                    // Sometimes we cannot find the file(probably deleted by the user), so we handle this and post a error.
-                    if (stream == null)
+                    cancellationToken.ThrowIfCancellationRequested();
+
+                    using (var stream = UserFileStorage.GetStream(file.File.GetStoragePath()))
                     {
-                        // Only pop up once to prevent spam.
-                        if (!fileMissing)
+                        // Sometimes we cannot find the file(probably deleted by the user), so we handle this and post a error.
+                        if (stream == null)
                         {
-                            PostNotification?.Invoke(new SimpleErrorNotification
+                            // Only pop up once to prevent spam.
+                            if (!fileMissing)
                             {
-                                Text = "Some of your files are missing, they will not be included in the archive"
-                            });
-                            fileMissing = true;
+                                PostNotification?.Invoke(new SimpleErrorNotification
+                                {
+                                    Text = "Some of your files are missing, they will not be included in the archive"
+                                });
+                                fileMissing = true;
+                            }
+                        }
+                        else
+                        {
+                            writer.Write(file.Filename, stream);
                         }
                     }
-                    else
-                    {
-                        writer.Write(file.Filename, stream);
-                    }
-                }
 
-                i++;
-                notification.Progress = i / model.Files.Count();
-                notification.Text = $"Exporting... ({i}/{model.Files.Count()})";
+                    i++;
+                    notification.Progress = i / model.Files.Count();
+                    notification.Text = $"Exporting... ({i}/{model.Files.Count()})";
+                }
+            }
+            catch (ObjectDisposedException)
+            {
+                // outputStream may close before writing when request cancel
+                if (cancellationToken.IsCancellationRequested)
+                    return;
+
+                throw;
             }
         }
     }

From 2a6ea99e6a0da51b7e610125e4bbb2d6175675b3 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 19 Feb 2023 02:09:59 +0900
Subject: [PATCH 0077/1604] store exportingModels for all exporter

No one wants to export multiple copies of the same model at the same time, right?
---
 osu.Game/Database/LegacyModelExporter.cs | 28 ++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index e17805f417..f9605140e3 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -35,6 +35,9 @@ namespace osu.Game.Database
 
         public Action<Notification>? PostNotification { get; set; }
 
+        // Store the model being exported.
+        private readonly List<TModel> exportingModels = new List<TModel>();
+
         /// <summary>
         /// Construct exporter.
         /// Create a new exporter for each export, otherwise it will cause confusing notifications.
@@ -59,13 +62,26 @@ namespace osu.Game.Database
         /// <returns></returns>
         public async Task ExportAsync(TModel model, CancellationToken? cancellationToken = null)
         {
+            if (!exportingModels.Contains(model))
+            {
+                exportingModels.Add(model);
+            }
+            else
+            {
+                PostNotification?.Invoke(new SimpleErrorNotification()
+                {
+                    Text = "File is being exported"
+                });
+                return;
+            }
+
             string itemFilename = GetFilename(model).GetValidFilename();
             IEnumerable<string> existingExports =
                 exportStorage
                     .GetFiles(string.Empty, $"{itemFilename}*{FileExtension}")
                     .Concat(exportStorage.GetDirectories(string.Empty));
             string filename = NamingUtils.GetNextBestFilename(existingExports, $"{itemFilename}{FileExtension}");
-            bool success;
+            bool success = false;
 
             ProgressNotification notification = new ProgressNotification
             {
@@ -87,10 +103,14 @@ namespace osu.Game.Database
             {
                 success = false;
             }
-
-            if (!success)
+            finally
             {
-                exportStorage.Delete(filename);
+                if (!success)
+                {
+                    exportStorage.Delete(filename);
+                }
+
+                exportingModels.Remove(model);
             }
         }
 

From 8446e7d841993bcb8644d542daa6a3ae9b482905 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 19 Feb 2023 02:17:24 +0900
Subject: [PATCH 0078/1604] comment

---
 osu.Game/Database/LegacyArchiveExporter.cs | 2 +-
 osu.Game/Database/LegacyModelExporter.cs   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Database/LegacyArchiveExporter.cs b/osu.Game/Database/LegacyArchiveExporter.cs
index 2f75e36fee..24a5d52f73 100644
--- a/osu.Game/Database/LegacyArchiveExporter.cs
+++ b/osu.Game/Database/LegacyArchiveExporter.cs
@@ -74,7 +74,7 @@ namespace osu.Game.Database
             }
             catch (ObjectDisposedException)
             {
-                // outputStream may close before writing when request cancel
+                // outputStream may close before writing when request cancel.
                 if (cancellationToken.IsCancellationRequested)
                     return;
 
diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index f9605140e3..fd63b5f28a 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Database
 
         public Action<Notification>? PostNotification { get; set; }
 
-        // Store the model being exported.
+        // Store the model being exporting.
         private readonly List<TModel> exportingModels = new List<TModel>();
 
         /// <summary>
@@ -62,6 +62,7 @@ namespace osu.Game.Database
         /// <returns></returns>
         public async Task ExportAsync(TModel model, CancellationToken? cancellationToken = null)
         {
+            // check if the model is being exporting already
             if (!exportingModels.Contains(model))
             {
                 exportingModels.Add(model);
@@ -105,6 +106,7 @@ namespace osu.Game.Database
             }
             finally
             {
+                // cleanup if export is failed or canceled.
                 if (!success)
                 {
                     exportStorage.Delete(filename);

From 79715fe37b3ac24ce30e1dd50e441c67adc27e5e Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 19 Feb 2023 02:24:07 +0900
Subject: [PATCH 0079/1604] catch when zipWriter dispose

ObjectDisposedException also appear when zipwriter dispose after user request cancel
---
 osu.Game/Database/LegacyArchiveExporter.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Database/LegacyArchiveExporter.cs b/osu.Game/Database/LegacyArchiveExporter.cs
index 24a5d52f73..fd2befd2e0 100644
--- a/osu.Game/Database/LegacyArchiveExporter.cs
+++ b/osu.Game/Database/LegacyArchiveExporter.cs
@@ -35,13 +35,13 @@ namespace osu.Game.Database
         /// <param name="cancellationToken">The Cancellation token that can cancel the exporting.</param>
         private void exportZipArchive(TModel model, Stream outputStream, ProgressNotification notification, CancellationToken cancellationToken = default)
         {
-            using var writer = new ZipWriter(outputStream, new ZipWriterOptions(CompressionType.Deflate));
-
-            float i = 0;
-            bool fileMissing = false;
-
             try
             {
+                var writer = new ZipWriter(outputStream, new ZipWriterOptions(CompressionType.Deflate));
+
+                float i = 0;
+                bool fileMissing = false;
+
                 foreach (var file in model.Files)
                 {
                     cancellationToken.ThrowIfCancellationRequested();

From fba99b344ce666f04057096f42a0edf70fb41dcd Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 19 Feb 2023 02:41:08 +0900
Subject: [PATCH 0080/1604] Accidentally deleted using

wtf
---
 osu.Game/Database/LegacyArchiveExporter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Database/LegacyArchiveExporter.cs b/osu.Game/Database/LegacyArchiveExporter.cs
index fd2befd2e0..e5215e13a6 100644
--- a/osu.Game/Database/LegacyArchiveExporter.cs
+++ b/osu.Game/Database/LegacyArchiveExporter.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Database
         {
             try
             {
-                var writer = new ZipWriter(outputStream, new ZipWriterOptions(CompressionType.Deflate));
+                using var writer = new ZipWriter(outputStream, new ZipWriterOptions(CompressionType.Deflate));
 
                 float i = 0;
                 bool fileMissing = false;

From 229b31520f039a9dbacb99cabab04e132dfdf9fb Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 19 Feb 2023 02:42:33 +0900
Subject: [PATCH 0081/1604] remove ()

---
 osu.Game/Database/LegacyModelExporter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index fd63b5f28a..acb83ce1d5 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Database
             }
             else
             {
-                PostNotification?.Invoke(new SimpleErrorNotification()
+                PostNotification?.Invoke(new SimpleErrorNotification
                 {
                     Text = "File is being exported"
                 });

From 0667b8396083dd52fc1f4d321d49f56068c45ff4 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 19 Feb 2023 02:56:53 +0900
Subject: [PATCH 0082/1604] Path.GetExtension() will not get null

---
 osu.Game/Database/LegacyScoreImporter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Database/LegacyScoreImporter.cs b/osu.Game/Database/LegacyScoreImporter.cs
index 131b4ffb0e..b80a35f90a 100644
--- a/osu.Game/Database/LegacyScoreImporter.cs
+++ b/osu.Game/Database/LegacyScoreImporter.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Database
                 return Enumerable.Empty<string>();
 
             return storage.GetFiles(ImportFromStablePath)
-                          .Where(p => Importer.HandledExtensions.Any(ext => Path.GetExtension(p)?.Equals(ext, StringComparison.OrdinalIgnoreCase) ?? false))
+                          .Where(p => Importer.HandledExtensions.Any(ext => Path.GetExtension(p).Equals(ext, StringComparison.OrdinalIgnoreCase)))
                           .Select(path => storage.GetFullPath(path));
         }
 

From 04dcd661e06988365775fec6044ddad12c39aa51 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Tue, 21 Feb 2023 20:53:02 +0900
Subject: [PATCH 0083/1604] async logic fix

---
 osu.Game/Database/LegacyModelExporter.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index acb83ce1d5..cd405f90be 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -124,12 +124,12 @@ namespace osu.Game.Database
         /// <param name="notification">The notification will displayed to the user</param>
         /// <param name="cancellationToken">The Cancellation token that can cancel the exporting.</param>
         /// <returns>Whether the export was successful</returns>
-        public async Task<bool> ExportToStreamAsync(TModel model, Stream stream, ProgressNotification? notification = null, CancellationToken cancellationToken = default)
+        public Task<bool> ExportToStreamAsync(TModel model, Stream stream, ProgressNotification? notification = null, CancellationToken cancellationToken = default)
         {
             ProgressNotification notify = notification ?? new ProgressNotification();
 
             Guid id = model.ID;
-            return await Task.Run(() =>
+            return Task.Run(() =>
             {
                 realmAccess.Run(r =>
                 {
@@ -148,7 +148,7 @@ namespace osu.Game.Database
                 notify.CompletionText = "Export Complete, Click to open the folder";
                 notify.State = ProgressNotificationState.Completed;
                 return true;
-            }, cancellationToken).ConfigureAwait(false);
+            }, cancellationToken);
         }
 
         /// <summary>

From d20e1df6030cba04cc2d75385608b59b560c5b93 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Tue, 21 Feb 2023 20:54:06 +0900
Subject: [PATCH 0084/1604] wrong xmldoc

because of https://github.com/ppy/osu/pull/21308/commits/6900d0120a70287ef531a4c0facd398508a76b06
---
 osu.Game/Database/LegacyModelExporter.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index cd405f90be..96104a68a0 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -152,10 +152,9 @@ namespace osu.Game.Database
         }
 
         /// <summary>
-        /// Exports an item to Stream.
-        /// Override if custom export method is required.
+        /// Exports model to Stream.
         /// </summary>
-        /// <param name="model">The item to export.</param>
+        /// <param name="model">The model to export.</param>
         /// <param name="outputStream">The output stream to export to.</param>
         /// <param name="notification">The notification will displayed to the user</param>
         /// <param name="cancellationToken">The Cancellation token that can cancel the exporting.</param>

From 191604340f8cbaf4d42c31cbc2ef2665fdfbb318 Mon Sep 17 00:00:00 2001
From: Terochi <mates.cernicky@gmail.com>
Date: Tue, 21 Feb 2023 19:05:10 +0100
Subject: [PATCH 0085/1604] Added a way for mod settings to be kept when
 changing ruleset + test

---
 .../TestSceneModSelectOverlay.cs              | 48 +++++++++++++++++++
 osu.Game/OsuGameBase.cs                       | 17 ++++++-
 osu.Game/Rulesets/Mods/Mod.cs                 | 31 ++++++++++--
 3 files changed, 91 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 5ccaebd721..25edcd4e0a 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -21,6 +21,7 @@ using osu.Game.Rulesets.Catch.Mods;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Rulesets.Taiko.Mods;
 using osu.Game.Tests.Mods;
 using osuTK;
 using osuTK.Input;
@@ -371,6 +372,53 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("no mod selected", () => SelectedMods.Value.Count == 0);
         }
 
+        [Test]
+        public void TestKeepSharedSettingsFromSimilarMods()
+        {
+            const float setting_change = 1.2f;
+
+            createScreen();
+            changeRuleset(0);
+
+            AddStep("select difficulty adjust mod", () => SelectedMods.Value = new[] { Ruleset.Value.CreateInstance().CreateMod<ModDifficultyAdjust>()! });
+
+            changeRuleset(0);
+            AddAssert("ensure mod still selected", () => SelectedMods.Value.SingleOrDefault() is OsuModDifficultyAdjust);
+
+            AddStep("change mod settings", () =>
+            {
+                var osuMod = (getMod() as OsuModDifficultyAdjust)!;
+                osuMod.ExtendedLimits.Value = true;
+                osuMod.CircleSize.Value = setting_change;
+                osuMod.DrainRate.Value = setting_change;
+                osuMod.OverallDifficulty.Value = setting_change;
+                osuMod.ApproachRate.Value = setting_change;
+            });
+
+            changeRuleset(1);
+            AddAssert("taiko variant selected", () => SelectedMods.Value.SingleOrDefault() is TaikoModDifficultyAdjust);
+
+            AddAssert("shared settings didn't change", () =>
+            {
+                var taikoMod = getMod() as TaikoModDifficultyAdjust;
+                return
+                    taikoMod?.ExtendedLimits.Value == true &&
+                    taikoMod?.DrainRate.Value == setting_change &&
+                    taikoMod?.OverallDifficulty.Value == setting_change;
+            });
+
+            AddAssert("non-shared settings at default", () =>
+            {
+                var taikoMod = getMod() as TaikoModDifficultyAdjust;
+                if (taikoMod == null)
+                    return false;
+
+                return taikoMod.ScrollSpeed.Value == taikoMod.ScrollSpeed.Default;
+            });
+
+            ModDifficultyAdjust getMod() => (SelectedMods.Value.Single() as ModDifficultyAdjust)!;
+        }
+
         [Test]
         public void TestExternallySetCustomizedMod()
         {
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index cf58d07b9e..9644e3fc75 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -393,8 +393,11 @@ namespace osu.Game
 
             Ruleset.BindValueChanged(onRulesetChanged);
             Beatmap.BindValueChanged(onBeatmapChanged);
+            SelectedMods.BindValueChanged(change => Logger.Log($"{modSetting(change.OldValue)} => {modSetting(change.NewValue)}"));
         }
 
+        private object modSetting(IReadOnlyList<Mod> mods) => mods.OfType<ModDoubleTime>().FirstOrDefault()?.GetSettingsSourceProperties().First().Item2.GetValue(mods.OfType<ModDoubleTime>().First())!;
+
         private void addFilesWarning()
         {
             var realmStore = new RealmFileStore(realm, Storage);
@@ -626,7 +629,8 @@ namespace osu.Game
                 return;
             }
 
-            var previouslySelectedMods = SelectedMods.Value.ToArray();
+            //for some reason emptying SelectedMods resets all SettingSources Bindables to default value
+            var previouslySelectedMods = SelectedMods.Value.Select(mod => mod.DeepClone()).ToArray();
 
             if (!SelectedMods.Disabled)
                 SelectedMods.Value = Array.Empty<Mod>();
@@ -634,7 +638,16 @@ namespace osu.Game
             AvailableMods.Value = dict;
 
             if (!SelectedMods.Disabled)
-                SelectedMods.Value = previouslySelectedMods.Select(m => instance.CreateModFromAcronym(m.Acronym)).Where(m => m != null).ToArray();
+            {
+                SelectedMods.Value = previouslySelectedMods.Select(oldMod =>
+                {
+                    Mod newMod = instance.CreateModFromAcronym(oldMod.Acronym);
+
+                    newMod?.CopyFromSimilar(oldMod);
+
+                    return newMod;
+                }).Where(m => m != null).ToArray();
+            }
 
             void revertRulesetChange() => Ruleset.Value = r.OldValue?.Available == true ? r.OldValue : RulesetStore.AvailableRulesets.First();
         }
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 04d55bc5fe..7cb647d223 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -12,6 +12,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
 using osu.Framework.Testing;
 using osu.Game.Configuration;
+using osu.Game.Extensions;
 using osu.Game.Rulesets.UI;
 using osu.Game.Utils;
 
@@ -139,6 +140,30 @@ namespace osu.Game.Rulesets.Mods
             return result;
         }
 
+        /// <summary>
+        /// Copies all shared mod setting values from <paramref name="source"/> into this instance.
+        /// </summary>
+        /// <param name="source">The mod to copy properties from.</param>
+        public void CopyFromSimilar(Mod source)
+        {
+            Dictionary<string, object> oldSettings = new Dictionary<string, object>();
+
+            foreach (var (_, property) in source.GetSettingsSourceProperties())
+            {
+                oldSettings.Add(property.Name.ToSnakeCase(), property.GetValue(source)!);
+            }
+
+            foreach (var (_, property) in this.GetSettingsSourceProperties())
+            {
+                var targetBindable = (IBindable)property.GetValue(this)!;
+
+                if (!oldSettings.TryGetValue(property.Name.ToSnakeCase(), out object? sourceSetting))
+                    continue;
+
+                CopyAdjustedSetting(targetBindable, sourceSetting);
+            }
+        }
+
         /// <summary>
         /// Copies mod setting values from <paramref name="source"/> into this instance, overwriting all existing settings.
         /// </summary>
@@ -148,10 +173,10 @@ namespace osu.Game.Rulesets.Mods
             if (source.GetType() != GetType())
                 throw new ArgumentException($"Expected mod of type {GetType()}, got {source.GetType()}.", nameof(source));
 
-            foreach (var (_, prop) in this.GetSettingsSourceProperties())
+            foreach (var (_, property) in this.GetSettingsSourceProperties())
             {
-                var targetBindable = (IBindable)prop.GetValue(this)!;
-                var sourceBindable = (IBindable)prop.GetValue(source)!;
+                var targetBindable = (IBindable)property.GetValue(this)!;
+                var sourceBindable = (IBindable)property.GetValue(source)!;
 
                 CopyAdjustedSetting(targetBindable, sourceBindable);
             }

From dd53a700711dd79fac8466fca94ea881db5fa537 Mon Sep 17 00:00:00 2001
From: Terochi <mates.cernicky@gmail.com>
Date: Tue, 21 Feb 2023 20:59:36 +0100
Subject: [PATCH 0086/1604] Addressed change requests

---
 .../TestSceneModSelectOverlay.cs              |  4 +-
 osu.Game/OsuGameBase.cs                       |  8 +---
 osu.Game/Rulesets/Mods/Mod.cs                 | 40 +++++++++----------
 3 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 25edcd4e0a..7a46876737 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -403,8 +403,8 @@ namespace osu.Game.Tests.Visual.UserInterface
                 var taikoMod = getMod() as TaikoModDifficultyAdjust;
                 return
                     taikoMod?.ExtendedLimits.Value == true &&
-                    taikoMod?.DrainRate.Value == setting_change &&
-                    taikoMod?.OverallDifficulty.Value == setting_change;
+                    taikoMod.DrainRate.Value == setting_change &&
+                    taikoMod.OverallDifficulty.Value == setting_change;
             });
 
             AddAssert("non-shared settings at default", () =>
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 9644e3fc75..af2fb123d3 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -58,7 +58,6 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
 using osu.Game.Skinning;
 using osu.Game.Utils;
-using File = System.IO.File;
 using RuntimeInfo = osu.Framework.RuntimeInfo;
 
 namespace osu.Game
@@ -393,11 +392,8 @@ namespace osu.Game
 
             Ruleset.BindValueChanged(onRulesetChanged);
             Beatmap.BindValueChanged(onBeatmapChanged);
-            SelectedMods.BindValueChanged(change => Logger.Log($"{modSetting(change.OldValue)} => {modSetting(change.NewValue)}"));
         }
 
-        private object modSetting(IReadOnlyList<Mod> mods) => mods.OfType<ModDoubleTime>().FirstOrDefault()?.GetSettingsSourceProperties().First().Item2.GetValue(mods.OfType<ModDoubleTime>().First())!;
-
         private void addFilesWarning()
         {
             var realmStore = new RealmFileStore(realm, Storage);
@@ -629,7 +625,7 @@ namespace osu.Game
                 return;
             }
 
-            //for some reason emptying SelectedMods resets all SettingSources Bindables to default value
+            //DeepCloning collection, because emptying SelectedMods resets all SettingSources Bindables to their default value
             var previouslySelectedMods = SelectedMods.Value.Select(mod => mod.DeepClone()).ToArray();
 
             if (!SelectedMods.Disabled)
@@ -643,7 +639,7 @@ namespace osu.Game
                 {
                     Mod newMod = instance.CreateModFromAcronym(oldMod.Acronym);
 
-                    newMod?.CopyFromSimilar(oldMod);
+                    newMod?.CopySharedSettings(oldMod);
 
                     return newMod;
                 }).Where(m => m != null).ToArray();
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 7cb647d223..bc588a5cd8 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -141,10 +141,28 @@ namespace osu.Game.Rulesets.Mods
         }
 
         /// <summary>
-        /// Copies all shared mod setting values from <paramref name="source"/> into this instance.
+        /// Copies mod setting values from <paramref name="source"/> into this instance, overwriting all existing settings.
         /// </summary>
         /// <param name="source">The mod to copy properties from.</param>
-        public void CopyFromSimilar(Mod source)
+        public void CopyFrom(Mod source)
+        {
+            if (source.GetType() != GetType())
+                throw new ArgumentException($"Expected mod of type {GetType()}, got {source.GetType()}.", nameof(source));
+
+            foreach (var (_, property) in this.GetSettingsSourceProperties())
+            {
+                var targetBindable = (IBindable)property.GetValue(this)!;
+                var sourceBindable = (IBindable)property.GetValue(source)!;
+
+                CopyAdjustedSetting(targetBindable, sourceBindable);
+            }
+        }
+
+        /// <summary>
+        /// Copies all mod setting values sharing same <see cref="MemberInfo.Name"/> from <paramref name="source"/> into this instance.
+        /// </summary>
+        /// <param name="source">The mod to copy properties from.</param>
+        internal void CopySharedSettings(Mod source)
         {
             Dictionary<string, object> oldSettings = new Dictionary<string, object>();
 
@@ -164,24 +182,6 @@ namespace osu.Game.Rulesets.Mods
             }
         }
 
-        /// <summary>
-        /// Copies mod setting values from <paramref name="source"/> into this instance, overwriting all existing settings.
-        /// </summary>
-        /// <param name="source">The mod to copy properties from.</param>
-        public void CopyFrom(Mod source)
-        {
-            if (source.GetType() != GetType())
-                throw new ArgumentException($"Expected mod of type {GetType()}, got {source.GetType()}.", nameof(source));
-
-            foreach (var (_, property) in this.GetSettingsSourceProperties())
-            {
-                var targetBindable = (IBindable)property.GetValue(this)!;
-                var sourceBindable = (IBindable)property.GetValue(source)!;
-
-                CopyAdjustedSetting(targetBindable, sourceBindable);
-            }
-        }
-
         /// <summary>
         /// When creating copies or clones of a Mod, this method will be called
         /// to copy explicitly adjusted user settings from <paramref name="target"/>.

From 82b07d19f86374a24128ee4e8ff7918bf1aa7acf Mon Sep 17 00:00:00 2001
From: Terochi <mates.cernicky@gmail.com>
Date: Tue, 21 Feb 2023 21:48:11 +0100
Subject: [PATCH 0087/1604] Fix of incorrect `using` optimization

---
 osu.Game/OsuGameBase.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index af2fb123d3..e16aaf39ee 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -58,6 +58,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
 using osu.Game.Skinning;
 using osu.Game.Utils;
+using File = System.IO.File;
 using RuntimeInfo = osu.Framework.RuntimeInfo;
 
 namespace osu.Game

From e321536acc2299c19b131b457838c84f15c1aed3 Mon Sep 17 00:00:00 2001
From: Terochi <mates.cernicky@gmail.com>
Date: Wed, 22 Feb 2023 07:48:43 +0100
Subject: [PATCH 0088/1604] Small clean up

---
 osu.Game/OsuGameBase.cs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index e16aaf39ee..de1f2e810c 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -626,17 +626,12 @@ namespace osu.Game
                 return;
             }
 
-            //DeepCloning collection, because emptying SelectedMods resets all SettingSources Bindables to their default value
-            var previouslySelectedMods = SelectedMods.Value.Select(mod => mod.DeepClone()).ToArray();
-
-            if (!SelectedMods.Disabled)
-                SelectedMods.Value = Array.Empty<Mod>();
-
             AvailableMods.Value = dict;
 
             if (!SelectedMods.Disabled)
             {
-                SelectedMods.Value = previouslySelectedMods.Select(oldMod =>
+                //converting mods from one ruleset to the other, while also keeping their shared settings unchanged
+                SelectedMods.Value = SelectedMods.Value.Select(oldMod =>
                 {
                     Mod newMod = instance.CreateModFromAcronym(oldMod.Acronym);
 

From 6e48860c79646d0f60e86e7e010954773d300730 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Feb 2023 17:13:55 +0900
Subject: [PATCH 0089/1604] Update in line with framework menu handling changes

---
 osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs b/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs
index ad02e3b2ab..0adff11342 100644
--- a/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs
+++ b/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs
@@ -77,10 +77,12 @@ namespace osu.Game.Graphics.UserInterface
 
         private void updateState()
         {
-            hoverClickSounds.Enabled.Value = !Item.Action.Disabled;
-            Alpha = Item.Action.Disabled ? 0.2f : 1;
+            bool enabledState = IsActionable || HasSubmenu;
 
-            if (IsHovered && !Item.Action.Disabled)
+            hoverClickSounds.Enabled.Value = enabledState;
+            Alpha = enabledState ? 1 : 0.2f;
+
+            if (IsHovered && enabledState)
             {
                 text.BoldText.FadeIn(transition_length, Easing.OutQuint);
                 text.NormalText.FadeOut(transition_length, Easing.OutQuint);

From ba345e559131e2c7c9dadc1237346c45883119e8 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Thu, 23 Feb 2023 20:10:50 +0900
Subject: [PATCH 0090/1604] delete notify post when duplicate export

---
 osu.Game/Database/LegacyModelExporter.cs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index 96104a68a0..c826b37689 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Database
         /// If specified CancellationToken, then use it. Otherwise use PostNotification's CancellationToken.
         /// </param>
         /// <returns></returns>
-        public async Task ExportAsync(TModel model, CancellationToken? cancellationToken = null)
+        public async Task<bool> ExportAsync(TModel model, CancellationToken? cancellationToken = null)
         {
             // check if the model is being exporting already
             if (!exportingModels.Contains(model))
@@ -69,10 +69,7 @@ namespace osu.Game.Database
             }
             else
             {
-                PostNotification?.Invoke(new SimpleErrorNotification
-                {
-                    Text = "File is being exported"
-                });
+                // model is being exported
                 return;
             }
 
@@ -114,6 +111,8 @@ namespace osu.Game.Database
 
                 exportingModels.Remove(model);
             }
+
+            return success;
         }
 
         /// <summary>

From 9e1eb50d9bf65390dcceec2835dc0e3d41e7083d Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Thu, 23 Feb 2023 20:20:54 +0900
Subject: [PATCH 0091/1604] use log

---
 osu.Game/Database/LegacyArchiveExporter.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Database/LegacyArchiveExporter.cs b/osu.Game/Database/LegacyArchiveExporter.cs
index e5215e13a6..1af8c454c1 100644
--- a/osu.Game/Database/LegacyArchiveExporter.cs
+++ b/osu.Game/Database/LegacyArchiveExporter.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Linq;
 using System.Threading;
+using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Extensions;
 using osu.Game.Overlays.Notifications;
@@ -12,6 +13,7 @@ using Realms;
 using SharpCompress.Common;
 using SharpCompress.Writers;
 using SharpCompress.Writers.Zip;
+using Logger = osu.Framework.Logging.Logger;
 
 namespace osu.Game.Database
 {
@@ -54,10 +56,7 @@ namespace osu.Game.Database
                             // Only pop up once to prevent spam.
                             if (!fileMissing)
                             {
-                                PostNotification?.Invoke(new SimpleErrorNotification
-                                {
-                                    Text = "Some of your files are missing, they will not be included in the archive"
-                                });
+                                Logger.Log("Some of model files are missing, they will not be included in the archive", LoggingTarget.Database, LogLevel.Error);
                                 fileMissing = true;
                             }
                         }

From 60bdae41b62a36ed48eb4b2a0978518d5c6a987e Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Thu, 23 Feb 2023 22:17:13 +0900
Subject: [PATCH 0092/1604] make static

---
 osu.Game/Database/LegacyModelExporter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index c826b37689..635af14e76 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Database
         public Action<Notification>? PostNotification { get; set; }
 
         // Store the model being exporting.
-        private readonly List<TModel> exportingModels = new List<TModel>();
+        private static readonly List<TModel> exportingModels = new List<TModel>();
 
         /// <summary>
         /// Construct exporter.

From 78201c464905b418379ce66013c19a04ef036946 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Thu, 23 Feb 2023 22:17:35 +0900
Subject: [PATCH 0093/1604] log to database

---
 osu.Game/Database/LegacyModelExporter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index 635af14e76..f14cae62e1 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -140,7 +140,7 @@ namespace osu.Game.Database
                 if (t.IsFaulted)
                 {
                     notify.State = ProgressNotificationState.Cancelled;
-                    Logger.Error(t.Exception, "An error occurred while exporting");
+                    Logger.Error(t.Exception, "An error occurred while exporting", LoggingTarget.Database);
                     return false;
                 }
 

From 09e7c21b23a71c8df297c4037af11f1d45046052 Mon Sep 17 00:00:00 2001
From: Terochi <mates.cernicky@gmail.com>
Date: Fri, 24 Feb 2023 15:11:22 +0100
Subject: [PATCH 0094/1604] Implemented a more complex setting conversion logic
 + tests

---
 osu.Game.Tests/Mods/ModSettingsTest.cs        | 42 ++++++++++++
 .../TestSceneModSelectOverlay.cs              | 67 +++++++++++++++----
 osu.Game/Rulesets/Mods/Mod.cs                 | 38 ++++++++++-
 3 files changed, 133 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Tests/Mods/ModSettingsTest.cs b/osu.Game.Tests/Mods/ModSettingsTest.cs
index b9ea1f2567..99198f6bae 100644
--- a/osu.Game.Tests/Mods/ModSettingsTest.cs
+++ b/osu.Game.Tests/Mods/ModSettingsTest.cs
@@ -2,6 +2,9 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
+using osu.Framework.Bindables;
+using osu.Framework.Localisation;
+using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Mods;
 
@@ -32,5 +35,44 @@ namespace osu.Game.Tests.Mods
             Assert.That(((OsuModDoubleTime)original.Mods[0]).SpeedChange.Value, Is.EqualTo(2.0));
             Assert.That(((OsuModDoubleTime)copy.Mods[0]).SpeedChange.Value, Is.EqualTo(1.5));
         }
+
+        [Test]
+        public void TestCopySharedSettingsOfDifferentType()
+        {
+            const double setting_change = 2.5;
+
+            var osuMod = new TestNonMatchinSettingTypeOsuMod();
+            var maniaMod = new TestNonMatchinSettingTypeManiaMod();
+
+            osuMod.TestSetting.Value = setting_change;
+            maniaMod.CopySharedSettings(osuMod);
+            osuMod.CopySharedSettings(maniaMod);
+
+            Assert.That(maniaMod.TestSetting.IsDefault, "Value has been changed");
+            Assert.That(osuMod.TestSetting.Value == setting_change);
+        }
+
+        private class TestNonMatchinSettingTypeOsuMod : TestNonMatchinSettingTypeMod
+        {
+            public override string Acronym => "NMO";
+            public override BindableNumber<double> TestSetting { get; } = new BindableDouble(3.5);
+        }
+
+        private class TestNonMatchinSettingTypeManiaMod : TestNonMatchinSettingTypeMod
+        {
+            public override string Acronym => "NMM";
+            public override Bindable<bool> TestSetting { get; } = new BindableBool(true);
+        }
+
+        private abstract class TestNonMatchinSettingTypeMod : Mod
+        {
+            public override string Name => "Non-matching setting type mod";
+            public override LocalisableString Description => "Description";
+            public override double ScoreMultiplier => 1;
+            public override ModType Type => ModType.Conversion;
+
+            [SettingSource("Test setting")]
+            public abstract IBindable TestSetting { get; }
+        }
     }
 }
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 7a46876737..a354a22fb7 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -18,6 +18,7 @@ using osu.Game.Overlays.Mods;
 using osu.Game.Overlays.Settings;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Catch.Mods;
+using osu.Game.Rulesets.Mania.Mods;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
@@ -387,7 +388,8 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             AddStep("change mod settings", () =>
             {
-                var osuMod = (getMod() as OsuModDifficultyAdjust)!;
+                var osuMod = getMod<OsuModDifficultyAdjust>();
+
                 osuMod.ExtendedLimits.Value = true;
                 osuMod.CircleSize.Value = setting_change;
                 osuMod.DrainRate.Value = setting_change;
@@ -400,23 +402,60 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             AddAssert("shared settings didn't change", () =>
             {
-                var taikoMod = getMod() as TaikoModDifficultyAdjust;
-                return
-                    taikoMod?.ExtendedLimits.Value == true &&
-                    taikoMod.DrainRate.Value == setting_change &&
-                    taikoMod.OverallDifficulty.Value == setting_change;
+                var taikoMod = getMod<TaikoModDifficultyAdjust>();
+
+                return taikoMod.ExtendedLimits.Value &&
+                       taikoMod.DrainRate.Value == setting_change &&
+                       taikoMod.OverallDifficulty.Value == setting_change;
             });
 
-            AddAssert("non-shared settings at default", () =>
+            AddAssert("non-shared settings unchanged", () =>
             {
-                var taikoMod = getMod() as TaikoModDifficultyAdjust;
-                if (taikoMod == null)
-                    return false;
+                var taikoMod = getMod<TaikoModDifficultyAdjust>();
 
-                return taikoMod.ScrollSpeed.Value == taikoMod.ScrollSpeed.Default;
+                return taikoMod.ScrollSpeed.IsDefault;
+            });
+        }
+
+        [Test]
+        public void TestKeepSharedSettingsRatio()
+        {
+            const float setting_change = 1.8f;
+
+            createScreen();
+            changeRuleset(0);
+
+            AddStep("select flashlight mod", () => SelectedMods.Value = new[] { Ruleset.Value.CreateInstance().CreateMod<ModFlashlight>()! });
+
+            changeRuleset(0);
+            AddAssert("ensure mod still selected", () => SelectedMods.Value.SingleOrDefault() is OsuModFlashlight);
+
+            AddStep("change mod settings", () =>
+            {
+                var osuMod = getMod<OsuModFlashlight>();
+
+                // range <0.5 - 2>
+                osuMod.SizeMultiplier.Value = setting_change;
             });
 
-            ModDifficultyAdjust getMod() => (SelectedMods.Value.Single() as ModDifficultyAdjust)!;
+            changeRuleset(3);
+            AddAssert("mania variant selected", () => SelectedMods.Value.SingleOrDefault() is ManiaModFlashlight);
+
+            AddAssert("shared settings changed to closest ratio", () =>
+            {
+                var maniaMod = getMod<ManiaModFlashlight>();
+
+                // range <0.5 - 3>
+                // converted value based on ratio = (setting_change - 0.5) / (2 - 0.5) * (3 - 0.5) + 0.5 = 2.66
+                return maniaMod.SizeMultiplier.Value == 2.7f; // taking precision into account
+            });
+
+            AddAssert("other settings unchanged", () =>
+            {
+                var maniaMod = getMod<ManiaModFlashlight>();
+
+                return maniaMod.ComboBasedSize.IsDefault;
+            });
         }
 
         [Test]
@@ -514,6 +553,8 @@ namespace osu.Game.Tests.Visual.UserInterface
             waitForColumnLoad();
 
             AddAssert("unimplemented mod panel is filtered", () => getPanelForMod(typeof(TestUnimplementedMod)).Filtered.Value);
+
+            AddStep("disable panel filtering", () => getPanelForMod(typeof(TestUnimplementedMod)).Filtered.Value = false);
         }
 
         [Test]
@@ -629,6 +670,8 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert($"customisation toggle is {(active ? "" : "not ")}active", () => modSelectOverlay.CustomisationButton.AsNonNull().Active.Value == active);
         }
 
+        private T getMod<T>() where T : Mod => (T)SelectedMods.Value.Single();
+
         private ModPanel getPanelForMod(Type modType)
             => modSelectOverlay.ChildrenOfType<ModPanel>().Single(panel => panel.Mod.GetType() == modType);
 
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index bc588a5cd8..f6c0e851fd 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using AutoMapper.Internal;
 using Newtonsoft.Json;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.TypeExtensions;
@@ -173,13 +174,46 @@ namespace osu.Game.Rulesets.Mods
 
             foreach (var (_, property) in this.GetSettingsSourceProperties())
             {
-                var targetBindable = (IBindable)property.GetValue(this)!;
+                object targetSetting = property.GetValue(this)!;
 
                 if (!oldSettings.TryGetValue(property.Name.ToSnakeCase(), out object? sourceSetting))
                     continue;
 
-                CopyAdjustedSetting(targetBindable, sourceSetting);
+                if (((IBindable)sourceSetting).IsDefault)
+                    // keep at default value if the source is default
+                    continue;
+
+                Type? targetType = getGenericBaseType(targetSetting, typeof(BindableNumber<>));
+                Type? sourceType = getGenericBaseType(sourceSetting, typeof(BindableNumber<>));
+
+                if (targetType == null || sourceType == null)
+                {
+                    if (getGenericBaseType(targetSetting, typeof(Bindable<>))!.GenericTypeArguments.Single() ==
+                        getGenericBaseType(sourceSetting, typeof(Bindable<>))!.GenericTypeArguments.Single())
+                        // change settings only if the type is the same
+                        CopyAdjustedSetting((IBindable)targetSetting, sourceSetting);
+
+                    continue;
+                }
+
+                double targetMin = getValue(targetSetting, nameof(IBindableNumber<int>.MinValue));
+                double targetMax = getValue(targetSetting, nameof(IBindableNumber<int>.MaxValue));
+                double sourceMin = getValue(sourceSetting, nameof(IBindableNumber<int>.MinValue));
+                double sourceMax = getValue(sourceSetting, nameof(IBindableNumber<int>.MaxValue));
+                double sourceValue = getValue(sourceSetting, nameof(IBindableNumber<int>.Value));
+
+                // convert value to same ratio
+                double targetValue = (sourceValue - sourceMin) / (sourceMax - sourceMin) * (targetMax - targetMin) + targetMin;
+
+                targetType.GetProperty(nameof(IBindableNumber<int>.Value))!.SetValue(targetSetting,
+                    Convert.ChangeType(targetValue, targetType.GenericTypeArguments.Single()));
             }
+
+            double getValue(object target, string name) =>
+                Convert.ToDouble(target.GetType().GetProperty(name)!.GetValue(target)!);
+
+            Type? getGenericBaseType(object target, Type genericType) =>
+                target.GetType().GetTypeInheritance().FirstOrDefault(t => t.IsGenericType && t.GetGenericTypeDefinition() == genericType);
         }
 
         /// <summary>

From a20e2685bee85872cadd858036f6938fb5375f71 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sat, 25 Feb 2023 20:11:08 +0900
Subject: [PATCH 0095/1604] make static name fix

---
 osu.Game/Database/LegacyModelExporter.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index f14cae62e1..4ac48aaa09 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Database
         public Action<Notification>? PostNotification { get; set; }
 
         // Store the model being exporting.
-        private static readonly List<TModel> exportingModels = new List<TModel>();
+        private static readonly List<TModel> exporting_models = new List<TModel>();
 
         /// <summary>
         /// Construct exporter.
@@ -63,14 +63,14 @@ namespace osu.Game.Database
         public async Task<bool> ExportAsync(TModel model, CancellationToken? cancellationToken = null)
         {
             // check if the model is being exporting already
-            if (!exportingModels.Contains(model))
+            if (!exporting_models.Contains(model))
             {
-                exportingModels.Add(model);
+                exporting_models.Add(model);
             }
             else
             {
                 // model is being exported
-                return;
+                return false;
             }
 
             string itemFilename = GetFilename(model).GetValidFilename();
@@ -109,7 +109,7 @@ namespace osu.Game.Database
                     exportStorage.Delete(filename);
                 }
 
-                exportingModels.Remove(model);
+                exporting_models.Remove(model);
             }
 
             return success;

From fdf95446882f67ab27621a70ce05095b8ee25216 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 26 Feb 2023 15:28:10 +0900
Subject: [PATCH 0096/1604] cancel handle

---
 osu.Game/Database/LegacyModelExporter.cs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index 4ac48aaa09..b47e0a9913 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -137,6 +137,12 @@ namespace osu.Game.Database
                 });
             }, cancellationToken).ContinueWith(t =>
             {
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    notify.State = ProgressNotificationState.Cancelled;
+                    return false;
+                }
+
                 if (t.IsFaulted)
                 {
                     notify.State = ProgressNotificationState.Cancelled;
@@ -144,10 +150,8 @@ namespace osu.Game.Database
                     return false;
                 }
 
-                notify.CompletionText = "Export Complete, Click to open the folder";
-                notify.State = ProgressNotificationState.Completed;
                 return true;
-            }, cancellationToken);
+            }, CancellationToken.None);
         }
 
         /// <summary>

From e8092bff4686eb4491c4751cb5d927f4f74a1515 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 26 Feb 2023 15:28:24 +0900
Subject: [PATCH 0097/1604] logic fix?

---
 osu.Game/Database/LegacyModelExporter.cs | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index b47e0a9913..06e4497e81 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -87,7 +87,6 @@ namespace osu.Game.Database
                 Text = "Exporting...",
                 CompletionText = "Export completed"
             };
-            notification.CompletionClickAction += () => exportStorage.PresentFileExternally(filename);
             PostNotification?.Invoke(notification);
 
             try
@@ -101,16 +100,20 @@ namespace osu.Game.Database
             {
                 success = false;
             }
-            finally
-            {
-                // cleanup if export is failed or canceled.
-                if (!success)
-                {
-                    exportStorage.Delete(filename);
-                }
 
-                exporting_models.Remove(model);
+            // cleanup if export is failed or canceled.
+            if (!success)
+            {
+                exportStorage.Delete(filename);
             }
+            else
+            {
+                notification.CompletionText = "Export Complete, Click to open the folder";
+                notification.CompletionClickAction = () => exportStorage.PresentFileExternally(filename);
+                notification.State = ProgressNotificationState.Completed;
+            }
+
+            exporting_models.Remove(model);
 
             return success;
         }

From 1d5c87039eb42bf4fb342e8ced0e5fbcba61d535 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 26 Feb 2023 15:28:43 +0900
Subject: [PATCH 0098/1604] typo

---
 osu.Game/Database/LegacyModelExporter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index 06e4497e81..6f2fe90957 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -121,7 +121,7 @@ namespace osu.Game.Database
         /// <summary>
         /// Export model to stream.
         /// </summary>
-        /// <param name="model">The medel which have <see cref="IHasGuidPrimaryKey"/>.</param>
+        /// <param name="model">The model which have <see cref="IHasGuidPrimaryKey"/>.</param>
         /// <param name="stream">The stream to export.</param>
         /// <param name="notification">The notification will displayed to the user</param>
         /// <param name="cancellationToken">The Cancellation token that can cancel the exporting.</param>

From 4858d3fd4282e0f2ea48f3a5f1138f341d00edc6 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Tue, 7 Mar 2023 02:00:40 +0900
Subject: [PATCH 0099/1604] Added ability to edit mod presets

---
 .../UserInterface/TestSceneModPresetColumn.cs | 171 +++++++++++++++++-
 osu.Game/Overlays/Mods/EditPresetPopover.cs   | 140 ++++++++++++++
 osu.Game/Overlays/Mods/ModPresetPanel.cs      |   8 +-
 3 files changed, 316 insertions(+), 3 deletions(-)
 create mode 100644 osu.Game/Overlays/Mods/EditPresetPopover.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
index 1090764788..f48c52ad40 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
@@ -243,7 +243,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddUntilStep("wait for context menu", () => this.ChildrenOfType<OsuContextMenu>().Any());
             AddStep("click delete", () =>
             {
-                var deleteItem = this.ChildrenOfType<DrawableOsuMenuItem>().Single();
+                var deleteItem = this.ChildrenOfType<DrawableOsuMenuItem>().ElementAt(1);
                 InputManager.MoveMouseTo(deleteItem);
                 InputManager.Click(MouseButton.Left);
             });
@@ -261,6 +261,175 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("preset soft-deleted", () => Realm.Run(r => r.All<ModPreset>().Count(preset => preset.DeletePending) == 1));
         }
 
+        [Test]
+        public void TestEditPresentName()
+        {
+            ModPresetColumn modPresetColumn = null!;
+            string presetName = null!;
+
+            AddStep("clear mods", () => SelectedMods.Value = Array.Empty<Mod>());
+            AddStep("create content", () => Child = modPresetColumn = new ModPresetColumn
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+            });
+
+            AddUntilStep("items loaded", () => modPresetColumn.IsLoaded && modPresetColumn.ItemsLoaded);
+            AddStep("right click first panel", () =>
+            {
+                var panel = this.ChildrenOfType<ModPresetPanel>().First();
+                presetName = panel.Preset.Value.Name;
+                InputManager.MoveMouseTo(panel);
+                InputManager.Click(MouseButton.Right);
+            });
+
+            AddUntilStep("wait for context menu", () => this.ChildrenOfType<OsuContextMenu>().Any());
+            AddStep("click edit", () =>
+            {
+                var editItem = this.ChildrenOfType<DrawableOsuMenuItem>().ElementAt(0);
+                InputManager.MoveMouseTo(editItem);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            OsuPopover? popover = null;
+            AddUntilStep("wait for popover", () => (popover = this.ChildrenOfType<OsuPopover>().FirstOrDefault()) != null);
+            AddStep("clear preset name", () => popover.ChildrenOfType<LabelledTextBox>().First().Current.Value = "");
+            AddStep("attempt preset edit", () =>
+            {
+                InputManager.MoveMouseTo(popover.ChildrenOfType<ShearedButton>().Single());
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddWaitStep("wait some", 3);
+            AddAssert("present is not changed", () => this.ChildrenOfType<ModPresetPanel>().First().Preset.Value.Name == presetName);
+            AddUntilStep("popover is unchanged", () => this.ChildrenOfType<OsuPopover>().FirstOrDefault() == popover);
+            AddStep("edit preset name", () => popover.ChildrenOfType<LabelledTextBox>().First().Current.Value = "something new");
+            AddStep("attempt preset edit", () =>
+            {
+                InputManager.MoveMouseTo(popover.ChildrenOfType<ShearedButton>().Single());
+                InputManager.Click(MouseButton.Left);
+            });
+            AddUntilStep("popover closed", () => !this.ChildrenOfType<OsuPopover>().Any());
+            AddAssert("present is changed", () => this.ChildrenOfType<ModPresetPanel>().First().Preset.Value.Name != presetName);
+        }
+
+        [Test]
+        public void TestEditPresetMod()
+        {
+            ModPresetColumn modPresetColumn = null!;
+            var mods = new Mod[] { new OsuModHidden(), new OsuModHardRock() };
+
+            AddStep("clear mods", () => SelectedMods.Value = Array.Empty<Mod>());
+            AddStep("create content", () => Child = modPresetColumn = new ModPresetColumn
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+            });
+
+            AddUntilStep("items loaded", () => modPresetColumn.IsLoaded && modPresetColumn.ItemsLoaded);
+            AddStep("select mods", () => SelectedMods.Value = mods);
+            AddStep("right click first panel", () =>
+            {
+                var panel = this.ChildrenOfType<ModPresetPanel>().First();
+                InputManager.MoveMouseTo(panel);
+                InputManager.Click(MouseButton.Right);
+            });
+
+            AddUntilStep("wait for context menu", () => this.ChildrenOfType<OsuContextMenu>().Any());
+            AddStep("click edit", () =>
+            {
+                var editItem = this.ChildrenOfType<DrawableOsuMenuItem>().ElementAt(0);
+                InputManager.MoveMouseTo(editItem);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            OsuPopover? popover = null;
+            AddUntilStep("wait for popover", () => (popover = this.ChildrenOfType<OsuPopover>().FirstOrDefault()) != null);
+            AddStep("enable switch", () => popover.ChildrenOfType<LabelledSwitchButton>().Single().Current.Value = true);
+            AddStep("attempt preset edit", () =>
+            {
+                InputManager.MoveMouseTo(popover.ChildrenOfType<ShearedButton>().Single());
+                InputManager.Click(MouseButton.Left);
+            });
+            AddUntilStep("popover closed", () => !this.ChildrenOfType<OsuPopover>().Any());
+            AddAssert("present mod is changed", () => this.ChildrenOfType<ModPresetPanel>().First().Preset.Value.Mods.Count == 2);
+        }
+
+        [Test]
+        public void TestEditModSwitchDisableWithNoModSelest()
+        {
+            ModPresetColumn modPresetColumn = null!;
+
+            AddStep("clear mods", () => SelectedMods.Value = Array.Empty<Mod>());
+            AddStep("create content", () => Child = modPresetColumn = new ModPresetColumn
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+            });
+
+            AddUntilStep("items loaded", () => modPresetColumn.IsLoaded && modPresetColumn.ItemsLoaded);
+            AddStep("right click first panel", () =>
+            {
+                var panel = this.ChildrenOfType<ModPresetPanel>().First();
+                InputManager.MoveMouseTo(panel);
+                InputManager.Click(MouseButton.Right);
+            });
+
+            AddUntilStep("wait for context menu", () => this.ChildrenOfType<OsuContextMenu>().Any());
+            AddStep("click edit", () =>
+            {
+                var editItem = this.ChildrenOfType<DrawableOsuMenuItem>().ElementAt(0);
+                InputManager.MoveMouseTo(editItem);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            OsuPopover? popover = null;
+            AddUntilStep("wait for popover", () => (popover = this.ChildrenOfType<OsuPopover>().FirstOrDefault()) != null);
+            AddAssert("use current mod is disblaed", () => popover.ChildrenOfType<LabelledSwitchButton>().Single().Current.Value == false);
+            AddAssert("use current mod switch cannot be switch", () => popover.ChildrenOfType<LabelledSwitchButton>().Single().Current.Disabled == true);
+        }
+
+        [Test]
+        public void TestEditModSwitchDisableWithPresetSelest()
+        {
+            ModPresetColumn modPresetColumn = null!;
+
+            AddStep("clear mods", () => SelectedMods.Value = Array.Empty<Mod>());
+            AddStep("create content", () => Child = modPresetColumn = new ModPresetColumn
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+            });
+
+            AddUntilStep("items loaded", () => modPresetColumn.IsLoaded && modPresetColumn.ItemsLoaded);
+            AddStep("select first preset mod", () =>
+                SelectedMods.Value = this.ChildrenOfType<ModPresetPanel>().First().Preset.Value.Mods.ToList());
+
+            AddStep("right click first panel", () =>
+            {
+                var panel = this.ChildrenOfType<ModPresetPanel>().First();
+                InputManager.MoveMouseTo(panel);
+                InputManager.Click(MouseButton.Right);
+            });
+
+            AddUntilStep("wait for context menu", () => this.ChildrenOfType<OsuContextMenu>().Any());
+            AddStep("click edit", () =>
+            {
+                var editItem = this.ChildrenOfType<DrawableOsuMenuItem>().ElementAt(0);
+                InputManager.MoveMouseTo(editItem);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            OsuPopover? popover = null;
+            AddUntilStep("wait for popover", () => (popover = this.ChildrenOfType<OsuPopover>().FirstOrDefault()) != null);
+            AddAssert("use current mod is enabled", () => popover.ChildrenOfType<LabelledSwitchButton>().Single().Current.Value == true);
+            AddAssert("use current mod switch cannot be switch", () => popover.ChildrenOfType<LabelledSwitchButton>().Single().Current.Disabled == true);
+
+            AddStep("clear mods", () => SelectedMods.Value = Array.Empty<Mod>());
+            AddAssert("use current mod is disblaed", () => popover.ChildrenOfType<LabelledSwitchButton>().Single().Current.Value == false);
+            AddAssert("use current mod switch cannot be switch", () => popover.ChildrenOfType<LabelledSwitchButton>().Single().Current.Disabled == true);
+        }
+
         private ICollection<ModPreset> createTestPresets() => new[]
         {
             new ModPreset
diff --git a/osu.Game/Overlays/Mods/EditPresetPopover.cs b/osu.Game/Overlays/Mods/EditPresetPopover.cs
new file mode 100644
index 0000000000..270b6f43d9
--- /dev/null
+++ b/osu.Game/Overlays/Mods/EditPresetPopover.cs
@@ -0,0 +1,140 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Extensions;
+using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Localisation;
+using osu.Game.Rulesets.Mods;
+using osuTK;
+
+namespace osu.Game.Overlays.Mods
+{
+    internal partial class EditPresetPopover : OsuPopover
+    {
+        private readonly ModPresetPanel button;
+
+        private readonly LabelledTextBox nameTextBox;
+        private readonly LabelledTextBox descriptionTextBox;
+        private readonly LabelledSwitchButton useCurrentSwitch;
+        private readonly ShearedButton createButton;
+
+        [Resolved]
+        private Bindable<IReadOnlyList<Mod>> selectedMods { get; set; } = null!;
+
+        private readonly ModPreset preset;
+
+        public EditPresetPopover(ModPresetPanel modPresetPanel)
+        {
+            button = modPresetPanel;
+            preset = button.Preset.Value;
+
+            Child = new FillFlowContainer
+            {
+                Width = 300,
+                AutoSizeAxes = Axes.Y,
+                Spacing = new Vector2(7),
+                Children = new Drawable[]
+                {
+                    nameTextBox = new LabelledTextBox
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                        Label = CommonStrings.Name,
+                        TabbableContentContainer = this
+                    },
+                    descriptionTextBox = new LabelledTextBox
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                        Label = CommonStrings.Description,
+                        TabbableContentContainer = this
+                    },
+                    useCurrentSwitch = new LabelledSwitchButton
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                        Label = "Use Current Mod select",
+                    },
+                    createButton = new ShearedButton
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                        Text = CommonStrings.MenuBarEdit,
+                        Action = tryEditPreset
+                    }
+                }
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider, OsuColour colours)
+        {
+            Body.BorderThickness = 3;
+            Body.BorderColour = colours.Orange1;
+
+            nameTextBox.Current.Value = preset.Name;
+            descriptionTextBox.Current.Value = preset.Description;
+
+            selectedMods.BindValueChanged(_ => updateMods(), true);
+
+            createButton.DarkerColour = colours.Orange1;
+            createButton.LighterColour = colours.Orange0;
+            createButton.TextColour = colourProvider.Background6;
+        }
+
+        private void updateMods()
+        {
+            useCurrentSwitch.Current.Disabled = false;
+
+            // disable the switch when mod is equal.
+            if (button.Active.Value)
+            {
+                useCurrentSwitch.Current.Value = true;
+                useCurrentSwitch.Current.Disabled = true;
+            }
+            else
+            {
+                useCurrentSwitch.Current.Value = false;
+                useCurrentSwitch.Current.Disabled = !selectedMods.Value.Any();
+            }
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            ScheduleAfterChildren(() => GetContainingInputManager().ChangeFocus(nameTextBox));
+        }
+
+        private void tryEditPreset()
+        {
+            if (string.IsNullOrWhiteSpace(nameTextBox.Current.Value))
+            {
+                Body.Shake();
+                return;
+            }
+
+            button.Preset.PerformWrite(s =>
+            {
+                s.Name = nameTextBox.Current.Value;
+                s.Description = descriptionTextBox.Current.Value;
+
+                if (useCurrentSwitch.Current.Value)
+                {
+                    s.Mods = selectedMods.Value.ToArray();
+                }
+            });
+
+            this.HidePopover();
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Mods/ModPresetPanel.cs b/osu.Game/Overlays/Mods/ModPresetPanel.cs
index 6e12e34124..f4f1af50df 100644
--- a/osu.Game/Overlays/Mods/ModPresetPanel.cs
+++ b/osu.Game/Overlays/Mods/ModPresetPanel.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Configuration;
@@ -17,7 +18,7 @@ using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Overlays.Mods
 {
-    public partial class ModPresetPanel : ModSelectPanel, IHasCustomTooltip<ModPreset>, IHasContextMenu
+    public partial class ModPresetPanel : ModSelectPanel, IHasCustomTooltip<ModPreset>, IHasContextMenu, IHasPopover
     {
         public readonly Live<ModPreset> Preset;
 
@@ -91,7 +92,8 @@ namespace osu.Game.Overlays.Mods
 
         public MenuItem[] ContextMenuItems => new MenuItem[]
         {
-            new OsuMenuItem(CommonStrings.ButtonsDelete, MenuItemType.Destructive, () => dialogOverlay?.Push(new DeleteModPresetDialog(Preset)))
+            new OsuMenuItem(CommonStrings.ButtonsEdit, MenuItemType.Highlighted, this.ShowPopover),
+            new OsuMenuItem(CommonStrings.ButtonsDelete, MenuItemType.Destructive, () => dialogOverlay?.Push(new DeleteModPresetDialog(Preset))),
         };
 
         #endregion
@@ -102,5 +104,7 @@ namespace osu.Game.Overlays.Mods
 
             settingChangeTracker?.Dispose();
         }
+
+        public Popover GetPopover() => new EditPresetPopover(this);
     }
 }

From 0095fd85cad0a7b8dcddd29c983991af959a57fb Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Tue, 7 Mar 2023 02:18:34 +0900
Subject: [PATCH 0100/1604] remove `== true`

---
 .../Visual/UserInterface/TestSceneModPresetColumn.cs      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
index f48c52ad40..8fbc8940c7 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
@@ -386,7 +386,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             OsuPopover? popover = null;
             AddUntilStep("wait for popover", () => (popover = this.ChildrenOfType<OsuPopover>().FirstOrDefault()) != null);
             AddAssert("use current mod is disblaed", () => popover.ChildrenOfType<LabelledSwitchButton>().Single().Current.Value == false);
-            AddAssert("use current mod switch cannot be switch", () => popover.ChildrenOfType<LabelledSwitchButton>().Single().Current.Disabled == true);
+            AddAssert("use current mod switch cannot be switch", () => popover.ChildrenOfType<LabelledSwitchButton>().Single().Current.Disabled);
         }
 
         [Test]
@@ -422,12 +422,12 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             OsuPopover? popover = null;
             AddUntilStep("wait for popover", () => (popover = this.ChildrenOfType<OsuPopover>().FirstOrDefault()) != null);
-            AddAssert("use current mod is enabled", () => popover.ChildrenOfType<LabelledSwitchButton>().Single().Current.Value == true);
-            AddAssert("use current mod switch cannot be switch", () => popover.ChildrenOfType<LabelledSwitchButton>().Single().Current.Disabled == true);
+            AddAssert("use current mod is enabled", () => popover.ChildrenOfType<LabelledSwitchButton>().Single().Current.Value);
+            AddAssert("use current mod switch cannot be switch", () => popover.ChildrenOfType<LabelledSwitchButton>().Single().Current.Disabled);
 
             AddStep("clear mods", () => SelectedMods.Value = Array.Empty<Mod>());
             AddAssert("use current mod is disblaed", () => popover.ChildrenOfType<LabelledSwitchButton>().Single().Current.Value == false);
-            AddAssert("use current mod switch cannot be switch", () => popover.ChildrenOfType<LabelledSwitchButton>().Single().Current.Disabled == true);
+            AddAssert("use current mod switch cannot be switch", () => popover.ChildrenOfType<LabelledSwitchButton>().Single().Current.Disabled);
         }
 
         private ICollection<ModPreset> createTestPresets() => new[]

From 54564e05578df03133636cad564becd6b892378f Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Tue, 7 Mar 2023 21:13:35 +0900
Subject: [PATCH 0101/1604] new design

---
 .../UserInterface/TestSceneModPresetColumn.cs | 86 ++-----------------
 osu.Game/Overlays/Mods/EditPresetPopover.cs   | 62 ++++++-------
 2 files changed, 38 insertions(+), 110 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
index 8fbc8940c7..d6065374ac 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
@@ -296,7 +296,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("clear preset name", () => popover.ChildrenOfType<LabelledTextBox>().First().Current.Value = "");
             AddStep("attempt preset edit", () =>
             {
-                InputManager.MoveMouseTo(popover.ChildrenOfType<ShearedButton>().Single());
+                InputManager.MoveMouseTo(popover.ChildrenOfType<ShearedButton>().ElementAt(1));
                 InputManager.Click(MouseButton.Left);
             });
 
@@ -306,7 +306,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("edit preset name", () => popover.ChildrenOfType<LabelledTextBox>().First().Current.Value = "something new");
             AddStep("attempt preset edit", () =>
             {
-                InputManager.MoveMouseTo(popover.ChildrenOfType<ShearedButton>().Single());
+                InputManager.MoveMouseTo(popover.ChildrenOfType<ShearedButton>().ElementAt(1));
                 InputManager.Click(MouseButton.Left);
             });
             AddUntilStep("popover closed", () => !this.ChildrenOfType<OsuPopover>().Any());
@@ -345,91 +345,15 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             OsuPopover? popover = null;
             AddUntilStep("wait for popover", () => (popover = this.ChildrenOfType<OsuPopover>().FirstOrDefault()) != null);
-            AddStep("enable switch", () => popover.ChildrenOfType<LabelledSwitchButton>().Single().Current.Value = true);
-            AddStep("attempt preset edit", () =>
+            AddStep("click use current mods", () =>
             {
-                InputManager.MoveMouseTo(popover.ChildrenOfType<ShearedButton>().Single());
+                InputManager.MoveMouseTo(popover.ChildrenOfType<ShearedButton>().ElementAt(0));
                 InputManager.Click(MouseButton.Left);
             });
-            AddUntilStep("popover closed", () => !this.ChildrenOfType<OsuPopover>().Any());
+            AddUntilStep("popover not closed", () => this.ChildrenOfType<OsuPopover>().Any());
             AddAssert("present mod is changed", () => this.ChildrenOfType<ModPresetPanel>().First().Preset.Value.Mods.Count == 2);
         }
 
-        [Test]
-        public void TestEditModSwitchDisableWithNoModSelest()
-        {
-            ModPresetColumn modPresetColumn = null!;
-
-            AddStep("clear mods", () => SelectedMods.Value = Array.Empty<Mod>());
-            AddStep("create content", () => Child = modPresetColumn = new ModPresetColumn
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-            });
-
-            AddUntilStep("items loaded", () => modPresetColumn.IsLoaded && modPresetColumn.ItemsLoaded);
-            AddStep("right click first panel", () =>
-            {
-                var panel = this.ChildrenOfType<ModPresetPanel>().First();
-                InputManager.MoveMouseTo(panel);
-                InputManager.Click(MouseButton.Right);
-            });
-
-            AddUntilStep("wait for context menu", () => this.ChildrenOfType<OsuContextMenu>().Any());
-            AddStep("click edit", () =>
-            {
-                var editItem = this.ChildrenOfType<DrawableOsuMenuItem>().ElementAt(0);
-                InputManager.MoveMouseTo(editItem);
-                InputManager.Click(MouseButton.Left);
-            });
-
-            OsuPopover? popover = null;
-            AddUntilStep("wait for popover", () => (popover = this.ChildrenOfType<OsuPopover>().FirstOrDefault()) != null);
-            AddAssert("use current mod is disblaed", () => popover.ChildrenOfType<LabelledSwitchButton>().Single().Current.Value == false);
-            AddAssert("use current mod switch cannot be switch", () => popover.ChildrenOfType<LabelledSwitchButton>().Single().Current.Disabled);
-        }
-
-        [Test]
-        public void TestEditModSwitchDisableWithPresetSelest()
-        {
-            ModPresetColumn modPresetColumn = null!;
-
-            AddStep("clear mods", () => SelectedMods.Value = Array.Empty<Mod>());
-            AddStep("create content", () => Child = modPresetColumn = new ModPresetColumn
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-            });
-
-            AddUntilStep("items loaded", () => modPresetColumn.IsLoaded && modPresetColumn.ItemsLoaded);
-            AddStep("select first preset mod", () =>
-                SelectedMods.Value = this.ChildrenOfType<ModPresetPanel>().First().Preset.Value.Mods.ToList());
-
-            AddStep("right click first panel", () =>
-            {
-                var panel = this.ChildrenOfType<ModPresetPanel>().First();
-                InputManager.MoveMouseTo(panel);
-                InputManager.Click(MouseButton.Right);
-            });
-
-            AddUntilStep("wait for context menu", () => this.ChildrenOfType<OsuContextMenu>().Any());
-            AddStep("click edit", () =>
-            {
-                var editItem = this.ChildrenOfType<DrawableOsuMenuItem>().ElementAt(0);
-                InputManager.MoveMouseTo(editItem);
-                InputManager.Click(MouseButton.Left);
-            });
-
-            OsuPopover? popover = null;
-            AddUntilStep("wait for popover", () => (popover = this.ChildrenOfType<OsuPopover>().FirstOrDefault()) != null);
-            AddAssert("use current mod is enabled", () => popover.ChildrenOfType<LabelledSwitchButton>().Single().Current.Value);
-            AddAssert("use current mod switch cannot be switch", () => popover.ChildrenOfType<LabelledSwitchButton>().Single().Current.Disabled);
-
-            AddStep("clear mods", () => SelectedMods.Value = Array.Empty<Mod>());
-            AddAssert("use current mod is disblaed", () => popover.ChildrenOfType<LabelledSwitchButton>().Single().Current.Value == false);
-            AddAssert("use current mod switch cannot be switch", () => popover.ChildrenOfType<LabelledSwitchButton>().Single().Current.Disabled);
-        }
-
         private ICollection<ModPreset> createTestPresets() => new[]
         {
             new ModPreset
diff --git a/osu.Game/Overlays/Mods/EditPresetPopover.cs b/osu.Game/Overlays/Mods/EditPresetPopover.cs
index 270b6f43d9..4eaf5e19db 100644
--- a/osu.Game/Overlays/Mods/EditPresetPopover.cs
+++ b/osu.Game/Overlays/Mods/EditPresetPopover.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Overlays.Mods
 
         private readonly LabelledTextBox nameTextBox;
         private readonly LabelledTextBox descriptionTextBox;
-        private readonly LabelledSwitchButton useCurrentSwitch;
+        private readonly ShearedButton useCurrentModButton;
         private readonly ShearedButton createButton;
 
         [Resolved]
@@ -42,6 +42,7 @@ namespace osu.Game.Overlays.Mods
                 Width = 300,
                 AutoSizeAxes = Axes.Y,
                 Spacing = new Vector2(7),
+                Direction = FillDirection.Vertical,
                 Children = new Drawable[]
                 {
                     nameTextBox = new LabelledTextBox
@@ -58,18 +59,30 @@ namespace osu.Game.Overlays.Mods
                         Label = CommonStrings.Description,
                         TabbableContentContainer = this
                     },
-                    useCurrentSwitch = new LabelledSwitchButton
+                    new FillFlowContainer
                     {
                         Anchor = Anchor.TopCentre,
                         Origin = Anchor.TopCentre,
-                        Label = "Use Current Mod select",
-                    },
-                    createButton = new ShearedButton
-                    {
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.TopCentre,
-                        Text = CommonStrings.MenuBarEdit,
-                        Action = tryEditPreset
+                        Direction = FillDirection.Horizontal,
+                        AutoSizeAxes = Axes.Y,
+                        Spacing = new Vector2(7),
+                        Children = new Drawable[]
+                        {
+                            useCurrentModButton = new ShearedButton
+                            {
+                                Anchor = Anchor.TopCentre,
+                                Origin = Anchor.TopCentre,
+                                Text = "Use Current Mods",
+                                Action = trySaveCurrentMod
+                            },
+                            createButton = new ShearedButton
+                            {
+                                Anchor = Anchor.TopCentre,
+                                Origin = Anchor.TopCentre,
+                                Text = Resources.Localisation.Web.CommonStrings.ButtonsSave,
+                                Action = tryEditPreset
+                            },
+                        }
                     }
                 }
             };
@@ -84,28 +97,24 @@ namespace osu.Game.Overlays.Mods
             nameTextBox.Current.Value = preset.Name;
             descriptionTextBox.Current.Value = preset.Description;
 
-            selectedMods.BindValueChanged(_ => updateMods(), true);
-
             createButton.DarkerColour = colours.Orange1;
             createButton.LighterColour = colours.Orange0;
             createButton.TextColour = colourProvider.Background6;
+
+            useCurrentModButton.DarkerColour = colours.Blue1;
+            useCurrentModButton.LighterColour = colours.Blue0;
+            useCurrentModButton.TextColour = colourProvider.Background6;
         }
 
-        private void updateMods()
+        private void trySaveCurrentMod()
         {
-            useCurrentSwitch.Current.Disabled = false;
+            if (button.Active.Value || !selectedMods.Value.Any())
+                return;
 
-            // disable the switch when mod is equal.
-            if (button.Active.Value)
+            button.Preset.PerformWrite(s =>
             {
-                useCurrentSwitch.Current.Value = true;
-                useCurrentSwitch.Current.Disabled = true;
-            }
-            else
-            {
-                useCurrentSwitch.Current.Value = false;
-                useCurrentSwitch.Current.Disabled = !selectedMods.Value.Any();
-            }
+                s.Mods = selectedMods.Value.ToArray();
+            });
         }
 
         protected override void LoadComplete()
@@ -127,11 +136,6 @@ namespace osu.Game.Overlays.Mods
             {
                 s.Name = nameTextBox.Current.Value;
                 s.Description = descriptionTextBox.Current.Value;
-
-                if (useCurrentSwitch.Current.Value)
-                {
-                    s.Mods = selectedMods.Value.ToArray();
-                }
             });
 
             this.HidePopover();

From bedf4cc2596f9202a8760cbbe731ca2f1f6bf8ed Mon Sep 17 00:00:00 2001
From: Terochi <mates.cernicky@gmail.com>
Date: Tue, 7 Mar 2023 16:03:11 +0100
Subject: [PATCH 0102/1604] Remove extra code

---
 .../Visual/UserInterface/TestSceneModSelectOverlay.cs           | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index a354a22fb7..75efc07d43 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -553,8 +553,6 @@ namespace osu.Game.Tests.Visual.UserInterface
             waitForColumnLoad();
 
             AddAssert("unimplemented mod panel is filtered", () => getPanelForMod(typeof(TestUnimplementedMod)).Filtered.Value);
-
-            AddStep("disable panel filtering", () => getPanelForMod(typeof(TestUnimplementedMod)).Filtered.Value = false);
         }
 
         [Test]

From 9ea93e0a9fb7b5a9d629519cd6e257e80acd1510 Mon Sep 17 00:00:00 2001
From: Terochi <mates.cernicky@gmail.com>
Date: Tue, 7 Mar 2023 20:38:33 +0100
Subject: [PATCH 0103/1604] Add more tests

---
 osu.Game.Tests/Mods/ModSettingsTest.cs | 91 +++++++++++++++++++++-----
 1 file changed, 75 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Tests/Mods/ModSettingsTest.cs b/osu.Game.Tests/Mods/ModSettingsTest.cs
index 99198f6bae..45e162df1a 100644
--- a/osu.Game.Tests/Mods/ModSettingsTest.cs
+++ b/osu.Game.Tests/Mods/ModSettingsTest.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using NUnit.Framework;
 using osu.Framework.Bindables;
 using osu.Framework.Localisation;
@@ -37,34 +38,92 @@ namespace osu.Game.Tests.Mods
         }
 
         [Test]
-        public void TestCopySharedSettingsOfDifferentType()
+        public void TestDifferentTypeSettingsKeptWhenCopied()
         {
-            const double setting_change = 2.5;
+            const double setting_change = 50.4;
 
-            var osuMod = new TestNonMatchinSettingTypeOsuMod();
-            var maniaMod = new TestNonMatchinSettingTypeManiaMod();
+            var modDouble = new TestNonMatchingSettingTypeModDouble();
+            var modBool = new TestNonMatchingSettingTypeModBool();
 
-            osuMod.TestSetting.Value = setting_change;
-            maniaMod.CopySharedSettings(osuMod);
-            osuMod.CopySharedSettings(maniaMod);
+            modDouble.TestSetting.Value = setting_change;
+            modBool.TestSetting.Value = !modBool.TestSetting.Default;
+            modDouble.CopySharedSettings(modBool);
+            modBool.CopySharedSettings(modDouble);
 
-            Assert.That(maniaMod.TestSetting.IsDefault, "Value has been changed");
-            Assert.That(osuMod.TestSetting.Value == setting_change);
+            Assert.That(modDouble.TestSetting.Value, Is.EqualTo(setting_change));
+            Assert.That(modBool.TestSetting.Value, Is.EqualTo(!modBool.TestSetting.Default));
         }
 
-        private class TestNonMatchinSettingTypeOsuMod : TestNonMatchinSettingTypeMod
+        [Test]
+        public void TestCopyDoubleToIntWithDefaultRange()
         {
-            public override string Acronym => "NMO";
-            public override BindableNumber<double> TestSetting { get; } = new BindableDouble(3.5);
+            const double setting_change = 50.4;
+
+            var modDouble = new TestNonMatchingSettingTypeModDouble { TestSetting = { Value = setting_change } };
+            var modInt = new TestNonMatchingSettingTypeModInt();
+
+            modInt.CopySharedSettings(modDouble);
+
+            Assert.That(modInt.TestSetting.Value, Is.EqualTo((int)setting_change));
         }
 
-        private class TestNonMatchinSettingTypeManiaMod : TestNonMatchinSettingTypeMod
+        [Test]
+        public void TestCopyIntToDoubleWithDefaultRange()
         {
-            public override string Acronym => "NMM";
-            public override Bindable<bool> TestSetting { get; } = new BindableBool(true);
+            const int setting_change = 50;
+
+            var modInt = new TestNonMatchingSettingTypeModInt { TestSetting = { Value = setting_change } };
+            var modDouble = new TestNonMatchingSettingTypeModDouble();
+
+            modDouble.CopySharedSettings(modInt);
+
+            Assert.That(modDouble.TestSetting.Value, Is.EqualTo(setting_change));
         }
 
-        private abstract class TestNonMatchinSettingTypeMod : Mod
+        [Test]
+        public void TestCopyDoubleToIntWithClampedRange()
+        {
+            const double setting_change = 50.4;
+
+            var modDouble = new TestNonMatchingSettingTypeModDouble { TestSetting = { MaxValue = 100, MinValue = 0, Value = setting_change } };
+            var modInt = new TestNonMatchingSettingTypeModInt { TestSetting = { MaxValue = 200, MinValue = 0 } };
+
+            modInt.CopySharedSettings(modDouble);
+
+            Assert.That(modInt.TestSetting.Value, Is.EqualTo(Convert.ToInt32(setting_change * 2)));
+        }
+
+        [Test]
+        public void TestDefaultValueKeptWhenCopied()
+        {
+            var modBoolTrue = new TestNonMatchingSettingTypeModBool { TestSetting = { Default = true, Value = false } };
+            var modBoolFalse = new TestNonMatchingSettingTypeModBool { TestSetting = { Default = false, Value = true } };
+
+            modBoolFalse.CopySharedSettings(modBoolTrue);
+
+            Assert.That(modBoolFalse.TestSetting.Default, Is.EqualTo(false));
+            Assert.That(modBoolFalse.TestSetting.Value, Is.EqualTo(modBoolTrue.TestSetting.Value));
+        }
+
+        private class TestNonMatchingSettingTypeModDouble : TestNonMatchingSettingTypeMod
+        {
+            public override string Acronym => "NMD";
+            public override BindableNumber<double> TestSetting { get; } = new BindableDouble();
+        }
+
+        private class TestNonMatchingSettingTypeModInt : TestNonMatchingSettingTypeMod
+        {
+            public override string Acronym => "NMI";
+            public override BindableNumber<int> TestSetting { get; } = new BindableInt();
+        }
+
+        private class TestNonMatchingSettingTypeModBool : TestNonMatchingSettingTypeMod
+        {
+            public override string Acronym => "NMB";
+            public override Bindable<bool> TestSetting { get; } = new BindableBool();
+        }
+
+        private abstract class TestNonMatchingSettingTypeMod : Mod
         {
             public override string Name => "Non-matching setting type mod";
             public override LocalisableString Description => "Description";

From 8bf84869a5334c14aec47ebeb43470c8a0d808a1 Mon Sep 17 00:00:00 2001
From: Terochi <mates.cernicky@gmail.com>
Date: Tue, 7 Mar 2023 20:39:50 +0100
Subject: [PATCH 0104/1604] Fixed errors covered in new tests

---
 osu.Game/Rulesets/Mods/Mod.cs | 44 +++++++++++++++++++++++++++--------
 1 file changed, 34 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index f6c0e851fd..e630a53045 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -165,6 +165,10 @@ namespace osu.Game.Rulesets.Mods
         /// <param name="source">The mod to copy properties from.</param>
         internal void CopySharedSettings(Mod source)
         {
+            const string min_value = nameof(BindableNumber<int>.MinValue);
+            const string max_value = nameof(BindableNumber<int>.MaxValue);
+            const string value = nameof(Bindable<int>.Value);
+
             Dictionary<string, object> oldSettings = new Dictionary<string, object>();
 
             foreach (var (_, property) in source.GetSettingsSourceProperties())
@@ -190,27 +194,47 @@ namespace osu.Game.Rulesets.Mods
                 {
                     if (getGenericBaseType(targetSetting, typeof(Bindable<>))!.GenericTypeArguments.Single() ==
                         getGenericBaseType(sourceSetting, typeof(Bindable<>))!.GenericTypeArguments.Single())
+                    {
                         // change settings only if the type is the same
-                        CopyAdjustedSetting((IBindable)targetSetting, sourceSetting);
+                        setValue(targetSetting, value, getValue(sourceSetting, value));
+                    }
 
                     continue;
                 }
 
-                double targetMin = getValue(targetSetting, nameof(IBindableNumber<int>.MinValue));
-                double targetMax = getValue(targetSetting, nameof(IBindableNumber<int>.MaxValue));
-                double sourceMin = getValue(sourceSetting, nameof(IBindableNumber<int>.MinValue));
-                double sourceMax = getValue(sourceSetting, nameof(IBindableNumber<int>.MaxValue));
-                double sourceValue = getValue(sourceSetting, nameof(IBindableNumber<int>.Value));
+                Type targetGenericType = targetType.GenericTypeArguments.Single();
+                Type sourceGenericType = sourceType.GenericTypeArguments.Single();
+
+                double allowedMin = Math.Max(
+                    Convert.ToDouble(targetGenericType.GetField("MinValue")!.GetValue(null)),
+                    Convert.ToDouble(sourceGenericType.GetField("MinValue")!.GetValue(null))
+                );
+
+                double allowedMax = Math.Min(
+                    Convert.ToDouble(targetGenericType.GetField("MaxValue")!.GetValue(null)),
+                    Convert.ToDouble(sourceGenericType.GetField("MaxValue")!.GetValue(null))
+                );
+
+                double targetMin = getValueDouble(targetSetting, min_value);
+                double targetMax = getValueDouble(targetSetting, max_value);
+                double sourceMin = getValueDouble(sourceSetting, min_value);
+                double sourceMax = getValueDouble(sourceSetting, max_value);
+                double sourceValue = getValueDouble(sourceSetting, value);
 
                 // convert value to same ratio
                 double targetValue = (sourceValue - sourceMin) / (sourceMax - sourceMin) * (targetMax - targetMin) + targetMin;
 
-                targetType.GetProperty(nameof(IBindableNumber<int>.Value))!.SetValue(targetSetting,
-                    Convert.ChangeType(targetValue, targetType.GenericTypeArguments.Single()));
+                setValue(targetSetting, value, Convert.ChangeType(targetValue, targetType.GenericTypeArguments.Single()));
+
+                double getValueDouble(object target, string name) =>
+                    Math.Clamp(Convert.ToDouble(getValue(target, name)!), allowedMin, allowedMax);
             }
 
-            double getValue(object target, string name) =>
-                Convert.ToDouble(target.GetType().GetProperty(name)!.GetValue(target)!);
+            object? getValue(object target, string name) =>
+                target.GetType().GetProperty(name)!.GetValue(target);
+
+            void setValue(object target, string name, object? newValue) =>
+                target.GetType().GetProperty(name)!.SetValue(target, newValue);
 
             Type? getGenericBaseType(object target, Type genericType) =>
                 target.GetType().GetTypeInheritance().FirstOrDefault(t => t.IsGenericType && t.GetGenericTypeDefinition() == genericType);

From 5a1316f0e5eb0d7acd8c813e84849cef5c584dbb Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Thu, 9 Mar 2023 22:23:13 +0900
Subject: [PATCH 0105/1604] split save logic

---
 osu.Game/Overlays/Mods/EditPresetPopover.cs |  8 ++------
 osu.Game/Overlays/Mods/ModPresetPanel.cs    | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Mods/EditPresetPopover.cs b/osu.Game/Overlays/Mods/EditPresetPopover.cs
index 4eaf5e19db..32d4aeae76 100644
--- a/osu.Game/Overlays/Mods/EditPresetPopover.cs
+++ b/osu.Game/Overlays/Mods/EditPresetPopover.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
@@ -108,13 +107,10 @@ namespace osu.Game.Overlays.Mods
 
         private void trySaveCurrentMod()
         {
-            if (button.Active.Value || !selectedMods.Value.Any())
+            if (button.SaveCurrentMod())
                 return;
 
-            button.Preset.PerformWrite(s =>
-            {
-                s.Mods = selectedMods.Value.ToArray();
-            });
+            Body.Shake();
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Overlays/Mods/ModPresetPanel.cs b/osu.Game/Overlays/Mods/ModPresetPanel.cs
index f4f1af50df..f861245007 100644
--- a/osu.Game/Overlays/Mods/ModPresetPanel.cs
+++ b/osu.Game/Overlays/Mods/ModPresetPanel.cs
@@ -98,6 +98,20 @@ namespace osu.Game.Overlays.Mods
 
         #endregion
 
+        public bool SaveCurrentMod()
+        {
+            if (!checkCurrentModCanBeSave())
+                return false;
+
+            Preset.PerformWrite(s =>
+            {
+                s.Mods = selectedMods.Value.ToArray();
+            });
+            return true;
+        }
+
+        private bool checkCurrentModCanBeSave() => (!Active.Value && selectedMods.Value.Any());
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);

From 3d746e8dfbb6cfbd7a08a480eda3d56a3262ed67 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Thu, 9 Mar 2023 22:43:11 +0900
Subject: [PATCH 0106/1604] content Menu

---
 osu.Game/Overlays/Mods/ModPresetPanel.cs | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModPresetPanel.cs b/osu.Game/Overlays/Mods/ModPresetPanel.cs
index f861245007..f3fb5b5bb0 100644
--- a/osu.Game/Overlays/Mods/ModPresetPanel.cs
+++ b/osu.Game/Overlays/Mods/ModPresetPanel.cs
@@ -90,11 +90,24 @@ namespace osu.Game.Overlays.Mods
 
         #region IHasContextMenu
 
-        public MenuItem[] ContextMenuItems => new MenuItem[]
+        public MenuItem[] ContextMenuItems
         {
-            new OsuMenuItem(CommonStrings.ButtonsEdit, MenuItemType.Highlighted, this.ShowPopover),
-            new OsuMenuItem(CommonStrings.ButtonsDelete, MenuItemType.Destructive, () => dialogOverlay?.Push(new DeleteModPresetDialog(Preset))),
-        };
+            get
+            {
+                var menu = new List<MenuItem>
+                {
+                    new OsuMenuItem(CommonStrings.ButtonsEdit, MenuItemType.Highlighted, this.ShowPopover),
+                    new OsuMenuItem(CommonStrings.ButtonsDelete, MenuItemType.Destructive, () => dialogOverlay?.Push(new DeleteModPresetDialog(Preset))),
+                };
+
+                if (checkCurrentModCanBeSave())
+                {
+                    menu.Insert(1, new OsuMenuItem("Use Current Mods", MenuItemType.Destructive, () => SaveCurrentMod()));
+                }
+
+                return menu.ToArray();
+            }
+        }
 
         #endregion
 

From d009cd8422780247f035bb586851790bac37f6b5 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Thu, 9 Mar 2023 22:45:33 +0900
Subject: [PATCH 0107/1604] test

---
 .../UserInterface/TestSceneModPresetColumn.cs | 73 ++++++++++++++++++-
 1 file changed, 71 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
index d6065374ac..b67f67db2b 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
@@ -327,6 +327,32 @@ namespace osu.Game.Tests.Visual.UserInterface
             });
 
             AddUntilStep("items loaded", () => modPresetColumn.IsLoaded && modPresetColumn.ItemsLoaded);
+
+            AddStep("right click first panel", () =>
+            {
+                var panel = this.ChildrenOfType<ModPresetPanel>().First();
+                InputManager.MoveMouseTo(panel);
+                InputManager.Click(MouseButton.Right);
+            });
+            AddUntilStep("wait for context menu", () => this.ChildrenOfType<OsuContextMenu>().Any());
+            AddStep("click edit", () =>
+            {
+                var editItem = this.ChildrenOfType<DrawableOsuMenuItem>().ElementAt(0);
+                InputManager.MoveMouseTo(editItem);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            OsuPopover? popover = null;
+            AddUntilStep("wait for popover", () => (popover = this.ChildrenOfType<OsuPopover>().FirstOrDefault()) != null);
+            AddStep("click use current mods", () =>
+            {
+                InputManager.MoveMouseTo(popover.ChildrenOfType<ShearedButton>().ElementAt(0));
+                InputManager.Click(MouseButton.Left);
+            });
+            AddWaitStep("wait some", 3);
+            AddUntilStep("popover not closed", () => this.ChildrenOfType<OsuPopover>().Any());
+            AddAssert("present mod not changed", () => this.ChildrenOfType<ModPresetPanel>().First().Preset.Value.Mods.Count == 1);
+
             AddStep("select mods", () => SelectedMods.Value = mods);
             AddStep("right click first panel", () =>
             {
@@ -343,14 +369,57 @@ namespace osu.Game.Tests.Visual.UserInterface
                 InputManager.Click(MouseButton.Left);
             });
 
-            OsuPopover? popover = null;
             AddUntilStep("wait for popover", () => (popover = this.ChildrenOfType<OsuPopover>().FirstOrDefault()) != null);
             AddStep("click use current mods", () =>
             {
                 InputManager.MoveMouseTo(popover.ChildrenOfType<ShearedButton>().ElementAt(0));
                 InputManager.Click(MouseButton.Left);
             });
-            AddUntilStep("popover not closed", () => this.ChildrenOfType<OsuPopover>().Any());
+            AddWaitStep("wait some", 3);
+            AddUntilStep("popover closed", () => !this.ChildrenOfType<OsuPopover>().Any());
+            AddAssert("present mod is changed", () => this.ChildrenOfType<ModPresetPanel>().First().Preset.Value.Mods.Count == 2);
+        }
+
+        [Test]
+        public void TestEditPresetModInContextMenu()
+        {
+            ModPresetColumn modPresetColumn = null!;
+            var mods = new Mod[] { new OsuModHidden(), new OsuModHardRock() };
+
+            AddStep("clear mods", () => SelectedMods.Value = Array.Empty<Mod>());
+            AddStep("create content", () => Child = modPresetColumn = new ModPresetColumn
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+            });
+
+            AddUntilStep("items loaded", () => modPresetColumn.IsLoaded && modPresetColumn.ItemsLoaded);
+
+            AddStep("right click first panel", () =>
+            {
+                var panel = this.ChildrenOfType<ModPresetPanel>().First();
+                InputManager.MoveMouseTo(panel);
+                InputManager.Click(MouseButton.Right);
+            });
+            AddUntilStep("wait for context menu", () => this.ChildrenOfType<OsuContextMenu>().Any());
+            AddAssert("No Use Current Mods", () => this.ChildrenOfType<DrawableOsuMenuItem>().Count() == 2);
+
+            AddStep("select mods", () => SelectedMods.Value = mods);
+            AddStep("right click first panel", () =>
+            {
+                var panel = this.ChildrenOfType<ModPresetPanel>().First();
+                InputManager.MoveMouseTo(panel);
+                InputManager.Click(MouseButton.Right);
+            });
+
+            AddUntilStep("wait for context menu", () => this.ChildrenOfType<OsuContextMenu>().Any());
+            AddAssert("Have Use Current Mods", () => this.ChildrenOfType<DrawableOsuMenuItem>().Count() == 3);
+            AddStep("Click Use Current Mods", () =>
+            {
+                var editItem = this.ChildrenOfType<DrawableOsuMenuItem>().ElementAt(1);
+                InputManager.MoveMouseTo(editItem);
+                InputManager.Click(MouseButton.Left);
+            });
             AddAssert("present mod is changed", () => this.ChildrenOfType<ModPresetPanel>().First().Preset.Value.Mods.Count == 2);
         }
 

From ca416175bb6e168c3c8fa469b296d059a8991541 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Thu, 9 Mar 2023 22:58:44 +0900
Subject: [PATCH 0108/1604] remove useless property

---
 osu.Game/Overlays/Mods/EditPresetPopover.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Overlays/Mods/EditPresetPopover.cs b/osu.Game/Overlays/Mods/EditPresetPopover.cs
index 32d4aeae76..3043f4a544 100644
--- a/osu.Game/Overlays/Mods/EditPresetPopover.cs
+++ b/osu.Game/Overlays/Mods/EditPresetPopover.cs
@@ -26,9 +26,6 @@ namespace osu.Game.Overlays.Mods
         private readonly ShearedButton useCurrentModButton;
         private readonly ShearedButton createButton;
 
-        [Resolved]
-        private Bindable<IReadOnlyList<Mod>> selectedMods { get; set; } = null!;
-
         private readonly ModPreset preset;
 
         public EditPresetPopover(ModPresetPanel modPresetPanel)

From f4e262040275e4466f4e43def09980a6a1b6d432 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Fri, 10 Mar 2023 00:56:22 +0900
Subject: [PATCH 0109/1604] fix test

---
 .../UserInterface/TestSceneModPresetColumn.cs | 22 +++++++++++--------
 osu.Game/Overlays/Mods/EditPresetPopover.cs   |  2 --
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
index b67f67db2b..eaa3664623 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
@@ -266,6 +266,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         {
             ModPresetColumn modPresetColumn = null!;
             string presetName = null!;
+            ModPresetPanel panel = null!;
 
             AddStep("clear mods", () => SelectedMods.Value = Array.Empty<Mod>());
             AddStep("create content", () => Child = modPresetColumn = new ModPresetColumn
@@ -277,7 +278,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddUntilStep("items loaded", () => modPresetColumn.IsLoaded && modPresetColumn.ItemsLoaded);
             AddStep("right click first panel", () =>
             {
-                var panel = this.ChildrenOfType<ModPresetPanel>().First();
+                panel = this.ChildrenOfType<ModPresetPanel>().First();
                 presetName = panel.Preset.Value.Name;
                 InputManager.MoveMouseTo(panel);
                 InputManager.Click(MouseButton.Right);
@@ -301,7 +302,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             });
 
             AddWaitStep("wait some", 3);
-            AddAssert("present is not changed", () => this.ChildrenOfType<ModPresetPanel>().First().Preset.Value.Name == presetName);
+            AddAssert("present is not changed", () => panel.Preset.Value.Name == presetName);
             AddUntilStep("popover is unchanged", () => this.ChildrenOfType<OsuPopover>().FirstOrDefault() == popover);
             AddStep("edit preset name", () => popover.ChildrenOfType<LabelledTextBox>().First().Current.Value = "something new");
             AddStep("attempt preset edit", () =>
@@ -310,7 +311,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                 InputManager.Click(MouseButton.Left);
             });
             AddUntilStep("popover closed", () => !this.ChildrenOfType<OsuPopover>().Any());
-            AddAssert("present is changed", () => this.ChildrenOfType<ModPresetPanel>().First().Preset.Value.Name != presetName);
+            AddAssert("present is changed", () => panel.Preset.Value.Name != presetName);
         }
 
         [Test]
@@ -351,7 +352,8 @@ namespace osu.Game.Tests.Visual.UserInterface
             });
             AddWaitStep("wait some", 3);
             AddUntilStep("popover not closed", () => this.ChildrenOfType<OsuPopover>().Any());
-            AddAssert("present mod not changed", () => this.ChildrenOfType<ModPresetPanel>().First().Preset.Value.Mods.Count == 1);
+            AddAssert("present mod not changed", () =>
+                !new HashSet<Mod>(this.ChildrenOfType<ModPresetPanel>().First().Preset.Value.Mods).SetEquals(mods));
 
             AddStep("select mods", () => SelectedMods.Value = mods);
             AddStep("right click first panel", () =>
@@ -377,14 +379,15 @@ namespace osu.Game.Tests.Visual.UserInterface
             });
             AddWaitStep("wait some", 3);
             AddUntilStep("popover closed", () => !this.ChildrenOfType<OsuPopover>().Any());
-            AddAssert("present mod is changed", () => this.ChildrenOfType<ModPresetPanel>().First().Preset.Value.Mods.Count == 2);
+            AddAssert("present mod is changed", () =>
+                new HashSet<Mod>(this.ChildrenOfType<ModPresetPanel>().First().Preset.Value.Mods).SetEquals(mods));
         }
 
         [Test]
         public void TestEditPresetModInContextMenu()
         {
             ModPresetColumn modPresetColumn = null!;
-            var mods = new Mod[] { new OsuModHidden(), new OsuModHardRock() };
+            var mods = new Mod[] { new OsuModHidden() };
 
             AddStep("clear mods", () => SelectedMods.Value = Array.Empty<Mod>());
             AddStep("create content", () => Child = modPresetColumn = new ModPresetColumn
@@ -405,9 +408,9 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("No Use Current Mods", () => this.ChildrenOfType<DrawableOsuMenuItem>().Count() == 2);
 
             AddStep("select mods", () => SelectedMods.Value = mods);
-            AddStep("right click first panel", () =>
+            AddStep("right click second panel", () =>
             {
-                var panel = this.ChildrenOfType<ModPresetPanel>().First();
+                var panel = this.ChildrenOfType<ModPresetPanel>().ElementAt(1);
                 InputManager.MoveMouseTo(panel);
                 InputManager.Click(MouseButton.Right);
             });
@@ -420,7 +423,8 @@ namespace osu.Game.Tests.Visual.UserInterface
                 InputManager.MoveMouseTo(editItem);
                 InputManager.Click(MouseButton.Left);
             });
-            AddAssert("present mod is changed", () => this.ChildrenOfType<ModPresetPanel>().First().Preset.Value.Mods.Count == 2);
+            AddAssert("present mod is changed", () =>
+                new HashSet<Mod>(this.ChildrenOfType<ModPresetPanel>().ElementAt(1).Preset.Value.Mods).SetEquals(mods));
         }
 
         private ICollection<ModPreset> createTestPresets() => new[]
diff --git a/osu.Game/Overlays/Mods/EditPresetPopover.cs b/osu.Game/Overlays/Mods/EditPresetPopover.cs
index 3043f4a544..a5c562914b 100644
--- a/osu.Game/Overlays/Mods/EditPresetPopover.cs
+++ b/osu.Game/Overlays/Mods/EditPresetPopover.cs
@@ -1,9 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Collections.Generic;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;

From b51c41a8043ae04fdc57aad461beb9f74b2320b5 Mon Sep 17 00:00:00 2001
From: Terochi <mates.cernicky@gmail.com>
Date: Thu, 9 Mar 2023 20:14:58 +0100
Subject: [PATCH 0110/1604] Addressed changes

---
 osu.Game.Tests/Mods/ModSettingsTest.cs | 92 ++++++++++++++++++--------
 osu.Game/Rulesets/Mods/Mod.cs          | 69 ++++++++++++-------
 2 files changed, 109 insertions(+), 52 deletions(-)

diff --git a/osu.Game.Tests/Mods/ModSettingsTest.cs b/osu.Game.Tests/Mods/ModSettingsTest.cs
index 45e162df1a..e2e050870e 100644
--- a/osu.Game.Tests/Mods/ModSettingsTest.cs
+++ b/osu.Game.Tests/Mods/ModSettingsTest.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Tests.Mods
     public class ModSettingsTest
     {
         [Test]
-        public void TestModSettingsUnboundWhenCopied()
+        public void TestModSettingsUnboundWhenCloned()
         {
             var original = new OsuModDoubleTime();
             var copy = (OsuModDoubleTime)original.DeepClone();
@@ -26,7 +26,7 @@ namespace osu.Game.Tests.Mods
         }
 
         [Test]
-        public void TestMultiModSettingsUnboundWhenCopied()
+        public void TestMultiModSettingsUnboundWhenCloned()
         {
             var original = new MultiMod(new OsuModDoubleTime());
             var copy = (MultiMod)original.DeepClone();
@@ -54,6 +54,42 @@ namespace osu.Game.Tests.Mods
             Assert.That(modBool.TestSetting.Value, Is.EqualTo(!modBool.TestSetting.Default));
         }
 
+        [Test]
+        public void TestDefaultValueKeptWhenCopied()
+        {
+            var modBoolTrue = new TestNonMatchingSettingTypeModBool { TestSetting = { Default = true, Value = false } };
+            var modBoolFalse = new TestNonMatchingSettingTypeModBool { TestSetting = { Default = false, Value = true } };
+
+            modBoolFalse.CopySharedSettings(modBoolTrue);
+
+            Assert.That(modBoolFalse.TestSetting.Default, Is.EqualTo(false));
+            Assert.That(modBoolFalse.TestSetting.Value, Is.EqualTo(modBoolTrue.TestSetting.Value));
+        }
+
+        [Test]
+        public void TestValueResetsToDefaultWhenCopied()
+        {
+            var modDouble = new TestNonMatchingSettingTypeModDouble();
+            var modInt = new TestNonMatchingSettingTypeModInt { TestSetting = { Value = 1 } };
+
+            modInt.CopySharedSettings(modDouble);
+
+            Assert.That(modInt.TestSetting.Value, Is.EqualTo(modInt.TestSetting.Default));
+        }
+
+        [Test]
+        public void TestRelativelyScaleWithClampedRangeWhenCopied()
+        {
+            const double setting_change = 50.4;
+
+            var modDouble100 = new TestNonMatchingSettingTypeModDouble { TestSetting = { MaxValue = 100, MinValue = 0, Value = setting_change } };
+            var modDouble200 = new TestNonMatchingSettingTypeModDouble { TestSetting = { MaxValue = 200, MinValue = 0 } };
+
+            modDouble200.CopySharedSettings(modDouble100);
+
+            Assert.That(modDouble200.TestSetting.Value, Is.EqualTo(setting_change * 2));
+        }
+
         [Test]
         public void TestCopyDoubleToIntWithDefaultRange()
         {
@@ -64,7 +100,32 @@ namespace osu.Game.Tests.Mods
 
             modInt.CopySharedSettings(modDouble);
 
-            Assert.That(modInt.TestSetting.Value, Is.EqualTo((int)setting_change));
+            Assert.That(modInt.TestSetting.Value, Is.EqualTo(Convert.ToInt32(setting_change)));
+        }
+
+        [Test]
+        public void TestCopyDoubleToIntWithOutOfBoundsRange()
+        {
+            const double setting_change = 50.4;
+
+            var modDouble = new TestNonMatchingSettingTypeModDouble { TestSetting = { MinValue = int.MinValue - 1d, Value = setting_change } };
+            // make RangeConstrainedBindable.HasDefinedRange return true
+            var modInt = new TestNonMatchingSettingTypeModInt { TestSetting = { MinValue = int.MinValue + 1 } };
+
+            modInt.CopySharedSettings(modDouble);
+
+            Assert.That(modInt.TestSetting.Value, Is.EqualTo(Convert.ToInt32(setting_change)));
+        }
+
+        [Test]
+        public void TestCopyDoubleToIntWithOutOfBoundsValue()
+        {
+            var modDouble = new TestNonMatchingSettingTypeModDouble { TestSetting = { MinValue = int.MinValue + 1, Value = int.MaxValue + 1d } };
+            var modInt = new TestNonMatchingSettingTypeModInt { TestSetting = { MinValue = int.MinValue + 1 } };
+
+            modInt.CopySharedSettings(modDouble);
+
+            Assert.That(modInt.TestSetting.Value, Is.EqualTo(int.MaxValue));
         }
 
         [Test]
@@ -80,31 +141,6 @@ namespace osu.Game.Tests.Mods
             Assert.That(modDouble.TestSetting.Value, Is.EqualTo(setting_change));
         }
 
-        [Test]
-        public void TestCopyDoubleToIntWithClampedRange()
-        {
-            const double setting_change = 50.4;
-
-            var modDouble = new TestNonMatchingSettingTypeModDouble { TestSetting = { MaxValue = 100, MinValue = 0, Value = setting_change } };
-            var modInt = new TestNonMatchingSettingTypeModInt { TestSetting = { MaxValue = 200, MinValue = 0 } };
-
-            modInt.CopySharedSettings(modDouble);
-
-            Assert.That(modInt.TestSetting.Value, Is.EqualTo(Convert.ToInt32(setting_change * 2)));
-        }
-
-        [Test]
-        public void TestDefaultValueKeptWhenCopied()
-        {
-            var modBoolTrue = new TestNonMatchingSettingTypeModBool { TestSetting = { Default = true, Value = false } };
-            var modBoolFalse = new TestNonMatchingSettingTypeModBool { TestSetting = { Default = false, Value = true } };
-
-            modBoolFalse.CopySharedSettings(modBoolTrue);
-
-            Assert.That(modBoolFalse.TestSetting.Default, Is.EqualTo(false));
-            Assert.That(modBoolFalse.TestSetting.Value, Is.EqualTo(modBoolTrue.TestSetting.Value));
-        }
-
         private class TestNonMatchingSettingTypeModDouble : TestNonMatchingSettingTypeMod
         {
             public override string Acronym => "NMD";
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index e630a53045..85014d555d 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -169,28 +169,31 @@ namespace osu.Game.Rulesets.Mods
             const string max_value = nameof(BindableNumber<int>.MaxValue);
             const string value = nameof(Bindable<int>.Value);
 
-            Dictionary<string, object> oldSettings = new Dictionary<string, object>();
+            Dictionary<string, object> sourceSettings = new Dictionary<string, object>();
 
-            foreach (var (_, property) in source.GetSettingsSourceProperties())
+            foreach (var (_, sourceProperty) in source.GetSettingsSourceProperties())
             {
-                oldSettings.Add(property.Name.ToSnakeCase(), property.GetValue(source)!);
+                sourceSettings.Add(sourceProperty.Name.ToSnakeCase(), sourceProperty.GetValue(source)!);
             }
 
-            foreach (var (_, property) in this.GetSettingsSourceProperties())
+            foreach (var (_, targetProperty) in this.GetSettingsSourceProperties())
             {
-                object targetSetting = property.GetValue(this)!;
+                object targetSetting = targetProperty.GetValue(this)!;
 
-                if (!oldSettings.TryGetValue(property.Name.ToSnakeCase(), out object? sourceSetting))
+                if (!sourceSettings.TryGetValue(targetProperty.Name.ToSnakeCase(), out object? sourceSetting))
                     continue;
 
                 if (((IBindable)sourceSetting).IsDefault)
-                    // keep at default value if the source is default
+                {
+                    // reset to default value if the source is default
+                    targetSetting.GetType().GetMethod(nameof(Bindable<int>.SetDefault))!.Invoke(targetSetting, null);
                     continue;
+                }
 
-                Type? targetType = getGenericBaseType(targetSetting, typeof(BindableNumber<>));
-                Type? sourceType = getGenericBaseType(sourceSetting, typeof(BindableNumber<>));
+                Type? targetBindableNumberType = getGenericBaseType(targetSetting, typeof(BindableNumber<>));
+                Type? sourceBindableNumberType = getGenericBaseType(sourceSetting, typeof(BindableNumber<>));
 
-                if (targetType == null || sourceType == null)
+                if (targetBindableNumberType == null || sourceBindableNumberType == null)
                 {
                     if (getGenericBaseType(targetSetting, typeof(Bindable<>))!.GenericTypeArguments.Single() ==
                         getGenericBaseType(sourceSetting, typeof(Bindable<>))!.GenericTypeArguments.Single())
@@ -202,8 +205,16 @@ namespace osu.Game.Rulesets.Mods
                     continue;
                 }
 
-                Type targetGenericType = targetType.GenericTypeArguments.Single();
-                Type sourceGenericType = sourceType.GenericTypeArguments.Single();
+                bool rangeOutOfBounds = false;
+
+                Type targetGenericType = targetBindableNumberType.GenericTypeArguments.Single();
+                Type sourceGenericType = sourceBindableNumberType.GenericTypeArguments.Single();
+
+                if (!Convert.ToBoolean(getValue(targetSetting, nameof(RangeConstrainedBindable<int>.HasDefinedRange))) ||
+                    !Convert.ToBoolean(getValue(sourceSetting, nameof(RangeConstrainedBindable<int>.HasDefinedRange))))
+                    // check if we have a range to rescale from and a range to rescale to
+                    // if not, copy the raw value
+                    rangeOutOfBounds = true;
 
                 double allowedMin = Math.Max(
                     Convert.ToDouble(targetGenericType.GetField("MinValue")!.GetValue(null)),
@@ -219,25 +230,35 @@ namespace osu.Game.Rulesets.Mods
                 double targetMax = getValueDouble(targetSetting, max_value);
                 double sourceMin = getValueDouble(sourceSetting, min_value);
                 double sourceMax = getValueDouble(sourceSetting, max_value);
-                double sourceValue = getValueDouble(sourceSetting, value);
+                double sourceValue = Math.Clamp(getValueDouble(sourceSetting, value), allowedMin, allowedMax);
 
-                // convert value to same ratio
-                double targetValue = (sourceValue - sourceMin) / (sourceMax - sourceMin) * (targetMax - targetMin) + targetMin;
+                double targetValue = rangeOutOfBounds
+                    // keep raw value
+                    ? sourceValue
+                    // convert value to same ratio
+                    : (sourceValue - sourceMin) / (sourceMax - sourceMin) * (targetMax - targetMin) + targetMin;
 
-                setValue(targetSetting, value, Convert.ChangeType(targetValue, targetType.GenericTypeArguments.Single()));
+                setValue(targetSetting, value, Convert.ChangeType(targetValue, targetBindableNumberType.GenericTypeArguments.Single()));
 
-                double getValueDouble(object target, string name) =>
-                    Math.Clamp(Convert.ToDouble(getValue(target, name)!), allowedMin, allowedMax);
+                double getValueDouble(object setting, string name)
+                {
+                    double settingValue = Convert.ToDouble(getValue(setting, name)!);
+
+                    if (settingValue < allowedMin || settingValue > allowedMax)
+                        rangeOutOfBounds = true;
+
+                    return settingValue;
+                }
             }
 
-            object? getValue(object target, string name) =>
-                target.GetType().GetProperty(name)!.GetValue(target);
+            object? getValue(object setting, string name) =>
+                setting.GetType().GetProperty(name)!.GetValue(setting);
 
-            void setValue(object target, string name, object? newValue) =>
-                target.GetType().GetProperty(name)!.SetValue(target, newValue);
+            void setValue(object setting, string name, object? newValue) =>
+                setting.GetType().GetProperty(name)!.SetValue(setting, newValue);
 
-            Type? getGenericBaseType(object target, Type genericType) =>
-                target.GetType().GetTypeInheritance().FirstOrDefault(t => t.IsGenericType && t.GetGenericTypeDefinition() == genericType);
+            Type? getGenericBaseType(object setting, Type genericType) =>
+                setting.GetType().GetTypeInheritance().FirstOrDefault(t => t.IsGenericType && t.GetGenericTypeDefinition() == genericType);
         }
 
         /// <summary>

From 8b0f127ff2a652cb2d8381d4c500c6cd040b878e Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sat, 11 Mar 2023 11:25:52 +0900
Subject: [PATCH 0111/1604] split ModPresetRow

---
 osu.Game/Overlays/Mods/ModPresetRow.cs     | 64 ++++++++++++++++++++++
 osu.Game/Overlays/Mods/ModPresetTooltip.cs | 54 ------------------
 2 files changed, 64 insertions(+), 54 deletions(-)
 create mode 100644 osu.Game/Overlays/Mods/ModPresetRow.cs

diff --git a/osu.Game/Overlays/Mods/ModPresetRow.cs b/osu.Game/Overlays/Mods/ModPresetRow.cs
new file mode 100644
index 0000000000..4829e93b87
--- /dev/null
+++ b/osu.Game/Overlays/Mods/ModPresetRow.cs
@@ -0,0 +1,64 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.UI;
+using osuTK;
+
+namespace osu.Game.Overlays.Mods
+{
+    public partial class ModPresetRow : FillFlowContainer
+    {
+        public ModPresetRow(Mod mod)
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+            Direction = FillDirection.Vertical;
+            Spacing = new Vector2(4);
+            InternalChildren = new Drawable[]
+            {
+                new FillFlowContainer
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Direction = FillDirection.Horizontal,
+                    Spacing = new Vector2(7),
+                    Children = new Drawable[]
+                    {
+                        new ModSwitchTiny(mod)
+                        {
+                            Active = { Value = true },
+                            Scale = new Vector2(0.6f),
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft
+                        },
+                        new OsuSpriteText
+                        {
+                            Text = mod.Name,
+                            Font = OsuFont.Default.With(size: 16, weight: FontWeight.SemiBold),
+                            Origin = Anchor.CentreLeft,
+                            Anchor = Anchor.CentreLeft,
+                            Margin = new MarginPadding { Bottom = 2 }
+                        }
+                    }
+                }
+            };
+
+            if (!string.IsNullOrEmpty(mod.SettingDescription))
+            {
+                AddInternal(new OsuTextFlowContainer
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Padding = new MarginPadding { Left = 14 },
+                    Text = mod.SettingDescription
+                });
+            }
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Mods/ModPresetTooltip.cs b/osu.Game/Overlays/Mods/ModPresetTooltip.cs
index ff4f00da69..8e8259de45 100644
--- a/osu.Game/Overlays/Mods/ModPresetTooltip.cs
+++ b/osu.Game/Overlays/Mods/ModPresetTooltip.cs
@@ -6,11 +6,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.UI;
 using osuTK;
 
 namespace osu.Game.Overlays.Mods
@@ -61,55 +57,5 @@ namespace osu.Game.Overlays.Mods
         protected override void PopOut() => this.FadeOut(transition_duration, Easing.OutQuint);
 
         public void Move(Vector2 pos) => Position = pos;
-
-        private partial class ModPresetRow : FillFlowContainer
-        {
-            public ModPresetRow(Mod mod)
-            {
-                RelativeSizeAxes = Axes.X;
-                AutoSizeAxes = Axes.Y;
-                Direction = FillDirection.Vertical;
-                Spacing = new Vector2(4);
-                InternalChildren = new Drawable[]
-                {
-                    new FillFlowContainer
-                    {
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Direction = FillDirection.Horizontal,
-                        Spacing = new Vector2(7),
-                        Children = new Drawable[]
-                        {
-                            new ModSwitchTiny(mod)
-                            {
-                                Active = { Value = true },
-                                Scale = new Vector2(0.6f),
-                                Anchor = Anchor.CentreLeft,
-                                Origin = Anchor.CentreLeft
-                            },
-                            new OsuSpriteText
-                            {
-                                Text = mod.Name,
-                                Font = OsuFont.Default.With(size: 16, weight: FontWeight.SemiBold),
-                                Origin = Anchor.CentreLeft,
-                                Anchor = Anchor.CentreLeft,
-                                Margin = new MarginPadding { Bottom = 2 }
-                            }
-                        }
-                    }
-                };
-
-                if (!string.IsNullOrEmpty(mod.SettingDescription))
-                {
-                    AddInternal(new OsuTextFlowContainer
-                    {
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Padding = new MarginPadding { Left = 14 },
-                        Text = mod.SettingDescription
-                    });
-                }
-            }
-        }
     }
 }

From 1cd565193e3a546e0e6d8e603e4eebc09688a0fd Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sat, 11 Mar 2023 11:39:35 +0900
Subject: [PATCH 0112/1604] public CheckCurrentModCanBeSave

---
 osu.Game/Overlays/Mods/ModPresetPanel.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModPresetPanel.cs b/osu.Game/Overlays/Mods/ModPresetPanel.cs
index f3fb5b5bb0..d01981d18c 100644
--- a/osu.Game/Overlays/Mods/ModPresetPanel.cs
+++ b/osu.Game/Overlays/Mods/ModPresetPanel.cs
@@ -100,7 +100,7 @@ namespace osu.Game.Overlays.Mods
                     new OsuMenuItem(CommonStrings.ButtonsDelete, MenuItemType.Destructive, () => dialogOverlay?.Push(new DeleteModPresetDialog(Preset))),
                 };
 
-                if (checkCurrentModCanBeSave())
+                if (CheckCurrentModCanBeSave())
                 {
                     menu.Insert(1, new OsuMenuItem("Use Current Mods", MenuItemType.Destructive, () => SaveCurrentMod()));
                 }
@@ -113,7 +113,7 @@ namespace osu.Game.Overlays.Mods
 
         public bool SaveCurrentMod()
         {
-            if (!checkCurrentModCanBeSave())
+            if (!CheckCurrentModCanBeSave())
                 return false;
 
             Preset.PerformWrite(s =>
@@ -123,7 +123,7 @@ namespace osu.Game.Overlays.Mods
             return true;
         }
 
-        private bool checkCurrentModCanBeSave() => (!Active.Value && selectedMods.Value.Any());
+        public bool CheckCurrentModCanBeSave() => (!Active.Value && selectedMods.Value.Any());
 
         protected override void Dispose(bool isDisposing)
         {

From 15f11bb1e8ff7ea4d5ed8defa45ea0069fbd303f Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sat, 11 Mar 2023 12:31:33 +0900
Subject: [PATCH 0113/1604] scorll container and save mod after popover hidden

Requires manual handling of many visual effects
---
 .../UserInterface/TestSceneModPresetColumn.cs | 12 ++-
 osu.Game/Overlays/Mods/EditPresetPopover.cs   | 76 +++++++++++++++++--
 osu.Game/Overlays/Mods/ModPresetPanel.cs      | 12 ++-
 osu.Game/Overlays/Mods/ModPresetTooltip.cs    | 13 ++--
 4 files changed, 95 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
index eaa3664623..68efb2a5f4 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
@@ -353,7 +353,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddWaitStep("wait some", 3);
             AddUntilStep("popover not closed", () => this.ChildrenOfType<OsuPopover>().Any());
             AddAssert("present mod not changed", () =>
-                !new HashSet<Mod>(this.ChildrenOfType<ModPresetPanel>().First().Preset.Value.Mods).SetEquals(mods));
+                !new HashSet<Mod>(this.ChildrenOfType<ModPresetPanel>().First().Mods.Value).SetEquals(mods));
 
             AddStep("select mods", () => SelectedMods.Value = mods);
             AddStep("right click first panel", () =>
@@ -378,8 +378,16 @@ namespace osu.Game.Tests.Visual.UserInterface
                 InputManager.Click(MouseButton.Left);
             });
             AddWaitStep("wait some", 3);
-            AddUntilStep("popover closed", () => !this.ChildrenOfType<OsuPopover>().Any());
+            AddUntilStep("popover not closed", () => this.ChildrenOfType<OsuPopover>().Any());
             AddAssert("present mod is changed", () =>
+                new HashSet<Mod>(this.ChildrenOfType<ModPresetPanel>().First().Mods.Value).SetEquals(mods));
+
+            AddStep("click edit", () =>
+            {
+                InputManager.MoveMouseTo(popover.ChildrenOfType<ShearedButton>().ElementAt(1));
+                InputManager.Click(MouseButton.Left);
+            });
+            AddAssert("present mod in realm is changed", () =>
                 new HashSet<Mod>(this.ChildrenOfType<ModPresetPanel>().First().Preset.Value.Mods).SetEquals(mods));
         }
 
diff --git a/osu.Game/Overlays/Mods/EditPresetPopover.cs b/osu.Game/Overlays/Mods/EditPresetPopover.cs
index a5c562914b..92860e96a6 100644
--- a/osu.Game/Overlays/Mods/EditPresetPopover.cs
+++ b/osu.Game/Overlays/Mods/EditPresetPopover.cs
@@ -1,12 +1,16 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Extensions;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Localisation;
@@ -23,8 +27,19 @@ namespace osu.Game.Overlays.Mods
         private readonly LabelledTextBox descriptionTextBox;
         private readonly ShearedButton useCurrentModButton;
         private readonly ShearedButton createButton;
+        private readonly FillFlowContainer scrollContent;
 
         private readonly ModPreset preset;
+        private List<Mod> saveModAfterClosed = new List<Mod>();
+
+        [Resolved]
+        private Bindable<IReadOnlyList<Mod>> selectedMods { get; set; } = null!;
+
+        [Resolved]
+        private OsuColour colours { get; set; } = null!;
+
+        [Resolved]
+        private OverlayColourProvider colourProvider { get; set; } = null!;
 
         public EditPresetPopover(ModPresetPanel modPresetPanel)
         {
@@ -53,6 +68,19 @@ namespace osu.Game.Overlays.Mods
                         Label = CommonStrings.Description,
                         TabbableContentContainer = this
                     },
+                    new OsuScrollContainer
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Height = 100,
+                        Padding = new MarginPadding(7),
+                        Child = scrollContent = new FillFlowContainer
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Padding = new MarginPadding(7),
+                            Spacing = new Vector2(7),
+                        }
+                    },
                     new FillFlowContainer
                     {
                         Anchor = Anchor.TopCentre,
@@ -83,7 +111,7 @@ namespace osu.Game.Overlays.Mods
         }
 
         [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider, OsuColour colours)
+        private void load()
         {
             Body.BorderThickness = 3;
             Body.BorderColour = colours.Orange1;
@@ -95,17 +123,40 @@ namespace osu.Game.Overlays.Mods
             createButton.LighterColour = colours.Orange0;
             createButton.TextColour = colourProvider.Background6;
 
-            useCurrentModButton.DarkerColour = colours.Blue1;
-            useCurrentModButton.LighterColour = colours.Blue0;
-            useCurrentModButton.TextColour = colourProvider.Background6;
+            selectedMods.BindValueChanged(_ => updateActiveState(), true);
+
+            scrollContent.ChildrenEnumerable = preset.Mods.Select(mod => new ModPresetRow(mod));
         }
 
         private void trySaveCurrentMod()
         {
-            if (button.SaveCurrentMod())
+            if (!button.CheckCurrentModCanBeSave())
+            {
+                Body.Shake();
                 return;
+            }
 
-            Body.Shake();
+            saveModAfterClosed = selectedMods.Value.ToList();
+            scrollContent.Clear();
+            scrollContent.ChildrenEnumerable = saveModAfterClosed.Select(mod => new ModPresetRow(mod));
+            button.Mods.Value = saveModAfterClosed;
+            updateActiveState();
+        }
+
+        private void updateActiveState()
+        {
+            if (button.CheckCurrentModCanBeSave())
+            {
+                useCurrentModButton.DarkerColour = colours.Blue1;
+                useCurrentModButton.LighterColour = colours.Blue0;
+                useCurrentModButton.TextColour = colourProvider.Background6;
+            }
+            else
+            {
+                useCurrentModButton.DarkerColour = colours.Blue3;
+                useCurrentModButton.LighterColour = colours.Blue4;
+                useCurrentModButton.TextColour = colourProvider.Background2;
+            }
         }
 
         protected override void LoadComplete()
@@ -131,5 +182,18 @@ namespace osu.Game.Overlays.Mods
 
             this.HidePopover();
         }
+
+        protected override void UpdateState(ValueChangedEvent<Visibility> state)
+        {
+            base.UpdateState(state);
+
+            if (state.NewValue == Visibility.Hidden && saveModAfterClosed.Any())
+            {
+                button.Preset.PerformWrite(s =>
+                {
+                    s.Mods = saveModAfterClosed;
+                });
+            }
+        }
     }
 }
diff --git a/osu.Game/Overlays/Mods/ModPresetPanel.cs b/osu.Game/Overlays/Mods/ModPresetPanel.cs
index d01981d18c..49437c5bb1 100644
--- a/osu.Game/Overlays/Mods/ModPresetPanel.cs
+++ b/osu.Game/Overlays/Mods/ModPresetPanel.cs
@@ -18,10 +18,12 @@ using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Overlays.Mods
 {
-    public partial class ModPresetPanel : ModSelectPanel, IHasCustomTooltip<ModPreset>, IHasContextMenu, IHasPopover
+    public partial class ModPresetPanel : ModSelectPanel, IHasCustomTooltip<List<Mod>>, IHasContextMenu, IHasPopover
     {
         public readonly Live<ModPreset> Preset;
 
+        public readonly Bindable<List<Mod>> Mods = new Bindable<List<Mod>>();
+
         public override BindableBool Active { get; } = new BindableBool();
 
         [Resolved]
@@ -35,6 +37,7 @@ namespace osu.Game.Overlays.Mods
         public ModPresetPanel(Live<ModPreset> preset)
         {
             Preset = preset;
+            Mods.Value = preset.Value.Mods.ToList();
 
             Title = preset.Value.Name;
             Description = preset.Value.Description;
@@ -51,6 +54,7 @@ namespace osu.Game.Overlays.Mods
             base.LoadComplete();
 
             selectedMods.BindValueChanged(_ => selectedModsChanged(), true);
+            Mods.BindValueChanged(_ => updateActiveState(), true);
         }
 
         protected override void Select()
@@ -78,13 +82,13 @@ namespace osu.Game.Overlays.Mods
 
         private void updateActiveState()
         {
-            Active.Value = new HashSet<Mod>(Preset.Value.Mods).SetEquals(selectedMods.Value);
+            Active.Value = new HashSet<Mod>(Mods.Value).SetEquals(selectedMods.Value);
         }
 
         #region IHasCustomTooltip
 
-        public ModPreset TooltipContent => Preset.Value;
-        public ITooltip<ModPreset> GetCustomTooltip() => new ModPresetTooltip(ColourProvider);
+        public List<Mod> TooltipContent => Mods.Value;
+        public ITooltip<List<Mod>> GetCustomTooltip() => new ModPresetTooltip(ColourProvider);
 
         #endregion
 
diff --git a/osu.Game/Overlays/Mods/ModPresetTooltip.cs b/osu.Game/Overlays/Mods/ModPresetTooltip.cs
index 8e8259de45..0b31a97064 100644
--- a/osu.Game/Overlays/Mods/ModPresetTooltip.cs
+++ b/osu.Game/Overlays/Mods/ModPresetTooltip.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -11,7 +12,7 @@ using osuTK;
 
 namespace osu.Game.Overlays.Mods
 {
-    public partial class ModPresetTooltip : VisibilityContainer, ITooltip<ModPreset>
+    public partial class ModPresetTooltip : VisibilityContainer, ITooltip<List<Mod>>
     {
         protected override Container<Drawable> Content { get; }
 
@@ -42,15 +43,15 @@ namespace osu.Game.Overlays.Mods
             };
         }
 
-        private ModPreset? lastPreset;
+        private List<Mod>? lastPreset;
 
-        public void SetContent(ModPreset preset)
+        public void SetContent(List<Mod> mods)
         {
-            if (ReferenceEquals(preset, lastPreset))
+            if (ReferenceEquals(mods, lastPreset))
                 return;
 
-            lastPreset = preset;
-            Content.ChildrenEnumerable = preset.Mods.Select(mod => new ModPresetRow(mod));
+            lastPreset = mods;
+            Content.ChildrenEnumerable = mods.Select(mod => new ModPresetRow(mod));
         }
 
         protected override void PopIn() => this.FadeIn(transition_duration, Easing.OutQuint);

From 8e8dda3ac0ad1d49043198681fcac2b092c9cdda Mon Sep 17 00:00:00 2001
From: Terochi <mates.cernicky@gmail.com>
Date: Sat, 11 Mar 2023 23:29:36 +0100
Subject: [PATCH 0114/1604] Big simplifying

---
 osu.Game.Tests/Mods/ModSettingsTest.cs        | 83 +++----------------
 .../TestSceneModSelectOverlay.cs              | 42 ----------
 osu.Game/Rulesets/Mods/Mod.cs                 | 61 ++------------
 3 files changed, 19 insertions(+), 167 deletions(-)

diff --git a/osu.Game.Tests/Mods/ModSettingsTest.cs b/osu.Game.Tests/Mods/ModSettingsTest.cs
index e2e050870e..d943f0ffb1 100644
--- a/osu.Game.Tests/Mods/ModSettingsTest.cs
+++ b/osu.Game.Tests/Mods/ModSettingsTest.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
 using NUnit.Framework;
 using osu.Framework.Bindables;
 using osu.Framework.Localisation;
@@ -42,16 +41,20 @@ namespace osu.Game.Tests.Mods
         {
             const double setting_change = 50.4;
 
-            var modDouble = new TestNonMatchingSettingTypeModDouble();
-            var modBool = new TestNonMatchingSettingTypeModBool();
+            var modDouble = new TestNonMatchingSettingTypeModDouble { TestSetting = { Value = setting_change } };
+            var modBool = new TestNonMatchingSettingTypeModBool { TestSetting = { Default = false, Value = true } };
+            var modInt = new TestNonMatchingSettingTypeModInt { TestSetting = { Value = (int)setting_change } };
 
-            modDouble.TestSetting.Value = setting_change;
-            modBool.TestSetting.Value = !modBool.TestSetting.Default;
             modDouble.CopySharedSettings(modBool);
+            modDouble.CopySharedSettings(modInt);
             modBool.CopySharedSettings(modDouble);
+            modBool.CopySharedSettings(modInt);
+            modInt.CopySharedSettings(modDouble);
+            modInt.CopySharedSettings(modBool);
 
             Assert.That(modDouble.TestSetting.Value, Is.EqualTo(setting_change));
             Assert.That(modBool.TestSetting.Value, Is.EqualTo(!modBool.TestSetting.Default));
+            Assert.That(modInt.TestSetting.Value, Is.EqualTo((int)setting_change));
         }
 
         [Test]
@@ -70,75 +73,11 @@ namespace osu.Game.Tests.Mods
         public void TestValueResetsToDefaultWhenCopied()
         {
             var modDouble = new TestNonMatchingSettingTypeModDouble();
-            var modInt = new TestNonMatchingSettingTypeModInt { TestSetting = { Value = 1 } };
+            var modBool = new TestNonMatchingSettingTypeModBool { TestSetting = { Default = false, Value = true } };
 
-            modInt.CopySharedSettings(modDouble);
+            modBool.CopySharedSettings(modDouble);
 
-            Assert.That(modInt.TestSetting.Value, Is.EqualTo(modInt.TestSetting.Default));
-        }
-
-        [Test]
-        public void TestRelativelyScaleWithClampedRangeWhenCopied()
-        {
-            const double setting_change = 50.4;
-
-            var modDouble100 = new TestNonMatchingSettingTypeModDouble { TestSetting = { MaxValue = 100, MinValue = 0, Value = setting_change } };
-            var modDouble200 = new TestNonMatchingSettingTypeModDouble { TestSetting = { MaxValue = 200, MinValue = 0 } };
-
-            modDouble200.CopySharedSettings(modDouble100);
-
-            Assert.That(modDouble200.TestSetting.Value, Is.EqualTo(setting_change * 2));
-        }
-
-        [Test]
-        public void TestCopyDoubleToIntWithDefaultRange()
-        {
-            const double setting_change = 50.4;
-
-            var modDouble = new TestNonMatchingSettingTypeModDouble { TestSetting = { Value = setting_change } };
-            var modInt = new TestNonMatchingSettingTypeModInt();
-
-            modInt.CopySharedSettings(modDouble);
-
-            Assert.That(modInt.TestSetting.Value, Is.EqualTo(Convert.ToInt32(setting_change)));
-        }
-
-        [Test]
-        public void TestCopyDoubleToIntWithOutOfBoundsRange()
-        {
-            const double setting_change = 50.4;
-
-            var modDouble = new TestNonMatchingSettingTypeModDouble { TestSetting = { MinValue = int.MinValue - 1d, Value = setting_change } };
-            // make RangeConstrainedBindable.HasDefinedRange return true
-            var modInt = new TestNonMatchingSettingTypeModInt { TestSetting = { MinValue = int.MinValue + 1 } };
-
-            modInt.CopySharedSettings(modDouble);
-
-            Assert.That(modInt.TestSetting.Value, Is.EqualTo(Convert.ToInt32(setting_change)));
-        }
-
-        [Test]
-        public void TestCopyDoubleToIntWithOutOfBoundsValue()
-        {
-            var modDouble = new TestNonMatchingSettingTypeModDouble { TestSetting = { MinValue = int.MinValue + 1, Value = int.MaxValue + 1d } };
-            var modInt = new TestNonMatchingSettingTypeModInt { TestSetting = { MinValue = int.MinValue + 1 } };
-
-            modInt.CopySharedSettings(modDouble);
-
-            Assert.That(modInt.TestSetting.Value, Is.EqualTo(int.MaxValue));
-        }
-
-        [Test]
-        public void TestCopyIntToDoubleWithDefaultRange()
-        {
-            const int setting_change = 50;
-
-            var modInt = new TestNonMatchingSettingTypeModInt { TestSetting = { Value = setting_change } };
-            var modDouble = new TestNonMatchingSettingTypeModDouble();
-
-            modDouble.CopySharedSettings(modInt);
-
-            Assert.That(modDouble.TestSetting.Value, Is.EqualTo(setting_change));
+            Assert.That(modBool.TestSetting.Value, Is.EqualTo(modBool.TestSetting.Default));
         }
 
         private class TestNonMatchingSettingTypeModDouble : TestNonMatchingSettingTypeMod
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 75efc07d43..b4b5052f23 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -18,7 +18,6 @@ using osu.Game.Overlays.Mods;
 using osu.Game.Overlays.Settings;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Catch.Mods;
-using osu.Game.Rulesets.Mania.Mods;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
@@ -417,47 +416,6 @@ namespace osu.Game.Tests.Visual.UserInterface
             });
         }
 
-        [Test]
-        public void TestKeepSharedSettingsRatio()
-        {
-            const float setting_change = 1.8f;
-
-            createScreen();
-            changeRuleset(0);
-
-            AddStep("select flashlight mod", () => SelectedMods.Value = new[] { Ruleset.Value.CreateInstance().CreateMod<ModFlashlight>()! });
-
-            changeRuleset(0);
-            AddAssert("ensure mod still selected", () => SelectedMods.Value.SingleOrDefault() is OsuModFlashlight);
-
-            AddStep("change mod settings", () =>
-            {
-                var osuMod = getMod<OsuModFlashlight>();
-
-                // range <0.5 - 2>
-                osuMod.SizeMultiplier.Value = setting_change;
-            });
-
-            changeRuleset(3);
-            AddAssert("mania variant selected", () => SelectedMods.Value.SingleOrDefault() is ManiaModFlashlight);
-
-            AddAssert("shared settings changed to closest ratio", () =>
-            {
-                var maniaMod = getMod<ManiaModFlashlight>();
-
-                // range <0.5 - 3>
-                // converted value based on ratio = (setting_change - 0.5) / (2 - 0.5) * (3 - 0.5) + 0.5 = 2.66
-                return maniaMod.SizeMultiplier.Value == 2.7f; // taking precision into account
-            });
-
-            AddAssert("other settings unchanged", () =>
-            {
-                var maniaMod = getMod<ManiaModFlashlight>();
-
-                return maniaMod.ComboBasedSize.IsDefault;
-            });
-        }
-
         [Test]
         public void TestExternallySetCustomizedMod()
         {
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 85014d555d..623a734b82 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -165,8 +165,6 @@ namespace osu.Game.Rulesets.Mods
         /// <param name="source">The mod to copy properties from.</param>
         internal void CopySharedSettings(Mod source)
         {
-            const string min_value = nameof(BindableNumber<int>.MinValue);
-            const string max_value = nameof(BindableNumber<int>.MaxValue);
             const string value = nameof(Bindable<int>.Value);
 
             Dictionary<string, object> sourceSettings = new Dictionary<string, object>();
@@ -190,65 +188,22 @@ namespace osu.Game.Rulesets.Mods
                     continue;
                 }
 
+                bool hasSameGenericArgument = getGenericBaseType(targetSetting, typeof(Bindable<>))!.GenericTypeArguments.Single() ==
+                                              getGenericBaseType(sourceSetting, typeof(Bindable<>))!.GenericTypeArguments.Single();
+
+                if (!hasSameGenericArgument)
+                    continue;
+
                 Type? targetBindableNumberType = getGenericBaseType(targetSetting, typeof(BindableNumber<>));
                 Type? sourceBindableNumberType = getGenericBaseType(sourceSetting, typeof(BindableNumber<>));
 
                 if (targetBindableNumberType == null || sourceBindableNumberType == null)
                 {
-                    if (getGenericBaseType(targetSetting, typeof(Bindable<>))!.GenericTypeArguments.Single() ==
-                        getGenericBaseType(sourceSetting, typeof(Bindable<>))!.GenericTypeArguments.Single())
-                    {
-                        // change settings only if the type is the same
-                        setValue(targetSetting, value, getValue(sourceSetting, value));
-                    }
-
+                    setValue(targetSetting, value, getValue(sourceSetting, value));
                     continue;
                 }
 
-                bool rangeOutOfBounds = false;
-
-                Type targetGenericType = targetBindableNumberType.GenericTypeArguments.Single();
-                Type sourceGenericType = sourceBindableNumberType.GenericTypeArguments.Single();
-
-                if (!Convert.ToBoolean(getValue(targetSetting, nameof(RangeConstrainedBindable<int>.HasDefinedRange))) ||
-                    !Convert.ToBoolean(getValue(sourceSetting, nameof(RangeConstrainedBindable<int>.HasDefinedRange))))
-                    // check if we have a range to rescale from and a range to rescale to
-                    // if not, copy the raw value
-                    rangeOutOfBounds = true;
-
-                double allowedMin = Math.Max(
-                    Convert.ToDouble(targetGenericType.GetField("MinValue")!.GetValue(null)),
-                    Convert.ToDouble(sourceGenericType.GetField("MinValue")!.GetValue(null))
-                );
-
-                double allowedMax = Math.Min(
-                    Convert.ToDouble(targetGenericType.GetField("MaxValue")!.GetValue(null)),
-                    Convert.ToDouble(sourceGenericType.GetField("MaxValue")!.GetValue(null))
-                );
-
-                double targetMin = getValueDouble(targetSetting, min_value);
-                double targetMax = getValueDouble(targetSetting, max_value);
-                double sourceMin = getValueDouble(sourceSetting, min_value);
-                double sourceMax = getValueDouble(sourceSetting, max_value);
-                double sourceValue = Math.Clamp(getValueDouble(sourceSetting, value), allowedMin, allowedMax);
-
-                double targetValue = rangeOutOfBounds
-                    // keep raw value
-                    ? sourceValue
-                    // convert value to same ratio
-                    : (sourceValue - sourceMin) / (sourceMax - sourceMin) * (targetMax - targetMin) + targetMin;
-
-                setValue(targetSetting, value, Convert.ChangeType(targetValue, targetBindableNumberType.GenericTypeArguments.Single()));
-
-                double getValueDouble(object setting, string name)
-                {
-                    double settingValue = Convert.ToDouble(getValue(setting, name)!);
-
-                    if (settingValue < allowedMin || settingValue > allowedMax)
-                        rangeOutOfBounds = true;
-
-                    return settingValue;
-                }
+                setValue(targetSetting, value, Convert.ChangeType(getValue(sourceSetting, value), targetBindableNumberType.GenericTypeArguments.Single()));
             }
 
             object? getValue(object setting, string name) =>

From 5aebbac6c5e8377f265404139c7630b9da834464 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 14 Mar 2023 18:15:18 +0900
Subject: [PATCH 0115/1604] Fix osu!mania hold note animations not correctly
 re-applying after rewind

There's early exit logic in `OnPressed`/`OnReleased` for the sake of
keeping order correct, but this doesn't account for the fact that
`DrawableHitObject` resets all animations when the hit state changes.

A bit of an ugly workaround, but seems to work as expected.
---
 .../Objects/Drawables/DrawableHoldNote.cs                    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index 25d0573a82..3bf3aec9c3 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -323,7 +323,12 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
             // do not run any of this logic when rewinding, as it inverts order of presses/releases.
             if (Time.Elapsed < 0)
+            {
+                // Except for the IsHitting state, as this handles animations that need to be reapplied
+                // after rewind.
+                isHitting.Value = false;
                 return;
+            }
 
             // Make sure a hold was started
             if (HoldStartTime == null)

From 42bcc8bafc01005ad91035dde8d80d027b3552f5 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Thu, 16 Mar 2023 19:15:50 +0900
Subject: [PATCH 0116/1604] revert mod store

---
 osu.Game/Overlays/Mods/ModPresetPanel.cs   | 12 ++++--------
 osu.Game/Overlays/Mods/ModPresetTooltip.cs | 13 ++++++-------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModPresetPanel.cs b/osu.Game/Overlays/Mods/ModPresetPanel.cs
index 49437c5bb1..d01981d18c 100644
--- a/osu.Game/Overlays/Mods/ModPresetPanel.cs
+++ b/osu.Game/Overlays/Mods/ModPresetPanel.cs
@@ -18,12 +18,10 @@ using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Overlays.Mods
 {
-    public partial class ModPresetPanel : ModSelectPanel, IHasCustomTooltip<List<Mod>>, IHasContextMenu, IHasPopover
+    public partial class ModPresetPanel : ModSelectPanel, IHasCustomTooltip<ModPreset>, IHasContextMenu, IHasPopover
     {
         public readonly Live<ModPreset> Preset;
 
-        public readonly Bindable<List<Mod>> Mods = new Bindable<List<Mod>>();
-
         public override BindableBool Active { get; } = new BindableBool();
 
         [Resolved]
@@ -37,7 +35,6 @@ namespace osu.Game.Overlays.Mods
         public ModPresetPanel(Live<ModPreset> preset)
         {
             Preset = preset;
-            Mods.Value = preset.Value.Mods.ToList();
 
             Title = preset.Value.Name;
             Description = preset.Value.Description;
@@ -54,7 +51,6 @@ namespace osu.Game.Overlays.Mods
             base.LoadComplete();
 
             selectedMods.BindValueChanged(_ => selectedModsChanged(), true);
-            Mods.BindValueChanged(_ => updateActiveState(), true);
         }
 
         protected override void Select()
@@ -82,13 +78,13 @@ namespace osu.Game.Overlays.Mods
 
         private void updateActiveState()
         {
-            Active.Value = new HashSet<Mod>(Mods.Value).SetEquals(selectedMods.Value);
+            Active.Value = new HashSet<Mod>(Preset.Value.Mods).SetEquals(selectedMods.Value);
         }
 
         #region IHasCustomTooltip
 
-        public List<Mod> TooltipContent => Mods.Value;
-        public ITooltip<List<Mod>> GetCustomTooltip() => new ModPresetTooltip(ColourProvider);
+        public ModPreset TooltipContent => Preset.Value;
+        public ITooltip<ModPreset> GetCustomTooltip() => new ModPresetTooltip(ColourProvider);
 
         #endregion
 
diff --git a/osu.Game/Overlays/Mods/ModPresetTooltip.cs b/osu.Game/Overlays/Mods/ModPresetTooltip.cs
index 0b31a97064..8e8259de45 100644
--- a/osu.Game/Overlays/Mods/ModPresetTooltip.cs
+++ b/osu.Game/Overlays/Mods/ModPresetTooltip.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -12,7 +11,7 @@ using osuTK;
 
 namespace osu.Game.Overlays.Mods
 {
-    public partial class ModPresetTooltip : VisibilityContainer, ITooltip<List<Mod>>
+    public partial class ModPresetTooltip : VisibilityContainer, ITooltip<ModPreset>
     {
         protected override Container<Drawable> Content { get; }
 
@@ -43,15 +42,15 @@ namespace osu.Game.Overlays.Mods
             };
         }
 
-        private List<Mod>? lastPreset;
+        private ModPreset? lastPreset;
 
-        public void SetContent(List<Mod> mods)
+        public void SetContent(ModPreset preset)
         {
-            if (ReferenceEquals(mods, lastPreset))
+            if (ReferenceEquals(preset, lastPreset))
                 return;
 
-            lastPreset = mods;
-            Content.ChildrenEnumerable = mods.Select(mod => new ModPresetRow(mod));
+            lastPreset = preset;
+            Content.ChildrenEnumerable = preset.Mods.Select(mod => new ModPresetRow(mod));
         }
 
         protected override void PopIn() => this.FadeIn(transition_duration, Easing.OutQuint);

From d025c441ca2249489b6d0c523d55b44ef1da6108 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Thu, 16 Mar 2023 19:38:52 +0900
Subject: [PATCH 0117/1604] delay mod save after click save or not popover
 hidden

---
 .../UserInterface/TestSceneModPresetColumn.cs | 20 ++++++-----
 osu.Game/Overlays/Mods/EditPresetPopover.cs   | 36 ++++++++++---------
 2 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
index 68efb2a5f4..c4c5584c5e 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
@@ -319,6 +319,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         {
             ModPresetColumn modPresetColumn = null!;
             var mods = new Mod[] { new OsuModHidden(), new OsuModHardRock() };
+            List<Mod> previousMod = null!;
 
             AddStep("clear mods", () => SelectedMods.Value = Array.Empty<Mod>());
             AddStep("create content", () => Child = modPresetColumn = new ModPresetColumn
@@ -332,6 +333,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("right click first panel", () =>
             {
                 var panel = this.ChildrenOfType<ModPresetPanel>().First();
+                previousMod = panel.Preset.Value.Mods.ToList();
                 InputManager.MoveMouseTo(panel);
                 InputManager.Click(MouseButton.Right);
             });
@@ -350,10 +352,14 @@ namespace osu.Game.Tests.Visual.UserInterface
                 InputManager.MoveMouseTo(popover.ChildrenOfType<ShearedButton>().ElementAt(0));
                 InputManager.Click(MouseButton.Left);
             });
+            AddStep("attempt preset edit", () =>
+            {
+                InputManager.MoveMouseTo(popover.ChildrenOfType<ShearedButton>().ElementAt(1));
+                InputManager.Click(MouseButton.Left);
+            });
             AddWaitStep("wait some", 3);
-            AddUntilStep("popover not closed", () => this.ChildrenOfType<OsuPopover>().Any());
             AddAssert("present mod not changed", () =>
-                !new HashSet<Mod>(this.ChildrenOfType<ModPresetPanel>().First().Mods.Value).SetEquals(mods));
+                new HashSet<Mod>(this.ChildrenOfType<ModPresetPanel>().First().Preset.Value.Mods).SetEquals(previousMod));
 
             AddStep("select mods", () => SelectedMods.Value = mods);
             AddStep("right click first panel", () =>
@@ -377,17 +383,13 @@ namespace osu.Game.Tests.Visual.UserInterface
                 InputManager.MoveMouseTo(popover.ChildrenOfType<ShearedButton>().ElementAt(0));
                 InputManager.Click(MouseButton.Left);
             });
-            AddWaitStep("wait some", 3);
-            AddUntilStep("popover not closed", () => this.ChildrenOfType<OsuPopover>().Any());
-            AddAssert("present mod is changed", () =>
-                new HashSet<Mod>(this.ChildrenOfType<ModPresetPanel>().First().Mods.Value).SetEquals(mods));
-
-            AddStep("click edit", () =>
+            AddStep("attempt preset edit", () =>
             {
                 InputManager.MoveMouseTo(popover.ChildrenOfType<ShearedButton>().ElementAt(1));
                 InputManager.Click(MouseButton.Left);
             });
-            AddAssert("present mod in realm is changed", () =>
+            AddWaitStep("wait some", 3);
+            AddAssert("present mod is changed", () =>
                 new HashSet<Mod>(this.ChildrenOfType<ModPresetPanel>().First().Preset.Value.Mods).SetEquals(mods));
         }
 
diff --git a/osu.Game/Overlays/Mods/EditPresetPopover.cs b/osu.Game/Overlays/Mods/EditPresetPopover.cs
index 92860e96a6..0e21260493 100644
--- a/osu.Game/Overlays/Mods/EditPresetPopover.cs
+++ b/osu.Game/Overlays/Mods/EditPresetPopover.cs
@@ -130,7 +130,7 @@ namespace osu.Game.Overlays.Mods
 
         private void trySaveCurrentMod()
         {
-            if (!button.CheckCurrentModCanBeSave())
+            if (!checkCanBeSave())
             {
                 Body.Shake();
                 return;
@@ -139,13 +139,12 @@ namespace osu.Game.Overlays.Mods
             saveModAfterClosed = selectedMods.Value.ToList();
             scrollContent.Clear();
             scrollContent.ChildrenEnumerable = saveModAfterClosed.Select(mod => new ModPresetRow(mod));
-            button.Mods.Value = saveModAfterClosed;
             updateActiveState();
         }
 
         private void updateActiveState()
         {
-            if (button.CheckCurrentModCanBeSave())
+            if (checkCanBeSave())
             {
                 useCurrentModButton.DarkerColour = colours.Blue1;
                 useCurrentModButton.LighterColour = colours.Blue0;
@@ -159,6 +158,19 @@ namespace osu.Game.Overlays.Mods
             }
         }
 
+        private bool checkCanBeSave()
+        {
+            if (!selectedMods.Value.Any())
+                return false;
+
+            if (saveModAfterClosed.Any())
+            {
+                return !new HashSet<Mod>(saveModAfterClosed).SetEquals(selectedMods.Value);
+            }
+
+            return button.CheckCurrentModCanBeSave();
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -178,22 +190,14 @@ namespace osu.Game.Overlays.Mods
             {
                 s.Name = nameTextBox.Current.Value;
                 s.Description = descriptionTextBox.Current.Value;
+
+                if (saveModAfterClosed.Any())
+                {
+                    s.Mods = saveModAfterClosed;
+                }
             });
 
             this.HidePopover();
         }
-
-        protected override void UpdateState(ValueChangedEvent<Visibility> state)
-        {
-            base.UpdateState(state);
-
-            if (state.NewValue == Visibility.Hidden && saveModAfterClosed.Any())
-            {
-                button.Preset.PerformWrite(s =>
-                {
-                    s.Mods = saveModAfterClosed;
-                });
-            }
-        }
     }
 }

From c65a79614dcee1f5d570a31fe1dc37a0bcc1487a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Mar 2023 15:45:02 +0900
Subject: [PATCH 0118/1604] Don't show offset calibration controls when "relax"
 mod is active

Closes https://github.com/ppy/osu/issues/22892.
---
 osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs b/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
index 9492614b66..8d5459809e 100644
--- a/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
@@ -18,6 +18,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Localisation;
 using osu.Game.Overlays.Settings;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Ranking.Statistics;
@@ -183,7 +184,7 @@ namespace osu.Game.Screens.Play.PlayerSettings
             if (score.NewValue == null)
                 return;
 
-            if (score.NewValue.Mods.Any(m => !m.UserPlayable))
+            if (score.NewValue.Mods.Any(m => !m.UserPlayable || m is ModRelax))
                 return;
 
             var hitEvents = score.NewValue.HitEvents;

From 8518d15b8daf8cd2cbb047054e8b2286c0f63493 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Thu, 23 Mar 2023 00:13:24 +0900
Subject: [PATCH 0119/1604] use endpoint

---
 .../Visual/Online/TestSceneChatOverlay.cs     | 33 +++++++++++++++-
 .../Online/API/Requests/ChatReportRequest.cs  | 38 +++++++++++++++++++
 osu.Game/Overlays/Chat/ChatLine.cs            |  2 +-
 osu.Game/Overlays/Chat/DrawableUsername.cs    | 24 ++++++++++--
 4 files changed, 91 insertions(+), 6 deletions(-)
 create mode 100644 osu.Game/Online/API/Requests/ChatReportRequest.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
index 48db5691ce..08337fbff9 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
@@ -8,6 +8,7 @@ using System.Linq;
 using System.Collections.Generic;
 using System.Net;
 using System.Threading;
+using System.Threading.Tasks;
 using JetBrains.Annotations;
 using NUnit.Framework;
 using osu.Framework.Allocation;
@@ -32,6 +33,7 @@ using osu.Game.Overlays.Chat.ChannelList;
 using osuTK;
 using osuTK.Input;
 using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Overlays.Comments;
 
 namespace osu.Game.Tests.Visual.Online
 {
@@ -55,6 +57,9 @@ namespace osu.Game.Tests.Visual.Online
 
         private int currentMessageId;
 
+        private DummyAPIAccess dummyAPI => (DummyAPIAccess)API;
+        private readonly ManualResetEventSlim requestLock = new ManualResetEventSlim();
+
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
@@ -581,6 +586,8 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestChatReport()
         {
+            ChatReportRequest request = null;
+
             AddStep("Show overlay with channel", () =>
             {
                 chatOverlay.Show();
@@ -590,6 +597,26 @@ namespace osu.Game.Tests.Visual.Online
             AddAssert("Overlay is visible", () => chatOverlay.State.Value == Visibility.Visible);
             waitForChannel1Visible();
 
+            AddStep("Setup request handling", () =>
+            {
+                requestLock.Reset();
+
+                dummyAPI.HandleRequest = r =>
+                {
+                    if (!(r is ChatReportRequest req))
+                        return false;
+
+                    Task.Run(() =>
+                    {
+                        request = req;
+                        requestLock.Wait(10000);
+                        req.TriggerSuccess();
+                    });
+
+                    return true;
+                };
+            });
+
             AddStep("Show report popover", () => this.ChildrenOfType<DrawableUsername>().First().ShowPopover());
 
             AddStep("Try to report", () =>
@@ -599,7 +626,11 @@ namespace osu.Game.Tests.Visual.Online
                 InputManager.Click(MouseButton.Left);
             });
 
-            AddAssert("Report message sended", () => channelManager.CurrentChannel.Value.Messages.Any(x => x.Content.Contains("!report")));
+            AddWaitStep("Wait", 3);
+
+            AddAssert("Overlay closed", () => !this.ChildrenOfType<ReportChatPopover>().Any());
+            AddStep("Complete request", () => requestLock.Set());
+            AddUntilStep("Request sent", () => request != null);
         }
 
         private void joinTestChannel(int i)
diff --git a/osu.Game/Online/API/Requests/ChatReportRequest.cs b/osu.Game/Online/API/Requests/ChatReportRequest.cs
new file mode 100644
index 0000000000..00d314be68
--- /dev/null
+++ b/osu.Game/Online/API/Requests/ChatReportRequest.cs
@@ -0,0 +1,38 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Net.Http;
+using osu.Framework.IO.Network;
+using osu.Game.Online.Chat;
+using osu.Game.Overlays.Chat;
+
+namespace osu.Game.Online.API.Requests;
+
+public class ChatReportRequest : APIRequest
+{
+    public readonly long? MessageId;
+    public readonly ChatReportReason Reason;
+    public readonly string Comment;
+
+    public ChatReportRequest(long? id, ChatReportReason reason, string comment)
+    {
+        MessageId = id;
+        Reason = reason;
+        Comment = comment;
+    }
+
+    protected override WebRequest CreateWebRequest()
+    {
+        var req = base.CreateWebRequest();
+        req.Method = HttpMethod.Post;
+
+        req.AddParameter(@"reportable_type", @"message");
+        req.AddParameter(@"reportable_id", $"{MessageId}");
+        req.AddParameter(@"reason", Reason.ToString());
+        req.AddParameter(@"comments", Comment);
+
+        return req;
+    }
+
+    protected override string Target => @"reports";
+}
diff --git a/osu.Game/Overlays/Chat/ChatLine.cs b/osu.Game/Overlays/Chat/ChatLine.cs
index 70c3bf181c..0e69501ae9 100644
--- a/osu.Game/Overlays/Chat/ChatLine.cs
+++ b/osu.Game/Overlays/Chat/ChatLine.cs
@@ -92,7 +92,7 @@ namespace osu.Game.Overlays.Chat
                             Font = OsuFont.GetFont(size: FontSize * 0.75f, weight: FontWeight.SemiBold, fixedWidth: true),
                             AlwaysPresent = true,
                         },
-                        drawableUsername = new DrawableUsername(message.Sender)
+                        drawableUsername = new DrawableUsername(message)
                         {
                             Width = UsernameWidth,
                             FontSize = FontSize,
diff --git a/osu.Game/Overlays/Chat/DrawableUsername.cs b/osu.Game/Overlays/Chat/DrawableUsername.cs
index 640ce2eca6..c9b0b018e3 100644
--- a/osu.Game/Overlays/Chat/DrawableUsername.cs
+++ b/osu.Game/Overlays/Chat/DrawableUsername.cs
@@ -21,6 +21,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Localisation;
 using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Chat;
 using osu.Game.Resources.Localisation.Web;
@@ -72,13 +73,15 @@ namespace osu.Game.Overlays.Chat
         private Bindable<Channel?>? currentChannel { get; set; }
 
         private readonly APIUser user;
+        private readonly Message message;
         private readonly OsuSpriteText drawableText;
 
         private readonly Drawable colouredDrawable;
 
-        public DrawableUsername(APIUser user)
+        public DrawableUsername(Message message)
         {
-            this.user = user;
+            this.message = message;
+            user = message.Sender;
 
             Action = openUserProfile;
 
@@ -171,7 +174,8 @@ namespace osu.Game.Overlays.Chat
                     }));
                 }
 
-                items.Add(new OsuMenuItem("Report", MenuItemType.Destructive, this.ShowPopover));
+                if (!user.Equals(api.LocalUser.Value))
+                    items.Add(new OsuMenuItem("Report", MenuItemType.Destructive, this.ShowPopover));
 
                 return items.ToArray();
             }
@@ -179,7 +183,19 @@ namespace osu.Game.Overlays.Chat
 
         private void report(ChatReportReason reason, string comments)
         {
-            chatManager?.PostMessage($"!report {user.Username} ({reason.GetDescription()}): {comments}");
+            var request = new ChatReportRequest(message.Id, reason, comments);
+
+            request.Failure += _ => Schedule(() =>
+            {
+                currentChannel?.Value?.AddNewMessages(new ErrorMessage("Report failed to send, please retry"));
+            });
+
+            request.Success += () => Schedule(() =>
+            {
+                currentChannel?.Value?.AddNewMessages(new InfoMessage("Report has been sent"));
+            });
+
+            api.Queue(request);
         }
 
         private void openUserChannel()

From 85a924f0782ee04f48aae86224f09343f7b37979 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Thu, 23 Mar 2023 01:02:17 +0900
Subject: [PATCH 0120/1604] why

merge problem?
---
 osu.Game/Overlays/Chat/DrawableUsername.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Chat/DrawableUsername.cs b/osu.Game/Overlays/Chat/DrawableUsername.cs
index c9b0b018e3..25967003e9 100644
--- a/osu.Game/Overlays/Chat/DrawableUsername.cs
+++ b/osu.Game/Overlays/Chat/DrawableUsername.cs
@@ -163,8 +163,7 @@ namespace osu.Game.Overlays.Chat
                 };
 
                 if (!user.Equals(api.LocalUser.Value))
-                    items.Add(new OsuMenuItem("Start Chat", MenuItemType.Standard, openUserChannel));
-                items.Add(new OsuMenuItem(UsersStrings.CardSendMessage, MenuItemType.Standard, openUserChannel));
+                    items.Add(new OsuMenuItem(UsersStrings.CardSendMessage, MenuItemType.Standard, openUserChannel));
 
                 if (currentChannel?.Value != null)
                 {

From 26f2d9047d3238b4790613102e2d0500a18d69d9 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Thu, 23 Mar 2023 01:11:44 +0900
Subject: [PATCH 0121/1604] code style fix

---
 osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs | 1 -
 osu.Game/Online/API/Requests/ChatReportRequest.cs    | 1 -
 2 files changed, 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
index 08337fbff9..5845ba3783 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
@@ -33,7 +33,6 @@ using osu.Game.Overlays.Chat.ChannelList;
 using osuTK;
 using osuTK.Input;
 using osu.Game.Graphics.UserInterfaceV2;
-using osu.Game.Overlays.Comments;
 
 namespace osu.Game.Tests.Visual.Online
 {
diff --git a/osu.Game/Online/API/Requests/ChatReportRequest.cs b/osu.Game/Online/API/Requests/ChatReportRequest.cs
index 00d314be68..01cb455183 100644
--- a/osu.Game/Online/API/Requests/ChatReportRequest.cs
+++ b/osu.Game/Online/API/Requests/ChatReportRequest.cs
@@ -3,7 +3,6 @@
 
 using System.Net.Http;
 using osu.Framework.IO.Network;
-using osu.Game.Online.Chat;
 using osu.Game.Overlays.Chat;
 
 namespace osu.Game.Online.API.Requests;

From eaef5ff2a3e0412036246eb6b4226a156bdbeaed Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sat, 25 Mar 2023 22:13:51 -0700
Subject: [PATCH 0122/1604] Fix now playing playlist not highlighting selected
 item on initial open

---
 osu.Game/Overlays/Music/PlaylistItem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Music/PlaylistItem.cs b/osu.Game/Overlays/Music/PlaylistItem.cs
index 00c5ce8002..4032af7651 100644
--- a/osu.Game/Overlays/Music/PlaylistItem.cs
+++ b/osu.Game/Overlays/Music/PlaylistItem.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Overlays.Music
 
                     selected = newSelected;
                     updateSelectionState(false);
-                });
+                }, true);
 
                 updateSelectionState(true);
             });

From b065689cf89b0771c7d117d67c36f9400942d3d7 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Mon, 27 Mar 2023 23:04:45 +0900
Subject: [PATCH 0123/1604] Limit the area of popover to DrawableChannel

popover may be blocked by textBar
---
 osu.Game/Overlays/ChatOverlay.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 332ffa110a..96dbfe31f3 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -123,7 +123,7 @@ namespace osu.Game.Overlays
                                     RelativeSizeAxes = Axes.Y,
                                     Width = side_bar_width,
                                 },
-                                new PopoverContainer
+                                new Container
                                 {
                                     RelativeSizeAxes = Axes.Both,
                                     Anchor = Anchor.TopRight,
@@ -135,9 +135,13 @@ namespace osu.Game.Overlays
                                     },
                                     Children = new Drawable[]
                                     {
-                                        currentChannelContainer = new Container<DrawableChannel>
+                                        new PopoverContainer
                                         {
                                             RelativeSizeAxes = Axes.Both,
+                                            Child = currentChannelContainer = new Container<DrawableChannel>
+                                            {
+                                                RelativeSizeAxes = Axes.Both,
+                                            }
                                         },
                                         loading = new LoadingLayer(true),
                                         channelListing = new ChannelListing

From 31df626f0ebe022884f2b5bd2bce49898661ec1d Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Tue, 28 Mar 2023 21:32:28 +0900
Subject: [PATCH 0124/1604] disable button when select other reason

---
 .../Graphics/UserInterfaceV2/ReportPopover.cs | 24 ++++++++++++-------
 osu.Game/Overlays/Chat/ReportChatPopover.cs   |  6 ++++-
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Graphics/UserInterfaceV2/ReportPopover.cs b/osu.Game/Graphics/UserInterfaceV2/ReportPopover.cs
index 44af108ab1..46006402ad 100644
--- a/osu.Game/Graphics/UserInterfaceV2/ReportPopover.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/ReportPopover.cs
@@ -24,8 +24,6 @@ namespace osu.Game.Graphics.UserInterfaceV2
         private OsuEnumDropdown<T> reasonDropdown = null!;
         private OsuTextBox commentsTextBox = null!;
         private RoundedButton submitButton = null!;
-
-        public bool CanSubmitEmptyReason = false;
         public LocalisableString Header;
 
         protected ReportPopover(LocalisableString headerString)
@@ -102,13 +100,21 @@ namespace osu.Game.Graphics.UserInterfaceV2
                 }
             };
 
-            if (!CanSubmitEmptyReason)
-            {
-                commentsTextBox.Current.BindValueChanged(e =>
-                {
-                    submitButton.Enabled.Value = !string.IsNullOrWhiteSpace(e.NewValue);
-                }, true);
-            }
+            commentsTextBox.Current.BindValueChanged(_ => updateStatus());
+
+            reasonDropdown.Current.BindValueChanged(_ => updateStatus());
+
+            updateStatus();
+        }
+
+        private void updateStatus()
+        {
+            submitButton.Enabled.Value = !string.IsNullOrWhiteSpace(commentsTextBox.Current.Value) || CheckCanSubmitEmptyComment(reasonDropdown.Current.Value);
+        }
+
+        protected virtual bool CheckCanSubmitEmptyComment(T reason)
+        {
+            return false;
         }
     }
 }
diff --git a/osu.Game/Overlays/Chat/ReportChatPopover.cs b/osu.Game/Overlays/Chat/ReportChatPopover.cs
index 79c3922795..de5f3268b8 100644
--- a/osu.Game/Overlays/Chat/ReportChatPopover.cs
+++ b/osu.Game/Overlays/Chat/ReportChatPopover.cs
@@ -12,7 +12,11 @@ namespace osu.Game.Overlays.Chat
         public ReportChatPopover(APIUser? user)
             : base(ReportStrings.UserTitle(user?.Username ?? @"Someone"))
         {
-            CanSubmitEmptyReason = true;
+        }
+
+        protected override bool CheckCanSubmitEmptyComment(ChatReportReason reason)
+        {
+            return reason != ChatReportReason.Other;
         }
     }
 }

From f01247f1ab75dfd7f9dc81200a569b3f114b4296 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Tue, 28 Mar 2023 21:39:42 +0900
Subject: [PATCH 0125/1604] test

---
 .../Visual/Online/TestSceneChatOverlay.cs     | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
index 5845ba3783..faf48ef854 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
@@ -618,6 +618,12 @@ namespace osu.Game.Tests.Visual.Online
 
             AddStep("Show report popover", () => this.ChildrenOfType<DrawableUsername>().First().ShowPopover());
 
+            AddStep("Set report reason to other", () =>
+            {
+                var reason = this.ChildrenOfType<OsuEnumDropdown<ChatReportReason>>().Single();
+                reason.Current.Value = ChatReportReason.Other;
+            });
+
             AddStep("Try to report", () =>
             {
                 var btn = this.ChildrenOfType<ReportChatPopover>().Single().ChildrenOfType<RoundedButton>().Single();
@@ -626,7 +632,21 @@ namespace osu.Game.Tests.Visual.Online
             });
 
             AddWaitStep("Wait", 3);
+            AddAssert("Nothing happened", () => this.ChildrenOfType<ReportChatPopover>().Any());
+            AddStep("Set report data", () =>
+            {
+                var field = this.ChildrenOfType<ReportChatPopover>().Single().ChildrenOfType<OsuTextBox>().Single();
+                field.Current.Value = "test other";
+            });
 
+            AddStep("Try to report", () =>
+            {
+                var btn = this.ChildrenOfType<ReportChatPopover>().Single().ChildrenOfType<RoundedButton>().Single();
+                InputManager.MoveMouseTo(btn);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddWaitStep("Wait", 3);
             AddAssert("Overlay closed", () => !this.ChildrenOfType<ReportChatPopover>().Any());
             AddStep("Complete request", () => requestLock.Set());
             AddUntilStep("Request sent", () => request != null);

From 46ede27869efca77ec226081454cf682ad907a77 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Tue, 28 Mar 2023 22:24:05 +0900
Subject: [PATCH 0126/1604] add feature to adjust `ScalingContainer` background
 dim

---
 osu.Game/Configuration/OsuConfigManager.cs     |  2 ++
 .../Graphics/Containers/ScalingContainer.cs    | 11 +++++++++--
 .../Sections/Graphics/LayoutSettings.cs        | 18 ++++++++++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 70ad6bfc96..a06bfcc5f0 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -157,6 +157,7 @@ namespace osu.Game.Configuration
 
             SetDefault(OsuSetting.Scaling, ScalingMode.Off);
             SetDefault(OsuSetting.SafeAreaConsiderations, true);
+            SetDefault(OsuSetting.ScalingMenuBackgroundDim, 0.9f, 0.5f, 1f);
 
             SetDefault(OsuSetting.ScalingSizeX, 0.8f, 0.2f, 1f);
             SetDefault(OsuSetting.ScalingSizeY, 0.8f, 0.2f, 1f);
@@ -364,6 +365,7 @@ namespace osu.Game.Configuration
         ScalingPositionY,
         ScalingSizeX,
         ScalingSizeY,
+        ScalingMenuBackgroundDim,
         UIScale,
         IntroSequence,
         NotifyOnUsernameMentioned,
diff --git a/osu.Game/Graphics/Containers/ScalingContainer.cs b/osu.Game/Graphics/Containers/ScalingContainer.cs
index fb5c3e3b60..9c6830ce05 100644
--- a/osu.Game/Graphics/Containers/ScalingContainer.cs
+++ b/osu.Game/Graphics/Containers/ScalingContainer.cs
@@ -46,6 +46,8 @@ namespace osu.Game.Graphics.Containers
 
         private BackgroundScreenStack backgroundStack;
 
+        private Bindable<float> scalingMenuBackgroundDim;
+
         private RectangleF? customRect;
         private bool customRectIsRelativePosition;
 
@@ -138,6 +140,9 @@ namespace osu.Game.Graphics.Containers
 
             safeAreaPadding = safeArea.SafeAreaPadding.GetBoundCopy();
             safeAreaPadding.BindValueChanged(_ => Scheduler.AddOnce(updateSize));
+
+            scalingMenuBackgroundDim = config.GetBindable<float>(OsuSetting.ScalingMenuBackgroundDim);
+            scalingMenuBackgroundDim.ValueChanged += _ => Scheduler.AddOnce(updateSize);
         }
 
         protected override void LoadComplete()
@@ -148,7 +153,9 @@ namespace osu.Game.Graphics.Containers
             sizableContainer.FinishTransforms();
         }
 
-        private bool requiresBackgroundVisible => (scalingMode.Value == ScalingMode.Everything || scalingMode.Value == ScalingMode.ExcludeOverlays) && (sizeX.Value != 1 || sizeY.Value != 1);
+        private bool requiresBackgroundVisible => (scalingMode.Value == ScalingMode.Everything || scalingMode.Value == ScalingMode.ExcludeOverlays)
+                                                  && (sizeX.Value != 1 || sizeY.Value != 1)
+                                                  && scalingMenuBackgroundDim.Value != 1f;
 
         private void updateSize()
         {
@@ -161,7 +168,6 @@ namespace osu.Game.Graphics.Containers
                     {
                         AddInternal(backgroundStack = new BackgroundScreenStack
                         {
-                            Colour = OsuColour.Gray(0.1f),
                             Alpha = 0,
                             Depth = float.MaxValue
                         });
@@ -170,6 +176,7 @@ namespace osu.Game.Graphics.Containers
                     }
 
                     backgroundStack.FadeIn(TRANSITION_DURATION);
+                    backgroundStack.FadeColour(OsuColour.Gray(1.0f - scalingMenuBackgroundDim.Value), 800, Easing.OutQuint);
                 }
                 else
                     backgroundStack?.FadeOut(TRANSITION_DURATION);
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index 6465d62ef0..6dbaf27afc 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -30,6 +30,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
         protected override LocalisableString Header => GraphicsSettingsStrings.LayoutHeader;
 
         private FillFlowContainer<SettingsSlider<float>> scalingSettings = null!;
+        private SettingsSlider<float> dimSlider = null!;
 
         private readonly Bindable<Display> currentDisplay = new Bindable<Display>();
         private readonly IBindableList<WindowMode> windowModes = new BindableList<WindowMode>();
@@ -58,6 +59,8 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
         private Bindable<float> scalingSizeX = null!;
         private Bindable<float> scalingSizeY = null!;
 
+        private Bindable<float> scalingBackgroundDim = null!;
+
         private const int transition_duration = 400;
 
         [BackgroundDependencyLoader]
@@ -71,6 +74,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
             scalingSizeY = osuConfig.GetBindable<float>(OsuSetting.ScalingSizeY);
             scalingPositionX = osuConfig.GetBindable<float>(OsuSetting.ScalingPositionX);
             scalingPositionY = osuConfig.GetBindable<float>(OsuSetting.ScalingPositionY);
+            scalingBackgroundDim = osuConfig.GetBindable<float>(OsuSetting.ScalingMenuBackgroundDim);
 
             if (window != null)
             {
@@ -162,6 +166,13 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                             KeyboardStep = 0.01f,
                             DisplayAsPercentage = true
                         },
+                        dimSlider = new SettingsSlider<float>
+                        {
+                            LabelText = GameplaySettingsStrings.BackgroundDim,
+                            Current = scalingBackgroundDim,
+                            KeyboardStep = 0.01f,
+                            DisplayAsPercentage = true
+                        },
                     }
                 },
             };
@@ -219,6 +230,13 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                 scalingSettings.AutoSizeAxes = scalingMode.Value != ScalingMode.Off ? Axes.Y : Axes.None;
                 scalingSettings.ForEach(s =>
                 {
+                    if (s == dimSlider)
+                    {
+                        s.TransferValueOnCommit = false;
+                        s.CanBeShown.Value = scalingMode.Value == ScalingMode.Everything || scalingMode.Value == ScalingMode.ExcludeOverlays;
+                        return;
+                    }
+
                     s.TransferValueOnCommit = scalingMode.Value == ScalingMode.Everything;
                     s.CanBeShown.Value = scalingMode.Value != ScalingMode.Off;
                 });

From e85c28031e2348f0f4e71eafe3d1fe13ba4305fc Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Wed, 29 Mar 2023 22:55:25 +0900
Subject: [PATCH 0127/1604] change weird name

---
 osu.Game/Configuration/OsuConfigManager.cs                    | 4 ++--
 osu.Game/Graphics/Containers/ScalingContainer.cs              | 2 +-
 .../Overlays/Settings/Sections/Graphics/LayoutSettings.cs     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index a06bfcc5f0..1e7d3cf84f 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -157,7 +157,7 @@ namespace osu.Game.Configuration
 
             SetDefault(OsuSetting.Scaling, ScalingMode.Off);
             SetDefault(OsuSetting.SafeAreaConsiderations, true);
-            SetDefault(OsuSetting.ScalingMenuBackgroundDim, 0.9f, 0.5f, 1f);
+            SetDefault(OsuSetting.ScalingBackgroundDim, 0.9f, 0.5f, 1f);
 
             SetDefault(OsuSetting.ScalingSizeX, 0.8f, 0.2f, 1f);
             SetDefault(OsuSetting.ScalingSizeY, 0.8f, 0.2f, 1f);
@@ -365,7 +365,7 @@ namespace osu.Game.Configuration
         ScalingPositionY,
         ScalingSizeX,
         ScalingSizeY,
-        ScalingMenuBackgroundDim,
+        ScalingBackgroundDim,
         UIScale,
         IntroSequence,
         NotifyOnUsernameMentioned,
diff --git a/osu.Game/Graphics/Containers/ScalingContainer.cs b/osu.Game/Graphics/Containers/ScalingContainer.cs
index 9c6830ce05..8b0450b71c 100644
--- a/osu.Game/Graphics/Containers/ScalingContainer.cs
+++ b/osu.Game/Graphics/Containers/ScalingContainer.cs
@@ -141,7 +141,7 @@ namespace osu.Game.Graphics.Containers
             safeAreaPadding = safeArea.SafeAreaPadding.GetBoundCopy();
             safeAreaPadding.BindValueChanged(_ => Scheduler.AddOnce(updateSize));
 
-            scalingMenuBackgroundDim = config.GetBindable<float>(OsuSetting.ScalingMenuBackgroundDim);
+            scalingMenuBackgroundDim = config.GetBindable<float>(OsuSetting.ScalingBackgroundDim);
             scalingMenuBackgroundDim.ValueChanged += _ => Scheduler.AddOnce(updateSize);
         }
 
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index 6dbaf27afc..895ae1ed89 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -74,7 +74,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
             scalingSizeY = osuConfig.GetBindable<float>(OsuSetting.ScalingSizeY);
             scalingPositionX = osuConfig.GetBindable<float>(OsuSetting.ScalingPositionX);
             scalingPositionY = osuConfig.GetBindable<float>(OsuSetting.ScalingPositionY);
-            scalingBackgroundDim = osuConfig.GetBindable<float>(OsuSetting.ScalingMenuBackgroundDim);
+            scalingBackgroundDim = osuConfig.GetBindable<float>(OsuSetting.ScalingBackgroundDim);
 
             if (window != null)
             {

From 19b7036b95eeac979f75850feb19b2a5a1a97ce2 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Wed, 29 Mar 2023 22:56:35 +0900
Subject: [PATCH 0128/1604] use same same duration

negligence in migrating code
---
 osu.Game/Graphics/Containers/ScalingContainer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/Containers/ScalingContainer.cs b/osu.Game/Graphics/Containers/ScalingContainer.cs
index 8b0450b71c..bd52c8bb32 100644
--- a/osu.Game/Graphics/Containers/ScalingContainer.cs
+++ b/osu.Game/Graphics/Containers/ScalingContainer.cs
@@ -176,7 +176,7 @@ namespace osu.Game.Graphics.Containers
                     }
 
                     backgroundStack.FadeIn(TRANSITION_DURATION);
-                    backgroundStack.FadeColour(OsuColour.Gray(1.0f - scalingMenuBackgroundDim.Value), 800, Easing.OutQuint);
+                    backgroundStack.FadeColour(OsuColour.Gray(1.0f - scalingMenuBackgroundDim.Value), TRANSITION_DURATION, Easing.OutQuint);
                 }
                 else
                     backgroundStack?.FadeOut(TRANSITION_DURATION);

From 5d395e6d37f6247430e57c3ede359cad4c729b64 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Wed, 29 Mar 2023 22:59:54 +0900
Subject: [PATCH 0129/1604] move to ctor

---
 .../Overlays/Settings/Sections/Graphics/LayoutSettings.cs     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index 895ae1ed89..523b1237fa 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -171,7 +171,8 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                             LabelText = GameplaySettingsStrings.BackgroundDim,
                             Current = scalingBackgroundDim,
                             KeyboardStep = 0.01f,
-                            DisplayAsPercentage = true
+                            DisplayAsPercentage = true,
+                            TransferValueOnCommit = false
                         },
                     }
                 },
@@ -232,7 +233,6 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                 {
                     if (s == dimSlider)
                     {
-                        s.TransferValueOnCommit = false;
                         s.CanBeShown.Value = scalingMode.Value == ScalingMode.Everything || scalingMode.Value == ScalingMode.ExcludeOverlays;
                         return;
                     }

From 13b522e825b6f1b2f1d7e843bd8fa2421f41d482 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 9 Apr 2023 21:54:26 +0900
Subject: [PATCH 0130/1604] repair usage of CancellationToken

Co-Authored-By: n0099 <n@n0099.net>
---
 osu.Game/Database/LegacyModelExporter.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index 6f2fe90957..e8fc25ab84 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Database
         /// If specified CancellationToken, then use it. Otherwise use PostNotification's CancellationToken.
         /// </param>
         /// <returns></returns>
-        public async Task<bool> ExportAsync(TModel model, CancellationToken? cancellationToken = null)
+        public async Task<bool> ExportAsync(TModel model, CancellationToken cancellationToken = default)
         {
             // check if the model is being exporting already
             if (!exporting_models.Contains(model))
@@ -93,7 +93,8 @@ namespace osu.Game.Database
             {
                 using (var stream = exportStorage.CreateFileSafely(filename))
                 {
-                    success = await ExportToStreamAsync(model, stream, notification, cancellationToken ?? notification.CancellationToken).ConfigureAwait(false);
+                    success = await ExportToStreamAsync(model, stream, notification,
+                        cancellationToken == CancellationToken.None ? notification.CancellationToken : cancellationToken).ConfigureAwait(false);
                 }
             }
             catch (OperationCanceledException)

From 1f4da35c8d75e77d3eadca6bbf7624cf2b63331c Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 9 Apr 2023 22:11:52 +0900
Subject: [PATCH 0131/1604] notification nullable fix

---
 osu.Game/Database/LegacyArchiveExporter.cs | 12 ++++++++----
 osu.Game/Database/LegacyModelExporter.cs   |  9 +++------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Database/LegacyArchiveExporter.cs b/osu.Game/Database/LegacyArchiveExporter.cs
index 1af8c454c1..35f09189c9 100644
--- a/osu.Game/Database/LegacyArchiveExporter.cs
+++ b/osu.Game/Database/LegacyArchiveExporter.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Database
         {
         }
 
-        protected override void ExportToStream(TModel model, Stream outputStream, ProgressNotification notification, CancellationToken cancellationToken = default)
+        protected override void ExportToStream(TModel model, Stream outputStream, ProgressNotification? notification, CancellationToken cancellationToken = default)
             => exportZipArchive(model, outputStream, notification, cancellationToken);
 
         /// <summary>
@@ -35,7 +35,7 @@ namespace osu.Game.Database
         /// <param name="outputStream">The output stream to export to.</param>
         /// <param name="notification">The notification will displayed to the user</param>
         /// <param name="cancellationToken">The Cancellation token that can cancel the exporting.</param>
-        private void exportZipArchive(TModel model, Stream outputStream, ProgressNotification notification, CancellationToken cancellationToken = default)
+        private void exportZipArchive(TModel model, Stream outputStream, ProgressNotification? notification, CancellationToken cancellationToken = default)
         {
             try
             {
@@ -67,8 +67,12 @@ namespace osu.Game.Database
                     }
 
                     i++;
-                    notification.Progress = i / model.Files.Count();
-                    notification.Text = $"Exporting... ({i}/{model.Files.Count()})";
+
+                    if (notification != null)
+                    {
+                        notification.Progress = i / model.Files.Count();
+                        notification.Text = $"Exporting... ({i}/{model.Files.Count()})";
+                    }
                 }
             }
             catch (ObjectDisposedException)
diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index e8fc25ab84..0f09c2c19b 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -105,6 +105,7 @@ namespace osu.Game.Database
             // cleanup if export is failed or canceled.
             if (!success)
             {
+                notification.State = ProgressNotificationState.Cancelled;
                 exportStorage.Delete(filename);
             }
             else
@@ -129,27 +130,23 @@ namespace osu.Game.Database
         /// <returns>Whether the export was successful</returns>
         public Task<bool> ExportToStreamAsync(TModel model, Stream stream, ProgressNotification? notification = null, CancellationToken cancellationToken = default)
         {
-            ProgressNotification notify = notification ?? new ProgressNotification();
-
             Guid id = model.ID;
             return Task.Run(() =>
             {
                 realmAccess.Run(r =>
                 {
                     TModel refetchModel = r.Find<TModel>(id);
-                    ExportToStream(refetchModel, stream, notify, cancellationToken);
+                    ExportToStream(refetchModel, stream, notification, cancellationToken);
                 });
             }, cancellationToken).ContinueWith(t =>
             {
                 if (cancellationToken.IsCancellationRequested)
                 {
-                    notify.State = ProgressNotificationState.Cancelled;
                     return false;
                 }
 
                 if (t.IsFaulted)
                 {
-                    notify.State = ProgressNotificationState.Cancelled;
                     Logger.Error(t.Exception, "An error occurred while exporting", LoggingTarget.Database);
                     return false;
                 }
@@ -165,6 +162,6 @@ namespace osu.Game.Database
         /// <param name="outputStream">The output stream to export to.</param>
         /// <param name="notification">The notification will displayed to the user</param>
         /// <param name="cancellationToken">The Cancellation token that can cancel the exporting.</param>
-        protected abstract void ExportToStream(TModel model, Stream outputStream, ProgressNotification notification, CancellationToken cancellationToken = default);
+        protected abstract void ExportToStream(TModel model, Stream outputStream, ProgressNotification? notification, CancellationToken cancellationToken = default);
     }
 }

From de21b4a2f73dfd6ee9278148b88b1f8ab92ca5af Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 9 Apr 2023 22:15:00 +0900
Subject: [PATCH 0132/1604] use Live<TModel>

Use RealmAccess only when needed
---
 osu.Game.Tests/Skins/IO/ImportSkinTest.cs     |  9 ++---
 osu.Game/Beatmaps/BeatmapManager.cs           |  4 +--
 osu.Game/Database/LegacyArchiveExporter.cs    |  4 +--
 osu.Game/Database/LegacyBeatmapExporter.cs    |  4 +--
 osu.Game/Database/LegacyModelExporter.cs      | 36 ++++++++++++-------
 osu.Game/Database/LegacyScoreExporter.cs      |  5 ++-
 osu.Game/Database/LegacySkinExporter.cs       |  3 +-
 .../Overlays/Settings/Sections/SkinSection.cs |  2 +-
 osu.Game/Scoring/ScoreManager.cs              |  4 +--
 osu.Game/Skinning/SkinManager.cs              |  6 ++--
 10 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
index 726ff74d7f..8043c01d2d 100644
--- a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
+++ b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
@@ -119,10 +119,7 @@ namespace osu.Game.Tests.Skins.IO
             var import1 = await loadSkinIntoOsu(osu, new ImportTask(createOskWithIni("name 1", "author 1"), "custom.osk"));
             assertCorrectMetadata(import1, "name 1 [custom]", "author 1", osu);
 
-            await import1.PerformRead(async s =>
-            {
-                await new LegacySkinExporter(osu.Dependencies.Get<Storage>(), osu.Dependencies.Get<RealmAccess>()).ExportToStreamAsync(s, exportStream);
-            });
+            await new LegacySkinExporter(osu.Dependencies.Get<Storage>()).ExportToStreamAsync(import1, exportStream);
 
             string exportFilename = import1.GetDisplayString();
 
@@ -203,7 +200,7 @@ namespace osu.Game.Tests.Skins.IO
                 Assert.IsFalse(s.Protected);
                 Assert.AreEqual(typeof(ArgonSkin), s.CreateInstance(skinManager).GetType());
 
-                await new LegacySkinExporter(osu.Dependencies.Get<Storage>(), osu.Dependencies.Get<RealmAccess>()).ExportToStreamAsync(s, exportStream);
+                await new LegacySkinExporter(osu.Dependencies.Get<Storage>()).ExportToStreamAsync(skinManager.CurrentSkinInfo.Value, exportStream);
 
                 Assert.Greater(exportStream.Length, 0);
             });
@@ -236,7 +233,7 @@ namespace osu.Game.Tests.Skins.IO
                 Assert.IsFalse(s.Protected);
                 Assert.AreEqual(typeof(DefaultLegacySkin), s.CreateInstance(skinManager).GetType());
 
-                await new LegacySkinExporter(osu.Dependencies.Get<Storage>(), osu.Dependencies.Get<RealmAccess>()).ExportToStreamAsync(s, exportStream);
+                await new LegacySkinExporter(osu.Dependencies.Get<Storage>()).ExportToStreamAsync(skinManager.CurrentSkinInfo.Value, exportStream);
 
                 Assert.Greater(exportStream.Length, 0);
             });
diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index d3bf8081b1..877a0c7667 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -79,7 +79,7 @@ namespace osu.Game.Beatmaps
 
             workingBeatmapCache = CreateWorkingBeatmapCache(audioManager, gameResources, userResources, defaultBeatmap, host);
 
-            beatmapExporter = new LegacyBeatmapExporter(storage, realm)
+            beatmapExporter = new LegacyBeatmapExporter(storage)
             {
                 PostNotification = obj => PostNotification?.Invoke(obj)
             };
@@ -400,7 +400,7 @@ namespace osu.Game.Beatmaps
         public Task<Live<BeatmapSetInfo>?> ImportAsUpdate(ProgressNotification notification, ImportTask importTask, BeatmapSetInfo original) =>
             beatmapImporter.ImportAsUpdate(notification, importTask, original);
 
-        public Task Export(BeatmapSetInfo beatmap) => beatmapExporter.ExportAsync(beatmap);
+        public Task Export(BeatmapSetInfo beatmap) => beatmapExporter.ExportAsync(beatmap, Realm);
 
         private void updateHashAndMarkDirty(BeatmapSetInfo setInfo)
         {
diff --git a/osu.Game/Database/LegacyArchiveExporter.cs b/osu.Game/Database/LegacyArchiveExporter.cs
index 35f09189c9..297139a20e 100644
--- a/osu.Game/Database/LegacyArchiveExporter.cs
+++ b/osu.Game/Database/LegacyArchiveExporter.cs
@@ -20,8 +20,8 @@ namespace osu.Game.Database
     public abstract class LegacyArchiveExporter<TModel> : LegacyModelExporter<TModel>
         where TModel : RealmObject, IHasNamedFiles, IHasGuidPrimaryKey
     {
-        protected LegacyArchiveExporter(Storage storage, RealmAccess realm)
-            : base(storage, realm)
+        protected LegacyArchiveExporter(Storage storage)
+            : base(storage)
         {
         }
 
diff --git a/osu.Game/Database/LegacyBeatmapExporter.cs b/osu.Game/Database/LegacyBeatmapExporter.cs
index 107b91a234..e89d3da8c7 100644
--- a/osu.Game/Database/LegacyBeatmapExporter.cs
+++ b/osu.Game/Database/LegacyBeatmapExporter.cs
@@ -8,8 +8,8 @@ namespace osu.Game.Database
 {
     public class LegacyBeatmapExporter : LegacyArchiveExporter<BeatmapSetInfo>
     {
-        public LegacyBeatmapExporter(Storage storage, RealmAccess realm)
-            : base(storage, realm)
+        public LegacyBeatmapExporter(Storage storage)
+            : base(storage)
         {
         }
 
diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index 0f09c2c19b..58606cb5fa 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -31,24 +31,35 @@ namespace osu.Game.Database
         private readonly Storage exportStorage;
         protected virtual string GetFilename(TModel item) => item.GetDisplayString();
 
-        private readonly RealmAccess realmAccess;
-
         public Action<Notification>? PostNotification { get; set; }
 
         // Store the model being exporting.
-        private static readonly List<TModel> exporting_models = new List<TModel>();
+        private static readonly List<Live<TModel>> exporting_models = new List<Live<TModel>>();
 
         /// <summary>
         /// Construct exporter.
         /// Create a new exporter for each export, otherwise it will cause confusing notifications.
         /// </summary>
         /// <param name="storage">Storage for storing exported files. Basically it is used to provide export stream</param>
-        /// <param name="realm">The RealmAccess used to provide the exported file.</param>
-        protected LegacyModelExporter(Storage storage, RealmAccess realm)
+        protected LegacyModelExporter(Storage storage)
         {
             exportStorage = storage.GetStorageForDirectory(@"exports");
             UserFileStorage = storage.GetStorageForDirectory(@"files");
-            realmAccess = realm;
+        }
+
+        /// <summary>
+        /// Export the model to default folder.
+        /// </summary>
+        /// <param name="model">The model should export.</param>
+        /// <param name="realm">Realm that convert model to Live.</param>
+        /// <param name="cancellationToken">
+        /// The Cancellation token that can cancel the exporting.
+        /// If specified CancellationToken, then use it. Otherwise use PostNotification's CancellationToken.
+        /// </param>
+        /// <returns></returns>
+        public Task<bool> ExportAsync(TModel model, RealmAccess realm, CancellationToken cancellationToken = default)
+        {
+            return ExportAsync(model.ToLive(realm), cancellationToken);
         }
 
         /// <summary>
@@ -60,7 +71,7 @@ namespace osu.Game.Database
         /// If specified CancellationToken, then use it. Otherwise use PostNotification's CancellationToken.
         /// </param>
         /// <returns></returns>
-        public async Task<bool> ExportAsync(TModel model, CancellationToken cancellationToken = default)
+        public async Task<bool> ExportAsync(Live<TModel> model, CancellationToken cancellationToken = default)
         {
             // check if the model is being exporting already
             if (!exporting_models.Contains(model))
@@ -73,7 +84,8 @@ namespace osu.Game.Database
                 return false;
             }
 
-            string itemFilename = GetFilename(model).GetValidFilename();
+            string itemFilename = model.PerformRead(s => GetFilename(s).GetValidFilename());
+
             IEnumerable<string> existingExports =
                 exportStorage
                     .GetFiles(string.Empty, $"{itemFilename}*{FileExtension}")
@@ -128,15 +140,13 @@ namespace osu.Game.Database
         /// <param name="notification">The notification will displayed to the user</param>
         /// <param name="cancellationToken">The Cancellation token that can cancel the exporting.</param>
         /// <returns>Whether the export was successful</returns>
-        public Task<bool> ExportToStreamAsync(TModel model, Stream stream, ProgressNotification? notification = null, CancellationToken cancellationToken = default)
+        public Task<bool> ExportToStreamAsync(Live<TModel> model, Stream stream, ProgressNotification? notification = null, CancellationToken cancellationToken = default)
         {
-            Guid id = model.ID;
             return Task.Run(() =>
             {
-                realmAccess.Run(r =>
+                model.PerformRead(s =>
                 {
-                    TModel refetchModel = r.Find<TModel>(id);
-                    ExportToStream(refetchModel, stream, notification, cancellationToken);
+                    ExportToStream(s, stream, notification, cancellationToken);
                 });
             }, cancellationToken).ContinueWith(t =>
             {
diff --git a/osu.Game/Database/LegacyScoreExporter.cs b/osu.Game/Database/LegacyScoreExporter.cs
index ef55ffdd96..bd7d273a64 100644
--- a/osu.Game/Database/LegacyScoreExporter.cs
+++ b/osu.Game/Database/LegacyScoreExporter.cs
@@ -13,8 +13,7 @@ namespace osu.Game.Database
 {
     public class LegacyScoreExporter : LegacyModelExporter<ScoreInfo>
     {
-        public LegacyScoreExporter(Storage storage, RealmAccess realm)
-            : base(storage, realm)
+        public LegacyScoreExporter(Storage storage) : base(storage)
         {
         }
 
@@ -28,7 +27,7 @@ namespace osu.Game.Database
 
         protected override string FileExtension => ".osr";
 
-        protected override void ExportToStream(ScoreInfo model, Stream stream, ProgressNotification notification, CancellationToken cancellationToken = default)
+        protected override void ExportToStream(ScoreInfo model, Stream stream, ProgressNotification? notification, CancellationToken cancellationToken = default)
         {
             var file = model.Files.SingleOrDefault();
             if (file == null)
diff --git a/osu.Game/Database/LegacySkinExporter.cs b/osu.Game/Database/LegacySkinExporter.cs
index d3e6a2f0f4..2a531203bc 100644
--- a/osu.Game/Database/LegacySkinExporter.cs
+++ b/osu.Game/Database/LegacySkinExporter.cs
@@ -8,8 +8,7 @@ namespace osu.Game.Database
 {
     public class LegacySkinExporter : LegacyArchiveExporter<SkinInfo>
     {
-        public LegacySkinExporter(Storage storage, RealmAccess realm)
-            : base(storage, realm)
+        public LegacySkinExporter(Storage storage) : base(storage)
         {
         }
 
diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index df5d7e0c27..5382eac675 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -159,7 +159,7 @@ namespace osu.Game.Overlays.Settings.Sections
             {
                 try
                 {
-                    skins.CurrentSkinInfo.Value.PerformRead(s => skins.ExportSkin(s));
+                    skins.ExportCurrentSkin();
                 }
                 catch (Exception e)
                 {
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 3201fec696..5e432b6a96 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Scoring
                 PostNotification = obj => PostNotification?.Invoke(obj)
             };
 
-            scoreExporter = new LegacyScoreExporter(storage, realm)
+            scoreExporter = new LegacyScoreExporter(storage)
             {
                 PostNotification = obj => PostNotification?.Invoke(obj)
             };
@@ -193,7 +193,7 @@ namespace osu.Game.Scoring
 
         public Task<IEnumerable<Live<ScoreInfo>>> Import(ProgressNotification notification, ImportTask[] tasks, ImportParameters parameters = default) => scoreImporter.Import(notification, tasks);
 
-        public Task Export(ScoreInfo score) => scoreExporter.ExportAsync(score);
+        public Task Export(ScoreInfo score) => scoreExporter.ExportAsync(score, Realm);
 
         public Task<Live<ScoreInfo>> ImportAsUpdate(ProgressNotification notification, ImportTask task, ScoreInfo original) => scoreImporter.ImportAsUpdate(notification, task, original);
 
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 1a76ec8623..45536e04eb 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -123,7 +123,7 @@ namespace osu.Game.Skinning
                 SourceChanged?.Invoke();
             };
 
-            skinExporter = new LegacySkinExporter(storage, realm)
+            skinExporter = new LegacySkinExporter(storage)
             {
                 PostNotification = obj => PostNotification?.Invoke(obj)
             };
@@ -305,7 +305,9 @@ namespace osu.Game.Skinning
         public Task<Live<SkinInfo>> Import(ImportTask task, ImportParameters parameters = default, CancellationToken cancellationToken = default) =>
             skinImporter.Import(task, parameters, cancellationToken);
 
-        public Task ExportSkin(SkinInfo skin) => skinExporter.ExportAsync(skin);
+        public Task ExportCurrentSkin() => ExportSkin(CurrentSkinInfo.Value);
+
+        public Task ExportSkin(Live<SkinInfo> skin) => skinExporter.ExportAsync(skin);
 
         #endregion
 

From 49193a2bdd950aab1a0d4183ce75b47e97050512 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 9 Apr 2023 22:25:47 +0900
Subject: [PATCH 0133/1604] CompletionText

Co-Authored-By: Dean Herbert <pe@ppy.sh>
---
 osu.Game/Database/LegacyModelExporter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index 58606cb5fa..a61d9fd582 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -122,7 +122,7 @@ namespace osu.Game.Database
             }
             else
             {
-                notification.CompletionText = "Export Complete, Click to open the folder";
+                notification.CompletionText = $"Exported {itemFilename}! Click to view.";
                 notification.CompletionClickAction = () => exportStorage.PresentFileExternally(filename);
                 notification.State = ProgressNotificationState.Completed;
             }

From fc55b96e776401b8b35737a49ba07ff309a0eef6 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 9 Apr 2023 14:27:42 +0900
Subject: [PATCH 0134/1604] remove `CompletionText` in Constructor

this will never used

Co-Authored-By: Dean Herbert <pe@ppy.sh>
---
 osu.Game/Database/LegacyModelExporter.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index a61d9fd582..975809b9a7 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -97,7 +97,6 @@ namespace osu.Game.Database
             {
                 State = ProgressNotificationState.Active,
                 Text = "Exporting...",
-                CompletionText = "Export completed"
             };
             PostNotification?.Invoke(notification);
 

From 5d64c1b7bfd7fd5ce51a2df503735a4f794b9517 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 9 Apr 2023 15:09:18 +0900
Subject: [PATCH 0135/1604] exception handling

---
 osu.Game/Database/LegacyModelExporter.cs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index 1c5d6b4813..7904be7f4f 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -124,8 +124,15 @@ namespace osu.Game.Database
                         cancellationToken == CancellationToken.None ? notification.CancellationToken : cancellationToken).ConfigureAwait(false);
                 }
             }
-            catch (OperationCanceledException)
+            catch
             {
+                notification.State = ProgressNotificationState.Cancelled;
+                throw;
+            }
+            finally
+            {
+                // Determines whether to export repeatedly, so he must be removed from the list at the end whether there is a error.
+                exporting_models.Remove(model);
             }
 
             // cleanup if export is failed or canceled.
@@ -141,7 +148,6 @@ namespace osu.Game.Database
                 notification.State = ProgressNotificationState.Completed;
             }
 
-            exporting_models.Remove(model);
             return success;
         }
 
@@ -171,7 +177,7 @@ namespace osu.Game.Database
                 if (t.IsFaulted)
                 {
                     Logger.Error(t.Exception, "An error occurred while exporting", LoggingTarget.Database);
-                    return false;
+                    throw t.Exception!;
                 }
 
                 return true;

From 52fc6de13f0be2f624e1a26be301f3f4e0c6c39e Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 9 Apr 2023 15:12:15 +0900
Subject: [PATCH 0136/1604] merge fix

wtf?
---
 osu.Game.Tests/Database/LegacyExporterTest.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Database/LegacyExporterTest.cs b/osu.Game.Tests/Database/LegacyExporterTest.cs
index d41b3a5017..2f92ec1a4c 100644
--- a/osu.Game.Tests/Database/LegacyExporterTest.cs
+++ b/osu.Game.Tests/Database/LegacyExporterTest.cs
@@ -110,9 +110,9 @@ namespace osu.Game.Tests.Database
             public override string ToString() => Filename;
         }
 
-        private class TestLegacyExporter : LegacyExporter<IHasNamedFiles>
+        private class TestLegacyModelExporter : LegacyModelExporter<IHasNamedFiles>
         {
-            public TestLegacyExporter(Storage storage)
+            public TestLegacyModelExporter(Storage storage)
                 : base(storage)
             {
             }

From def6da98fc8760c63efe8208241eea0c25dfd880 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 9 Apr 2023 15:40:40 +0900
Subject: [PATCH 0137/1604] fix test in #22653

---
 osu.Game.Tests/Database/LegacyExporterTest.cs | 96 +++++++++++++------
 1 file changed, 66 insertions(+), 30 deletions(-)

diff --git a/osu.Game.Tests/Database/LegacyExporterTest.cs b/osu.Game.Tests/Database/LegacyExporterTest.cs
index 2f92ec1a4c..c25e14d2ef 100644
--- a/osu.Game.Tests/Database/LegacyExporterTest.cs
+++ b/osu.Game.Tests/Database/LegacyExporterTest.cs
@@ -1,19 +1,26 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
 using NUnit.Framework;
+using osu.Framework.Extensions;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Platform;
 using osu.Framework.Testing;
 using osu.Game.Database;
+using osu.Game.Overlays.Notifications;
+using Realms;
 
 namespace osu.Game.Tests.Database
 {
     [TestFixture]
-    public class LegacyExporterTest
+    public class LegacyModelExporterTest
     {
-        private TestLegacyExporter legacyExporter = null!;
+        private TestLegacyModelExporter legacyExporter = null!;
         private TemporaryNativeStorage storage = null!;
 
         private const string short_filename = "normal file name";
@@ -25,15 +32,15 @@ namespace osu.Game.Tests.Database
         public void SetUp()
         {
             storage = new TemporaryNativeStorage("export-storage");
-            legacyExporter = new TestLegacyExporter(storage);
+            legacyExporter = new TestLegacyModelExporter(storage);
         }
 
         [Test]
         public void ExportFileWithNormalNameTest()
         {
-            var item = new TestPathInfo(short_filename);
+            var item = new TestRealmObject(short_filename);
 
-            Assert.That(item.Filename.Length, Is.LessThan(TestLegacyExporter.MAX_FILENAME_LENGTH));
+            Assert.That(item.Filename.Length, Is.LessThan(TestLegacyModelExporter.MAX_FILENAME_LENGTH));
 
             exportItemAndAssert(item, short_filename);
         }
@@ -41,9 +48,9 @@ namespace osu.Game.Tests.Database
         [Test]
         public void ExportFileWithNormalNameMultipleTimesTest()
         {
-            var item = new TestPathInfo(short_filename);
+            var item = new TestRealmObject(short_filename);
 
-            Assert.That(item.Filename.Length, Is.LessThan(TestLegacyExporter.MAX_FILENAME_LENGTH));
+            Assert.That(item.Filename.Length, Is.LessThan(TestLegacyModelExporter.MAX_FILENAME_LENGTH));
 
             //Export multiple times
             for (int i = 0; i < 100; i++)
@@ -56,24 +63,24 @@ namespace osu.Game.Tests.Database
         [Test]
         public void ExportFileWithSuperLongNameTest()
         {
-            int expectedLength = TestLegacyExporter.MAX_FILENAME_LENGTH - (legacyExporter.GetExtension().Length);
+            int expectedLength = TestLegacyModelExporter.MAX_FILENAME_LENGTH - (legacyExporter.GetExtension().Length);
             string expectedName = long_filename.Remove(expectedLength);
 
-            var item = new TestPathInfo(long_filename);
+            var item = new TestRealmObject(long_filename);
 
-            Assert.That(item.Filename.Length, Is.GreaterThan(TestLegacyExporter.MAX_FILENAME_LENGTH));
+            Assert.That(item.Filename.Length, Is.GreaterThan(TestLegacyModelExporter.MAX_FILENAME_LENGTH));
             exportItemAndAssert(item, expectedName);
         }
 
         [Test]
         public void ExportFileWithSuperLongNameMultipleTimesTest()
         {
-            int expectedLength = TestLegacyExporter.MAX_FILENAME_LENGTH - (legacyExporter.GetExtension().Length);
+            int expectedLength = TestLegacyModelExporter.MAX_FILENAME_LENGTH - (legacyExporter.GetExtension().Length);
             string expectedName = long_filename.Remove(expectedLength);
 
-            var item = new TestPathInfo(long_filename);
+            var item = new TestRealmObject(long_filename);
 
-            Assert.That(item.Filename.Length, Is.GreaterThan(TestLegacyExporter.MAX_FILENAME_LENGTH));
+            Assert.That(item.Filename.Length, Is.GreaterThan(TestLegacyModelExporter.MAX_FILENAME_LENGTH));
 
             //Export multiple times
             for (int i = 0; i < 100; i++)
@@ -83,9 +90,14 @@ namespace osu.Game.Tests.Database
             }
         }
 
-        private void exportItemAndAssert(IHasNamedFiles item, string expectedName)
+        private void exportItemAndAssert(TestRealmObject item, string expectedName)
         {
-            Assert.DoesNotThrow(() => legacyExporter.Export(item));
+            // ReSharper disable once AsyncVoidLambda
+            Assert.DoesNotThrow(() =>
+            {
+                Task t = Task.Run(() => legacyExporter.ExportAsync(new TestRealmLive(item)));
+                t.WaitSafely();
+            });
             Assert.That(storage.Exists($"exports/{expectedName}{legacyExporter.GetExtension()}"), Is.True);
         }
 
@@ -96,21 +108,7 @@ namespace osu.Game.Tests.Database
                 storage.Dispose();
         }
 
-        private class TestPathInfo : IHasNamedFiles
-        {
-            public string Filename { get; }
-
-            public IEnumerable<INamedFileUsage> Files { get; } = new List<INamedFileUsage>();
-
-            public TestPathInfo(string filename)
-            {
-                Filename = filename;
-            }
-
-            public override string ToString() => Filename;
-        }
-
-        private class TestLegacyModelExporter : LegacyModelExporter<IHasNamedFiles>
+        private class TestLegacyModelExporter : LegacyModelExporter<TestRealmObject>
         {
             public TestLegacyModelExporter(Storage storage)
                 : base(storage)
@@ -119,7 +117,45 @@ namespace osu.Game.Tests.Database
 
             public string GetExtension() => FileExtension;
 
+            protected override void ExportToStream(TestRealmObject model, Stream outputStream, ProgressNotification? notification, CancellationToken cancellationToken = default)
+            {
+            }
+
             protected override string FileExtension => ".test";
         }
+
+        private class TestRealmObject : RealmObject, IHasNamedFiles, IHasGuidPrimaryKey
+        {
+            public Guid ID => throw new NotImplementedException();
+            public string Filename { get; }
+
+            public IEnumerable<INamedFileUsage> Files { get; } = new List<INamedFileUsage>();
+
+            public TestRealmObject(string filename)
+            {
+                Filename = filename;
+            }
+
+            public override string ToString() => Filename;
+        }
+
+        private class TestRealmLive : Live<TestRealmObject>
+        {
+            public override void PerformRead(Action<TestRealmObject> perform) => perform(Value);
+
+            public override TReturn PerformRead<TReturn>(Func<TestRealmObject, TReturn> perform) => perform(Value);
+
+            public override void PerformWrite(Action<TestRealmObject> perform) => throw new NotImplementedException();
+
+            public override bool IsManaged => throw new NotImplementedException();
+
+            public override TestRealmObject Value { get; }
+
+            public TestRealmLive(TestRealmObject model)
+                : base(Guid.Empty)
+            {
+                Value = model;
+            }
+        }
     }
 }

From dd690891175a8597e72005782965c762052a5672 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 9 Apr 2023 15:43:18 +0900
Subject: [PATCH 0138/1604] code quality

---
 .../{LegacyExporterTest.cs => LegacyModelExporterTest.cs}      | 1 -
 osu.Game/Database/LegacyModelExporter.cs                       | 2 +-
 osu.Game/Database/LegacyScoreExporter.cs                       | 3 ++-
 osu.Game/Database/LegacySkinExporter.cs                        | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)
 rename osu.Game.Tests/Database/{LegacyExporterTest.cs => LegacyModelExporterTest.cs} (99%)

diff --git a/osu.Game.Tests/Database/LegacyExporterTest.cs b/osu.Game.Tests/Database/LegacyModelExporterTest.cs
similarity index 99%
rename from osu.Game.Tests/Database/LegacyExporterTest.cs
rename to osu.Game.Tests/Database/LegacyModelExporterTest.cs
index c25e14d2ef..27059c3058 100644
--- a/osu.Game.Tests/Database/LegacyExporterTest.cs
+++ b/osu.Game.Tests/Database/LegacyModelExporterTest.cs
@@ -92,7 +92,6 @@ namespace osu.Game.Tests.Database
 
         private void exportItemAndAssert(TestRealmObject item, string expectedName)
         {
-            // ReSharper disable once AsyncVoidLambda
             Assert.DoesNotThrow(() =>
             {
                 Task t = Task.Run(() => legacyExporter.ExportAsync(new TestRealmLive(item)));
diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyModelExporter.cs
index 7904be7f4f..0e4fefae5c 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyModelExporter.cs
@@ -107,7 +107,7 @@ namespace osu.Game.Database
                     .GetFiles(string.Empty, $"{itemFilename}*{FileExtension}")
                     .Concat(exportStorage.GetDirectories(string.Empty));
             string filename = NamingUtils.GetNextBestFilename(existingExports, $"{itemFilename}{FileExtension}");
-            bool success = false;
+            bool success;
 
             ProgressNotification notification = new ProgressNotification
             {
diff --git a/osu.Game/Database/LegacyScoreExporter.cs b/osu.Game/Database/LegacyScoreExporter.cs
index bd7d273a64..e7473c963b 100644
--- a/osu.Game/Database/LegacyScoreExporter.cs
+++ b/osu.Game/Database/LegacyScoreExporter.cs
@@ -13,7 +13,8 @@ namespace osu.Game.Database
 {
     public class LegacyScoreExporter : LegacyModelExporter<ScoreInfo>
     {
-        public LegacyScoreExporter(Storage storage) : base(storage)
+        public LegacyScoreExporter(Storage storage)
+            : base(storage)
         {
         }
 
diff --git a/osu.Game/Database/LegacySkinExporter.cs b/osu.Game/Database/LegacySkinExporter.cs
index 2a531203bc..4775a54c13 100644
--- a/osu.Game/Database/LegacySkinExporter.cs
+++ b/osu.Game/Database/LegacySkinExporter.cs
@@ -8,7 +8,8 @@ namespace osu.Game.Database
 {
     public class LegacySkinExporter : LegacyArchiveExporter<SkinInfo>
     {
-        public LegacySkinExporter(Storage storage) : base(storage)
+        public LegacySkinExporter(Storage storage)
+            : base(storage)
         {
         }
 

From 776c4cfaad00d1f9f99cfa70792022f68002c5b0 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Wed, 19 Apr 2023 18:34:35 -0700
Subject: [PATCH 0139/1604] Ensure `selected` field is correct in
 `updateSelectionState()`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 osu.Game/Overlays/Music/PlaylistItem.cs | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Overlays/Music/PlaylistItem.cs b/osu.Game/Overlays/Music/PlaylistItem.cs
index 4032af7651..4a39cc06c8 100644
--- a/osu.Game/Overlays/Music/PlaylistItem.cs
+++ b/osu.Game/Overlays/Music/PlaylistItem.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Overlays.Music
                 var artist = new RomanisableString(metadata.ArtistUnicode, metadata.Artist);
 
                 titlePart = text.AddText(title, sprite => sprite.Font = OsuFont.GetFont(weight: FontWeight.Regular));
-                titlePart.DrawablePartsRecreated += _ => updateSelectionState(true);
+                titlePart.DrawablePartsRecreated += _ => updateSelectionState(SelectedSet.Value, instant: true);
 
                 text.AddText(@"  "); // to separate the title from the artist.
                 text.AddText(artist, sprite =>
@@ -66,25 +66,22 @@ namespace osu.Game.Overlays.Music
                     sprite.Padding = new MarginPadding { Top = 1 };
                 });
 
-                SelectedSet.BindValueChanged(set =>
-                {
-                    bool newSelected = set.NewValue?.Equals(Model) == true;
-
-                    if (newSelected == selected)
-                        return;
-
-                    selected = newSelected;
-                    updateSelectionState(false);
-                }, true);
-
-                updateSelectionState(true);
+                SelectedSet.BindValueChanged(set => updateSelectionState(set.NewValue, instant: false));
+                updateSelectionState(SelectedSet.Value, instant: true);
             });
         }
 
         private bool selected;
 
-        private void updateSelectionState(bool instant)
+        private void updateSelectionState(Live<BeatmapSetInfo> selectedSet, bool instant)
         {
+            bool newSelected = selectedSet?.Equals(Model) == true;
+
+            if (newSelected == selected && !instant) // instant updates should forcibly set correct state regardless of previous state.
+                return;
+
+            selected = newSelected;
+
             foreach (Drawable s in titlePart.Drawables)
                 s.FadeColour(selected ? colours.Yellow : Color4.White, instant ? 0 : FADE_DURATION);
         }

From 9f4b1f0f242a95ab2df2e77e2f2670ae5f846364 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 Apr 2023 14:30:01 +0900
Subject: [PATCH 0140/1604] Always round editor rotation to integer values

---
 .../Edit/Compose/Components/SelectionBoxRotationHandle.cs       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
index 305f5bf3c4..c2a3f12efd 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
@@ -118,7 +118,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             float oldRotation = cumulativeRotation.Value ?? 0;
 
-            float newRotation = shouldSnap ? snap(rawCumulativeRotation, snap_step) : rawCumulativeRotation;
+            float newRotation = shouldSnap ? snap(rawCumulativeRotation, snap_step) : MathF.Round(rawCumulativeRotation);
             newRotation = (newRotation - 180) % 360 + 180;
 
             cumulativeRotation.Value = newRotation;

From b62de5514c532a3c2df5ef4c311eb5b273578050 Mon Sep 17 00:00:00 2001
From: Haspamelodica <melodicahaspa@gmail.com>
Date: Fri, 21 Apr 2023 02:10:24 +0200
Subject: [PATCH 0141/1604] Fixed video importing bug #23259

---
 osu.Game/Beatmaps/BeatmapManager.cs                  | 2 +-
 osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs    | 2 +-
 osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs | 2 +-
 osu.Game/Graphics/UserInterfaceV2/OsuFileSelector.cs | 2 +-
 osu.Game/OsuGameBase.cs                              | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index cab49b7d69..6af6a25579 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -368,7 +368,7 @@ namespace osu.Game.Beatmaps
                     // user requested abort
                     return;
 
-                var video = b.Files.FirstOrDefault(f => OsuGameBase.VIDEO_EXTENSIONS.Any(ex => f.Filename.EndsWith(ex, StringComparison.Ordinal)));
+                var video = b.Files.FirstOrDefault(f => OsuGameBase.VIDEO_EXTENSIONS.Any(ex => f.Filename.EndsWith(ex, StringComparison.OrdinalIgnoreCase)));
 
                 if (video != null)
                 {
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index a9bdd21b64..0e3a62e8fa 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -369,7 +369,7 @@ namespace osu.Game.Beatmaps.Formats
                     // Some very old beatmaps had incorrect type specifications for their backgrounds (ie. using 1 for VIDEO
                     // instead of 0 for BACKGROUND). To handle this gracefully, check the file extension against known supported
                     // video extensions and handle similar to a background if it doesn't match.
-                    if (!OsuGameBase.VIDEO_EXTENSIONS.Contains(Path.GetExtension(filename)))
+                    if (!OsuGameBase.VIDEO_EXTENSIONS.Contains(Path.GetExtension(filename).ToUpperInvariant()))
                     {
                         beatmap.BeatmapInfo.Metadata.BackgroundFile = filename;
                     }
diff --git a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
index f8308fe431..2eb496a798 100644
--- a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
@@ -114,7 +114,7 @@ namespace osu.Game.Beatmaps.Formats
                         //
                         // This avoids potential weird crashes when ffmpeg attempts to parse an image file as a video
                         // (see https://github.com/ppy/osu/issues/22829#issuecomment-1465552451).
-                        if (!OsuGameBase.VIDEO_EXTENSIONS.Contains(Path.GetExtension(path)))
+                        if (!OsuGameBase.VIDEO_EXTENSIONS.Contains(Path.GetExtension(path).ToUpperInvariant()))
                             break;
 
                         storyboard.GetLayer("Video").Add(new StoryboardVideo(path, offset));
diff --git a/osu.Game/Graphics/UserInterfaceV2/OsuFileSelector.cs b/osu.Game/Graphics/UserInterfaceV2/OsuFileSelector.cs
index 37e15c6127..825b1a5636 100644
--- a/osu.Game/Graphics/UserInterfaceV2/OsuFileSelector.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/OsuFileSelector.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
             {
                 get
                 {
-                    if (OsuGameBase.VIDEO_EXTENSIONS.Contains(File.Extension))
+                    if (OsuGameBase.VIDEO_EXTENSIONS.Contains(File.Extension.ToUpperInvariant()))
                         return FontAwesome.Regular.FileVideo;
 
                     switch (File.Extension)
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 34e31b0d61..2ab6c24af7 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -71,7 +71,7 @@ namespace osu.Game
     [Cached(typeof(OsuGameBase))]
     public partial class OsuGameBase : Framework.Game, ICanAcceptFiles, IBeatSyncProvider
     {
-        public static readonly string[] VIDEO_EXTENSIONS = { ".mp4", ".mov", ".avi", ".flv", ".mpg", ".wmv", ".m4v" };
+        public static readonly string[] VIDEO_EXTENSIONS = { ".MP4", ".MOV", ".AVI", ".FLV", ".MPG", ".WMV", ".M4V" };
 
         public const string OSU_PROTOCOL = "osu://";
 

From e90660c1a48c7eb46447348756ca2b976ca1bbf6 Mon Sep 17 00:00:00 2001
From: Haspamelodica <melodicahaspa@gmail.com>
Date: Fri, 21 Apr 2023 02:35:28 +0200
Subject: [PATCH 0142/1604] Switched to lowercase

---
 osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs    | 2 +-
 osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs | 2 +-
 osu.Game/Graphics/UserInterfaceV2/OsuFileSelector.cs | 2 +-
 osu.Game/OsuGameBase.cs                              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index 0e3a62e8fa..ef1dbc0488 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -369,7 +369,7 @@ namespace osu.Game.Beatmaps.Formats
                     // Some very old beatmaps had incorrect type specifications for their backgrounds (ie. using 1 for VIDEO
                     // instead of 0 for BACKGROUND). To handle this gracefully, check the file extension against known supported
                     // video extensions and handle similar to a background if it doesn't match.
-                    if (!OsuGameBase.VIDEO_EXTENSIONS.Contains(Path.GetExtension(filename).ToUpperInvariant()))
+                    if (!OsuGameBase.VIDEO_EXTENSIONS.Contains(Path.GetExtension(filename).ToLowerInvariant()))
                     {
                         beatmap.BeatmapInfo.Metadata.BackgroundFile = filename;
                     }
diff --git a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
index 2eb496a798..df5d3edb55 100644
--- a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
@@ -114,7 +114,7 @@ namespace osu.Game.Beatmaps.Formats
                         //
                         // This avoids potential weird crashes when ffmpeg attempts to parse an image file as a video
                         // (see https://github.com/ppy/osu/issues/22829#issuecomment-1465552451).
-                        if (!OsuGameBase.VIDEO_EXTENSIONS.Contains(Path.GetExtension(path).ToUpperInvariant()))
+                        if (!OsuGameBase.VIDEO_EXTENSIONS.Contains(Path.GetExtension(path).ToLowerInvariant()))
                             break;
 
                         storyboard.GetLayer("Video").Add(new StoryboardVideo(path, offset));
diff --git a/osu.Game/Graphics/UserInterfaceV2/OsuFileSelector.cs b/osu.Game/Graphics/UserInterfaceV2/OsuFileSelector.cs
index 825b1a5636..7097102335 100644
--- a/osu.Game/Graphics/UserInterfaceV2/OsuFileSelector.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/OsuFileSelector.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
             {
                 get
                 {
-                    if (OsuGameBase.VIDEO_EXTENSIONS.Contains(File.Extension.ToUpperInvariant()))
+                    if (OsuGameBase.VIDEO_EXTENSIONS.Contains(File.Extension.ToLowerInvariant()))
                         return FontAwesome.Regular.FileVideo;
 
                     switch (File.Extension)
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 2ab6c24af7..34e31b0d61 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -71,7 +71,7 @@ namespace osu.Game
     [Cached(typeof(OsuGameBase))]
     public partial class OsuGameBase : Framework.Game, ICanAcceptFiles, IBeatSyncProvider
     {
-        public static readonly string[] VIDEO_EXTENSIONS = { ".MP4", ".MOV", ".AVI", ".FLV", ".MPG", ".WMV", ".M4V" };
+        public static readonly string[] VIDEO_EXTENSIONS = { ".mp4", ".mov", ".avi", ".flv", ".mpg", ".wmv", ".m4v" };
 
         public const string OSU_PROTOCOL = "osu://";
 

From e9fb836e9ccfbd6690ffcf5c6974e2d125a5fb80 Mon Sep 17 00:00:00 2001
From: Haspamelodica <melodicahaspa@gmail.com>
Date: Fri, 21 Apr 2023 03:24:11 +0200
Subject: [PATCH 0143/1604] Added tests for video backgrounds

---
 .../Formats/LegacyBeatmapDecoderTest.cs       | 31 +++++++++++++++
 .../Formats/LegacyStoryboardDecoderTest.cs    | 38 ++++++++++++++++++-
 .../video-with-lowercase-extension.osb        |  5 +++
 .../video-with-uppercase-extension.osb        |  5 +++
 4 files changed, 77 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Tests/Resources/video-with-lowercase-extension.osb
 create mode 100644 osu.Game.Tests/Resources/video-with-uppercase-extension.osb

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
index 518981980b..5979f6785e 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -21,6 +21,7 @@ using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Beatmaps;
 using osu.Game.Skinning;
+using osu.Game.Storyboards;
 using osu.Game.Tests.Resources;
 using osuTK;
 using osuTK.Graphics;
@@ -160,6 +161,36 @@ namespace osu.Game.Tests.Beatmaps.Formats
             }
         }
 
+        [Test]
+        public void TestDecodeVideoWithLowercaseExtension()
+        {
+            var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
+
+            using (var resStream = TestResources.OpenResource("video-with-lowercase-extension.osb"))
+            using (var stream = new LineBufferedReader(resStream))
+            {
+                var beatmap = decoder.Decode(stream);
+                var metadata = beatmap.Metadata;
+
+                Assert.AreEqual("BG.jpg", metadata.BackgroundFile);
+            }
+        }
+
+        [Test]
+        public void TestDecodeVideoWithUppercaseExtension()
+        {
+            var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
+
+            using (var resStream = TestResources.OpenResource("video-with-uppercase-extension.osb"))
+            using (var stream = new LineBufferedReader(resStream))
+            {
+                var beatmap = decoder.Decode(stream);
+                var metadata = beatmap.Metadata;
+
+                Assert.AreEqual("BG.jpg", metadata.BackgroundFile);
+            }
+        }
+
         [Test]
         public void TestDecodeImageSpecifiedAsVideo()
         {
diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
index 3a776ac225..1bfe134610 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
@@ -169,6 +169,40 @@ namespace osu.Game.Tests.Beatmaps.Formats
             }
         }
 
+        [Test]
+        public void TestDecodeVideoWithLowercaseExtension()
+        {
+            var decoder = new LegacyStoryboardDecoder();
+
+            using (var resStream = TestResources.OpenResource("video-with-lowercase-extension.osb"))
+            using (var stream = new LineBufferedReader(resStream))
+            {
+                var storyboard = decoder.Decode(stream);
+
+                StoryboardLayer video = storyboard.Layers.Single(l => l.Name == "Video");
+                Assert.That(video.Elements.Count, Is.EqualTo(1));
+
+                Assert.AreEqual("Video.avi", ((StoryboardVideo)video.Elements[0]).Path);
+            }
+        }
+
+        [Test]
+        public void TestDecodeVideoWithUppercaseExtension()
+        {
+            var decoder = new LegacyStoryboardDecoder();
+
+            using (var resStream = TestResources.OpenResource("video-with-uppercase-extension.osb"))
+            using (var stream = new LineBufferedReader(resStream))
+            {
+                var storyboard = decoder.Decode(stream);
+
+                StoryboardLayer video = storyboard.Layers.Single(l => l.Name == "Video");
+                Assert.That(video.Elements.Count, Is.EqualTo(1));
+
+                Assert.AreEqual("Video.AVI", ((StoryboardVideo)video.Elements[0]).Path);
+            }
+        }
+
         [Test]
         public void TestDecodeImageSpecifiedAsVideo()
         {
@@ -179,8 +213,8 @@ namespace osu.Game.Tests.Beatmaps.Formats
             {
                 var storyboard = decoder.Decode(stream);
 
-                StoryboardLayer foreground = storyboard.Layers.Single(l => l.Name == "Video");
-                Assert.That(foreground.Elements.Count, Is.Zero);
+                StoryboardLayer video = storyboard.Layers.Single(l => l.Name == "Video");
+                Assert.That(video.Elements.Count, Is.Zero);
             }
         }
 
diff --git a/osu.Game.Tests/Resources/video-with-lowercase-extension.osb b/osu.Game.Tests/Resources/video-with-lowercase-extension.osb
new file mode 100644
index 0000000000..eec09722ed
--- /dev/null
+++ b/osu.Game.Tests/Resources/video-with-lowercase-extension.osb
@@ -0,0 +1,5 @@
+osu file format v14
+
+[Events]
+0,0,"BG.jpg",0,0
+Video,0,"Video.avi",0,0
diff --git a/osu.Game.Tests/Resources/video-with-uppercase-extension.osb b/osu.Game.Tests/Resources/video-with-uppercase-extension.osb
new file mode 100644
index 0000000000..3834a547f2
--- /dev/null
+++ b/osu.Game.Tests/Resources/video-with-uppercase-extension.osb
@@ -0,0 +1,5 @@
+osu file format v14
+
+[Events]
+0,0,"BG.jpg",0,0
+Video,0,"Video.AVI",0,0

From 3166f88c17a291724f03b2bb53ca96413864a443 Mon Sep 17 00:00:00 2001
From: Haspamelodica <melodicahaspa@gmail.com>
Date: Fri, 21 Apr 2023 10:11:47 +0200
Subject: [PATCH 0144/1604] Removed unneccessary using directive

---
 osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
index 5979f6785e..d898650b66 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -21,7 +21,6 @@ using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Beatmaps;
 using osu.Game.Skinning;
-using osu.Game.Storyboards;
 using osu.Game.Tests.Resources;
 using osuTK;
 using osuTK.Graphics;

From 847b63066b9e08255026c3c530ebb5acab9ab5a4 Mon Sep 17 00:00:00 2001
From: Terochi <mates.cernicky@gmail.com>
Date: Fri, 21 Apr 2023 21:46:03 +0200
Subject: [PATCH 0145/1604] fix

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index ab754e51f7..7787dd80c1 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -418,10 +418,13 @@ namespace osu.Game.Rulesets.Catch.UI
 
         private void clearPlate(DroppedObjectAnimation animation)
         {
-            var droppedObjects = caughtObjectContainer.Children.Select(getDroppedObject).ToArray();
+            var caughtObjects = caughtObjectContainer.Children.ToArray();
 
             caughtObjectContainer.Clear(false);
 
+            //use the already returned PoolableDrawables for new objects
+            var droppedObjects = caughtObjects.Select(getDroppedObject).ToArray();
+
             droppedObjectTarget.AddRange(droppedObjects);
 
             foreach (var droppedObject in droppedObjects)
@@ -430,13 +433,11 @@ namespace osu.Game.Rulesets.Catch.UI
 
         private void removeFromPlate(CaughtObject caughtObject, DroppedObjectAnimation animation)
         {
-            var droppedObject = getDroppedObject(caughtObject);
-
             caughtObjectContainer.Remove(caughtObject, false);
 
-            droppedObjectTarget.Add(droppedObject);
+            droppedObjectTarget.Add(getDroppedObject(caughtObject));
 
-            applyDropAnimation(droppedObject, animation);
+            applyDropAnimation(caughtObject, animation);
         }
 
         private void applyDropAnimation(Drawable d, DroppedObjectAnimation animation)
@@ -456,6 +457,8 @@ namespace osu.Game.Rulesets.Catch.UI
                     break;
             }
 
+            //define lifetime start for dropped objects to be disposed correctly when rewinding replay
+            d.LifetimeStart = Clock.CurrentTime;
             d.Expire();
         }
 

From bb1ed387ef29958bcc8f8006cebfad2ead9dc8c8 Mon Sep 17 00:00:00 2001
From: Terochi <mates.cernicky@gmail.com>
Date: Sat, 22 Apr 2023 10:54:50 +0200
Subject: [PATCH 0146/1604] fixed missed bit and comments

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 7787dd80c1..f77dab56c8 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -422,7 +422,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
             caughtObjectContainer.Clear(false);
 
-            //use the already returned PoolableDrawables for new objects
+            // Use the already returned PoolableDrawables for new objects
             var droppedObjects = caughtObjects.Select(getDroppedObject).ToArray();
 
             droppedObjectTarget.AddRange(droppedObjects);
@@ -435,9 +435,11 @@ namespace osu.Game.Rulesets.Catch.UI
         {
             caughtObjectContainer.Remove(caughtObject, false);
 
-            droppedObjectTarget.Add(getDroppedObject(caughtObject));
+            var droppedObject = getDroppedObject(caughtObject);
 
-            applyDropAnimation(caughtObject, animation);
+            droppedObjectTarget.Add(droppedObject);
+
+            applyDropAnimation(droppedObject, animation);
         }
 
         private void applyDropAnimation(Drawable d, DroppedObjectAnimation animation)
@@ -457,7 +459,7 @@ namespace osu.Game.Rulesets.Catch.UI
                     break;
             }
 
-            //define lifetime start for dropped objects to be disposed correctly when rewinding replay
+            // Define lifetime start for dropped objects to be disposed correctly when rewinding replay
             d.LifetimeStart = Clock.CurrentTime;
             d.Expire();
         }

From 56ab029a58eeff34f1f976fb956b7f042d8c79df Mon Sep 17 00:00:00 2001
From: Hy0tic <vothanhdat278@gmail.com>
Date: Sat, 22 Apr 2023 13:30:08 -0400
Subject: [PATCH 0147/1604] fix issue where multipler does not update when
 adjusting speed for preset mod

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 16602db4be..d611fd3c0b 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -252,7 +252,7 @@ namespace osu.Game.Overlays.Mods
 
                 if (AllowCustomisation)
                 {
-                    modSettingChangeTracker = new ModSettingChangeTracker(val.NewValue);
+                    modSettingChangeTracker = new ModSettingChangeTracker(SelectedMods.Value);
                     modSettingChangeTracker.SettingChanged += _ => updateMultiplier();
                 }
             }, true);

From 0991c56e1c5cd9f9713ea7c55e9b9ce8fde3c37b Mon Sep 17 00:00:00 2001
From: Renzo Poggio <renzo.martin904@gmail.com>
Date: Tue, 25 Apr 2023 00:05:15 -0300
Subject: [PATCH 0148/1604] Add extra check in 'SelectPreviousRandom'

Check if the poped beatmap exists within the beatmapSets
---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 6ba9843f7b..8c0f67564a 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -540,7 +540,7 @@ namespace osu.Game.Screens.Select
             {
                 var beatmap = randomSelectedBeatmaps.Pop();
 
-                if (!beatmap.Filtered.Value)
+                if (!beatmap.Filtered.Value && beatmapSets.Any(beatset => beatset.Beatmaps.Contains(beatmap)))
                 {
                     if (selectedBeatmapSet != null)
                     {

From 3919400be2c0d2dddc287ca8bda36677dfb029fe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 25 Apr 2023 14:28:56 +0900
Subject: [PATCH 0149/1604] Apply NRT to some storyboard classes

---
 osu.Game/Storyboards/StoryboardAnimation.cs |  2 --
 osu.Game/Storyboards/StoryboardSprite.cs    | 13 +++++--------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Storyboards/StoryboardAnimation.cs b/osu.Game/Storyboards/StoryboardAnimation.cs
index 16deac8e9e..1a4b6bb923 100644
--- a/osu.Game/Storyboards/StoryboardAnimation.cs
+++ b/osu.Game/Storyboards/StoryboardAnimation.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osuTK;
 using osu.Framework.Graphics;
 using osu.Game.Storyboards.Drawables;
diff --git a/osu.Game/Storyboards/StoryboardSprite.cs b/osu.Game/Storyboards/StoryboardSprite.cs
index 5b7b194be7..0c28d7bce1 100644
--- a/osu.Game/Storyboards/StoryboardSprite.cs
+++ b/osu.Game/Storyboards/StoryboardSprite.cs
@@ -1,12 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using JetBrains.Annotations;
 using osu.Framework.Graphics;
 using osu.Game.Storyboards.Drawables;
 using osuTK;
@@ -114,7 +111,7 @@ namespace osu.Game.Storyboards
         public virtual Drawable CreateDrawable()
             => new DrawableStoryboardSprite(this);
 
-        public void ApplyTransforms(Drawable drawable, IEnumerable<Tuple<CommandTimelineGroup, double>> triggeredGroups = null)
+        public void ApplyTransforms(Drawable drawable, IEnumerable<Tuple<CommandTimelineGroup, double>>? triggeredGroups = null)
         {
             // For performance reasons, we need to apply the commands in order by start time. Not doing so will cause many functions to be interleaved, resulting in O(n^2) complexity.
             // To achieve this, commands are "generated" as pairs of (command, initFunc, transformFunc) and batched into a contiguous list
@@ -156,7 +153,7 @@ namespace osu.Game.Storyboards
 
             foreach (var command in commands)
             {
-                DrawablePropertyInitializer<T> initFunc = null;
+                DrawablePropertyInitializer<T>? initFunc = null;
 
                 if (!initialized)
                 {
@@ -169,7 +166,7 @@ namespace osu.Game.Storyboards
             }
         }
 
-        private IEnumerable<CommandTimeline<T>.TypedCommand> getCommands<T>(CommandTimelineSelector<T> timelineSelector, IEnumerable<Tuple<CommandTimelineGroup, double>> triggeredGroups)
+        private IEnumerable<CommandTimeline<T>.TypedCommand> getCommands<T>(CommandTimelineSelector<T> timelineSelector, IEnumerable<Tuple<CommandTimelineGroup, double>>? triggeredGroups)
         {
             var commands = TimelineGroup.GetCommands(timelineSelector);
             foreach (var loop in loops)
@@ -198,11 +195,11 @@ namespace osu.Game.Storyboards
         {
             public double StartTime => command.StartTime;
 
-            private readonly DrawablePropertyInitializer<T> initializeProperty;
+            private readonly DrawablePropertyInitializer<T>? initializeProperty;
             private readonly DrawableTransformer<T> transform;
             private readonly CommandTimeline<T>.TypedCommand command;
 
-            public GeneratedCommand([NotNull] CommandTimeline<T>.TypedCommand command, [CanBeNull] DrawablePropertyInitializer<T> initializeProperty, [NotNull] DrawableTransformer<T> transform)
+            public GeneratedCommand(CommandTimeline<T>.TypedCommand command, DrawablePropertyInitializer<T>? initializeProperty, DrawableTransformer<T> transform)
             {
                 this.command = command;
                 this.initializeProperty = initializeProperty;

From dce0c5fac815b4334a921b81989baf2d06e3c57c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 25 Apr 2023 15:14:32 +0900
Subject: [PATCH 0150/1604] Add test coverage of expected behaviour for
 playback of loops with no explicit end time

---
 .../Formats/LegacyStoryboardDecoderTest.cs    | 19 +++++++++++++++++++
 .../animation-loop-no-explicit-end-time.osb   |  6 ++++++
 2 files changed, 25 insertions(+)
 create mode 100644 osu.Game.Tests/Resources/animation-loop-no-explicit-end-time.osb

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
index 3a776ac225..17e94a8b5f 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
@@ -95,6 +95,25 @@ namespace osu.Game.Tests.Beatmaps.Formats
             }
         }
 
+        [Test]
+        public void TestLoopWithoutExplicitFadeOut()
+        {
+            var decoder = new LegacyStoryboardDecoder();
+
+            using (var resStream = TestResources.OpenResource("animation-loop-no-explicit-end-time.osb"))
+            using (var stream = new LineBufferedReader(resStream))
+            {
+                var storyboard = decoder.Decode(stream);
+
+                StoryboardLayer background = storyboard.Layers.Single(l => l.Depth == 3);
+                Assert.AreEqual(1, background.Elements.Count);
+
+                Assert.AreEqual(2000, background.Elements[0].StartTime);
+                Assert.AreEqual(2000, (background.Elements[0] as StoryboardAnimation)?.EarliestTransformTime);
+                Assert.AreEqual(12000, (background.Elements[0] as StoryboardAnimation)?.GetEndTime());
+            }
+        }
+
         [Test]
         public void TestCorrectAnimationStartTime()
         {
diff --git a/osu.Game.Tests/Resources/animation-loop-no-explicit-end-time.osb b/osu.Game.Tests/Resources/animation-loop-no-explicit-end-time.osb
new file mode 100644
index 0000000000..7afaa445df
--- /dev/null
+++ b/osu.Game.Tests/Resources/animation-loop-no-explicit-end-time.osb
@@ -0,0 +1,6 @@
+[Events]
+//Storyboard Layer 0 (Background)
+Animation,Background,Centre,"img.jpg",320,240,2,150,LoopForever
+ F,0,2000,,0,1
+ L,2000,10
+  F,18,0,1000,1,0

From e330052852a8692c769ed2152a5980a16679b576 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 25 Apr 2023 15:22:11 +0900
Subject: [PATCH 0151/1604] Add second definition of `EndTime` for storyboard
 elements to account for loops in lifetime

---
 .../Beatmaps/Formats/LegacyStoryboardDecoderTest.cs |  4 +++-
 .../Background/TestSceneBackgroundScreenDefault.cs  |  1 +
 .../Storyboards/IStoryboardElementWithDuration.cs   |  8 ++++++++
 osu.Game/Storyboards/StoryboardSprite.cs            | 13 +++++++++++++
 4 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
index 17e94a8b5f..f78825ffb1 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
@@ -110,7 +110,9 @@ namespace osu.Game.Tests.Beatmaps.Formats
 
                 Assert.AreEqual(2000, background.Elements[0].StartTime);
                 Assert.AreEqual(2000, (background.Elements[0] as StoryboardAnimation)?.EarliestTransformTime);
-                Assert.AreEqual(12000, (background.Elements[0] as StoryboardAnimation)?.GetEndTime());
+
+                Assert.AreEqual(3000, (background.Elements[0] as StoryboardAnimation)?.GetEndTime());
+                Assert.AreEqual(12000, (background.Elements[0] as StoryboardAnimation)?.EndTimeForDisplay);
             }
         }
 
diff --git a/osu.Game.Tests/Visual/Background/TestSceneBackgroundScreenDefault.cs b/osu.Game.Tests/Visual/Background/TestSceneBackgroundScreenDefault.cs
index fbdaad1cd8..8f4250799e 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneBackgroundScreenDefault.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneBackgroundScreenDefault.cs
@@ -311,6 +311,7 @@ namespace osu.Game.Tests.Visual.Background
                 public bool IsDrawable => true;
                 public double StartTime => double.MinValue;
                 public double EndTime => double.MaxValue;
+                public double EndTimeForDisplay => double.MaxValue;
 
                 public Drawable CreateDrawable() => new DrawableTestStoryboardElement();
             }
diff --git a/osu.Game/Storyboards/IStoryboardElementWithDuration.cs b/osu.Game/Storyboards/IStoryboardElementWithDuration.cs
index c8daeb3b3d..9eed139ad4 100644
--- a/osu.Game/Storyboards/IStoryboardElementWithDuration.cs
+++ b/osu.Game/Storyboards/IStoryboardElementWithDuration.cs
@@ -12,9 +12,17 @@ namespace osu.Game.Storyboards
     {
         /// <summary>
         /// The time at which the <see cref="IStoryboardElement"/> ends.
+        /// This is consumed to extend the length of a storyboard to ensure all visuals are played to completion.
         /// </summary>
         double EndTime { get; }
 
+        /// <summary>
+        /// The time this element displays until.
+        /// This is used for lifetime purposes, and includes long playing animations which don't necessarily extend
+        /// a storyboard's play time.
+        /// </summary>
+        double EndTimeForDisplay { get; }
+
         /// <summary>
         /// The duration of the StoryboardElement.
         /// </summary>
diff --git a/osu.Game/Storyboards/StoryboardSprite.cs b/osu.Game/Storyboards/StoryboardSprite.cs
index 0c28d7bce1..982185d51b 100644
--- a/osu.Game/Storyboards/StoryboardSprite.cs
+++ b/osu.Game/Storyboards/StoryboardSprite.cs
@@ -81,6 +81,19 @@ namespace osu.Game.Storyboards
             }
         }
 
+        public double EndTimeForDisplay
+        {
+            get
+            {
+                double latestEndTime = TimelineGroup.EndTime;
+
+                foreach (var l in loops)
+                    latestEndTime = Math.Max(latestEndTime, l.StartTime + l.CommandsDuration * l.TotalIterations);
+
+                return latestEndTime;
+            }
+        }
+
         public bool HasCommands => TimelineGroup.HasCommands || loops.Any(l => l.HasCommands);
 
         private delegate void DrawablePropertyInitializer<in T>(Drawable drawable, T value);

From a4c6850ab2e64fc2a195744af8b02fd6c61a4726 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Tue, 25 Apr 2023 11:34:09 +0200
Subject: [PATCH 0152/1604] made the SampleControlPoint and
 DifficultyControlPoint obsolete

---
 .../Legacy/DistanceObjectPatternGenerator.cs  | 11 ++--
 osu.Game.Rulesets.Osu/Objects/Slider.cs       | 32 +++++++---
 .../Beatmaps/TaikoBeatmapConverter.cs         | 11 ++--
 .../Beatmaps/Formats/LegacyBeatmapDecoder.cs  |  3 +
 osu.Game/Rulesets/Objects/HitObject.cs        | 61 ++++++++++++-------
 .../Rulesets/Objects/Legacy/ConvertSlider.cs  | 15 ++++-
 .../Objects/Types/IHasSliderVelocity.cs       | 15 +++++
 7 files changed, 105 insertions(+), 43 deletions(-)
 create mode 100644 osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.cs

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
index 2bdd0e16ad..9e031c2b4d 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
@@ -49,15 +49,14 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             Debug.Assert(distanceData != null);
 
             TimingControlPoint timingPoint = beatmap.ControlPointInfo.TimingPointAt(hitObject.StartTime);
-            DifficultyControlPoint difficultyPoint = hitObject.DifficultyControlPoint;
 
             double beatLength;
-#pragma warning disable 618
-            if (difficultyPoint is LegacyBeatmapDecoder.LegacyDifficultyControlPoint legacyDifficultyPoint)
-#pragma warning restore 618
-                beatLength = timingPoint.BeatLength * legacyDifficultyPoint.BpmMultiplier;
+            if (hitObject.LegacyBpmMultiplier.HasValue)
+                beatLength = timingPoint.BeatLength * hitObject.LegacyBpmMultiplier.Value;
+            else if (hitObject is IHasSliderVelocity hasSliderVelocity)
+                beatLength = timingPoint.BeatLength / hasSliderVelocity.SliderVelocity;
             else
-                beatLength = timingPoint.BeatLength / difficultyPoint.SliderVelocity;
+                beatLength = timingPoint.BeatLength;
 
             SpanCount = repeatsData?.SpanCount() ?? 1;
             StartTime = (int)Math.Round(hitObject.StartTime);
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 6c2be8a49a..6952033aec 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -8,6 +8,7 @@ using osu.Game.Rulesets.Objects.Types;
 using System.Collections.Generic;
 using osu.Game.Rulesets.Objects;
 using System.Linq;
+using System.Text.Json.Serialization;
 using System.Threading;
 using Newtonsoft.Json;
 using osu.Framework.Caching;
@@ -15,13 +16,14 @@ using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Formats;
+using osu.Game.Beatmaps.Legacy;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Objects
 {
-    public class Slider : OsuHitObject, IHasPathWithRepeats
+    public class Slider : OsuHitObject, IHasPathWithRepeats, IHasSliderVelocity
     {
         public double EndTime => StartTime + this.SpanCount() * Path.Distance / Velocity;
 
@@ -134,6 +136,13 @@ namespace osu.Game.Rulesets.Osu.Objects
         /// </summary>
         public bool OnlyJudgeNestedObjects = true;
 
+        public double SliderVelocity { get; set; } = 1;
+
+        /// <summary>
+        /// Whether to generate ticks on this <see cref="Slider"/>.
+        /// </summary>
+        public bool GenerateTicks = true;
+
         [JsonIgnore]
         public SliderHeadCircle HeadCircle { get; protected set; }
 
@@ -151,15 +160,24 @@ namespace osu.Game.Rulesets.Osu.Objects
             base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
 
             TimingControlPoint timingPoint = controlPointInfo.TimingPointAt(StartTime);
-#pragma warning disable 618
-            var legacyDifficultyPoint = DifficultyControlPoint as LegacyBeatmapDecoder.LegacyDifficultyControlPoint;
-#pragma warning restore 618
 
-            double scoringDistance = BASE_SCORING_DISTANCE * difficulty.SliderMultiplier * DifficultyControlPoint.SliderVelocity;
-            bool generateTicks = legacyDifficultyPoint?.GenerateTicks ?? true;
+            double scoringDistance = BASE_SCORING_DISTANCE * difficulty.SliderMultiplier * SliderVelocity;
 
             Velocity = scoringDistance / timingPoint.BeatLength;
-            TickDistance = generateTicks ? (scoringDistance / difficulty.SliderTickRate * TickDistanceMultiplier) : double.PositiveInfinity;
+            TickDistance = GenerateTicks ? (scoringDistance / difficulty.SliderTickRate * TickDistanceMultiplier) : double.PositiveInfinity;
+        }
+
+        protected override void ApplyLegacyInfoToSelf(ControlPointInfo controlPointInfo, IBeatmapDifficultyInfo difficulty)
+        {
+            base.ApplyLegacyInfoToSelf(controlPointInfo, difficulty);
+
+            DifficultyControlPoint difficultyControlPoint = controlPointInfo is LegacyControlPointInfo legacyInfo ? legacyInfo.DifficultyPointAt(StartTime) : DifficultyControlPoint.DEFAULT;
+#pragma warning disable 618
+            var legacyDifficultyPoint = difficultyControlPoint as LegacyBeatmapDecoder.LegacyDifficultyControlPoint;
+#pragma warning restore 618
+
+            SliderVelocity = difficultyControlPoint.SliderVelocity;
+            GenerateTicks = legacyDifficultyPoint?.GenerateTicks ?? true;
         }
 
         protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index 6a35e9376b..362ddccaf1 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -177,15 +177,14 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
             double distance = distanceData.Distance * spans * LegacyBeatmapEncoder.LEGACY_TAIKO_VELOCITY_MULTIPLIER;
 
             TimingControlPoint timingPoint = beatmap.ControlPointInfo.TimingPointAt(obj.StartTime);
-            DifficultyControlPoint difficultyPoint = obj.DifficultyControlPoint;
 
             double beatLength;
-#pragma warning disable 618
-            if (difficultyPoint is LegacyBeatmapDecoder.LegacyDifficultyControlPoint legacyDifficultyPoint)
-#pragma warning restore 618
-                beatLength = timingPoint.BeatLength * legacyDifficultyPoint.BpmMultiplier;
+            if (obj.LegacyBpmMultiplier.HasValue)
+                beatLength = timingPoint.BeatLength * obj.LegacyBpmMultiplier.Value;
+            else if (obj is IHasSliderVelocity hasSliderVelocity)
+                beatLength = timingPoint.BeatLength / hasSliderVelocity.SliderVelocity;
             else
-                beatLength = timingPoint.BeatLength / difficultyPoint.SliderVelocity;
+                beatLength = timingPoint.BeatLength;
 
             double sliderScoringPointDistance = osu_base_scoring_distance * beatmap.Difficulty.SliderMultiplier / beatmap.Difficulty.SliderTickRate;
 
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index a9bdd21b64..c17eea0e85 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -85,7 +85,10 @@ namespace osu.Game.Beatmaps.Formats
             this.beatmap.HitObjects = this.beatmap.HitObjects.OrderBy(h => h.StartTime).ToList();
 
             foreach (var hitObject in this.beatmap.HitObjects)
+            {
+                hitObject.ApplyLegacyInfo(this.beatmap.ControlPointInfo, this.beatmap.Difficulty);
                 hitObject.ApplyDefaults(this.beatmap.ControlPointInfo, this.beatmap.Difficulty);
+            }
         }
 
         /// <summary>
diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs
index 25f538d211..aea564a4b9 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -16,6 +16,7 @@ using osu.Framework.Lists;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Beatmaps.Formats;
 using osu.Game.Beatmaps.Legacy;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Types;
@@ -80,6 +81,12 @@ namespace osu.Game.Rulesets.Objects
         public SampleControlPoint SampleControlPoint = SampleControlPoint.DEFAULT;
         public DifficultyControlPoint DifficultyControlPoint = DifficultyControlPoint.DEFAULT;
 
+        /// <summary>
+        /// Legacy BPM multiplier that introduces floating-point errors for rulesets that depend on it.
+        /// DO NOT USE THIS UNLESS 100% SURE.
+        /// </summary>
+        public double? LegacyBpmMultiplier { get; private set; }
+
         /// <summary>
         /// Whether this <see cref="HitObject"/> is in Kiai time.
         /// </summary>
@@ -105,25 +112,6 @@ namespace osu.Game.Rulesets.Objects
         /// <param name="cancellationToken">The cancellation token.</param>
         public void ApplyDefaults(ControlPointInfo controlPointInfo, IBeatmapDifficultyInfo difficulty, CancellationToken cancellationToken = default)
         {
-            var legacyInfo = controlPointInfo as LegacyControlPointInfo;
-
-            if (legacyInfo != null)
-                DifficultyControlPoint = (DifficultyControlPoint)legacyInfo.DifficultyPointAt(StartTime).DeepClone();
-            else if (ReferenceEquals(DifficultyControlPoint, DifficultyControlPoint.DEFAULT))
-                DifficultyControlPoint = new DifficultyControlPoint();
-
-            DifficultyControlPoint.Time = StartTime;
-
-            ApplyDefaultsToSelf(controlPointInfo, difficulty);
-
-            // This is done here after ApplyDefaultsToSelf as we may require custom defaults to be applied to have an accurate end time.
-            if (legacyInfo != null)
-                SampleControlPoint = (SampleControlPoint)legacyInfo.SamplePointAt(this.GetEndTime() + control_point_leniency).DeepClone();
-            else if (ReferenceEquals(SampleControlPoint, SampleControlPoint.DEFAULT))
-                SampleControlPoint = new SampleControlPoint();
-
-            SampleControlPoint.Time = this.GetEndTime() + control_point_leniency;
-
             nestedHitObjects.Clear();
 
             CreateNestedHitObjects(cancellationToken);
@@ -164,9 +152,6 @@ namespace osu.Game.Rulesets.Objects
 
                 foreach (var nested in nestedHitObjects)
                     nested.StartTime += offset;
-
-                DifficultyControlPoint.Time = time.NewValue;
-                SampleControlPoint.Time = this.GetEndTime() + control_point_leniency;
             }
         }
 
@@ -178,6 +163,38 @@ namespace osu.Game.Rulesets.Objects
             HitWindows?.SetDifficulty(difficulty.OverallDifficulty);
         }
 
+        /// <summary>
+        /// Applies legacy information to this HitObject.
+        /// This method gets called at the end of <see cref="LegacyBeatmapDecoder"/> before applying defaults.
+        /// </summary>
+        /// <param name="controlPointInfo">The control points.</param>
+        /// <param name="difficulty">The difficulty settings to use.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        public void ApplyLegacyInfo(ControlPointInfo controlPointInfo, IBeatmapDifficultyInfo difficulty, CancellationToken cancellationToken = default)
+        {
+            var legacyInfo = controlPointInfo as LegacyControlPointInfo;
+
+            DifficultyControlPoint difficultyControlPoint = legacyInfo != null ? legacyInfo.DifficultyPointAt(StartTime) : DifficultyControlPoint.DEFAULT;
+#pragma warning disable 618
+            if (difficultyControlPoint is LegacyBeatmapDecoder.LegacyDifficultyControlPoint legacyDifficultyControlPoint)
+#pragma warning restore 618
+                LegacyBpmMultiplier = legacyDifficultyControlPoint.BpmMultiplier;
+
+            ApplyLegacyInfoToSelf(controlPointInfo, difficulty);
+
+            // This is done here after ApplyLegacyInfoToSelf as we may require custom defaults to be applied to have an accurate end time.
+            SampleControlPoint sampleControlPoint = legacyInfo != null ? legacyInfo.SamplePointAt(this.GetEndTime() + control_point_leniency) : SampleControlPoint.DEFAULT;
+
+            foreach (var hitSampleInfo in Samples)
+            {
+                sampleControlPoint.ApplyTo(hitSampleInfo);
+            }
+        }
+
+        protected virtual void ApplyLegacyInfoToSelf(ControlPointInfo controlPointInfo, IBeatmapDifficultyInfo difficulty)
+        {
+        }
+
         protected virtual void CreateNestedHitObjects(CancellationToken cancellationToken)
         {
         }
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
index bd2713a7d1..11e1f0beae 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
@@ -9,10 +9,11 @@ using Newtonsoft.Json;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Beatmaps.Legacy;
 
 namespace osu.Game.Rulesets.Objects.Legacy
 {
-    internal abstract class ConvertSlider : ConvertHitObject, IHasPathWithRepeats, IHasLegacyLastTickOffset
+    internal abstract class ConvertSlider : ConvertHitObject, IHasPathWithRepeats, IHasLegacyLastTickOffset, IHasSliderVelocity
     {
         /// <summary>
         /// Scoring distance with a speed-adjusted beat length of 1 second.
@@ -40,17 +41,27 @@ namespace osu.Game.Rulesets.Objects.Legacy
 
         public double Velocity = 1;
 
+        public double SliderVelocity { get; set; } = 1;
+
         protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, IBeatmapDifficultyInfo difficulty)
         {
             base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
 
             TimingControlPoint timingPoint = controlPointInfo.TimingPointAt(StartTime);
 
-            double scoringDistance = base_scoring_distance * difficulty.SliderMultiplier * DifficultyControlPoint.SliderVelocity;
+            double scoringDistance = base_scoring_distance * difficulty.SliderMultiplier * SliderVelocity;
 
             Velocity = scoringDistance / timingPoint.BeatLength;
         }
 
+        protected override void ApplyLegacyInfoToSelf(ControlPointInfo controlPointInfo, IBeatmapDifficultyInfo difficulty)
+        {
+            base.ApplyLegacyInfoToSelf(controlPointInfo, difficulty);
+
+            DifficultyControlPoint difficultyControlPoint = controlPointInfo is LegacyControlPointInfo legacyInfo ? legacyInfo.DifficultyPointAt(StartTime) : DifficultyControlPoint.DEFAULT;
+            SliderVelocity = difficultyControlPoint.SliderVelocity;
+        }
+
         public double LegacyLastTickOffset => 36;
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.cs b/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.cs
new file mode 100644
index 0000000000..a7195dab4b
--- /dev/null
+++ b/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.cs
@@ -0,0 +1,15 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+namespace osu.Game.Rulesets.Objects.Types;
+
+/// <summary>
+/// A HitObject that has a slider velocity multiplier.
+/// </summary>
+public interface IHasSliderVelocity
+{
+    /// <summary>
+    /// The slider velocity multiplier.
+    /// </summary>
+    double SliderVelocity { get; set; }
+}

From ea1e6e9798b7773bdf130febf4026edbd1caac52 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Tue, 25 Apr 2023 12:12:46 +0200
Subject: [PATCH 0153/1604] Add LegacyContext

---
 .../Legacy/DistanceObjectPatternGenerator.cs  |  5 +-
 osu.Game.Rulesets.Osu/Objects/Slider.cs       | 13 +--
 .../Beatmaps/TaikoBeatmapConverter.cs         |  5 +-
 .../Beatmaps/Formats/LegacyBeatmapDecoder.cs  | 16 +++-
 osu.Game/Beatmaps/Legacy/LegacyContext.cs     | 32 +++++++
 osu.Game/Context/IContext.cs                  | 10 +++
 osu.Game/Context/IHasContext.cs               | 88 +++++++++++++++++++
 osu.Game/Rulesets/Objects/HitObject.cs        | 15 +---
 8 files changed, 155 insertions(+), 29 deletions(-)
 create mode 100644 osu.Game/Beatmaps/Legacy/LegacyContext.cs
 create mode 100644 osu.Game/Context/IContext.cs
 create mode 100644 osu.Game/Context/IHasContext.cs

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
index 9e031c2b4d..b3a68269f7 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
@@ -15,6 +15,7 @@ using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Formats;
+using osu.Game.Beatmaps.Legacy;
 using osu.Game.Utils;
 
 namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
@@ -51,8 +52,8 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             TimingControlPoint timingPoint = beatmap.ControlPointInfo.TimingPointAt(hitObject.StartTime);
 
             double beatLength;
-            if (hitObject.LegacyBpmMultiplier.HasValue)
-                beatLength = timingPoint.BeatLength * hitObject.LegacyBpmMultiplier.Value;
+            if (hitObject.HasContext<LegacyContext>())
+                beatLength = timingPoint.BeatLength * hitObject.GetContext<LegacyContext>().BpmMultiplier;
             else if (hitObject is IHasSliderVelocity hasSliderVelocity)
                 beatLength = timingPoint.BeatLength / hasSliderVelocity.SliderVelocity;
             else
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 6952033aec..4010218f6e 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -138,11 +138,6 @@ namespace osu.Game.Rulesets.Osu.Objects
 
         public double SliderVelocity { get; set; } = 1;
 
-        /// <summary>
-        /// Whether to generate ticks on this <see cref="Slider"/>.
-        /// </summary>
-        public bool GenerateTicks = true;
-
         [JsonIgnore]
         public SliderHeadCircle HeadCircle { get; protected set; }
 
@@ -162,9 +157,10 @@ namespace osu.Game.Rulesets.Osu.Objects
             TimingControlPoint timingPoint = controlPointInfo.TimingPointAt(StartTime);
 
             double scoringDistance = BASE_SCORING_DISTANCE * difficulty.SliderMultiplier * SliderVelocity;
+            bool generateTicks = !HasContext<LegacyContext>() || GetContext<LegacyContext>().GenerateTicks;
 
             Velocity = scoringDistance / timingPoint.BeatLength;
-            TickDistance = GenerateTicks ? (scoringDistance / difficulty.SliderTickRate * TickDistanceMultiplier) : double.PositiveInfinity;
+            TickDistance = generateTicks ? (scoringDistance / difficulty.SliderTickRate * TickDistanceMultiplier) : double.PositiveInfinity;
         }
 
         protected override void ApplyLegacyInfoToSelf(ControlPointInfo controlPointInfo, IBeatmapDifficultyInfo difficulty)
@@ -172,12 +168,7 @@ namespace osu.Game.Rulesets.Osu.Objects
             base.ApplyLegacyInfoToSelf(controlPointInfo, difficulty);
 
             DifficultyControlPoint difficultyControlPoint = controlPointInfo is LegacyControlPointInfo legacyInfo ? legacyInfo.DifficultyPointAt(StartTime) : DifficultyControlPoint.DEFAULT;
-#pragma warning disable 618
-            var legacyDifficultyPoint = difficultyControlPoint as LegacyBeatmapDecoder.LegacyDifficultyControlPoint;
-#pragma warning restore 618
-
             SliderVelocity = difficultyControlPoint.SliderVelocity;
-            GenerateTicks = legacyDifficultyPoint?.GenerateTicks ?? true;
         }
 
         protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index 362ddccaf1..ef73ffd517 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -16,6 +16,7 @@ using JetBrains.Annotations;
 using osu.Game.Audio;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Formats;
+using osu.Game.Beatmaps.Legacy;
 
 namespace osu.Game.Rulesets.Taiko.Beatmaps
 {
@@ -179,8 +180,8 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
             TimingControlPoint timingPoint = beatmap.ControlPointInfo.TimingPointAt(obj.StartTime);
 
             double beatLength;
-            if (obj.LegacyBpmMultiplier.HasValue)
-                beatLength = timingPoint.BeatLength * obj.LegacyBpmMultiplier.Value;
+            if (obj.HasContext<LegacyContext>())
+                beatLength = timingPoint.BeatLength * obj.GetContext<LegacyContext>().BpmMultiplier;
             else if (obj is IHasSliderVelocity hasSliderVelocity)
                 beatLength = timingPoint.BeatLength / hasSliderVelocity.SliderVelocity;
             else
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index c17eea0e85..6f948e4d23 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -15,6 +15,7 @@ using osu.Game.Beatmaps.Legacy;
 using osu.Game.Beatmaps.Timing;
 using osu.Game.IO;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Legacy;
 
 namespace osu.Game.Beatmaps.Formats
@@ -86,11 +87,24 @@ namespace osu.Game.Beatmaps.Formats
 
             foreach (var hitObject in this.beatmap.HitObjects)
             {
-                hitObject.ApplyLegacyInfo(this.beatmap.ControlPointInfo, this.beatmap.Difficulty);
+                applyLegacyInfoToHitObject(hitObject);
                 hitObject.ApplyDefaults(this.beatmap.ControlPointInfo, this.beatmap.Difficulty);
             }
         }
 
+        private void applyLegacyInfoToHitObject(HitObject hitObject)
+        {
+            var legacyInfo = beatmap.ControlPointInfo as LegacyControlPointInfo;
+
+            DifficultyControlPoint difficultyControlPoint = legacyInfo != null ? legacyInfo.DifficultyPointAt(hitObject.StartTime) : DifficultyControlPoint.DEFAULT;
+#pragma warning disable 618
+            if (difficultyControlPoint is LegacyDifficultyControlPoint legacyDifficultyControlPoint)
+#pragma warning restore 618
+                hitObject.SetContext(new LegacyContext(legacyDifficultyControlPoint.BpmMultiplier, legacyDifficultyControlPoint.GenerateTicks));
+
+            hitObject.ApplyLegacyInfo(beatmap.ControlPointInfo, beatmap.Difficulty);
+        }
+
         /// <summary>
         /// Some `BeatmapInfo` members have default values that differ from the default values used by stable.
         /// In addition, legacy beatmaps will sometimes not contain some configuration keys, in which case
diff --git a/osu.Game/Beatmaps/Legacy/LegacyContext.cs b/osu.Game/Beatmaps/Legacy/LegacyContext.cs
new file mode 100644
index 0000000000..eeb02bdcb7
--- /dev/null
+++ b/osu.Game/Beatmaps/Legacy/LegacyContext.cs
@@ -0,0 +1,32 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Game.Context;
+
+namespace osu.Game.Beatmaps.Legacy;
+
+public class LegacyContext : IContext
+{
+    public LegacyContext(double bpmMultiplier, bool generateTicks)
+    {
+        BpmMultiplier = bpmMultiplier;
+        GenerateTicks = generateTicks;
+    }
+
+    /// <summary>
+    /// Legacy BPM multiplier that introduces floating-point errors for rulesets that depend on it.
+    /// DO NOT USE THIS UNLESS 100% SURE.
+    /// </summary>
+    public double BpmMultiplier { get; }
+
+    /// <summary>
+    /// Whether or not slider ticks should be generated at this control point.
+    /// This exists for backwards compatibility with maps that abuse NaN slider velocity behavior on osu!stable (e.g. /b/2628991).
+    /// </summary>
+    public bool GenerateTicks { get; }
+
+    public IContext Copy()
+    {
+        return new LegacyContext(BpmMultiplier, GenerateTicks);
+    }
+}
diff --git a/osu.Game/Context/IContext.cs b/osu.Game/Context/IContext.cs
new file mode 100644
index 0000000000..f70cdea9f8
--- /dev/null
+++ b/osu.Game/Context/IContext.cs
@@ -0,0 +1,10 @@
+namespace osu.Game.Context;
+
+public interface IContext
+{
+    /// <summary>
+    /// Makes a deep copy of this context.
+    /// </summary>
+    /// <returns>The deep copy of this context.</returns>
+    public IContext Copy();
+}
diff --git a/osu.Game/Context/IHasContext.cs b/osu.Game/Context/IHasContext.cs
new file mode 100644
index 0000000000..bee81ea555
--- /dev/null
+++ b/osu.Game/Context/IHasContext.cs
@@ -0,0 +1,88 @@
+using System;
+using System.Collections.Generic;
+
+namespace osu.Game.Context
+{
+    public abstract class ContextContainer
+    {
+        /// <summary>
+        /// The contexts of this container.
+        /// The objects always have the type of their key.
+        /// </summary>
+        private readonly Dictionary<Type, IContext> contexts;
+
+        protected ContextContainer()
+        {
+            contexts = new Dictionary<Type, IContext>();
+        }
+
+        /// <summary>
+        /// Checks whether this object has the context with type T.
+        /// </summary>
+        /// <typeparam name="T">The type to check the context of.</typeparam>
+        /// <returns>Whether the context object with type T exists in this object.</returns>
+        public bool HasContext<T>() where T : IContext
+        {
+            return contexts.ContainsKey(typeof(T));
+        }
+
+        /// <summary>
+        /// Gets the context with type T.
+        /// </summary>
+        /// <typeparam name="T">The type to get the context of.</typeparam>
+        /// <exception cref="KeyNotFoundException">If the context does not exist in this hit object.</exception>
+        /// <returns>The context object with type T.</returns>
+        public T GetContext<T>() where T : IContext
+        {
+            return (T)contexts[typeof(T)];
+        }
+
+        /// <summary>
+        /// Tries to get the context with type T.
+        /// </summary>
+        /// <param name="context">The found context with type T.</param>
+        /// <typeparam name="T">The type to get the context of.</typeparam>
+        /// <returns>Whether the context exists in this object.</returns>
+        public bool TryGetContext<T>(out T context) where T : IContext
+        {
+            if (contexts.TryGetValue(typeof(T), out var context2))
+            {
+                context = (T)context2;
+                return true;
+            }
+
+            context = default!;
+            return false;
+        }
+
+        /// <summary>
+        /// Sets the context object of type T.
+        /// </summary>
+        /// <typeparam name="T">The context type to set.</typeparam>
+        /// <param name="context">The context object to store in this object.</param>
+        public void SetContext<T>(T context) where T : IContext
+        {
+            contexts[typeof(T)] = context;
+        }
+
+        /// <summary>
+        /// Removes the context of type T from this object.
+        /// </summary>
+        /// <typeparam name="T">The type to remove the context of.</typeparam>
+        /// <returns>Whether a context was removed.</returns>
+        public bool RemoveContext<T>() where T : IContext
+        {
+            return RemoveContext(typeof(T));
+        }
+
+        /// <summary>
+        /// Removes the context of type T from this object.
+        /// </summary>
+        /// <param name="t">The type to remove the context of.</param>
+        /// <returns>Whether a context was removed.</returns>
+        public bool RemoveContext(Type t)
+        {
+            return contexts.Remove(t);
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs
index aea564a4b9..fb7a5739b4 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -18,6 +18,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.Beatmaps.Legacy;
+using osu.Game.Context;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
@@ -30,7 +31,7 @@ namespace osu.Game.Rulesets.Objects
     /// HitObjects may contain more properties for which you should be checking through the IHas* types.
     /// </para>
     /// </summary>
-    public class HitObject
+    public class HitObject : ContextContainer
     {
         /// <summary>
         /// A small adjustment to the start time of control points to account for rounding/precision errors.
@@ -81,12 +82,6 @@ namespace osu.Game.Rulesets.Objects
         public SampleControlPoint SampleControlPoint = SampleControlPoint.DEFAULT;
         public DifficultyControlPoint DifficultyControlPoint = DifficultyControlPoint.DEFAULT;
 
-        /// <summary>
-        /// Legacy BPM multiplier that introduces floating-point errors for rulesets that depend on it.
-        /// DO NOT USE THIS UNLESS 100% SURE.
-        /// </summary>
-        public double? LegacyBpmMultiplier { get; private set; }
-
         /// <summary>
         /// Whether this <see cref="HitObject"/> is in Kiai time.
         /// </summary>
@@ -174,12 +169,6 @@ namespace osu.Game.Rulesets.Objects
         {
             var legacyInfo = controlPointInfo as LegacyControlPointInfo;
 
-            DifficultyControlPoint difficultyControlPoint = legacyInfo != null ? legacyInfo.DifficultyPointAt(StartTime) : DifficultyControlPoint.DEFAULT;
-#pragma warning disable 618
-            if (difficultyControlPoint is LegacyBeatmapDecoder.LegacyDifficultyControlPoint legacyDifficultyControlPoint)
-#pragma warning restore 618
-                LegacyBpmMultiplier = legacyDifficultyControlPoint.BpmMultiplier;
-
             ApplyLegacyInfoToSelf(controlPointInfo, difficulty);
 
             // This is done here after ApplyLegacyInfoToSelf as we may require custom defaults to be applied to have an accurate end time.

From 891b87a5ff97e9eaeb7a0de15472217e97b2540c Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Tue, 25 Apr 2023 12:52:21 +0200
Subject: [PATCH 0154/1604] remove ApplyLegacyInfo method

---
 osu.Game.Rulesets.Osu/Objects/Slider.cs       |  8 -----
 .../Beatmaps/Formats/LegacyBeatmapDecoder.cs  | 36 ++++++++++++++++---
 osu.Game/Rulesets/Objects/HitObject.cs        | 26 --------------
 .../Rulesets/Objects/Legacy/ConvertSlider.cs  |  8 -----
 4 files changed, 32 insertions(+), 46 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 4010218f6e..a90d60cd1b 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -163,14 +163,6 @@ namespace osu.Game.Rulesets.Osu.Objects
             TickDistance = generateTicks ? (scoringDistance / difficulty.SliderTickRate * TickDistanceMultiplier) : double.PositiveInfinity;
         }
 
-        protected override void ApplyLegacyInfoToSelf(ControlPointInfo controlPointInfo, IBeatmapDifficultyInfo difficulty)
-        {
-            base.ApplyLegacyInfoToSelf(controlPointInfo, difficulty);
-
-            DifficultyControlPoint difficultyControlPoint = controlPointInfo is LegacyControlPointInfo legacyInfo ? legacyInfo.DifficultyPointAt(StartTime) : DifficultyControlPoint.DEFAULT;
-            SliderVelocity = difficultyControlPoint.SliderVelocity;
-        }
-
         protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
         {
             base.CreateNestedHitObjects(cancellationToken);
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index 6f948e4d23..dad23df282 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -17,6 +17,7 @@ using osu.Game.IO;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Legacy;
+using osu.Game.Rulesets.Objects.Types;
 
 namespace osu.Game.Beatmaps.Formats
 {
@@ -27,6 +28,11 @@ namespace osu.Game.Beatmaps.Formats
         /// </summary>
         public const int EARLY_VERSION_TIMING_OFFSET = 24;
 
+        /// <summary>
+        /// A small adjustment to the start time of control points to account for rounding/precision errors.
+        /// </summary>
+        private const double control_point_leniency = 1;
+
         internal static RulesetStore RulesetStore;
 
         private Beatmap beatmap;
@@ -87,12 +93,11 @@ namespace osu.Game.Beatmaps.Formats
 
             foreach (var hitObject in this.beatmap.HitObjects)
             {
-                applyLegacyInfoToHitObject(hitObject);
-                hitObject.ApplyDefaults(this.beatmap.ControlPointInfo, this.beatmap.Difficulty);
+                applyLegacyInfoAndDefaults(hitObject);
             }
         }
 
-        private void applyLegacyInfoToHitObject(HitObject hitObject)
+        private void applyLegacyInfoAndDefaults(HitObject hitObject)
         {
             var legacyInfo = beatmap.ControlPointInfo as LegacyControlPointInfo;
 
@@ -102,7 +107,30 @@ namespace osu.Game.Beatmaps.Formats
 #pragma warning restore 618
                 hitObject.SetContext(new LegacyContext(legacyDifficultyControlPoint.BpmMultiplier, legacyDifficultyControlPoint.GenerateTicks));
 
-            hitObject.ApplyLegacyInfo(beatmap.ControlPointInfo, beatmap.Difficulty);
+            if (hitObject is IHasSliderVelocity hasSliderVelocity)
+                hasSliderVelocity.SliderVelocity = difficultyControlPoint.SliderVelocity;
+
+            hitObject.ApplyDefaults(beatmap.ControlPointInfo, beatmap.Difficulty);
+
+            SampleControlPoint sampleControlPoint = legacyInfo != null ? legacyInfo.SamplePointAt(hitObject.GetEndTime() + control_point_leniency) : SampleControlPoint.DEFAULT;
+
+            foreach (var hitSampleInfo in hitObject.Samples)
+            {
+                sampleControlPoint.ApplyTo(hitSampleInfo);
+            }
+
+            if (hitObject is not IHasRepeats hasRepeats) return;
+
+            for (int i = 0; i < hasRepeats.NodeSamples.Count; i++)
+            {
+                double time = hitObject.StartTime + i * hasRepeats.Duration / hasRepeats.SpanCount() + control_point_leniency;
+                sampleControlPoint = legacyInfo != null ? legacyInfo.SamplePointAt(time) : SampleControlPoint.DEFAULT;
+
+                foreach (var hitSampleInfo in hasRepeats.NodeSamples[i])
+                {
+                    sampleControlPoint.ApplyTo(hitSampleInfo);
+                }
+            }
         }
 
         /// <summary>
diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs
index fb7a5739b4..2298a7ef12 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -158,32 +158,6 @@ namespace osu.Game.Rulesets.Objects
             HitWindows?.SetDifficulty(difficulty.OverallDifficulty);
         }
 
-        /// <summary>
-        /// Applies legacy information to this HitObject.
-        /// This method gets called at the end of <see cref="LegacyBeatmapDecoder"/> before applying defaults.
-        /// </summary>
-        /// <param name="controlPointInfo">The control points.</param>
-        /// <param name="difficulty">The difficulty settings to use.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        public void ApplyLegacyInfo(ControlPointInfo controlPointInfo, IBeatmapDifficultyInfo difficulty, CancellationToken cancellationToken = default)
-        {
-            var legacyInfo = controlPointInfo as LegacyControlPointInfo;
-
-            ApplyLegacyInfoToSelf(controlPointInfo, difficulty);
-
-            // This is done here after ApplyLegacyInfoToSelf as we may require custom defaults to be applied to have an accurate end time.
-            SampleControlPoint sampleControlPoint = legacyInfo != null ? legacyInfo.SamplePointAt(this.GetEndTime() + control_point_leniency) : SampleControlPoint.DEFAULT;
-
-            foreach (var hitSampleInfo in Samples)
-            {
-                sampleControlPoint.ApplyTo(hitSampleInfo);
-            }
-        }
-
-        protected virtual void ApplyLegacyInfoToSelf(ControlPointInfo controlPointInfo, IBeatmapDifficultyInfo difficulty)
-        {
-        }
-
         protected virtual void CreateNestedHitObjects(CancellationToken cancellationToken)
         {
         }
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
index 11e1f0beae..47aabf1599 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
@@ -54,14 +54,6 @@ namespace osu.Game.Rulesets.Objects.Legacy
             Velocity = scoringDistance / timingPoint.BeatLength;
         }
 
-        protected override void ApplyLegacyInfoToSelf(ControlPointInfo controlPointInfo, IBeatmapDifficultyInfo difficulty)
-        {
-            base.ApplyLegacyInfoToSelf(controlPointInfo, difficulty);
-
-            DifficultyControlPoint difficultyControlPoint = controlPointInfo is LegacyControlPointInfo legacyInfo ? legacyInfo.DifficultyPointAt(StartTime) : DifficultyControlPoint.DEFAULT;
-            SliderVelocity = difficultyControlPoint.SliderVelocity;
-        }
-
         public double LegacyLastTickOffset => 36;
     }
 }

From bf1951fc38200c8372df7ada3ce19bc8c4a9443a Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Tue, 25 Apr 2023 12:54:45 +0200
Subject: [PATCH 0155/1604] Fix incorrect xmldoc

---
 osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
index c454439c5c..6cd4d74a31 100644
--- a/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Beatmaps.ControlPoints
         public readonly Bindable<string> SampleBankBindable = new Bindable<string>(DEFAULT_BANK) { Default = DEFAULT_BANK };
 
         /// <summary>
-        /// The speed multiplier at this control point.
+        /// The default sample bank at this control point.
         /// </summary>
         public string SampleBank
         {
@@ -39,7 +39,7 @@ namespace osu.Game.Beatmaps.ControlPoints
         }
 
         /// <summary>
-        /// The default sample bank at this control point.
+        /// The default sample volume at this control point.
         /// </summary>
         public readonly BindableInt SampleVolumeBindable = new BindableInt(100)
         {

From 97910d6be6b96bcb56d77d8489f41f80cd58f1b4 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Tue, 25 Apr 2023 13:06:37 +0200
Subject: [PATCH 0156/1604] remove unused directives

---
 osu.Game.Rulesets.Osu/Objects/Slider.cs           | 1 -
 osu.Game/Rulesets/Objects/HitObject.cs            | 2 --
 osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs | 1 -
 3 files changed, 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index a90d60cd1b..73ac184c57 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -15,7 +15,6 @@ using osu.Framework.Caching;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Beatmaps.Formats;
 using osu.Game.Beatmaps.Legacy;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Osu.Judgements;
diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs
index 2298a7ef12..0502610eab 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -16,8 +16,6 @@ using osu.Framework.Lists;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Beatmaps.Formats;
-using osu.Game.Beatmaps.Legacy;
 using osu.Game.Context;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Types;
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
index 47aabf1599..f602cbac09 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
@@ -9,7 +9,6 @@ using Newtonsoft.Json;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Beatmaps.Legacy;
 
 namespace osu.Game.Rulesets.Objects.Legacy
 {

From dd2c289ce96ed4c874f901476bef18e0c4657a6c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 25 Apr 2023 20:22:12 +0900
Subject: [PATCH 0157/1604] Remove pointless default value

---
 osu.Game/Screens/Play/ArgonKeyCounter.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Play/ArgonKeyCounter.cs b/osu.Game/Screens/Play/ArgonKeyCounter.cs
index 70fe2e3a65..a978f001d5 100644
--- a/osu.Game/Screens/Play/ArgonKeyCounter.cs
+++ b/osu.Game/Screens/Play/ArgonKeyCounter.cs
@@ -56,7 +56,6 @@ namespace osu.Game.Screens.Play
                     Anchor = Anchor.BottomLeft,
                     Origin = Anchor.BottomLeft,
                     Font = OsuFont.Torus.With(size: count_font_size * scale_factor, weight: FontWeight.Bold),
-                    Text = "0"
                 },
             };
 

From 76309586330690aee88bfc4b7f6ac6b70cdbf751 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 25 Apr 2023 20:24:36 +0900
Subject: [PATCH 0158/1604] Stop using `Drawable.Name` to convey actual UI
 information

---
 osu.Game/Screens/Play/ArgonKeyCounter.cs       | 2 +-
 osu.Game/Screens/Play/HUD/DefaultKeyCounter.cs | 2 +-
 osu.Game/Screens/Play/HUD/KeyCounter.cs        | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/ArgonKeyCounter.cs b/osu.Game/Screens/Play/ArgonKeyCounter.cs
index a978f001d5..6818b30823 100644
--- a/osu.Game/Screens/Play/ArgonKeyCounter.cs
+++ b/osu.Game/Screens/Play/ArgonKeyCounter.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Screens.Play
                     Position = new Vector2(0, -13) * scale_factor,
                     Font = OsuFont.Torus.With(size: name_font_size * scale_factor, weight: FontWeight.Bold),
                     Colour = colours.Blue0,
-                    Text = Name
+                    Text = Trigger.Name
                 },
                 countText = new OsuSpriteText
                 {
diff --git a/osu.Game/Screens/Play/HUD/DefaultKeyCounter.cs b/osu.Game/Screens/Play/HUD/DefaultKeyCounter.cs
index 69a3e53dfc..f7ac72035f 100644
--- a/osu.Game/Screens/Play/HUD/DefaultKeyCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultKeyCounter.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Screens.Play.HUD
                     {
                         new OsuSpriteText
                         {
-                            Text = Name,
+                            Text = Trigger.Name,
                             Font = OsuFont.Numeric.With(size: 12),
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
diff --git a/osu.Game/Screens/Play/HUD/KeyCounter.cs b/osu.Game/Screens/Play/HUD/KeyCounter.cs
index 2a4ab1993a..7cdd6b025f 100644
--- a/osu.Game/Screens/Play/HUD/KeyCounter.cs
+++ b/osu.Game/Screens/Play/HUD/KeyCounter.cs
@@ -54,8 +54,6 @@ namespace osu.Game.Screens.Play.HUD
 
             Trigger.OnActivate += Activate;
             Trigger.OnDeactivate += Deactivate;
-
-            Name = trigger.Name;
         }
 
         private void increment()

From 0c3a01595362d1e995dfe46d7fbd0d1c4bd8c814 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 25 Apr 2023 21:37:17 +0900
Subject: [PATCH 0159/1604] Fix key counter test not testing the full binding
 of `IsCounting`

---
 .../Visual/Gameplay/TestSceneKeyCounter.cs    | 29 +++++++++----------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
index 1e35c24e97..aabc25d660 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
@@ -19,21 +19,21 @@ namespace osu.Game.Tests.Visual.Gameplay
     {
         public TestSceneKeyCounter()
         {
-            KeyCounterDisplay kc = new DefaultKeyCounterDisplay
+            KeyCounterDisplay defaultDisplay = new DefaultKeyCounterDisplay
             {
                 Origin = Anchor.Centre,
                 Anchor = Anchor.Centre,
                 Position = new Vector2(0, 72.7f)
             };
 
-            KeyCounterDisplay argonKc = new ArgonKeyCounterDisplay
+            KeyCounterDisplay argonDisplay = new ArgonKeyCounterDisplay
             {
                 Origin = Anchor.Centre,
                 Anchor = Anchor.Centre,
                 Position = new Vector2(0, -72.7f)
             };
 
-            kc.AddRange(new InputTrigger[]
+            defaultDisplay.AddRange(new InputTrigger[]
             {
                 new KeyCounterKeyboardTrigger(Key.X),
                 new KeyCounterKeyboardTrigger(Key.X),
@@ -41,7 +41,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 new KeyCounterMouseTrigger(MouseButton.Right),
             });
 
-            argonKc.AddRange(new InputTrigger[]
+            argonDisplay.AddRange(new InputTrigger[]
             {
                 new KeyCounterKeyboardTrigger(Key.X),
                 new KeyCounterKeyboardTrigger(Key.X),
@@ -49,32 +49,29 @@ namespace osu.Game.Tests.Visual.Gameplay
                 new KeyCounterMouseTrigger(MouseButton.Right),
             });
 
-            var testCounter = (DefaultKeyCounter)kc.Counters.First();
+            var testCounter = (DefaultKeyCounter)defaultDisplay.Counters.First();
 
             AddStep("Add random", () =>
             {
                 Key key = (Key)((int)Key.A + RNG.Next(26));
-                kc.Add(new KeyCounterKeyboardTrigger(key));
-                argonKc.Add(new KeyCounterKeyboardTrigger(key));
+                defaultDisplay.Add(new KeyCounterKeyboardTrigger(key));
+                argonDisplay.Add(new KeyCounterKeyboardTrigger(key));
             });
 
-            Key testKey = ((KeyCounterKeyboardTrigger)kc.Counters.First().Trigger).Key;
-
-            void addPressKeyStep()
-            {
-                AddStep($"Press {testKey} key", () => InputManager.Key(testKey));
-            }
+            Key testKey = ((KeyCounterKeyboardTrigger)defaultDisplay.Counters.First().Trigger).Key;
 
             addPressKeyStep();
             AddAssert($"Check {testKey} counter after keypress", () => testCounter.CountPresses.Value == 1);
             addPressKeyStep();
             AddAssert($"Check {testKey} counter after keypress", () => testCounter.CountPresses.Value == 2);
-            AddStep("Disable counting", () => testCounter.IsCounting.Value = false);
+            AddStep("Disable counting", () => defaultDisplay.IsCounting.Value = false);
             addPressKeyStep();
             AddAssert($"Check {testKey} count has not changed", () => testCounter.CountPresses.Value == 2);
 
-            Add(kc);
-            Add(argonKc);
+            Add(defaultDisplay);
+            Add(argonDisplay);
+
+            void addPressKeyStep() => AddStep($"Press {testKey} key", () => InputManager.Key(testKey));
         }
     }
 }

From 0a861ffcee21bae0b235b88b2455e1f2d3bfe2d6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 25 Apr 2023 21:22:55 +0900
Subject: [PATCH 0160/1604] Restructure key counters to use a common flow

---
 .../Screens/Play/ArgonKeyCounterDisplay.cs    | 14 ++++-----
 .../Play/HUD/DefaultKeyCounterDisplay.cs      | 29 +++++++++----------
 .../Screens/Play/HUD/KeyCounterDisplay.cs     |  8 +++--
 3 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/osu.Game/Screens/Play/ArgonKeyCounterDisplay.cs b/osu.Game/Screens/Play/ArgonKeyCounterDisplay.cs
index a62ac3d39a..984c2a7287 100644
--- a/osu.Game/Screens/Play/ArgonKeyCounterDisplay.cs
+++ b/osu.Game/Screens/Play/ArgonKeyCounterDisplay.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Collections.Generic;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Screens.Play.HUD;
@@ -13,13 +12,11 @@ namespace osu.Game.Screens.Play
     {
         private const int duration = 100;
 
-        private readonly FillFlowContainer<ArgonKeyCounter> keyFlow;
-
-        public override IEnumerable<KeyCounter> Counters => keyFlow;
+        protected override FillFlowContainer<KeyCounter> KeyFlow { get; }
 
         public ArgonKeyCounterDisplay()
         {
-            InternalChild = keyFlow = new FillFlowContainer<ArgonKeyCounter>
+            InternalChild = KeyFlow = new FillFlowContainer<KeyCounter>
             {
                 Direction = FillDirection.Horizontal,
                 AutoSizeAxes = Axes.Both,
@@ -32,13 +29,12 @@ namespace osu.Game.Screens.Play
         {
             base.Update();
 
-            Size = keyFlow.Size;
+            Size = KeyFlow.Size;
         }
 
-        public override void Add(InputTrigger trigger) =>
-            keyFlow.Add(new ArgonKeyCounter(trigger));
+        protected override KeyCounter CreateCounter(InputTrigger trigger) => new ArgonKeyCounter(trigger);
 
         protected override void UpdateVisibility()
-            => keyFlow.FadeTo(AlwaysVisible.Value || ConfigVisibility.Value ? 1 : 0, duration);
+            => KeyFlow.FadeTo(AlwaysVisible.Value || ConfigVisibility.Value ? 1 : 0, duration);
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/DefaultKeyCounterDisplay.cs b/osu.Game/Screens/Play/HUD/DefaultKeyCounterDisplay.cs
index 14d7f56093..e459574243 100644
--- a/osu.Game/Screens/Play/HUD/DefaultKeyCounterDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultKeyCounterDisplay.cs
@@ -1,7 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osuTK.Graphics;
@@ -13,13 +13,11 @@ namespace osu.Game.Screens.Play.HUD
         private const int duration = 100;
         private const double key_fade_time = 80;
 
-        private readonly FillFlowContainer<DefaultKeyCounter> keyFlow;
-
-        public override IEnumerable<KeyCounter> Counters => keyFlow;
+        protected override FillFlowContainer<KeyCounter> KeyFlow { get; }
 
         public DefaultKeyCounterDisplay()
         {
-            InternalChild = keyFlow = new FillFlowContainer<DefaultKeyCounter>
+            InternalChild = KeyFlow = new FillFlowContainer<KeyCounter>
             {
                 Direction = FillDirection.Horizontal,
                 AutoSizeAxes = Axes.Both,
@@ -33,20 +31,19 @@ namespace osu.Game.Screens.Play.HUD
 
             // Don't use autosize as it will shrink to zero when KeyFlow is hidden.
             // In turn this can cause the display to be masked off screen and never become visible again.
-            Size = keyFlow.Size;
+            Size = KeyFlow.Size;
         }
 
-        public override void Add(InputTrigger trigger) =>
-            keyFlow.Add(new DefaultKeyCounter(trigger)
-            {
-                FadeTime = key_fade_time,
-                KeyDownTextColor = KeyDownTextColor,
-                KeyUpTextColor = KeyUpTextColor,
-            });
+        protected override KeyCounter CreateCounter(InputTrigger trigger) => new DefaultKeyCounter(trigger)
+        {
+            FadeTime = key_fade_time,
+            KeyDownTextColor = KeyDownTextColor,
+            KeyUpTextColor = KeyUpTextColor,
+        };
 
         protected override void UpdateVisibility() =>
             // Isolate changing visibility of the key counters from fading this component.
-            keyFlow.FadeTo(AlwaysVisible.Value || ConfigVisibility.Value ? 1 : 0, duration);
+            KeyFlow.FadeTo(AlwaysVisible.Value || ConfigVisibility.Value ? 1 : 0, duration);
 
         private Color4 keyDownTextColor = Color4.DarkGray;
 
@@ -58,7 +55,7 @@ namespace osu.Game.Screens.Play.HUD
                 if (value != keyDownTextColor)
                 {
                     keyDownTextColor = value;
-                    foreach (var child in keyFlow)
+                    foreach (var child in KeyFlow.Cast<DefaultKeyCounter>())
                         child.KeyDownTextColor = value;
                 }
             }
@@ -74,7 +71,7 @@ namespace osu.Game.Screens.Play.HUD
                 if (value != keyUpTextColor)
                 {
                     keyUpTextColor = value;
-                    foreach (var child in keyFlow)
+                    foreach (var child in KeyFlow.Cast<DefaultKeyCounter>())
                         child.KeyUpTextColor = value;
                 }
             }
diff --git a/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs b/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs
index 49c0da6793..e218155af2 100644
--- a/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs
@@ -29,7 +29,9 @@ namespace osu.Game.Screens.Play.HUD
         /// <summary>
         /// The <see cref="KeyCounter"/>s contained in this <see cref="KeyCounterDisplay"/>.
         /// </summary>
-        public abstract IEnumerable<KeyCounter> Counters { get; }
+        public IEnumerable<KeyCounter> Counters => KeyFlow;
+
+        protected abstract FillFlowContainer<KeyCounter> KeyFlow { get; }
 
         /// <summary>
         /// Whether the actions reported by all <see cref="InputTrigger"/>s within this <see cref="KeyCounterDisplay"/> should be counted.
@@ -53,13 +55,15 @@ namespace osu.Game.Screens.Play.HUD
         /// <summary>
         /// Add a <see cref="InputTrigger"/> to this display.
         /// </summary>
-        public abstract void Add(InputTrigger trigger);
+        public void Add(InputTrigger trigger) => KeyFlow.Add(CreateCounter(trigger));
 
         /// <summary>
         /// Add a range of <see cref="InputTrigger"/> to this display.
         /// </summary>
         public void AddRange(IEnumerable<InputTrigger> triggers) => triggers.ForEach(Add);
 
+        protected abstract KeyCounter CreateCounter(InputTrigger trigger);
+
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {

From 6b4032e34b57fba897a4f8906a9097c6543acb30 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 25 Apr 2023 21:31:39 +0900
Subject: [PATCH 0161/1604] Add missing binding of `IsCounting` with contained
 counters

---
 osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs b/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs
index e218155af2..05427d3a32 100644
--- a/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs
@@ -55,7 +55,14 @@ namespace osu.Game.Screens.Play.HUD
         /// <summary>
         /// Add a <see cref="InputTrigger"/> to this display.
         /// </summary>
-        public void Add(InputTrigger trigger) => KeyFlow.Add(CreateCounter(trigger));
+        public void Add(InputTrigger trigger)
+        {
+            var keyCounter = CreateCounter(trigger);
+
+            KeyFlow.Add(keyCounter);
+
+            IsCounting.BindTo(keyCounter.IsCounting);
+        }
 
         /// <summary>
         /// Add a range of <see cref="InputTrigger"/> to this display.

From e08d7daffd7c5f582f98a43cad3f2fd2d64829bc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 25 Apr 2023 21:43:14 +0900
Subject: [PATCH 0162/1604] Don't show decimal point in tooltip

---
 osu.Game/Localisation/EditorStrings.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Localisation/EditorStrings.cs b/osu.Game/Localisation/EditorStrings.cs
index 7c9b52275d..20258b9c35 100644
--- a/osu.Game/Localisation/EditorStrings.cs
+++ b/osu.Game/Localisation/EditorStrings.cs
@@ -100,14 +100,14 @@ namespace osu.Game.Localisation
         public static LocalisableString TimelineTicks => new TranslatableString(getKey(@"timeline_ticks"), @"Ticks");
 
         /// <summary>
-        /// "{0:0.0}&#176;"
+        /// "{0:0}&#176;"
         /// </summary>
-        public static LocalisableString RotationUnsnapped(float newRotation) => new TranslatableString(getKey(@"rotation_unsnapped"), @"{0:0.0}°", newRotation);
+        public static LocalisableString RotationUnsnapped(float newRotation) => new TranslatableString(getKey(@"rotation_unsnapped"), @"{0:0}°", newRotation);
 
         /// <summary>
-        /// "{0:0.0}&#176; (snapped)"
+        /// "{0:0}&#176; (snapped)"
         /// </summary>
-        public static LocalisableString RotationSnapped(float newRotation) => new TranslatableString(getKey(@"rotation_snapped"), @"{0:0.0}° (snapped)", newRotation);
+        public static LocalisableString RotationSnapped(float newRotation) => new TranslatableString(getKey(@"rotation_snapped"), @"{0:0}° (snapped)", newRotation);
 
         private static string getKey(string key) => $@"{prefix}:{key}";
     }

From c37875bee824e8c00bbc0d07273dbd98cbef5930 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Tue, 25 Apr 2023 15:53:36 +0200
Subject: [PATCH 0163/1604] remove hitobject SampleControlPoint usage from
 LegacyBeatmapEncoder

---
 osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 072e442dea..04786cc9fb 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -92,7 +92,7 @@ namespace osu.Game.Beatmaps.Formats
             writer.WriteLine(FormattableString.Invariant($"AudioLeadIn: {beatmap.BeatmapInfo.AudioLeadIn}"));
             writer.WriteLine(FormattableString.Invariant($"PreviewTime: {beatmap.Metadata.PreviewTime}"));
             writer.WriteLine(FormattableString.Invariant($"Countdown: {(int)beatmap.BeatmapInfo.Countdown}"));
-            writer.WriteLine(FormattableString.Invariant($"SampleSet: {toLegacySampleBank((beatmap.HitObjects.FirstOrDefault()?.SampleControlPoint ?? SampleControlPoint.DEFAULT).SampleBank)}"));
+            writer.WriteLine(FormattableString.Invariant($"SampleSet: {toLegacySampleBank(((beatmap.ControlPointInfo as LegacyControlPointInfo)?.SamplePoints?.FirstOrDefault() ?? SampleControlPoint.DEFAULT).SampleBank)}"));
             writer.WriteLine(FormattableString.Invariant($"StackLeniency: {beatmap.BeatmapInfo.StackLeniency}"));
             writer.WriteLine(FormattableString.Invariant($"Mode: {onlineRulesetID}"));
             writer.WriteLine(FormattableString.Invariant($"LetterboxInBreaks: {(beatmap.BeatmapInfo.LetterboxInBreaks ? '1' : '0')}"));
@@ -268,7 +268,12 @@ namespace osu.Game.Beatmaps.Formats
             {
                 foreach (var hitObject in hitObjects)
                 {
-                    yield return hitObject.SampleControlPoint;
+                    if (hitObject.Samples.Count > 0)
+                    {
+                        int volume = hitObject.Samples.Max(o => o.Volume);
+                        int customIndex = hitObject.Samples.OfType<ConvertHitObjectParser.LegacyHitSampleInfo>().Max(o => o.CustomSampleBank);
+                        yield return new LegacyBeatmapDecoder.LegacySampleControlPoint { Time = hitObject.GetEndTime(), SampleVolume = volume, CustomSampleBank = customIndex };
+                    }
 
                     foreach (var nested in collectSampleControlPoints(hitObject.NestedHitObjects))
                         yield return nested;

From a6346171575e76ba0bf1b043040bbd0db8188b4e Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Tue, 25 Apr 2023 16:01:06 +0200
Subject: [PATCH 0164/1604] Fix file header notice

---
 osu.Game/Context/{IHasContext.cs => ContextContainer.cs} | 5 ++++-
 osu.Game/Context/IContext.cs                             | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)
 rename osu.Game/Context/{IHasContext.cs => ContextContainer.cs} (94%)

diff --git a/osu.Game/Context/IHasContext.cs b/osu.Game/Context/ContextContainer.cs
similarity index 94%
rename from osu.Game/Context/IHasContext.cs
rename to osu.Game/Context/ContextContainer.cs
index bee81ea555..7ff0280bcf 100644
--- a/osu.Game/Context/IHasContext.cs
+++ b/osu.Game/Context/ContextContainer.cs
@@ -1,4 +1,7 @@
-using System;
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
 using System.Collections.Generic;
 
 namespace osu.Game.Context
diff --git a/osu.Game/Context/IContext.cs b/osu.Game/Context/IContext.cs
index f70cdea9f8..61b1b11f43 100644
--- a/osu.Game/Context/IContext.cs
+++ b/osu.Game/Context/IContext.cs
@@ -1,4 +1,7 @@
-namespace osu.Game.Context;
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+namespace osu.Game.Context;
 
 public interface IContext
 {

From ebe1d852f53a80f3775f0ff602e95e8a74f3ca65 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Tue, 25 Apr 2023 16:01:43 +0200
Subject: [PATCH 0165/1604] remove other usages of hitobject SampleControlPoint

---
 osu.Game/Rulesets/Edit/Checks/CheckMutedObjects.cs       | 2 +-
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs             | 6 +++---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 8 +-------
 osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs      | 1 -
 osu.Game/Rulesets/UI/Playfield.cs                        | 4 ++--
 5 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckMutedObjects.cs b/osu.Game/Rulesets/Edit/Checks/CheckMutedObjects.cs
index 5b59a81f91..a2ae1764dd 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckMutedObjects.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckMutedObjects.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Rulesets.Edit.Checks
                 yield break;
 
             // Samples that allow themselves to be overridden by control points have a volume of 0.
-            int maxVolume = sampledHitObject.Samples.Max(sample => sample.Volume > 0 ? sample.Volume : sampledHitObject.SampleControlPoint.SampleVolume);
+            int maxVolume = sampledHitObject.Samples.Max(sample => sample.Volume);
             double samplePlayTime = sampledHitObject.GetEndTime();
 
             EdgeType edgeType = getEdgeAtTime(hitObject, samplePlayTime);
diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index f810f51027..91dd7754d0 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -74,9 +74,9 @@ namespace osu.Game.Rulesets.Edit
         /// <param name="commitStart">Whether this call is committing a value for HitObject.StartTime and continuing with further adjustments.</param>
         protected void BeginPlacement(bool commitStart = false)
         {
-            var nearestSampleControlPoint = beatmap.HitObjects.LastOrDefault(h => h.GetEndTime() < HitObject.StartTime)?.SampleControlPoint?.DeepClone() as SampleControlPoint;
-
-            HitObject.SampleControlPoint = nearestSampleControlPoint ?? new SampleControlPoint();
+            // Take the hitnormal sample of the last hit object
+            var lastHitNormal = beatmap.HitObjects.LastOrDefault(h => h.GetEndTime() < HitObject.StartTime)?.Samples?.FirstOrDefault(o => o.Name == HitSampleInfo.HIT_NORMAL);
+            HitObject.Samples.Add(lastHitNormal);
 
             placementHandler.BeginPlacement(HitObject);
             if (commitStart)
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index f6c3452e48..79fc778287 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -357,13 +357,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             if (samples.Length <= 0)
                 return;
 
-            if (HitObject.SampleControlPoint == null)
-            {
-                throw new InvalidOperationException($"{nameof(HitObject)}s must always have an attached {nameof(HitObject.SampleControlPoint)}."
-                                                    + $" This is an indication that {nameof(HitObject.ApplyDefaults)} has not been invoked on {this}.");
-            }
-
-            Samples.Samples = samples.Select(s => HitObject.SampleControlPoint.ApplyTo(s)).Cast<ISampleInfo>().ToArray();
+            Samples.Samples = samples.Cast<ISampleInfo>().ToArray();
         }
 
         private void onSamplesChanged(object sender, NotifyCollectionChangedEventArgs e) => LoadSamples();
diff --git a/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs b/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
index e1c03e49e3..d4510a4519 100644
--- a/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
+++ b/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
@@ -52,7 +52,6 @@ namespace osu.Game.Rulesets.UI
                 return;
 
             var samples = nextObject.Samples
-                                    .Select(s => nextObject.SampleControlPoint.ApplyTo(s))
                                     .Cast<ISampleInfo>()
                                     .ToArray();
 
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index b1c3b78e67..6016a53918 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -293,10 +293,10 @@ namespace osu.Game.Rulesets.UI
         {
             // prepare sample pools ahead of time so we're not initialising at runtime.
             foreach (var sample in hitObject.Samples)
-                prepareSamplePool(hitObject.SampleControlPoint.ApplyTo(sample));
+                prepareSamplePool(sample);
 
             foreach (var sample in hitObject.AuxiliarySamples)
-                prepareSamplePool(hitObject.SampleControlPoint.ApplyTo(sample));
+                prepareSamplePool(sample);
 
             foreach (var nestedObject in hitObject.NestedHitObjects)
                 preloadSamples(nestedObject);

From 065464d90cae0c7ea887be51b7ca171011f70560 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Tue, 25 Apr 2023 18:12:53 +0200
Subject: [PATCH 0166/1604] Fixed DifficultyPointPiece

---
 osu.Game.Rulesets.Osu/Objects/Slider.cs       |  9 ++-
 .../Rulesets/Objects/Legacy/ConvertSlider.cs  |  9 ++-
 .../Objects/Types/IHasSliderVelocity.cs       |  4 +
 .../Timeline/DifficultyPointPiece.cs          | 23 ++++--
 .../Timeline/HitObjectPointPiece.cs           | 77 +++++++++----------
 .../Components/Timeline/SamplePointPiece.cs   |  5 +-
 .../Timeline/TimelineHitObjectBlueprint.cs    | 45 ++++-------
 7 files changed, 90 insertions(+), 82 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 73ac184c57..efb98ba888 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -11,6 +11,7 @@ using System.Linq;
 using System.Text.Json.Serialization;
 using System.Threading;
 using Newtonsoft.Json;
+using osu.Framework.Bindables;
 using osu.Framework.Caching;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
@@ -135,7 +136,13 @@ namespace osu.Game.Rulesets.Osu.Objects
         /// </summary>
         public bool OnlyJudgeNestedObjects = true;
 
-        public double SliderVelocity { get; set; } = 1;
+        public BindableDouble SliderVelocityBindable = new BindableDouble(1);
+
+        public double SliderVelocity
+        {
+            get => SliderVelocityBindable.Value;
+            set => SliderVelocityBindable.Value = value;
+        }
 
         [JsonIgnore]
         public SliderHeadCircle HeadCircle { get; protected set; }
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
index f602cbac09..94d21a06ed 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
@@ -6,6 +6,7 @@
 using osu.Game.Rulesets.Objects.Types;
 using System.Collections.Generic;
 using Newtonsoft.Json;
+using osu.Framework.Bindables;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
@@ -40,7 +41,13 @@ namespace osu.Game.Rulesets.Objects.Legacy
 
         public double Velocity = 1;
 
-        public double SliderVelocity { get; set; } = 1;
+        public BindableDouble SliderVelocityBindable = new BindableDouble(1);
+
+        public double SliderVelocity
+        {
+            get => SliderVelocityBindable.Value;
+            set => SliderVelocityBindable.Value = value;
+        }
 
         protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, IBeatmapDifficultyInfo difficulty)
         {
diff --git a/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.cs b/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.cs
index a7195dab4b..c0ac5036ee 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.cs
@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Framework.Bindables;
+
 namespace osu.Game.Rulesets.Objects.Types;
 
 /// <summary>
@@ -12,4 +14,6 @@ public interface IHasSliderVelocity
     /// The slider velocity multiplier.
     /// </summary>
     double SliderVelocity { get; set; }
+
+    BindableNumber<double> SliderVelocityBindable { get; }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
index d3cdd461ea..4741b75641 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
@@ -13,12 +13,14 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
-using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Screens.Edit.Timing;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
@@ -29,13 +31,14 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         private readonly BindableNumber<double> speedMultiplier;
 
         public DifficultyPointPiece(HitObject hitObject)
-            : base(hitObject.DifficultyControlPoint)
         {
             HitObject = hitObject;
 
-            speedMultiplier = hitObject.DifficultyControlPoint.SliderVelocityBindable.GetBoundCopy();
+            speedMultiplier = (hitObject as IHasSliderVelocity)?.SliderVelocityBindable.GetBoundCopy();
         }
 
+        protected override Color4 GetRepresentingColour(OsuColour colours) => colours.Lime1;
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -78,7 +81,12 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                         Spacing = new Vector2(0, 15),
                         Children = new Drawable[]
                         {
-                            sliderVelocitySlider = new IndeterminateSliderWithTextBoxInput<double>("Velocity", new DifficultyControlPoint().SliderVelocityBindable)
+                            sliderVelocitySlider = new IndeterminateSliderWithTextBoxInput<double>("Velocity", new BindableDouble(1)
+                            {
+                                Precision = 0.01,
+                                MinValue = 0.1,
+                                MaxValue = 10
+                            })
                             {
                                 KeyboardStep = 0.1f
                             },
@@ -94,11 +102,10 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
                 // if the piece belongs to a currently selected object, assume that the user wants to change all selected objects.
                 // if the piece belongs to an unselected object, operate on that object alone, independently of the selection.
-                var relevantObjects = (beatmap.SelectedHitObjects.Contains(hitObject) ? beatmap.SelectedHitObjects : hitObject.Yield()).ToArray();
-                var relevantControlPoints = relevantObjects.Select(h => h.DifficultyControlPoint).ToArray();
+                var relevantObjects = (beatmap.SelectedHitObjects.Contains(hitObject) ? beatmap.SelectedHitObjects : hitObject.Yield()).Where(o => o is IHasSliderVelocity).ToArray();
 
                 // even if there are multiple objects selected, we can still display a value if they all have the same value.
-                var selectedPointBindable = relevantControlPoints.Select(point => point.SliderVelocity).Distinct().Count() == 1 ? relevantControlPoints.First().SliderVelocityBindable : null;
+                var selectedPointBindable = relevantObjects.Select(point => ((IHasSliderVelocity)point).SliderVelocity).Distinct().Count() == 1 ? ((IHasSliderVelocity)relevantObjects.First()).SliderVelocityBindable : null;
 
                 if (selectedPointBindable != null)
                 {
@@ -117,7 +124,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
                     foreach (var h in relevantObjects)
                     {
-                        h.DifficultyControlPoint.SliderVelocity = val.NewValue.Value;
+                        ((IHasSliderVelocity)h).SliderVelocity = val.NewValue.Value;
                         beatmap.Update(h);
                     }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/HitObjectPointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/HitObjectPointPiece.cs
index 5b0a5729c8..bd699c2e88 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/HitObjectPointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/HitObjectPointPiece.cs
@@ -7,59 +7,54 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osuTK.Graphics;
 
-namespace osu.Game.Screens.Edit.Compose.Components.Timeline
+namespace osu.Game.Screens.Edit.Compose.Components.Timeline;
+
+public partial class HitObjectPointPiece : CircularContainer
 {
-    public partial class HitObjectPointPiece : CircularContainer
+    protected OsuSpriteText Label { get; private set; }
+
+    [BackgroundDependencyLoader]
+    private void load(OsuColour colours)
     {
-        private readonly ControlPoint point;
+        AutoSizeAxes = Axes.Both;
 
-        protected OsuSpriteText Label { get; private set; }
+        Color4 colour = GetRepresentingColour(colours);
 
-        protected HitObjectPointPiece(ControlPoint point)
+        InternalChildren = new Drawable[]
         {
-            this.point = point;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            AutoSizeAxes = Axes.Both;
-
-            Color4 colour = point.GetRepresentingColour(colours);
-
-            InternalChildren = new Drawable[]
+            new Container
             {
-                new Container
+                AutoSizeAxes = Axes.X,
+                Height = 16,
+                Masking = true,
+                CornerRadius = 8,
+                Anchor = Anchor.BottomCentre,
+                Origin = Anchor.BottomCentre,
+                Children = new Drawable[]
                 {
-                    AutoSizeAxes = Axes.X,
-                    Height = 16,
-                    Masking = true,
-                    CornerRadius = 8,
-                    Anchor = Anchor.BottomCentre,
-                    Origin = Anchor.BottomCentre,
-                    Children = new Drawable[]
+                    new Box
                     {
-                        new Box
-                        {
-                            Colour = colour,
-                            RelativeSizeAxes = Axes.Both,
-                        },
-                        Label = new OsuSpriteText
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Padding = new MarginPadding(5),
-                            Font = OsuFont.Default.With(size: 12, weight: FontWeight.SemiBold),
-                            Colour = colours.B5,
-                        }
+                        Colour = colour,
+                        RelativeSizeAxes = Axes.Both,
+                    },
+                    Label = new OsuSpriteText
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Padding = new MarginPadding(5),
+                        Font = OsuFont.Default.With(size: 12, weight: FontWeight.SemiBold),
+                        Colour = colours.B5,
                     }
-                },
-            };
-        }
+                }
+            },
+        };
+
+    protected virtual Color4 GetRepresentingColour(OsuColour colours)
+    {
+        return colours.Yellow;
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
index 314137a565..50278bffc0 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
@@ -13,10 +13,12 @@ using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Screens.Edit.Timing;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
@@ -28,13 +30,14 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         private readonly BindableNumber<int> volume;
 
         public SamplePointPiece(HitObject hitObject)
-            : base(hitObject.SampleControlPoint)
         {
             HitObject = hitObject;
             volume = hitObject.SampleControlPoint.SampleVolumeBindable.GetBoundCopy();
             bank = hitObject.SampleControlPoint.SampleBankBindable.GetBoundCopy();
         }
 
+        protected override Color4 GetRepresentingColour(OsuColour colours) => colours.Pink;
+
         [BackgroundDependencyLoader]
         private void load()
         {
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index 4e5087c004..de659cddb8 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -102,6 +102,11 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                         },
                     }
                 },
+                sampleOverrideDisplay = new SamplePointPiece(Item)
+                {
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.TopCentre
+                },
             });
 
             if (item is IHasDuration)
@@ -111,6 +116,16 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                     OnDragHandled = e => OnDragHandled?.Invoke(e)
                 });
             }
+
+            if (item is IHasSliderVelocity)
+            {
+                AddInternal(difficultyOverrideDisplay = new DifficultyPointPiece(Item)
+                    {
+                        Anchor = Anchor.TopLeft,
+                        Origin = Anchor.BottomCentre
+                    }
+                );
+            }
         }
 
         protected override void LoadComplete()
@@ -208,36 +223,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 if (Item is IHasRepeats repeats)
                     updateRepeats(repeats);
             }
-
-            if (!ReferenceEquals(difficultyControlPoint, Item.DifficultyControlPoint))
-            {
-                difficultyControlPoint = Item.DifficultyControlPoint;
-                difficultyOverrideDisplay?.Expire();
-
-                if (Item.DifficultyControlPoint != null && Item is IHasDistance)
-                {
-                    AddInternal(difficultyOverrideDisplay = new DifficultyPointPiece(Item)
-                    {
-                        Anchor = Anchor.TopLeft,
-                        Origin = Anchor.BottomCentre
-                    });
-                }
-            }
-
-            if (!ReferenceEquals(sampleControlPoint, Item.SampleControlPoint))
-            {
-                sampleControlPoint = Item.SampleControlPoint;
-                sampleOverrideDisplay?.Expire();
-
-                if (Item.SampleControlPoint != null)
-                {
-                    AddInternal(sampleOverrideDisplay = new SamplePointPiece(Item)
-                    {
-                        Anchor = Anchor.BottomLeft,
-                        Origin = Anchor.TopCentre
-                    });
-                }
-            }
         }
 
         private void updateRepeats(IHasRepeats repeats)

From c23a7b014eb7a6a4b984bafc85459044cf29323e Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Tue, 25 Apr 2023 18:17:07 +0200
Subject: [PATCH 0167/1604] add missing }

---
 .../Edit/Compose/Components/Timeline/HitObjectPointPiece.cs      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/HitObjectPointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/HitObjectPointPiece.cs
index bd699c2e88..f7854705a4 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/HitObjectPointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/HitObjectPointPiece.cs
@@ -52,6 +52,7 @@ public partial class HitObjectPointPiece : CircularContainer
                 }
             },
         };
+    }
 
     protected virtual Color4 GetRepresentingColour(OsuColour colours)
     {

From 66eda40cdf1911c2c4139c00fa9ebc8478058168 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Tue, 25 Apr 2023 18:22:22 +0200
Subject: [PATCH 0168/1604] fix implementations of IHasSliderVelocity

---
 osu.Game.Rulesets.Osu/Objects/Slider.cs           | 2 +-
 osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index efb98ba888..e8eb197186 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -136,7 +136,7 @@ namespace osu.Game.Rulesets.Osu.Objects
         /// </summary>
         public bool OnlyJudgeNestedObjects = true;
 
-        public BindableDouble SliderVelocityBindable = new BindableDouble(1);
+        public BindableNumber<double> SliderVelocityBindable { get; } = new BindableDouble(1);
 
         public double SliderVelocity
         {
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
index 94d21a06ed..7ddd372dc9 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
 
         public double Velocity = 1;
 
-        public BindableDouble SliderVelocityBindable = new BindableDouble(1);
+        public BindableNumber<double> SliderVelocityBindable { get; } = new BindableDouble(1);
 
         public double SliderVelocity
         {

From 755ad25dbe22987fd1cd5e0c851adf1f99698640 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Tue, 25 Apr 2023 18:27:20 +0200
Subject: [PATCH 0169/1604] clean code

---
 .../Components/Timeline/TimelineHitObjectBlueprint.cs  | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index de659cddb8..1c36bec53e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -102,7 +102,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                         },
                     }
                 },
-                sampleOverrideDisplay = new SamplePointPiece(Item)
+                new SamplePointPiece(Item)
                 {
                     Anchor = Anchor.BottomLeft,
                     Origin = Anchor.TopCentre
@@ -119,7 +119,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             if (item is IHasSliderVelocity)
             {
-                AddInternal(difficultyOverrideDisplay = new DifficultyPointPiece(Item)
+                AddInternal(new DifficultyPointPiece(Item)
                     {
                         Anchor = Anchor.TopLeft,
                         Origin = Anchor.BottomCentre
@@ -202,12 +202,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             colouredComponents.Colour = OsuColour.ForegroundTextColourFor(averageColour);
         }
 
-        private SamplePointPiece? sampleOverrideDisplay;
-        private DifficultyPointPiece? difficultyOverrideDisplay;
-
-        private DifficultyControlPoint difficultyControlPoint = null!;
-        private SampleControlPoint sampleControlPoint = null!;
-
         protected override void Update()
         {
             base.Update();

From e4b64bdc3e0b3e3074c76a8286e986acfdeedb57 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Tue, 25 Apr 2023 19:06:29 +0200
Subject: [PATCH 0170/1604] clean up code stuff

---
 .../Patterns/Legacy/DistanceObjectPatternGenerator.cs    | 1 -
 osu.Game.Rulesets.Osu/Objects/Slider.cs                  | 1 -
 .../Components/Timeline/TimelineHitObjectBlueprint.cs    | 9 ++++-----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
index b3a68269f7..2427812ecd 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
@@ -14,7 +14,6 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Beatmaps.Formats;
 using osu.Game.Beatmaps.Legacy;
 using osu.Game.Utils;
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index e8eb197186..247cf94f59 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -8,7 +8,6 @@ using osu.Game.Rulesets.Objects.Types;
 using System.Collections.Generic;
 using osu.Game.Rulesets.Objects;
 using System.Linq;
-using System.Text.Json.Serialization;
 using System.Threading;
 using Newtonsoft.Json;
 using osu.Framework.Bindables;
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index 1c36bec53e..c2106e0598 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -120,11 +120,10 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             if (item is IHasSliderVelocity)
             {
                 AddInternal(new DifficultyPointPiece(Item)
-                    {
-                        Anchor = Anchor.TopLeft,
-                        Origin = Anchor.BottomCentre
-                    }
-                );
+                {
+                    Anchor = Anchor.TopLeft,
+                    Origin = Anchor.BottomCentre
+                });
             }
         }
 

From 753fa09356a2864060d0c8eb2dd95a29a7041785 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 25 Apr 2023 20:10:11 +0200
Subject: [PATCH 0171/1604] Fix test failures due to type mismatch

---
 osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs          | 2 +-
 osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index eecead5415..ae46dda750 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         // best way to check without exposing.
         private Drawable hideTarget => hudOverlay.KeyCounter;
-        private Drawable keyCounterFlow => hudOverlay.KeyCounter.ChildrenOfType<FillFlowContainer<DefaultKeyCounter>>().Single();
+        private Drawable keyCounterFlow => hudOverlay.KeyCounter.ChildrenOfType<FillFlowContainer<KeyCounter>>().Single();
 
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
index 7bbfc6a62b..0439656aae 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         // best way to check without exposing.
         private Drawable hideTarget => hudOverlay.KeyCounter;
-        private Drawable keyCounterFlow => hudOverlay.KeyCounter.ChildrenOfType<FillFlowContainer<DefaultKeyCounter>>().Single();
+        private Drawable keyCounterFlow => hudOverlay.KeyCounter.ChildrenOfType<FillFlowContainer<KeyCounter>>().Single();
 
         [Test]
         public void TestComboCounterIncrementing()

From 196b5b41eb07f7e0377c84b0d8ca381386dbc541 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 25 Apr 2023 20:17:52 +0200
Subject: [PATCH 0172/1604] Also disable counting on argon display in test

Mostly for my own peace of mind.
---
 osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
index aabc25d660..22f7111f68 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
@@ -64,7 +64,11 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert($"Check {testKey} counter after keypress", () => testCounter.CountPresses.Value == 1);
             addPressKeyStep();
             AddAssert($"Check {testKey} counter after keypress", () => testCounter.CountPresses.Value == 2);
-            AddStep("Disable counting", () => defaultDisplay.IsCounting.Value = false);
+            AddStep("Disable counting", () =>
+            {
+                argonDisplay.IsCounting.Value = false;
+                defaultDisplay.IsCounting.Value = false;
+            });
             addPressKeyStep();
             AddAssert($"Check {testKey} count has not changed", () => testCounter.CountPresses.Value == 2);
 

From 0841e73a39ba4c383a62e8897ed55b653f66be1a Mon Sep 17 00:00:00 2001
From: Terochi <mates.cernicky@gmail.com>
Date: Tue, 25 Apr 2023 21:05:40 +0200
Subject: [PATCH 0173/1604] Improved readability and sounds

---
 osu.Game.Tests/Mods/ModSettingsTest.cs | 29 +++-----
 osu.Game/OsuGameBase.cs                | 35 ++++++----
 osu.Game/Rulesets/Mods/Mod.cs          | 95 +++++++++++---------------
 3 files changed, 69 insertions(+), 90 deletions(-)

diff --git a/osu.Game.Tests/Mods/ModSettingsTest.cs b/osu.Game.Tests/Mods/ModSettingsTest.cs
index d943f0ffb1..b3f6f8da7d 100644
--- a/osu.Game.Tests/Mods/ModSettingsTest.cs
+++ b/osu.Game.Tests/Mods/ModSettingsTest.cs
@@ -43,18 +43,18 @@ namespace osu.Game.Tests.Mods
 
             var modDouble = new TestNonMatchingSettingTypeModDouble { TestSetting = { Value = setting_change } };
             var modBool = new TestNonMatchingSettingTypeModBool { TestSetting = { Default = false, Value = true } };
-            var modInt = new TestNonMatchingSettingTypeModInt { TestSetting = { Value = (int)setting_change } };
+            var modInt = new TestNonMatchingSettingTypeModInt { TestSetting = { Value = (int)setting_change / 2 } };
 
-            modDouble.CopySharedSettings(modBool);
-            modDouble.CopySharedSettings(modInt);
-            modBool.CopySharedSettings(modDouble);
-            modBool.CopySharedSettings(modInt);
-            modInt.CopySharedSettings(modDouble);
-            modInt.CopySharedSettings(modBool);
+            modDouble.CopyCommonSettings(modBool);
+            modDouble.CopyCommonSettings(modInt);
+            modBool.CopyCommonSettings(modDouble);
+            modBool.CopyCommonSettings(modInt);
+            modInt.CopyCommonSettings(modDouble);
+            modInt.CopyCommonSettings(modBool);
 
             Assert.That(modDouble.TestSetting.Value, Is.EqualTo(setting_change));
             Assert.That(modBool.TestSetting.Value, Is.EqualTo(!modBool.TestSetting.Default));
-            Assert.That(modInt.TestSetting.Value, Is.EqualTo((int)setting_change));
+            Assert.That(modInt.TestSetting.Value, Is.EqualTo((int)setting_change / 2));
         }
 
         [Test]
@@ -63,23 +63,12 @@ namespace osu.Game.Tests.Mods
             var modBoolTrue = new TestNonMatchingSettingTypeModBool { TestSetting = { Default = true, Value = false } };
             var modBoolFalse = new TestNonMatchingSettingTypeModBool { TestSetting = { Default = false, Value = true } };
 
-            modBoolFalse.CopySharedSettings(modBoolTrue);
+            modBoolFalse.CopyCommonSettings(modBoolTrue);
 
             Assert.That(modBoolFalse.TestSetting.Default, Is.EqualTo(false));
             Assert.That(modBoolFalse.TestSetting.Value, Is.EqualTo(modBoolTrue.TestSetting.Value));
         }
 
-        [Test]
-        public void TestValueResetsToDefaultWhenCopied()
-        {
-            var modDouble = new TestNonMatchingSettingTypeModDouble();
-            var modBool = new TestNonMatchingSettingTypeModBool { TestSetting = { Default = false, Value = true } };
-
-            modBool.CopySharedSettings(modDouble);
-
-            Assert.That(modBool.TestSetting.Value, Is.EqualTo(modBool.TestSetting.Default));
-        }
-
         private class TestNonMatchingSettingTypeModDouble : TestNonMatchingSettingTypeMod
         {
             public override string Acronym => "NMD";
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index de1f2e810c..f6cda62cc3 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -58,7 +58,6 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
 using osu.Game.Skinning;
 using osu.Game.Utils;
-using File = System.IO.File;
 using RuntimeInfo = osu.Framework.RuntimeInfo;
 
 namespace osu.Game
@@ -71,7 +70,7 @@ namespace osu.Game
     [Cached(typeof(OsuGameBase))]
     public partial class OsuGameBase : Framework.Game, ICanAcceptFiles, IBeatSyncProvider
     {
-        public static readonly string[] VIDEO_EXTENSIONS = { ".mp4", ".mov", ".avi", ".flv" };
+        public static readonly string[] VIDEO_EXTENSIONS = { ".mp4", ".mov", ".avi", ".flv", ".mpg", ".wmv", ".m4v" };
 
         public const string OSU_PROTOCOL = "osu://";
 
@@ -626,20 +625,30 @@ namespace osu.Game
                 return;
             }
 
+            var previouslySelectedCommonMods = new List<Mod>(SelectedMods.Value.Count);
+            var convertedCommonMods = new List<Mod>(SelectedMods.Value.Count);
+
+            foreach (var mod in SelectedMods.Value)
+            {
+                var convertedMod = instance.CreateModFromAcronym(mod.Acronym);
+
+                if (convertedMod == null)
+                    continue;
+
+                previouslySelectedCommonMods.Add(mod);
+
+                convertedMod.CopyCommonSettings(mod);
+                convertedCommonMods.Add(convertedMod);
+            }
+
+            if (!SelectedMods.Disabled)
+                // Select common mods to play the deselect samples for other mods
+                SelectedMods.Value = previouslySelectedCommonMods;
+
             AvailableMods.Value = dict;
 
             if (!SelectedMods.Disabled)
-            {
-                //converting mods from one ruleset to the other, while also keeping their shared settings unchanged
-                SelectedMods.Value = SelectedMods.Value.Select(oldMod =>
-                {
-                    Mod newMod = instance.CreateModFromAcronym(oldMod.Acronym);
-
-                    newMod?.CopySharedSettings(oldMod);
-
-                    return newMod;
-                }).Where(m => m != null).ToArray();
-            }
+                SelectedMods.Value = convertedCommonMods;
 
             void revertRulesetChange() => Ruleset.Value = r.OldValue?.Available == true ? r.OldValue : RulesetStore.AvailableRulesets.First();
         }
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 623a734b82..97434ce493 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -115,21 +115,25 @@ namespace osu.Game.Rulesets.Mods
         [JsonIgnore]
         public virtual Type[] IncompatibleMods => Array.Empty<Type>();
 
-        private IReadOnlyList<IBindable>? settingsBacking;
+        private IReadOnlyDictionary<string, IBindable>? settingsBacking;
 
         /// <summary>
-        /// A list of the all <see cref="IBindable"/> settings within this mod.
+        /// All <see cref="IBindable"/> settings within this mod.
         /// </summary>
-        internal IReadOnlyList<IBindable> Settings =>
+        internal IEnumerable<IBindable> SettingsBindables => Settings.Values;
+
+        /// <summary>
+        /// Provides mapping of names to <see cref="IBindable"/>s of all settings within this mod.
+        /// </summary>
+        internal IReadOnlyDictionary<string, IBindable> Settings =>
             settingsBacking ??= this.GetSettingsSourceProperties()
-                                    .Select(p => p.Item2.GetValue(this))
-                                    .Cast<IBindable>()
-                                    .ToList();
+                                    .Select(p => p.Item2)
+                                    .ToDictionary(property => property.Name.ToSnakeCase(), property => (IBindable)property.GetValue(this)!);
 
         /// <summary>
         /// Whether all settings in this mod are set to their default state.
         /// </summary>
-        protected virtual bool UsesDefaultConfiguration => Settings.All(s => s.IsDefault);
+        protected virtual bool UsesDefaultConfiguration => SettingsBindables.All(s => s.IsDefault);
 
         /// <summary>
         /// Creates a copy of this <see cref="Mod"/> initialised to a default state.
@@ -160,60 +164,37 @@ namespace osu.Game.Rulesets.Mods
         }
 
         /// <summary>
-        /// Copies all mod setting values sharing same <see cref="MemberInfo.Name"/> from <paramref name="source"/> into this instance.
+        /// When converting mods from one ruleset to the other, this method makes sure
+        /// to also copy the values of all settings sharing same <see cref="MemberInfo.Name"/> between the two instances.
         /// </summary>
-        /// <param name="source">The mod to copy properties from.</param>
-        internal void CopySharedSettings(Mod source)
+        /// <remarks>Copied values are unchanged, even if they have different clamping ranges.</remarks>
+        /// <param name="source">The mod to extract settings from.</param>
+        public void CopyCommonSettings(Mod source)
         {
-            const string value = nameof(Bindable<int>.Value);
+            if (source.UsesDefaultConfiguration)
+                return;
 
-            Dictionary<string, object> sourceSettings = new Dictionary<string, object>();
-
-            foreach (var (_, sourceProperty) in source.GetSettingsSourceProperties())
+            foreach (var (name, targetSetting) in Settings)
             {
-                sourceSettings.Add(sourceProperty.Name.ToSnakeCase(), sourceProperty.GetValue(source)!);
+                if (!source.Settings.TryGetValue(name, out IBindable? sourceSetting))
+                    continue;
+
+                if (sourceSetting.IsDefault)
+                    continue;
+
+                if (getBindableGenericType(targetSetting) != getBindableGenericType(sourceSetting))
+                    continue;
+
+                // TODO: special case for handling number types
+
+                PropertyInfo property = targetSetting.GetType().GetProperty(nameof(Bindable<bool>.Value))!;
+                property.SetValue(targetSetting, property.GetValue(sourceSetting));
             }
 
-            foreach (var (_, targetProperty) in this.GetSettingsSourceProperties())
-            {
-                object targetSetting = targetProperty.GetValue(this)!;
-
-                if (!sourceSettings.TryGetValue(targetProperty.Name.ToSnakeCase(), out object? sourceSetting))
-                    continue;
-
-                if (((IBindable)sourceSetting).IsDefault)
-                {
-                    // reset to default value if the source is default
-                    targetSetting.GetType().GetMethod(nameof(Bindable<int>.SetDefault))!.Invoke(targetSetting, null);
-                    continue;
-                }
-
-                bool hasSameGenericArgument = getGenericBaseType(targetSetting, typeof(Bindable<>))!.GenericTypeArguments.Single() ==
-                                              getGenericBaseType(sourceSetting, typeof(Bindable<>))!.GenericTypeArguments.Single();
-
-                if (!hasSameGenericArgument)
-                    continue;
-
-                Type? targetBindableNumberType = getGenericBaseType(targetSetting, typeof(BindableNumber<>));
-                Type? sourceBindableNumberType = getGenericBaseType(sourceSetting, typeof(BindableNumber<>));
-
-                if (targetBindableNumberType == null || sourceBindableNumberType == null)
-                {
-                    setValue(targetSetting, value, getValue(sourceSetting, value));
-                    continue;
-                }
-
-                setValue(targetSetting, value, Convert.ChangeType(getValue(sourceSetting, value), targetBindableNumberType.GenericTypeArguments.Single()));
-            }
-
-            object? getValue(object setting, string name) =>
-                setting.GetType().GetProperty(name)!.GetValue(setting);
-
-            void setValue(object setting, string name, object? newValue) =>
-                setting.GetType().GetProperty(name)!.SetValue(setting, newValue);
-
-            Type? getGenericBaseType(object setting, Type genericType) =>
-                setting.GetType().GetTypeInheritance().FirstOrDefault(t => t.IsGenericType && t.GetGenericTypeDefinition() == genericType);
+            Type getBindableGenericType(IBindable setting) =>
+                setting.GetType().GetTypeInheritance()
+                       .First(t => t.IsGenericType && t.GetGenericTypeDefinition() == typeof(Bindable<>))
+                       .GenericTypeArguments.Single();
         }
 
         /// <summary>
@@ -250,7 +231,7 @@ namespace osu.Game.Rulesets.Mods
             if (ReferenceEquals(this, other)) return true;
 
             return GetType() == other.GetType() &&
-                   Settings.SequenceEqual(other.Settings, ModSettingsEqualityComparer.Default);
+                   SettingsBindables.SequenceEqual(other.SettingsBindables, ModSettingsEqualityComparer.Default);
         }
 
         public override int GetHashCode()
@@ -259,7 +240,7 @@ namespace osu.Game.Rulesets.Mods
 
             hashCode.Add(GetType());
 
-            foreach (var setting in Settings)
+            foreach (var setting in SettingsBindables)
                 hashCode.Add(setting.GetUnderlyingSettingValue());
 
             return hashCode.ToHashCode();

From 8e297dc60a18a9d7057d4b7525ec8cd6189bb504 Mon Sep 17 00:00:00 2001
From: Terochi <mates.cernicky@gmail.com>
Date: Tue, 25 Apr 2023 21:28:03 +0200
Subject: [PATCH 0174/1604] Added safety measures for invalid mod combinations

---
 osu.Game/OsuGameBase.cs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index f6cda62cc3..0473f2665b 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -641,6 +641,16 @@ namespace osu.Game
                 convertedCommonMods.Add(convertedMod);
             }
 
+            if (!ModUtils.CheckValidForGameplay(convertedCommonMods, out var invalid))
+            {
+                invalid.ForEach(mod =>
+                {
+                    int index = convertedCommonMods.IndexOf(mod);
+                    convertedCommonMods.RemoveAt(index);
+                    previouslySelectedCommonMods.RemoveAt(index);
+                });
+            }
+
             if (!SelectedMods.Disabled)
                 // Select common mods to play the deselect samples for other mods
                 SelectedMods.Value = previouslySelectedCommonMods;

From 1efc78c0f8a7c3b17062c9a90318da3ef41a986c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 Apr 2023 13:28:51 +0900
Subject: [PATCH 0175/1604] Actually use new end time property when setting
 lifetimes

---
 osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs | 2 +-
 osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
index e598c79b08..be77c9a98e 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
@@ -85,7 +85,7 @@ namespace osu.Game.Storyboards.Drawables
             Loop = animation.LoopType == AnimationLoopType.LoopForever;
 
             LifetimeStart = animation.StartTime;
-            LifetimeEnd = animation.EndTime;
+            LifetimeEnd = animation.EndTimeForDisplay;
         }
 
         [Resolved]
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
index f9b09ed57c..400d33481c 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Storyboards.Drawables
             Position = sprite.InitialPosition;
 
             LifetimeStart = sprite.StartTime;
-            LifetimeEnd = sprite.EndTime;
+            LifetimeEnd = sprite.EndTimeForDisplay;
         }
 
         [Resolved]

From cb7b246e3352c08b73119b88fb0966e118720e2c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 Apr 2023 15:27:58 +0900
Subject: [PATCH 0176/1604] Fix naming and update in line with nullability

---
 osu.Game/Rulesets/Mods/ModFailCondition.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModFailCondition.cs b/osu.Game/Rulesets/Mods/ModFailCondition.cs
index 63cebc9747..97789b7f5a 100644
--- a/osu.Game/Rulesets/Mods/ModFailCondition.cs
+++ b/osu.Game/Rulesets/Mods/ModFailCondition.cs
@@ -19,18 +19,19 @@ namespace osu.Game.Rulesets.Mods
         public virtual bool PerformFail() => true;
 
         public virtual bool RestartOnFail => Restart.Value;
-        private event Action failureTriggered;
+
+        private Action? triggerFailureDelegate;
 
         public void ApplyToHealthProcessor(HealthProcessor healthProcessor)
         {
-            failureTriggered = healthProcessor.TriggerFailure;
+            triggerFailureDelegate = healthProcessor.TriggerFailure;
             healthProcessor.FailConditions += FailCondition;
         }
 
         /// <summary>
         /// Immediately triggers a failure on the loaded <see cref="HealthProcessor"/>.
         /// </summary>
-        protected void TriggerFailure() => failureTriggered?.Invoke();
+        protected void TriggerFailure() => triggerFailureDelegate?.Invoke();
 
         /// <summary>
         /// Determines whether <paramref name="result"/> should trigger a failure. Called every time a

From bfd81b77fa58ce67acefe3264ba05fadb8abf97a Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Wed, 26 Apr 2023 17:40:25 +0900
Subject: [PATCH 0177/1604] provide more Accuracy Mode for
 `ModAccuracyChallenge`

---
 .../Rulesets/Mods/ModAccuracyChallenge.cs     | 51 ++++++++++++-------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModAccuracyChallenge.cs b/osu.Game/Rulesets/Mods/ModAccuracyChallenge.cs
index d4223a80c2..03149fd8c8 100644
--- a/osu.Game/Rulesets/Mods/ModAccuracyChallenge.cs
+++ b/osu.Game/Rulesets/Mods/ModAccuracyChallenge.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Localisation;
 using osu.Game.Configuration;
+using osu.Game.Localisation.HUD;
 using osu.Game.Overlays.Settings;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Judgements;
@@ -42,30 +43,44 @@ namespace osu.Game.Rulesets.Mods
             Value = 0.9,
         };
 
-        private ScoreProcessor scoreProcessor = null!;
+        [SettingSource("Accuracy Mode", "The Accuracy mode that will be used to Judge.")]
+        public Bindable<AccuracyMode> AccuracyJudgeMode { get; } = new Bindable<AccuracyMode>();
 
-        public void ApplyToScoreProcessor(ScoreProcessor scoreProcessor) => this.scoreProcessor = scoreProcessor;
+        private readonly Bindable<double> currentAccuracy = new Bindable<double>();
+
+        public void ApplyToScoreProcessor(ScoreProcessor scoreProcessor)
+        {
+            switch (AccuracyJudgeMode.Value)
+            {
+                case AccuracyMode.Standard:
+                    currentAccuracy.BindTo(scoreProcessor.Accuracy);
+                    break;
+
+                case AccuracyMode.MaximumAchievable:
+                    currentAccuracy.BindTo(scoreProcessor.MaximumAccuracy);
+                    break;
+            }
+
+            currentAccuracy.BindValueChanged(s =>
+            {
+                if (s.NewValue < MinimumAccuracy.Value)
+                {
+                    TriggerFailure();
+                }
+            });
+        }
 
         public ScoreRank AdjustRank(ScoreRank rank, double accuracy) => rank;
 
-        protected override bool FailCondition(HealthProcessor healthProcessor, JudgementResult result)
+        protected override bool FailCondition(HealthProcessor healthProcessor, JudgementResult result) => false;
+
+        public enum AccuracyMode
         {
-            if (!result.Type.AffectsAccuracy())
-                return false;
+            [LocalisableDescription(typeof(GameplayAccuracyCounterStrings), nameof(GameplayAccuracyCounterStrings.AccuracyDisplayModeStandard))]
+            Standard,
 
-            return getAccuracyWithImminentResultAdded(result) < MinimumAccuracy.Value;
-        }
-
-        private double getAccuracyWithImminentResultAdded(JudgementResult result)
-        {
-            var score = new ScoreInfo { Ruleset = scoreProcessor.Ruleset.RulesetInfo };
-
-            // This is super ugly, but if we don't do it this way we will not have the most recent result added to the accuracy value.
-            // Hopefully we can improve this in the future.
-            scoreProcessor.PopulateScore(score);
-            score.Statistics[result.Type]++;
-
-            return scoreProcessor.ComputeAccuracy(score);
+            [LocalisableDescription(typeof(GameplayAccuracyCounterStrings), nameof(GameplayAccuracyCounterStrings.AccuracyDisplayModeMax))]
+            MaximumAchievable,
         }
     }
 }

From 332c199dc2b0cdabe76e56dc8696d6ee52f58fa9 Mon Sep 17 00:00:00 2001
From: Terochi <mates.cernicky@gmail.com>
Date: Wed, 26 Apr 2023 10:46:29 +0200
Subject: [PATCH 0178/1604] further simplification

---
 osu.Game/Rulesets/Mods/Mod.cs | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 97434ce493..0af8717264 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using AutoMapper.Internal;
 using Newtonsoft.Json;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.TypeExtensions;
@@ -182,7 +181,10 @@ namespace osu.Game.Rulesets.Mods
                 if (sourceSetting.IsDefault)
                     continue;
 
-                if (getBindableGenericType(targetSetting) != getBindableGenericType(sourceSetting))
+                var targetType = targetSetting.GetType();
+                var sourceType = sourceSetting.GetType();
+
+                if (!targetType.IsAssignableFrom(sourceType) && !sourceType.IsAssignableFrom(targetType))
                     continue;
 
                 // TODO: special case for handling number types
@@ -190,11 +192,6 @@ namespace osu.Game.Rulesets.Mods
                 PropertyInfo property = targetSetting.GetType().GetProperty(nameof(Bindable<bool>.Value))!;
                 property.SetValue(targetSetting, property.GetValue(sourceSetting));
             }
-
-            Type getBindableGenericType(IBindable setting) =>
-                setting.GetType().GetTypeInheritance()
-                       .First(t => t.IsGenericType && t.GetGenericTypeDefinition() == typeof(Bindable<>))
-                       .GenericTypeArguments.Single();
         }
 
         /// <summary>

From e27c4dfa101fe132f76614e32815c6a34ba455bc Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Wed, 26 Apr 2023 11:46:05 +0200
Subject: [PATCH 0179/1604] Invoke ApplyDefaultsToSelf

---
 osu.Game/Rulesets/Objects/HitObject.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs
index 0502610eab..7702635057 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -105,6 +105,8 @@ namespace osu.Game.Rulesets.Objects
         /// <param name="cancellationToken">The cancellation token.</param>
         public void ApplyDefaults(ControlPointInfo controlPointInfo, IBeatmapDifficultyInfo difficulty, CancellationToken cancellationToken = default)
         {
+            ApplyDefaultsToSelf(controlPointInfo, difficulty);
+
             nestedHitObjects.Clear();
 
             CreateNestedHitObjects(cancellationToken);

From 6c7094868163c7aeda18116d352739ba8309d57c Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Wed, 26 Apr 2023 13:10:57 +0200
Subject: [PATCH 0180/1604] Remove IContext & add IHasGenerateTicks

---
 .../Legacy/DistanceObjectPatternGenerator.cs  |  4 +-
 osu.Game.Rulesets.Osu/Objects/Slider.cs       |  8 +-
 .../Beatmaps/TaikoBeatmapConverter.cs         |  4 +-
 .../Beatmaps/Formats/LegacyBeatmapDecoder.cs  |  6 +-
 osu.Game/Beatmaps/Legacy/LegacyContext.cs     | 32 -------
 osu.Game/Context/ContextContainer.cs          | 91 -------------------
 osu.Game/Context/IContext.cs                  | 13 ---
 osu.Game/Rulesets/Objects/HitObject.cs        |  9 +-
 .../Objects/Types/IHasGenerateTicks.cs        | 17 ++++
 9 files changed, 37 insertions(+), 147 deletions(-)
 delete mode 100644 osu.Game/Beatmaps/Legacy/LegacyContext.cs
 delete mode 100644 osu.Game/Context/ContextContainer.cs
 delete mode 100644 osu.Game/Context/IContext.cs
 create mode 100644 osu.Game/Rulesets/Objects/Types/IHasGenerateTicks.cs

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
index 2427812ecd..20f39deed7 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
@@ -51,8 +51,8 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             TimingControlPoint timingPoint = beatmap.ControlPointInfo.TimingPointAt(hitObject.StartTime);
 
             double beatLength;
-            if (hitObject.HasContext<LegacyContext>())
-                beatLength = timingPoint.BeatLength * hitObject.GetContext<LegacyContext>().BpmMultiplier;
+            if (hitObject.LegacyBpmMultiplier.HasValue)
+                beatLength = timingPoint.BeatLength * hitObject.LegacyBpmMultiplier.Value;
             else if (hitObject is IHasSliderVelocity hasSliderVelocity)
                 beatLength = timingPoint.BeatLength / hasSliderVelocity.SliderVelocity;
             else
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 247cf94f59..dd75a86f96 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -15,14 +15,13 @@ using osu.Framework.Caching;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Beatmaps.Legacy;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Objects
 {
-    public class Slider : OsuHitObject, IHasPathWithRepeats, IHasSliderVelocity
+    public class Slider : OsuHitObject, IHasPathWithRepeats, IHasSliderVelocity, IHasGenerateTicks
     {
         public double EndTime => StartTime + this.SpanCount() * Path.Distance / Velocity;
 
@@ -143,6 +142,8 @@ namespace osu.Game.Rulesets.Osu.Objects
             set => SliderVelocityBindable.Value = value;
         }
 
+        public bool GenerateTicks { get; set; }
+
         [JsonIgnore]
         public SliderHeadCircle HeadCircle { get; protected set; }
 
@@ -162,10 +163,9 @@ namespace osu.Game.Rulesets.Osu.Objects
             TimingControlPoint timingPoint = controlPointInfo.TimingPointAt(StartTime);
 
             double scoringDistance = BASE_SCORING_DISTANCE * difficulty.SliderMultiplier * SliderVelocity;
-            bool generateTicks = !HasContext<LegacyContext>() || GetContext<LegacyContext>().GenerateTicks;
 
             Velocity = scoringDistance / timingPoint.BeatLength;
-            TickDistance = generateTicks ? (scoringDistance / difficulty.SliderTickRate * TickDistanceMultiplier) : double.PositiveInfinity;
+            TickDistance = GenerateTicks ? (scoringDistance / difficulty.SliderTickRate * TickDistanceMultiplier) : double.PositiveInfinity;
         }
 
         protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index ef73ffd517..2cf1d7a6ab 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -180,8 +180,8 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
             TimingControlPoint timingPoint = beatmap.ControlPointInfo.TimingPointAt(obj.StartTime);
 
             double beatLength;
-            if (obj.HasContext<LegacyContext>())
-                beatLength = timingPoint.BeatLength * obj.GetContext<LegacyContext>().BpmMultiplier;
+            if (obj.LegacyBpmMultiplier.HasValue)
+                beatLength = timingPoint.BeatLength * obj.LegacyBpmMultiplier.Value;
             else if (obj is IHasSliderVelocity hasSliderVelocity)
                 beatLength = timingPoint.BeatLength / hasSliderVelocity.SliderVelocity;
             else
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index dad23df282..9a1935f929 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -105,7 +105,11 @@ namespace osu.Game.Beatmaps.Formats
 #pragma warning disable 618
             if (difficultyControlPoint is LegacyDifficultyControlPoint legacyDifficultyControlPoint)
 #pragma warning restore 618
-                hitObject.SetContext(new LegacyContext(legacyDifficultyControlPoint.BpmMultiplier, legacyDifficultyControlPoint.GenerateTicks));
+            {
+                hitObject.LegacyBpmMultiplier = legacyDifficultyControlPoint.BpmMultiplier;
+                if (hitObject is IHasGenerateTicks hasGenerateTicks)
+                    hasGenerateTicks.GenerateTicks = legacyDifficultyControlPoint.GenerateTicks;
+            }
 
             if (hitObject is IHasSliderVelocity hasSliderVelocity)
                 hasSliderVelocity.SliderVelocity = difficultyControlPoint.SliderVelocity;
diff --git a/osu.Game/Beatmaps/Legacy/LegacyContext.cs b/osu.Game/Beatmaps/Legacy/LegacyContext.cs
deleted file mode 100644
index eeb02bdcb7..0000000000
--- a/osu.Game/Beatmaps/Legacy/LegacyContext.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Game.Context;
-
-namespace osu.Game.Beatmaps.Legacy;
-
-public class LegacyContext : IContext
-{
-    public LegacyContext(double bpmMultiplier, bool generateTicks)
-    {
-        BpmMultiplier = bpmMultiplier;
-        GenerateTicks = generateTicks;
-    }
-
-    /// <summary>
-    /// Legacy BPM multiplier that introduces floating-point errors for rulesets that depend on it.
-    /// DO NOT USE THIS UNLESS 100% SURE.
-    /// </summary>
-    public double BpmMultiplier { get; }
-
-    /// <summary>
-    /// Whether or not slider ticks should be generated at this control point.
-    /// This exists for backwards compatibility with maps that abuse NaN slider velocity behavior on osu!stable (e.g. /b/2628991).
-    /// </summary>
-    public bool GenerateTicks { get; }
-
-    public IContext Copy()
-    {
-        return new LegacyContext(BpmMultiplier, GenerateTicks);
-    }
-}
diff --git a/osu.Game/Context/ContextContainer.cs b/osu.Game/Context/ContextContainer.cs
deleted file mode 100644
index 7ff0280bcf..0000000000
--- a/osu.Game/Context/ContextContainer.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System;
-using System.Collections.Generic;
-
-namespace osu.Game.Context
-{
-    public abstract class ContextContainer
-    {
-        /// <summary>
-        /// The contexts of this container.
-        /// The objects always have the type of their key.
-        /// </summary>
-        private readonly Dictionary<Type, IContext> contexts;
-
-        protected ContextContainer()
-        {
-            contexts = new Dictionary<Type, IContext>();
-        }
-
-        /// <summary>
-        /// Checks whether this object has the context with type T.
-        /// </summary>
-        /// <typeparam name="T">The type to check the context of.</typeparam>
-        /// <returns>Whether the context object with type T exists in this object.</returns>
-        public bool HasContext<T>() where T : IContext
-        {
-            return contexts.ContainsKey(typeof(T));
-        }
-
-        /// <summary>
-        /// Gets the context with type T.
-        /// </summary>
-        /// <typeparam name="T">The type to get the context of.</typeparam>
-        /// <exception cref="KeyNotFoundException">If the context does not exist in this hit object.</exception>
-        /// <returns>The context object with type T.</returns>
-        public T GetContext<T>() where T : IContext
-        {
-            return (T)contexts[typeof(T)];
-        }
-
-        /// <summary>
-        /// Tries to get the context with type T.
-        /// </summary>
-        /// <param name="context">The found context with type T.</param>
-        /// <typeparam name="T">The type to get the context of.</typeparam>
-        /// <returns>Whether the context exists in this object.</returns>
-        public bool TryGetContext<T>(out T context) where T : IContext
-        {
-            if (contexts.TryGetValue(typeof(T), out var context2))
-            {
-                context = (T)context2;
-                return true;
-            }
-
-            context = default!;
-            return false;
-        }
-
-        /// <summary>
-        /// Sets the context object of type T.
-        /// </summary>
-        /// <typeparam name="T">The context type to set.</typeparam>
-        /// <param name="context">The context object to store in this object.</param>
-        public void SetContext<T>(T context) where T : IContext
-        {
-            contexts[typeof(T)] = context;
-        }
-
-        /// <summary>
-        /// Removes the context of type T from this object.
-        /// </summary>
-        /// <typeparam name="T">The type to remove the context of.</typeparam>
-        /// <returns>Whether a context was removed.</returns>
-        public bool RemoveContext<T>() where T : IContext
-        {
-            return RemoveContext(typeof(T));
-        }
-
-        /// <summary>
-        /// Removes the context of type T from this object.
-        /// </summary>
-        /// <param name="t">The type to remove the context of.</param>
-        /// <returns>Whether a context was removed.</returns>
-        public bool RemoveContext(Type t)
-        {
-            return contexts.Remove(t);
-        }
-    }
-}
diff --git a/osu.Game/Context/IContext.cs b/osu.Game/Context/IContext.cs
deleted file mode 100644
index 61b1b11f43..0000000000
--- a/osu.Game/Context/IContext.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-namespace osu.Game.Context;
-
-public interface IContext
-{
-    /// <summary>
-    /// Makes a deep copy of this context.
-    /// </summary>
-    /// <returns>The deep copy of this context.</returns>
-    public IContext Copy();
-}
diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs
index 7702635057..aaeffa49fc 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -16,7 +16,6 @@ using osu.Framework.Lists;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Context;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
@@ -29,7 +28,7 @@ namespace osu.Game.Rulesets.Objects
     /// HitObjects may contain more properties for which you should be checking through the IHas* types.
     /// </para>
     /// </summary>
-    public class HitObject : ContextContainer
+    public class HitObject
     {
         /// <summary>
         /// A small adjustment to the start time of control points to account for rounding/precision errors.
@@ -80,6 +79,12 @@ namespace osu.Game.Rulesets.Objects
         public SampleControlPoint SampleControlPoint = SampleControlPoint.DEFAULT;
         public DifficultyControlPoint DifficultyControlPoint = DifficultyControlPoint.DEFAULT;
 
+        /// <summary>
+        /// Legacy BPM multiplier that introduces floating-point errors for rulesets that depend on it.
+        /// DO NOT USE THIS UNLESS 100% SURE.
+        /// </summary>
+        public double? LegacyBpmMultiplier { get; set; }
+
         /// <summary>
         /// Whether this <see cref="HitObject"/> is in Kiai time.
         /// </summary>
diff --git a/osu.Game/Rulesets/Objects/Types/IHasGenerateTicks.cs b/osu.Game/Rulesets/Objects/Types/IHasGenerateTicks.cs
new file mode 100644
index 0000000000..5de7d348c5
--- /dev/null
+++ b/osu.Game/Rulesets/Objects/Types/IHasGenerateTicks.cs
@@ -0,0 +1,17 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+namespace osu.Game.Rulesets.Objects.Types
+{
+    /// <summary>
+    /// A type of <see cref="HitObject"/> which may or may not generate ticks.
+    /// </summary>
+    public interface IHasGenerateTicks
+    {
+        /// <summary>
+        /// Whether or not slider ticks should be generated at this control point.
+        /// This exists for backwards compatibility with maps that abuse NaN slider velocity behavior on osu!stable (e.g. /b/2628991).
+        /// </summary>
+        public bool GenerateTicks { get; set; }
+    }
+}

From 39d9f0c3f5d689506a0971d22d9e40fab01ecee4 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Wed, 26 Apr 2023 13:22:13 +0200
Subject: [PATCH 0181/1604] removing using

---
 .../Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
index 20f39deed7..91b7be6e8f 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
@@ -14,7 +14,6 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Beatmaps.Legacy;
 using osu.Game.Utils;
 
 namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy

From 87ca0f5335ebd07abe29c3958bf2b5cd88f947ef Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Wed, 26 Apr 2023 13:45:58 +0200
Subject: [PATCH 0182/1604] Update SamplePointPiece.cs

---
 .../Components/Timeline/SamplePointPiece.cs   | 57 ++++++++++++-------
 1 file changed, 38 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
index 50278bffc0..b02cfb505e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
@@ -12,7 +12,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
-using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Audio;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Rulesets.Objects;
@@ -26,14 +26,12 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
     {
         public readonly HitObject HitObject;
 
-        private readonly Bindable<string> bank;
-        private readonly BindableNumber<int> volume;
+        private readonly BindableList<HitSampleInfo> samplesBindable;
 
         public SamplePointPiece(HitObject hitObject)
         {
             HitObject = hitObject;
-            volume = hitObject.SampleControlPoint.SampleVolumeBindable.GetBoundCopy();
-            bank = hitObject.SampleControlPoint.SampleBankBindable.GetBoundCopy();
+            samplesBindable = hitObject.SamplesBindable.GetBoundCopy();
         }
 
         protected override Color4 GetRepresentingColour(OsuColour colours) => colours.Pink;
@@ -41,8 +39,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         [BackgroundDependencyLoader]
         private void load()
         {
-            volume.BindValueChanged(_ => updateText());
-            bank.BindValueChanged(_ => updateText(), true);
+            samplesBindable.BindCollectionChanged((_, _) => updateText(), true);
         }
 
         protected override bool OnClick(ClickEvent e)
@@ -53,7 +50,17 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private void updateText()
         {
-            Label.Text = $"{bank.Value} {volume.Value}";
+            Label.Text = $"{GetBankValue(samplesBindable)} {GetVolumeValue(samplesBindable)}";
+        }
+
+        public static string? GetBankValue(IEnumerable<HitSampleInfo> samples)
+        {
+            return samples.FirstOrDefault()?.Bank;
+        }
+
+        public static int GetVolumeValue(ICollection<HitSampleInfo> samples)
+        {
+            return samples.Count == 0 ? 0 : samples.Max(o => o.Volume);
         }
 
         public Popover GetPopover() => new SampleEditPopover(HitObject);
@@ -92,7 +99,11 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                             {
                                 Label = "Bank Name",
                             },
-                            volume = new IndeterminateSliderWithTextBoxInput<int>("Volume", new SampleControlPoint().SampleVolumeBindable)
+                            volume = new IndeterminateSliderWithTextBoxInput<int>("Volume", new BindableInt(100)
+                            {
+                                MinValue = 0,
+                                MaxValue = 100,
+                            })
                         }
                     }
                 };
@@ -103,14 +114,14 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 // if the piece belongs to a currently selected object, assume that the user wants to change all selected objects.
                 // if the piece belongs to an unselected object, operate on that object alone, independently of the selection.
                 var relevantObjects = (beatmap.SelectedHitObjects.Contains(hitObject) ? beatmap.SelectedHitObjects : hitObject.Yield()).ToArray();
-                var relevantControlPoints = relevantObjects.Select(h => h.SampleControlPoint).ToArray();
+                var relevantSamples = relevantObjects.Select(h => h.Samples).ToArray();
 
                 // even if there are multiple objects selected, we can still display sample volume or bank if they all have the same value.
-                string? commonBank = getCommonBank(relevantControlPoints);
+                string? commonBank = getCommonBank(relevantSamples);
                 if (!string.IsNullOrEmpty(commonBank))
                     bank.Current.Value = commonBank;
 
-                int? commonVolume = getCommonVolume(relevantControlPoints);
+                int? commonVolume = getCommonVolume(relevantSamples);
                 if (commonVolume != null)
                     volume.Current.Value = commonVolume.Value;
 
@@ -120,9 +131,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                     updateBankFor(relevantObjects, val.NewValue);
                     updateBankPlaceholderText(relevantObjects);
                 });
-                // on commit, ensure that the value is correct by sourcing it from the objects' control points again.
+                // on commit, ensure that the value is correct by sourcing it from the objects' samples again.
                 // this ensures that committing empty text causes a revert to the previous value.
-                bank.OnCommit += (_, _) => bank.Current.Value = getCommonBank(relevantControlPoints);
+                bank.OnCommit += (_, _) => bank.Current.Value = getCommonBank(relevantSamples);
 
                 volume.Current.BindValueChanged(val => updateVolumeFor(relevantObjects, val.NewValue));
             }
@@ -133,8 +144,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 ScheduleAfterChildren(() => GetContainingInputManager().ChangeFocus(volume));
             }
 
-            private static string? getCommonBank(SampleControlPoint[] relevantControlPoints) => relevantControlPoints.Select(point => point.SampleBank).Distinct().Count() == 1 ? relevantControlPoints.First().SampleBank : null;
-            private static int? getCommonVolume(SampleControlPoint[] relevantControlPoints) => relevantControlPoints.Select(point => point.SampleVolume).Distinct().Count() == 1 ? relevantControlPoints.First().SampleVolume : null;
+            private static string? getCommonBank(IList<HitSampleInfo>[] relevantSamples) => relevantSamples.Select(GetBankValue).Distinct().Count() == 1 ? GetBankValue(relevantSamples.First()) : null;
+            private static int? getCommonVolume(IList<HitSampleInfo>[] relevantSamples) => relevantSamples.Select(GetVolumeValue).Distinct().Count() == 1 ? GetVolumeValue(relevantSamples.First()) : null;
 
             private void updateBankFor(IEnumerable<HitObject> objects, string? newBank)
             {
@@ -145,7 +156,11 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
                 foreach (var h in objects)
                 {
-                    h.SampleControlPoint.SampleBank = newBank;
+                    for (int i = 0; i < h.Samples.Count; i++)
+                    {
+                        h.Samples[i] = h.Samples[i].With(newBank: newBank);
+                    }
+
                     beatmap.Update(h);
                 }
 
@@ -154,7 +169,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             private void updateBankPlaceholderText(IEnumerable<HitObject> objects)
             {
-                string? commonBank = getCommonBank(objects.Select(h => h.SampleControlPoint).ToArray());
+                string? commonBank = getCommonBank(objects.Select(h => h.Samples).ToArray());
                 bank.PlaceholderText = string.IsNullOrEmpty(commonBank) ? "(multiple)" : string.Empty;
             }
 
@@ -167,7 +182,11 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
                 foreach (var h in objects)
                 {
-                    h.SampleControlPoint.SampleVolume = newVolume.Value;
+                    for (int i = 0; i < h.Samples.Count; i++)
+                    {
+                        h.Samples[i] = h.Samples[i].With(newVolume: newVolume.Value);
+                    }
+
                     beatmap.Update(h);
                 }
 

From d97daee96be2c10f90709cc30beceb1f369ae225 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Wed, 26 Apr 2023 13:55:39 +0200
Subject: [PATCH 0183/1604] remove all non-test usage of SampleControlPoint

---
 .../Objects/Drawables/DrawableHoldNote.cs              |  8 +-------
 .../Blueprints/Sliders/SliderSelectionBlueprint.cs     | 10 ----------
 osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs      |  1 -
 .../Objects/Drawables/DrawableSlider.cs                | 10 ++--------
 .../Objects/Drawables/DrawableSpinner.cs               |  2 +-
 osu.Game.Rulesets.Osu/Objects/Spinner.cs               |  2 +-
 osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs  |  7 ++++---
 7 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index 6e1c6cf80f..372ef1e164 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -350,13 +350,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         {
             // Note: base.LoadSamples() isn't called since the slider plays the tail's hitsounds for the time being.
 
-            if (HitObject.SampleControlPoint == null)
-            {
-                throw new InvalidOperationException($"{nameof(HitObject)}s must always have an attached {nameof(HitObject.SampleControlPoint)}."
-                                                    + $" This is an indication that {nameof(HitObject.ApplyDefaults)} has not been invoked on {this}.");
-            }
-
-            slidingSample.Samples = HitObject.CreateSlidingSamples().Select(s => HitObject.SampleControlPoint.ApplyTo(s)).Cast<ISampleInfo>().ToArray();
+            slidingSample.Samples = HitObject.CreateSlidingSamples().Cast<ISampleInfo>().ToArray();
         }
 
         public override void StopAllSamples()
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index e444287b73..8cf64a6a7e 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -311,17 +311,11 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                 var splitControlPoints = controlPoints.Take(index + 1).ToList();
                 controlPoints.RemoveRange(0, index);
 
-                // Turn the control points which were split off into a new slider.
-                var samplePoint = (SampleControlPoint)HitObject.SampleControlPoint.DeepClone();
-                var difficultyPoint = (DifficultyControlPoint)HitObject.DifficultyControlPoint.DeepClone();
-
                 var newSlider = new Slider
                 {
                     StartTime = HitObject.StartTime,
                     Position = HitObject.Position + splitControlPoints[0].Position,
                     NewCombo = HitObject.NewCombo,
-                    SampleControlPoint = samplePoint,
-                    DifficultyControlPoint = difficultyPoint,
                     LegacyLastTickOffset = HitObject.LegacyLastTickOffset,
                     Samples = HitObject.Samples.Select(s => s.With()).ToList(),
                     RepeatCount = HitObject.RepeatCount,
@@ -378,15 +372,11 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
                 Vector2 position = HitObject.Position + HitObject.Path.PositionAt(pathPosition);
 
-                var samplePoint = (SampleControlPoint)HitObject.SampleControlPoint.DeepClone();
-                samplePoint.Time = time;
-
                 editorBeatmap.Add(new HitCircle
                 {
                     StartTime = time,
                     Position = position,
                     NewCombo = i == 0 && HitObject.NewCombo,
-                    SampleControlPoint = samplePoint,
                     Samples = HitObject.HeadCircle.Samples.Select(s => s.With()).ToList()
                 });
 
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 6d5280e528..2a6d6ce4c3 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -362,7 +362,6 @@ namespace osu.Game.Rulesets.Osu.Edit
                 StartTime = firstHitObject.StartTime,
                 Position = firstHitObject.Position,
                 NewCombo = firstHitObject.NewCombo,
-                SampleControlPoint = firstHitObject.SampleControlPoint,
                 Samples = firstHitObject.Samples,
             };
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index a7b02596d5..664a8146e7 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -133,14 +133,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             // Note: base.LoadSamples() isn't called since the slider plays the tail's hitsounds for the time being.
 
-            if (HitObject.SampleControlPoint == null)
-            {
-                throw new InvalidOperationException($"{nameof(HitObject)}s must always have an attached {nameof(HitObject.SampleControlPoint)}."
-                                                    + $" This is an indication that {nameof(HitObject.ApplyDefaults)} has not been invoked on {this}.");
-            }
-
-            Samples.Samples = HitObject.TailSamples.Select(s => HitObject.SampleControlPoint.ApplyTo(s)).Cast<ISampleInfo>().ToArray();
-            slidingSample.Samples = HitObject.CreateSlidingSamples().Select(s => HitObject.SampleControlPoint.ApplyTo(s)).Cast<ISampleInfo>().ToArray();
+            Samples.Samples = HitObject.TailSamples.Cast<ISampleInfo>().ToArray();
+            slidingSample.Samples = HitObject.CreateSlidingSamples().Cast<ISampleInfo>().ToArray();
         }
 
         public override void StopAllSamples()
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index a5193f1b6e..0ceda1d4b0 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -126,7 +126,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.LoadSamples();
 
-            spinningSample.Samples = HitObject.CreateSpinningSamples().Select(s => HitObject.SampleControlPoint.ApplyTo(s)).Cast<ISampleInfo>().ToArray();
+            spinningSample.Samples = HitObject.CreateSpinningSamples().Cast<ISampleInfo>().ToArray();
             spinningSample.Frequency.Value = spinning_sample_initial_frequency;
         }
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Spinner.cs b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
index ed6f8a9a6a..55924c19c9 100644
--- a/osu.Game.Rulesets.Osu/Objects/Spinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Rulesets.Osu.Objects
 
             return new[]
             {
-                SampleControlPoint.ApplyTo(referenceSample).With("spinnerspin")
+                referenceSample.With("spinnerspin")
             };
         }
     }
diff --git a/osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs b/osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs
index 4809791af8..92f2b74568 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Linq;
 using osu.Game.Audio;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.UI;
@@ -17,12 +18,12 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         public void Play(HitType hitType)
         {
-            var hitObject = GetMostValidObject();
+            var hitSample = GetMostValidObject()?.Samples?.FirstOrDefault(o => o.Name == HitSampleInfo.HIT_NORMAL);
 
-            if (hitObject == null)
+            if (hitSample == null)
                 return;
 
-            PlaySamples(new ISampleInfo[] { hitObject.SampleControlPoint.GetSampleInfo(hitType == HitType.Rim ? HitSampleInfo.HIT_CLAP : HitSampleInfo.HIT_NORMAL) });
+            PlaySamples(new ISampleInfo[] { new HitSampleInfo(hitType == HitType.Rim ? HitSampleInfo.HIT_CLAP : HitSampleInfo.HIT_NORMAL, hitSample.Bank, volume: hitSample.Volume) });
         }
 
         public override void Play() => throw new InvalidOperationException(@"Use override with HitType parameter instead");

From c6fc1806595df9be3e3cb738fae20a0efaa8839d Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Wed, 26 Apr 2023 14:21:52 +0200
Subject: [PATCH 0184/1604] remove all test usages of SampleControlPoint

---
 .../Editor/TestSceneObjectMerging.cs          |  3 +-
 .../Editor/TestSceneSliderSplitting.cs        | 10 ++-----
 .../Editor/TestSceneSliderStreamConversion.cs |  3 +-
 .../Formats/LegacyBeatmapDecoderTest.cs       |  6 ++--
 .../Editing/TestSceneEditorClipboard.cs       |  4 ---
 .../Visual/Editing/TestSceneEditorSaving.cs   | 10 -------
 ...estSceneHitObjectSamplePointAdjustments.cs | 29 ++++++++++++-------
 .../TestSceneGameplaySampleTriggerSource.cs   |  6 ++--
 osu.Game/Audio/HitSampleInfo.cs               |  5 ++--
 osu.Game/Rulesets/Objects/HitObject.cs        |  1 -
 10 files changed, 32 insertions(+), 45 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectMerging.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectMerging.cs
index e7ac38c20e..b05c755bfd 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectMerging.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectMerging.cs
@@ -138,8 +138,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
                 var mergedSlider = (Slider)EditorBeatmap.SelectedHitObjects.First();
                 return slider1 is not null && mergedSlider.HeadCircle.Samples.SequenceEqual(slider1.HeadCircle.Samples)
                                            && mergedSlider.TailCircle.Samples.SequenceEqual(slider1.TailCircle.Samples)
-                                           && mergedSlider.Samples.SequenceEqual(slider1.Samples)
-                                           && mergedSlider.SampleControlPoint.IsRedundant(slider1.SampleControlPoint);
+                                           && mergedSlider.Samples.SequenceEqual(slider1.Samples);
             });
 
             AddAssert("slider end is at same completion for last slider", () =>
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs
index 6cb77c7b92..a104433ea9 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs
@@ -181,10 +181,8 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             {
                 if (slider is null) return;
 
-                slider.SampleControlPoint.SampleBank = "soft";
-                slider.SampleControlPoint.SampleVolume = 70;
-                sample = new HitSampleInfo("hitwhistle");
-                slider.Samples.Add(sample);
+                sample = new HitSampleInfo("hitwhistle", "soft", volume: 70);
+                slider.Samples.Add(sample.With());
             });
 
             AddStep("select added slider", () =>
@@ -207,9 +205,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddAssert("sliders have hitsounds", hasHitsounds);
 
             bool hasHitsounds() => sample is not null &&
-                                   EditorBeatmap.HitObjects.All(o => o.SampleControlPoint.SampleBank == "soft" &&
-                                                                     o.SampleControlPoint.SampleVolume == 70 &&
-                                                                     o.Samples.Contains(sample));
+                                   EditorBeatmap.HitObjects.All(o => o.Samples.Contains(sample));
         }
 
         private bool sliderCreatedFor(Slider s, double startTime, double endTime, params (Vector2 pos, PathType? pathType)[] expectedControlPoints)
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderStreamConversion.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderStreamConversion.cs
index 53465d43c9..a162d9a491 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderStreamConversion.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderStreamConversion.cs
@@ -199,8 +199,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
                 Precision.AlmostEquals(circle.StartTime, time, 1)
                 && Precision.AlmostEquals(circle.Position, position, 0.01f)
                 && circle.NewCombo == startsNewCombo
-                && circle.Samples.SequenceEqual(slider.HeadCircle.Samples)
-                && circle.SampleControlPoint.IsRedundant(slider.SampleControlPoint);
+                && circle.Samples.SequenceEqual(slider.HeadCircle.Samples);
         }
 
         private bool sliderRestored(Slider slider)
diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
index 518981980b..622a1837eb 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -480,7 +480,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.AreEqual("Gameplay/soft-hitnormal8", getTestableSampleInfo(hitObjects[4]).LookupNames.First());
             }
 
-            static HitSampleInfo getTestableSampleInfo(HitObject hitObject) => hitObject.SampleControlPoint.ApplyTo(hitObject.Samples[0]);
+            static HitSampleInfo getTestableSampleInfo(HitObject hitObject) => hitObject.Samples[0];
         }
 
         [Test]
@@ -498,7 +498,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.AreEqual("Gameplay/normal-hitnormal3", getTestableSampleInfo(hitObjects[2]).LookupNames.First());
             }
 
-            static HitSampleInfo getTestableSampleInfo(HitObject hitObject) => hitObject.SampleControlPoint.ApplyTo(hitObject.Samples[0]);
+            static HitSampleInfo getTestableSampleInfo(HitObject hitObject) => hitObject.Samples[0];
         }
 
         [Test]
@@ -518,7 +518,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.AreEqual(70, getTestableSampleInfo(hitObjects[3]).Volume);
             }
 
-            static HitSampleInfo getTestableSampleInfo(HitObject hitObject) => hitObject.SampleControlPoint.ApplyTo(hitObject.Samples[0]);
+            static HitSampleInfo getTestableSampleInfo(HitObject hitObject) => hitObject.Samples[0];
         }
 
         [Test]
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs
index d26bb6bb8a..3c98a83fa0 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs
@@ -95,10 +95,6 @@ namespace osu.Game.Tests.Visual.Editing
                 var path = slider.Path;
                 return path.ControlPoints.Count == 2 && path.ControlPoints.SequenceEqual(addedObject.Path.ControlPoints);
             });
-
-            // see `HitObject.control_point_leniency`.
-            AddAssert("sample control point has correct time", () => Precision.AlmostEquals(slider.SampleControlPoint.Time, slider.GetEndTime(), 1));
-            AddAssert("difficulty control point has correct time", () => slider.DifficultyControlPoint.Time == slider.StartTime);
         }
 
         [Test]
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorSaving.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSaving.cs
index b396b382ff..64c48e74cf 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorSaving.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSaving.cs
@@ -122,19 +122,9 @@ namespace osu.Game.Tests.Visual.Editing
 
             AddAssert("Beatmap has correct timing point", () => EditorBeatmap.ControlPointInfo.TimingPoints.Single().Time == 500);
 
-            // After placement these must be non-default as defaults are read-only.
-            AddAssert("Placed object has non-default control points", () =>
-                !ReferenceEquals(EditorBeatmap.HitObjects[0].SampleControlPoint, SampleControlPoint.DEFAULT) &&
-                !ReferenceEquals(EditorBeatmap.HitObjects[0].DifficultyControlPoint, DifficultyControlPoint.DEFAULT));
-
             ReloadEditorToSameBeatmap();
 
             AddAssert("Beatmap still has correct timing point", () => EditorBeatmap.ControlPointInfo.TimingPoints.Single().Time == 500);
-
-            // After placement these must be non-default as defaults are read-only.
-            AddAssert("Placed object still has non-default control points", () =>
-                !ReferenceEquals(EditorBeatmap.HitObjects[0].SampleControlPoint, SampleControlPoint.DEFAULT) &&
-                !ReferenceEquals(EditorBeatmap.HitObjects[0].DifficultyControlPoint, DifficultyControlPoint.DEFAULT));
         }
 
         [Test]
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSamplePointAdjustments.cs b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSamplePointAdjustments.cs
index e8dcc6f19b..7403cad52f 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSamplePointAdjustments.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSamplePointAdjustments.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using Humanizer;
 using NUnit.Framework;
 using osu.Framework.Testing;
+using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics.UserInterface;
@@ -39,10 +40,9 @@ namespace osu.Game.Tests.Visual.Editing
                 {
                     StartTime = 0,
                     Position = (OsuPlayfield.BASE_SIZE - new Vector2(100, 0)) / 2,
-                    SampleControlPoint = new SampleControlPoint
+                    Samples = new List<HitSampleInfo>
                     {
-                        SampleBank = "normal",
-                        SampleVolume = 80
+                        new HitSampleInfo(HitSampleInfo.HIT_NORMAL, "normal", volume: 80)
                     }
                 });
 
@@ -50,10 +50,9 @@ namespace osu.Game.Tests.Visual.Editing
                 {
                     StartTime = 500,
                     Position = (OsuPlayfield.BASE_SIZE + new Vector2(100, 0)) / 2,
-                    SampleControlPoint = new SampleControlPoint
+                    Samples = new List<HitSampleInfo>
                     {
-                        SampleBank = "soft",
-                        SampleVolume = 60
+                        new HitSampleInfo(HitSampleInfo.HIT_NORMAL, "soft", volume: 60)
                     }
                 });
             });
@@ -96,7 +95,12 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("unify sample volume", () =>
             {
                 foreach (var h in EditorBeatmap.HitObjects)
-                    h.SampleControlPoint.SampleVolume = 50;
+                {
+                    for (int i = 0; i < h.Samples.Count; i++)
+                    {
+                        h.Samples[i] = h.Samples[i].With(newVolume: 50);
+                    }
+                }
             });
 
             AddStep("select both objects", () => EditorBeatmap.SelectedHitObjects.AddRange(EditorBeatmap.HitObjects));
@@ -136,7 +140,12 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("unify sample bank", () =>
             {
                 foreach (var h in EditorBeatmap.HitObjects)
-                    h.SampleControlPoint.SampleBank = "soft";
+                {
+                    for (int i = 0; i < h.Samples.Count; i++)
+                    {
+                        h.Samples[i] = h.Samples[i].With(newBank: "soft");
+                    }
+                }
             });
 
             AddStep("select both objects", () => EditorBeatmap.SelectedHitObjects.AddRange(EditorBeatmap.HitObjects));
@@ -248,7 +257,7 @@ namespace osu.Game.Tests.Visual.Editing
         private void hitObjectHasSampleVolume(int objectIndex, int volume) => AddAssert($"{objectIndex.ToOrdinalWords()} has volume {volume}", () =>
         {
             var h = EditorBeatmap.HitObjects.ElementAt(objectIndex);
-            return h.SampleControlPoint.SampleVolume == volume;
+            return h.Samples.All(o => o.Volume == volume);
         });
 
         private void setBankViaPopover(string bank) => AddStep($"set bank {bank} via popover", () =>
@@ -265,7 +274,7 @@ namespace osu.Game.Tests.Visual.Editing
         private void hitObjectHasSampleBank(int objectIndex, string bank) => AddAssert($"{objectIndex.ToOrdinalWords()} has bank {bank}", () =>
         {
             var h = EditorBeatmap.HitObjects.ElementAt(objectIndex);
-            return h.SampleControlPoint.SampleBank == bank;
+            return h.Samples.All(o => o.Bank == bank);
         });
     }
 }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs
index 31133f00d9..114c554d28 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs
@@ -73,8 +73,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 new HitCircle
                 {
                     StartTime = t += spacing,
-                    Samples = new[] { new HitSampleInfo(HitSampleInfo.HIT_NORMAL) },
-                    SampleControlPoint = new SampleControlPoint { SampleBank = "soft" },
+                    Samples = new[] { new HitSampleInfo(HitSampleInfo.HIT_NORMAL, "soft") },
                 },
                 new HitCircle
                 {
@@ -84,8 +83,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 {
                     StartTime = t += spacing,
                     Path = new SliderPath(PathType.Linear, new[] { Vector2.Zero, Vector2.UnitY * 200 }),
-                    Samples = new[] { new HitSampleInfo(HitSampleInfo.HIT_WHISTLE) },
-                    SampleControlPoint = new SampleControlPoint { SampleBank = "soft" },
+                    Samples = new[] { new HitSampleInfo(HitSampleInfo.HIT_WHISTLE, "soft") },
                 },
             });
 
diff --git a/osu.Game/Audio/HitSampleInfo.cs b/osu.Game/Audio/HitSampleInfo.cs
index efa5562cb8..e9c06152cc 100644
--- a/osu.Game/Audio/HitSampleInfo.cs
+++ b/osu.Game/Audio/HitSampleInfo.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
+using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Utils;
 
 namespace osu.Game.Audio
@@ -32,7 +33,7 @@ namespace osu.Game.Audio
         /// <summary>
         /// The bank to load the sample from.
         /// </summary>
-        public readonly string? Bank;
+        public readonly string Bank;
 
         /// <summary>
         /// An optional suffix to provide priority lookup. Falls back to non-suffixed <see cref="Name"/>.
@@ -47,7 +48,7 @@ namespace osu.Game.Audio
         public HitSampleInfo(string name, string? bank = null, string? suffix = null, int volume = 0)
         {
             Name = name;
-            Bank = bank;
+            Bank = bank ?? SampleControlPoint.DEFAULT_BANK;
             Suffix = suffix;
             Volume = volume;
         }
diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs
index aaeffa49fc..73ecc28404 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -76,7 +76,6 @@ namespace osu.Game.Rulesets.Objects
         /// </summary>
         public virtual IList<HitSampleInfo> AuxiliarySamples => ImmutableList<HitSampleInfo>.Empty;
 
-        public SampleControlPoint SampleControlPoint = SampleControlPoint.DEFAULT;
         public DifficultyControlPoint DifficultyControlPoint = DifficultyControlPoint.DEFAULT;
 
         /// <summary>

From 5accb05f45d81d3e7fc385cdb53053d9aa9ee2c6 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Wed, 26 Apr 2023 14:28:48 +0200
Subject: [PATCH 0185/1604] fix invalidoperation exception

---
 osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 04786cc9fb..a4783046c4 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -271,7 +271,9 @@ namespace osu.Game.Beatmaps.Formats
                     if (hitObject.Samples.Count > 0)
                     {
                         int volume = hitObject.Samples.Max(o => o.Volume);
-                        int customIndex = hitObject.Samples.OfType<ConvertHitObjectParser.LegacyHitSampleInfo>().Max(o => o.CustomSampleBank);
+                        int customIndex = hitObject.Samples.Any(o => o is ConvertHitObjectParser.LegacyHitSampleInfo)
+                            ? hitObject.Samples.OfType<ConvertHitObjectParser.LegacyHitSampleInfo>().Max(o => o.CustomSampleBank)
+                            : 0;
                         yield return new LegacyBeatmapDecoder.LegacySampleControlPoint { Time = hitObject.GetEndTime(), SampleVolume = volume, CustomSampleBank = customIndex };
                     }
 

From 1b4f4372d5304553768c8b83bd6d460bad5acfc0 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Wed, 26 Apr 2023 14:32:12 +0200
Subject: [PATCH 0186/1604] fixed sample control point applying

---
 osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index 9a1935f929..6b9e21f916 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -118,10 +118,7 @@ namespace osu.Game.Beatmaps.Formats
 
             SampleControlPoint sampleControlPoint = legacyInfo != null ? legacyInfo.SamplePointAt(hitObject.GetEndTime() + control_point_leniency) : SampleControlPoint.DEFAULT;
 
-            foreach (var hitSampleInfo in hitObject.Samples)
-            {
-                sampleControlPoint.ApplyTo(hitSampleInfo);
-            }
+            hitObject.Samples = hitObject.Samples.Select(o => sampleControlPoint.ApplyTo(o)).ToList();
 
             if (hitObject is not IHasRepeats hasRepeats) return;
 
@@ -130,10 +127,7 @@ namespace osu.Game.Beatmaps.Formats
                 double time = hitObject.StartTime + i * hasRepeats.Duration / hasRepeats.SpanCount() + control_point_leniency;
                 sampleControlPoint = legacyInfo != null ? legacyInfo.SamplePointAt(time) : SampleControlPoint.DEFAULT;
 
-                foreach (var hitSampleInfo in hasRepeats.NodeSamples[i])
-                {
-                    sampleControlPoint.ApplyTo(hitSampleInfo);
-                }
+                hasRepeats.NodeSamples[i] = hasRepeats.NodeSamples[i].Select(o => sampleControlPoint.ApplyTo(o)).ToList();
             }
         }
 

From 9f8d7bccbab8e011ca69288476fae517a62b1c38 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Wed, 26 Apr 2023 17:34:02 +0200
Subject: [PATCH 0187/1604] fix usings

---
 .../Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs         | 1 -
 osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs       | 1 -
 .../Visual/Editing/TestSceneHitObjectSamplePointAdjustments.cs  | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 8cf64a6a7e..6685507ee0 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -14,7 +14,6 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Framework.Utils;
 using osu.Game.Audio;
-using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index 2cf1d7a6ab..362ddccaf1 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -16,7 +16,6 @@ using JetBrains.Annotations;
 using osu.Game.Audio;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Formats;
-using osu.Game.Beatmaps.Legacy;
 
 namespace osu.Game.Rulesets.Taiko.Beatmaps
 {
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSamplePointAdjustments.cs b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSamplePointAdjustments.cs
index 7403cad52f..7a0418cfec 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSamplePointAdjustments.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSamplePointAdjustments.cs
@@ -4,12 +4,12 @@
 #nullable disable
 
 using System.Linq;
+using System.Collections.Generic;
 using Humanizer;
 using NUnit.Framework;
 using osu.Framework.Testing;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Rulesets;

From c44f71a7374f370831a72b3c13d0343368e6f86b Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Wed, 26 Apr 2023 17:55:38 +0200
Subject: [PATCH 0188/1604] remove all regular usage of DifficultyControlPoint

---
 .../Edit/Blueprints/Components/EditablePath.cs    |  2 +-
 osu.Game.Rulesets.Catch/Objects/JuiceStream.cs    | 15 ++++++++++++---
 .../Sliders/SliderPlacementBlueprint.cs           |  8 +++-----
 .../Beatmaps/TaikoBeatmapConverter.cs             |  4 +++-
 osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs       | 13 +++++++++++--
 ...estSceneHitObjectDifficultyPointAdjustments.cs |  5 +----
 osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs |  5 ++++-
 .../Rulesets/Edit/DistancedHitObjectComposer.cs   |  3 ++-
 osu.Game/Rulesets/Objects/HitObject.cs            |  2 +-
 .../Timeline/TimelineHitObjectBlueprint.cs        | 12 ++++--------
 10 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Edit/Blueprints/Components/EditablePath.cs b/osu.Game.Rulesets.Catch/Edit/Blueprints/Components/EditablePath.cs
index 74d6565600..7a577f8a83 100644
--- a/osu.Game.Rulesets.Catch/Edit/Blueprints/Components/EditablePath.cs
+++ b/osu.Game.Rulesets.Catch/Edit/Blueprints/Components/EditablePath.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Rulesets.Catch.Edit.Blueprints.Components
         public void UpdateHitObjectFromPath(JuiceStream hitObject)
         {
             // The SV setting may need to be changed for the current path.
-            var svBindable = hitObject.DifficultyControlPoint.SliderVelocityBindable;
+            var svBindable = hitObject.SliderVelocityBindable;
             double svToVelocityFactor = hitObject.Velocity / svBindable.Value;
             double requiredVelocity = path.ComputeRequiredVelocity();
 
diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
index 96e2d5c4e5..f8af161ad5 100644
--- a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using Newtonsoft.Json;
+using osu.Framework.Bindables;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
@@ -16,7 +17,7 @@ using osu.Game.Rulesets.Objects.Types;
 
 namespace osu.Game.Rulesets.Catch.Objects
 {
-    public class JuiceStream : CatchHitObject, IHasPathWithRepeats
+    public class JuiceStream : CatchHitObject, IHasPathWithRepeats, IHasSliderVelocity
     {
         /// <summary>
         /// Positional distance that results in a duration of one second, before any speed adjustments.
@@ -27,6 +28,14 @@ namespace osu.Game.Rulesets.Catch.Objects
 
         public int RepeatCount { get; set; }
 
+        public BindableNumber<double> SliderVelocityBindable { get; } = new BindableDouble(1);
+
+        public double SliderVelocity
+        {
+            get => SliderVelocityBindable.Value;
+            set => SliderVelocityBindable.Value = value;
+        }
+
         [JsonIgnore]
         private double velocityFactor;
 
@@ -34,10 +43,10 @@ namespace osu.Game.Rulesets.Catch.Objects
         private double tickDistanceFactor;
 
         [JsonIgnore]
-        public double Velocity => velocityFactor * DifficultyControlPoint.SliderVelocity;
+        public double Velocity => velocityFactor * SliderVelocity;
 
         [JsonIgnore]
-        public double TickDistance => tickDistanceFactor * DifficultyControlPoint.SliderVelocity;
+        public double TickDistance => tickDistanceFactor * SliderVelocity;
 
         /// <summary>
         /// The length of one span of this <see cref="JuiceStream"/>.
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 77393efeb3..50514865e1 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -10,7 +10,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Framework.Input.Events;
-using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
@@ -83,11 +82,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                 case SliderPlacementState.Initial:
                     BeginPlacement();
 
-                    var nearestDifficultyPoint = editorBeatmap.HitObjects
-                                                              .LastOrDefault(h => h is Slider && h.GetEndTime() < HitObject.StartTime)?
-                                                              .DifficultyControlPoint?.DeepClone() as DifficultyControlPoint;
+                    double? nearestSliderVelocity = (editorBeatmap.HitObjects
+                                                                  .LastOrDefault(h => h is Slider && h.GetEndTime() < HitObject.StartTime) as Slider)?.SliderVelocity;
 
-                    HitObject.DifficultyControlPoint = nearestDifficultyPoint ?? new DifficultyControlPoint();
+                    HitObject.SliderVelocity = nearestSliderVelocity ?? 1;
                     HitObject.Position = ToLocalSpace(result.ScreenSpacePosition);
 
                     // Replacing the DifficultyControlPoint above doesn't trigger any kind of invalidation.
diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index 362ddccaf1..05fb314342 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -64,7 +64,9 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
 
                 foreach (HitObject hitObject in original.HitObjects)
                 {
-                    double nextScrollSpeed = hitObject.DifficultyControlPoint.SliderVelocity;
+                    if (hitObject is not IHasSliderVelocity hasSliderVelocity) continue;
+
+                    double nextScrollSpeed = hasSliderVelocity.SliderVelocity;
                     EffectControlPoint currentEffectPoint = converted.ControlPointInfo.EffectPointAt(hitObject.StartTime);
 
                     if (!Precision.AlmostEquals(lastScrollSpeed, nextScrollSpeed, acceptableDifference: currentEffectPoint.ScrollSpeedBindable.Precision))
diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
index 3325eda7cf..5613bb190a 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
@@ -5,6 +5,7 @@
 
 using osu.Game.Rulesets.Objects.Types;
 using System.Threading;
+using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Formats;
@@ -15,7 +16,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {
-    public class DrumRoll : TaikoStrongableHitObject, IHasPath
+    public class DrumRoll : TaikoStrongableHitObject, IHasPath, IHasSliderVelocity
     {
         /// <summary>
         /// Drum roll distance that results in a duration of 1 speed-adjusted beat length.
@@ -35,6 +36,14 @@ namespace osu.Game.Rulesets.Taiko.Objects
         /// </summary>
         public double Velocity { get; private set; }
 
+        public BindableNumber<double> SliderVelocityBindable { get; } = new BindableDouble(1);
+
+        public double SliderVelocity
+        {
+            get => SliderVelocityBindable.Value;
+            set => SliderVelocityBindable.Value = value;
+        }
+
         /// <summary>
         /// Numer of ticks per beat length.
         /// </summary>
@@ -52,7 +61,7 @@ namespace osu.Game.Rulesets.Taiko.Objects
 
             TimingControlPoint timingPoint = controlPointInfo.TimingPointAt(StartTime);
 
-            double scoringDistance = base_distance * difficulty.SliderMultiplier * DifficultyControlPoint.SliderVelocity;
+            double scoringDistance = base_distance * difficulty.SliderMultiplier * SliderVelocity;
             Velocity = scoringDistance / timingPoint.BeatLength;
 
             tickSpacing = timingPoint.BeatLength / TickRate;
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectDifficultyPointAdjustments.cs b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectDifficultyPointAdjustments.cs
index ab82678eb9..f34e286f50 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectDifficultyPointAdjustments.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectDifficultyPointAdjustments.cs
@@ -61,10 +61,7 @@ namespace osu.Game.Tests.Visual.Editing
                             new PathControlPoint(new Vector2(100, 0))
                         }
                     },
-                    DifficultyControlPoint = new DifficultyControlPoint
-                    {
-                        SliderVelocity = 2
-                    }
+                    SliderVelocity = 2
                 });
             });
         }
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index a4783046c4..a681429d02 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -249,7 +249,10 @@ namespace osu.Game.Beatmaps.Formats
                     yield break;
 
                 foreach (var hitObject in hitObjects)
-                    yield return hitObject.DifficultyControlPoint;
+                {
+                    if (hitObject is IHasSliderVelocity hasSliderVelocity)
+                        yield return new DifficultyControlPoint { Time = hitObject.StartTime, SliderVelocity = hasSliderVelocity.SliderVelocity };
+                }
             }
 
             void extractDifficultyControlPoints(IEnumerable<HitObject> hitObjects)
diff --git a/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs b/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
index aa47b4f424..5aa9e3c179 100644
--- a/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
@@ -23,6 +23,7 @@ using osu.Game.Overlays;
 using osu.Game.Overlays.OSD;
 using osu.Game.Overlays.Settings.Sections;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Screens.Edit.Components.TernaryButtons;
 
 namespace osu.Game.Rulesets.Edit
@@ -239,7 +240,7 @@ namespace osu.Game.Rulesets.Edit
 
         public virtual float GetBeatSnapDistanceAt(HitObject referenceObject, bool useReferenceSliderVelocity = true)
         {
-            return (float)(100 * (useReferenceSliderVelocity ? referenceObject.DifficultyControlPoint.SliderVelocity : 1) * EditorBeatmap.Difficulty.SliderMultiplier * 1
+            return (float)(100 * (useReferenceSliderVelocity && referenceObject is IHasSliderVelocity hasSliderVelocity ? hasSliderVelocity.SliderVelocity : 1) * EditorBeatmap.Difficulty.SliderMultiplier * 1
                            / BeatSnapProvider.BeatDivisor);
         }
 
diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs
index 73ecc28404..4822ec3919 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -76,7 +76,7 @@ namespace osu.Game.Rulesets.Objects
         /// </summary>
         public virtual IList<HitSampleInfo> AuxiliarySamples => ImmutableList<HitSampleInfo>.Empty;
 
-        public DifficultyControlPoint DifficultyControlPoint = DifficultyControlPoint.DEFAULT;
+        public DifficultyControlPoint DifficultyControlPoint { get; set; } = DifficultyControlPoint.DEFAULT;
 
         /// <summary>
         /// Legacy BPM multiplier that introduces floating-point errors for rulesets that depend on it.
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index c2106e0598..61a3931839 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -15,7 +15,6 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Framework.Threading;
 using osu.Framework.Utils;
-using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
@@ -373,17 +372,14 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                             case IHasRepeats repeatHitObject:
                                 double proposedDuration = time - hitObject.StartTime;
 
-                                if (e.CurrentState.Keyboard.ShiftPressed)
+                                if (e.CurrentState.Keyboard.ShiftPressed && hitObject is IHasSliderVelocity hasSliderVelocity)
                                 {
-                                    if (ReferenceEquals(hitObject.DifficultyControlPoint, DifficultyControlPoint.DEFAULT))
-                                        hitObject.DifficultyControlPoint = new DifficultyControlPoint();
+                                    double newVelocity = hasSliderVelocity.SliderVelocity * (repeatHitObject.Duration / proposedDuration);
 
-                                    double newVelocity = hitObject.DifficultyControlPoint.SliderVelocity * (repeatHitObject.Duration / proposedDuration);
-
-                                    if (Precision.AlmostEquals(newVelocity, hitObject.DifficultyControlPoint.SliderVelocity))
+                                    if (Precision.AlmostEquals(newVelocity, hasSliderVelocity.SliderVelocity))
                                         return;
 
-                                    hitObject.DifficultyControlPoint.SliderVelocity = newVelocity;
+                                    hasSliderVelocity.SliderVelocity = newVelocity;
                                     beatmap.Update(hitObject);
                                 }
                                 else

From 76df5fd3e27ddb2149182b5586ab1eff1634f7c4 Mon Sep 17 00:00:00 2001
From: sw1tchbl4d3 <sw1tchbl4d3@sw1tchbl4d3.com>
Date: Wed, 26 Apr 2023 18:05:47 +0200
Subject: [PATCH 0189/1604] Limit taiko playfield aspect ratio to 5:4 - 16:9

---
 .../Mods/TaikoModClassic.cs                   |  2 +-
 .../UI/DrawableTaikoRuleset.cs                |  8 ++++---
 .../UI/TaikoPlayfieldAdjustmentContainer.cs   | 22 ++++++++++++++-----
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModClassic.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModClassic.cs
index d0361b1c8d..cdeaafde10 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModClassic.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModClassic.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
         public void ApplyToDrawableRuleset(DrawableRuleset<TaikoHitObject> drawableRuleset)
         {
             var drawableTaikoRuleset = (DrawableTaikoRuleset)drawableRuleset;
-            drawableTaikoRuleset.LockPlayfieldMaxAspect.Value = false;
+            drawableTaikoRuleset.LockPlayfieldAspectRange.Value = false;
 
             var playfield = (TaikoPlayfield)drawableRuleset.Playfield;
             playfield.ClassicHitTargetPosition.Value = true;
diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
index a08877e2dd..64d406a308 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Taiko.UI
     {
         public new BindableDouble TimeRange => base.TimeRange;
 
-        public readonly BindableBool LockPlayfieldMaxAspect = new BindableBool(true);
+        public readonly BindableBool LockPlayfieldAspectRange = new BindableBool(true);
 
         public new TaikoInputManager KeyBindingInputManager => (TaikoInputManager)base.KeyBindingInputManager;
 
@@ -69,7 +69,9 @@ namespace osu.Game.Rulesets.Taiko.UI
             const float scroll_rate = 10;
 
             // Since the time range will depend on a positional value, it is referenced to the x480 pixel space.
-            float ratio = DrawHeight / 480;
+            // Width is used because it defines how many notes fit on the playfield.
+            // We clamp the ratio to the maximum aspect ratio to keep scroll speed consistent on widths lower than the default.
+            float ratio = Math.Max(DrawSize.X / 768f, TaikoPlayfieldAdjustmentContainer.MAXIMUM_ASPECT);
 
             TimeRange.Value = (Playfield.HitObjectContainer.DrawWidth / ratio) * scroll_rate;
         }
@@ -92,7 +94,7 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         public override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new TaikoPlayfieldAdjustmentContainer
         {
-            LockPlayfieldMaxAspect = { BindTarget = LockPlayfieldMaxAspect }
+            LockPlayfieldAspectRange = { BindTarget = LockPlayfieldAspectRange }
         };
 
         protected override PassThroughInputManager CreateInputManager() => new TaikoInputManager(Ruleset.RulesetInfo);
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfieldAdjustmentContainer.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfieldAdjustmentContainer.cs
index 42732d90e4..3587783104 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfieldAdjustmentContainer.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfieldAdjustmentContainer.cs
@@ -11,9 +11,11 @@ namespace osu.Game.Rulesets.Taiko.UI
     public partial class TaikoPlayfieldAdjustmentContainer : PlayfieldAdjustmentContainer
     {
         private const float default_relative_height = TaikoPlayfield.DEFAULT_HEIGHT / 768;
-        private const float default_aspect = 16f / 9f;
 
-        public readonly IBindable<bool> LockPlayfieldMaxAspect = new BindableBool(true);
+        public const float MAXIMUM_ASPECT = 16f / 9f;
+        public const float MINIMUM_ASPECT = 5f / 4f;
+
+        public readonly IBindable<bool> LockPlayfieldAspectRange = new BindableBool(true);
 
         protected override void Update()
         {
@@ -26,12 +28,22 @@ namespace osu.Game.Rulesets.Taiko.UI
             //
             // As a middle-ground, the aspect ratio can still be adjusted in the downwards direction but has a maximum limit.
             // This is still a bit weird, because readability changes with window size, but it is what it is.
-            if (LockPlayfieldMaxAspect.Value && Parent.ChildSize.X / Parent.ChildSize.Y > default_aspect)
-                height *= Math.Clamp(Parent.ChildSize.X / Parent.ChildSize.Y, 0.4f, 4) / default_aspect;
+            if (LockPlayfieldAspectRange.Value)
+            {
+                float currentAspect = Parent.ChildSize.X / Parent.ChildSize.Y;
 
+                if (currentAspect > MAXIMUM_ASPECT)
+                    height *= currentAspect / MAXIMUM_ASPECT;
+                else if (currentAspect < MINIMUM_ASPECT)
+                    height *= currentAspect / MINIMUM_ASPECT;
+            }
+
+            // Limit the maximum relative height of the playfield to one-third of available area to avoid it masking out on extreme resolutions.
+            height = Math.Min(height, 1f / 3f);
             Height = height;
 
-            // Position the taiko playfield exactly one playfield from the top of the screen.
+            // Position the taiko playfield exactly one playfield from the top of the screen, if there is enough space for it.
+            // Note that the relative height cannot exceed one-third - if that limit is hit, the playfield will be exactly centered.
             RelativePositionAxes = Axes.Y;
             Y = height;
         }

From 354cd238742546522b78b74bd03238b49180551e Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Wed, 26 Apr 2023 18:17:02 +0200
Subject: [PATCH 0190/1604] removed all usage of hitobject's
 DifficultyControlPoint

---
 .../TestSceneJuiceStreamPlacementBlueprint.cs |  4 ++--
 .../TestSceneJuiceStreamSelectionBlueprint.cs |  4 ++--
 .../TestSceneObjectOrderedHitPolicy.cs        |  2 +-
 .../TestSceneSliderFollowCircleInput.cs       |  3 +--
 .../TestSceneSliderInput.cs                   |  3 +--
 .../TestSceneStartTimeOrderedHitPolicy.cs     |  2 +-
 ...tSceneHitObjectComposerDistanceSnapping.cs | 22 ++++++-------------
 .../Editing/TestSceneEditorClipboard.cs       |  1 -
 ...ceneHitObjectDifficultyPointAdjustments.cs |  8 +++----
 osu.Game/Rulesets/Objects/HitObject.cs        |  2 --
 10 files changed, 19 insertions(+), 32 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamPlacementBlueprint.cs b/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamPlacementBlueprint.cs
index 18d3d29bdc..2426f8c886 100644
--- a/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamPlacementBlueprint.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Rulesets.Catch.Tests.Editor
             AddAssert("end time is correct", () => Precision.AlmostEquals(lastObject.EndTime, times[1]));
             AddAssert("start position is correct", () => Precision.AlmostEquals(lastObject.OriginalX, positions[0]));
             AddAssert("end position is correct", () => Precision.AlmostEquals(lastObject.EndX, positions[1]));
-            AddAssert("default slider velocity", () => lastObject.DifficultyControlPoint.SliderVelocityBindable.IsDefault);
+            AddAssert("default slider velocity", () => lastObject.SliderVelocityBindable.IsDefault);
         }
 
         [Test]
@@ -76,7 +76,7 @@ namespace osu.Game.Rulesets.Catch.Tests.Editor
             addPlacementSteps(times, positions);
             addPathCheckStep(times, positions);
 
-            AddAssert("slider velocity changed", () => !lastObject.DifficultyControlPoint.SliderVelocityBindable.IsDefault);
+            AddAssert("slider velocity changed", () => !lastObject.SliderVelocityBindable.IsDefault);
         }
 
         [Test]
diff --git a/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamSelectionBlueprint.cs b/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamSelectionBlueprint.cs
index f25b66c360..beba5811fe 100644
--- a/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamSelectionBlueprint.cs
@@ -108,11 +108,11 @@ namespace osu.Game.Rulesets.Catch.Tests.Editor
             double[] times = { 100, 300 };
             float[] positions = { 200, 300 };
             addBlueprintStep(times, positions);
-            AddAssert("default slider velocity", () => hitObject.DifficultyControlPoint.SliderVelocityBindable.IsDefault);
+            AddAssert("default slider velocity", () => hitObject.SliderVelocityBindable.IsDefault);
 
             addDragStartStep(times[1], positions[1]);
             AddMouseMoveStep(times[1], 400);
-            AddAssert("slider velocity changed", () => !hitObject.DifficultyControlPoint.SliderVelocityBindable.IsDefault);
+            AddAssert("slider velocity changed", () => !hitObject.SliderVelocityBindable.IsDefault);
         }
 
         [Test]
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
index 5d9316a21b..ee70441688 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
@@ -439,7 +439,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             public TestSlider()
             {
-                DifficultyControlPoint = new DifficultyControlPoint { SliderVelocity = 0.1f };
+                SliderVelocity = 0.1f;
 
                 DefaultsApplied += _ =>
                 {
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderFollowCircleInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderFollowCircleInput.cs
index a32f0a13b8..fc2e6d1f72 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderFollowCircleInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderFollowCircleInput.cs
@@ -7,7 +7,6 @@ using NUnit.Framework;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
@@ -47,7 +46,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                     {
                         StartTime = time_slider_start,
                         Position = new Vector2(0, 0),
-                        DifficultyControlPoint = new DifficultyControlPoint { SliderVelocity = velocity },
+                        SliderVelocity = velocity,
                         Path = new SliderPath(PathType.Linear, new[]
                         {
                             Vector2.Zero,
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index 5f27cdc191..d83926ab9b 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -8,7 +8,6 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
@@ -350,7 +349,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                         {
                             StartTime = time_slider_start,
                             Position = new Vector2(0, 0),
-                            DifficultyControlPoint = new DifficultyControlPoint { SliderVelocity = 0.1f },
+                            SliderVelocity = 0.1f,
                             Path = new SliderPath(PathType.PerfectCurve, new[]
                             {
                                 Vector2.Zero,
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
index 29e6fc4301..f4257a9ee7 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
@@ -399,7 +399,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             public TestSlider()
             {
-                DifficultyControlPoint = new DifficultyControlPoint { SliderVelocity = 0.1f };
+                SliderVelocity = 0.1f;
 
                 DefaultsApplied += _ =>
                 {
diff --git a/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs b/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
index f556f6e2fe..6399507aa0 100644
--- a/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
+++ b/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
@@ -14,6 +14,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Beatmaps;
 using osu.Game.Rulesets.Osu.Edit;
+using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Edit;
 using osu.Game.Tests.Visual;
 
@@ -74,12 +75,9 @@ namespace osu.Game.Tests.Editing
         [TestCase(2)]
         public void TestSpeedMultiplierDoesNotChangeDistanceSnap(float multiplier)
         {
-            assertSnapDistance(100, new HitObject
+            assertSnapDistance(100, new Slider
             {
-                DifficultyControlPoint = new DifficultyControlPoint
-                {
-                    SliderVelocity = multiplier
-                }
+                SliderVelocity = multiplier
             }, false);
         }
 
@@ -87,12 +85,9 @@ namespace osu.Game.Tests.Editing
         [TestCase(2)]
         public void TestSpeedMultiplierDoesChangeDistanceSnap(float multiplier)
         {
-            assertSnapDistance(100 * multiplier, new HitObject
+            assertSnapDistance(100 * multiplier, new Slider
             {
-                DifficultyControlPoint = new DifficultyControlPoint
-                {
-                    SliderVelocity = multiplier
-                }
+                SliderVelocity = multiplier
             }, true);
         }
 
@@ -114,12 +109,9 @@ namespace osu.Game.Tests.Editing
             const float base_distance = 100;
             const float slider_velocity = 1.2f;
 
-            var referenceObject = new HitObject
+            var referenceObject = new Slider
             {
-                DifficultyControlPoint = new DifficultyControlPoint
-                {
-                    SliderVelocity = slider_velocity
-                }
+                SliderVelocity = slider_velocity
             };
 
             assertSnapDistance(base_distance * slider_velocity, referenceObject, true);
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs
index 3c98a83fa0..c4c05278b5 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs
@@ -6,7 +6,6 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Testing;
-using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Edit;
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectDifficultyPointAdjustments.cs b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectDifficultyPointAdjustments.cs
index f34e286f50..3b998b4219 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectDifficultyPointAdjustments.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectDifficultyPointAdjustments.cs
@@ -8,10 +8,10 @@ using Humanizer;
 using NUnit.Framework;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.UI;
@@ -97,8 +97,8 @@ namespace osu.Game.Tests.Visual.Editing
         {
             AddStep("unify slider velocity", () =>
             {
-                foreach (var h in EditorBeatmap.HitObjects)
-                    h.DifficultyControlPoint.SliderVelocity = 1.5;
+                foreach (var h in EditorBeatmap.HitObjects.OfType<IHasSliderVelocity>())
+                    h.SliderVelocity = 1.5;
             });
 
             AddStep("select both objects", () => EditorBeatmap.SelectedHitObjects.AddRange(EditorBeatmap.HitObjects));
@@ -182,7 +182,7 @@ namespace osu.Game.Tests.Visual.Editing
         private void hitObjectHasVelocity(int objectIndex, double velocity) => AddAssert($"{objectIndex.ToOrdinalWords()} has velocity {velocity}", () =>
         {
             var h = EditorBeatmap.HitObjects.ElementAt(objectIndex);
-            return h.DifficultyControlPoint.SliderVelocity == velocity;
+            return h is IHasSliderVelocity hasSliderVelocity && hasSliderVelocity.SliderVelocity == velocity;
         });
     }
 }
diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs
index 4822ec3919..095ec1ff1b 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -76,8 +76,6 @@ namespace osu.Game.Rulesets.Objects
         /// </summary>
         public virtual IList<HitSampleInfo> AuxiliarySamples => ImmutableList<HitSampleInfo>.Empty;
 
-        public DifficultyControlPoint DifficultyControlPoint { get; set; } = DifficultyControlPoint.DEFAULT;
-
         /// <summary>
         /// Legacy BPM multiplier that introduces floating-point errors for rulesets that depend on it.
         /// DO NOT USE THIS UNLESS 100% SURE.

From 3c6141f233d0eb829c831fea7d838f7f2da2ecbd Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Thu, 27 Apr 2023 17:08:29 +0300
Subject: [PATCH 0191/1604] Add `ModSearch`

---
 osu.Game/Overlays/Mods/ModSearch.cs        | 8 ++++++++
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 osu.Game/Overlays/Mods/ModSearch.cs

diff --git a/osu.Game/Overlays/Mods/ModSearch.cs b/osu.Game/Overlays/Mods/ModSearch.cs
new file mode 100644
index 0000000000..c96be4d817
--- /dev/null
+++ b/osu.Game/Overlays/Mods/ModSearch.cs
@@ -0,0 +1,8 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+namespace osu.Game.Overlays.Mods;
+
+public partial class ModSearch
+{
+}
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 16602db4be..edf16c09fb 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -188,8 +188,8 @@ namespace osu.Game.Overlays.Mods
             {
                 MainAreaContent.Add(new Container
                 {
-                    Anchor = Anchor.TopRight,
-                    Origin = Anchor.TopRight,
+                    Anchor = Anchor.TopLeft,
+                    Origin = Anchor.TopLeft,
                     AutoSizeAxes = Axes.X,
                     Height = ModsEffectDisplay.HEIGHT,
                     Margin = new MarginPadding { Horizontal = 100 },
@@ -197,7 +197,7 @@ namespace osu.Game.Overlays.Mods
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre
-                    },
+                    }
                 });
             }
 

From b795e8ac5a25eac8619bee8fbfe510d2edd91573 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Thu, 27 Apr 2023 17:26:35 +0300
Subject: [PATCH 0192/1604] Use `ModSearch` in `ModeSelectOverlay`

---
 osu.Game/Overlays/Mods/ModSearch.cs        |  4 +++-
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 12 ++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/ModSearch.cs b/osu.Game/Overlays/Mods/ModSearch.cs
index c96be4d817..0a82d967af 100644
--- a/osu.Game/Overlays/Mods/ModSearch.cs
+++ b/osu.Game/Overlays/Mods/ModSearch.cs
@@ -1,8 +1,10 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Framework.Graphics.Containers;
+
 namespace osu.Game.Overlays.Mods;
 
-public partial class ModSearch
+public partial class ModSearch : Container
 {
 }
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index edf16c09fb..31f2c87100 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -110,6 +110,8 @@ namespace osu.Game.Overlays.Mods
 
         private DifficultyMultiplierDisplay? multiplierDisplay;
 
+        private ModSearch? modSearch;
+
         protected ShearedButton BackButton { get; private set; } = null!;
         protected ShearedToggleButton? CustomisationButton { get; private set; }
 
@@ -201,6 +203,16 @@ namespace osu.Game.Overlays.Mods
                 });
             }
 
+            MainAreaContent.Add(new Container
+            {
+                Anchor = Anchor.TopRight,
+                Origin = Anchor.TopRight,
+                AutoSizeAxes = Axes.X,
+                Height = ModsEffectDisplay.HEIGHT,
+                Margin = new MarginPadding { Horizontal = 100 },
+                Child = modSearch = new ModSearch()
+            });
+
             FooterContent.Child = footerButtonFlow = new FillFlowContainer<ShearedButton>
             {
                 RelativeSizeAxes = Axes.X,

From f5c652325a55402d71dfb3182dea9769906f5d1b Mon Sep 17 00:00:00 2001
From: _ltn <46729135+rltn@users.noreply.github.com>
Date: Thu, 27 Apr 2023 23:44:18 +0300
Subject: [PATCH 0193/1604] Create UpdateableCountryText.cs

---
 .../Users/Drawables/UpdateableCountryText.cs  | 67 +++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 osu.Game/Users/Drawables/UpdateableCountryText.cs

diff --git a/osu.Game/Users/Drawables/UpdateableCountryText.cs b/osu.Game/Users/Drawables/UpdateableCountryText.cs
new file mode 100644
index 0000000000..60174505a5
--- /dev/null
+++ b/osu.Game/Users/Drawables/UpdateableCountryText.cs
@@ -0,0 +1,67 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using osu.Framework.Allocation;
+using osu.Framework.Input.Events;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays;
+using osu.Framework.Extensions;
+
+namespace osu.Game.Users.Drawables
+{
+    public partial class UpdateableCountryText : ModelBackedDrawable<CountryCode>
+    {
+        public CountryCode CountryCode
+        {
+            get => Model;
+            set => Model = value;
+        }
+        
+        public bool ShowPlaceholderOnUnknown = true;
+
+        public Action? Action;
+
+        protected override Drawable? CreateDrawable(CountryCode countryCode)
+        {
+            if (countryCode == CountryCode.Unknown && !ShowPlaceholderOnUnknown)
+                return null;
+
+            return new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Children = new Drawable[]
+                {
+                    new OsuSpriteText
+                    {
+                        Font = OsuFont.GetFont(size: 14f, weight: FontWeight.Regular),
+                        Margin = new MarginPadding { Left = 5 },
+                        Origin = Anchor.CentreLeft,
+                        Anchor = Anchor.CentreLeft,
+                        Text = countryCode.GetDescription(),
+                    },
+                    new HoverClickSounds()
+                }
+            };
+        }
+
+        [Resolved]
+        private RankingsOverlay? rankingsOverlay { get; set; }
+
+        public UpdateableCountryText(CountryCode countryCode = CountryCode.Unknown)
+        {
+            CountryCode = countryCode;
+        }
+        protected override bool OnClick(ClickEvent e)
+        {
+            Action?.Invoke();
+            rankingsOverlay?.ShowCountry(CountryCode);
+            return true;
+        }
+    }
+    
+}
\ No newline at end of file

From b13201fb792801e87b5a9148abd2a9ec6a011976 Mon Sep 17 00:00:00 2001
From: _ltn <46729135+rltn@users.noreply.github.com>
Date: Fri, 28 Apr 2023 01:14:42 +0300
Subject: [PATCH 0194/1604] UpdateableCountryText rewrite

---
 .../Users/Drawables/UpdateableCountryText.cs  | 55 ++++++-------------
 1 file changed, 17 insertions(+), 38 deletions(-)

diff --git a/osu.Game/Users/Drawables/UpdateableCountryText.cs b/osu.Game/Users/Drawables/UpdateableCountryText.cs
index 60174505a5..fd749da707 100644
--- a/osu.Game/Users/Drawables/UpdateableCountryText.cs
+++ b/osu.Game/Users/Drawables/UpdateableCountryText.cs
@@ -7,6 +7,7 @@ using osu.Framework.Input.Events;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays;
@@ -14,53 +15,31 @@ using osu.Framework.Extensions;
 
 namespace osu.Game.Users.Drawables
 {
-    public partial class UpdateableCountryText : ModelBackedDrawable<CountryCode>
+    public partial class UpdateableCountryText : OsuHoverContainer
     {
-        public CountryCode CountryCode
-        {
-            get => Model;
-            set => Model = value;
-        }
         
         public bool ShowPlaceholderOnUnknown = true;
 
-        public Action? Action;
-
-        protected override Drawable? CreateDrawable(CountryCode countryCode)
-        {
-            if (countryCode == CountryCode.Unknown && !ShowPlaceholderOnUnknown)
-                return null;
-
-            return new Container
-            {
-                RelativeSizeAxes = Axes.Both,
-                Children = new Drawable[]
-                {
-                    new OsuSpriteText
-                    {
-                        Font = OsuFont.GetFont(size: 14f, weight: FontWeight.Regular),
-                        Margin = new MarginPadding { Left = 5 },
-                        Origin = Anchor.CentreLeft,
-                        Anchor = Anchor.CentreLeft,
-                        Text = countryCode.GetDescription(),
-                    },
-                    new HoverClickSounds()
-                }
-            };
-        }
-
         [Resolved]
         private RankingsOverlay? rankingsOverlay { get; set; }
-
-        public UpdateableCountryText(CountryCode countryCode = CountryCode.Unknown)
+        public UpdateableCountryText()
         {
-            CountryCode = countryCode;
+            AutoSizeAxes = Axes.Both;
         }
-        protected override bool OnClick(ClickEvent e)
+
+        // [BackgroundDependencyLoader]
+        public void load(CountryCode countryCode)
         {
-            Action?.Invoke();
-            rankingsOverlay?.ShowCountry(CountryCode);
-            return true;
+            Action = () =>
+            {
+                rankingsOverlay?.ShowCountry(countryCode);
+            };
+
+            Child = new OsuSpriteText
+            {
+                Font = OsuFont.GetFont(size: 14f, weight: FontWeight.Regular),
+                Text = countryCode.GetDescription(),
+            };
         }
     }
     

From e9843f20665a00da524cc240a1ea307d00d548d2 Mon Sep 17 00:00:00 2001
From: _ltn <46729135+rltn@users.noreply.github.com>
Date: Fri, 28 Apr 2023 01:16:50 +0300
Subject: [PATCH 0195/1604] replace country text object

---
 osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
index d04329430b..811628c3c1 100644
--- a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Overlays.Profile.Header
         private ExternalLinkButton openUserExternally = null!;
         private OsuSpriteText titleText = null!;
         private UpdateableFlag userFlag = null!;
-        private OsuSpriteText userCountryText = null!;
+        private UpdateableCountryText userCountryText = null!;
         private GroupBadgeFlow groupBadgeFlow = null!;
         private ToggleCoverButton coverToggle = null!;
 
@@ -156,9 +156,8 @@ namespace osu.Game.Overlays.Profile.Header
                                                             Size = new Vector2(28, 20),
                                                             ShowPlaceholderOnUnknown = false,
                                                         },
-                                                        userCountryText = new OsuSpriteText
+                                                        userCountryText = new UpdateableCountryText
                                                         {
-                                                            Font = OsuFont.GetFont(size: 14f, weight: FontWeight.Regular),
                                                             Margin = new MarginPadding { Left = 5 },
                                                             Origin = Anchor.CentreLeft,
                                                             Anchor = Anchor.CentreLeft,
@@ -201,7 +200,7 @@ namespace osu.Game.Overlays.Profile.Header
             usernameText.Text = user?.Username ?? string.Empty;
             openUserExternally.Link = $@"{api.WebsiteRootUrl}/users/{user?.Id ?? 0}";
             userFlag.CountryCode = user?.CountryCode ?? default;
-            userCountryText.Text = (user?.CountryCode ?? default).GetDescription();
+            userCountryText.load(user?.CountryCode ?? default);
             supporterTag.SupportLevel = user?.SupportLevel ?? 0;
             titleText.Text = user?.Title ?? string.Empty;
             titleText.Colour = Color4Extensions.FromHex(user?.Colour ?? "fff");

From 092377fdaa234738a79eeb409cea0e5722c154a4 Mon Sep 17 00:00:00 2001
From: _ltn <46729135+rltn@users.noreply.github.com>
Date: Fri, 28 Apr 2023 01:47:14 +0300
Subject: [PATCH 0196/1604] moving UpdateableCountryText

---
 .../Profile/Header/TopHeaderContainer.cs      | 41 +++++++++++++++++
 .../Users/Drawables/UpdateableCountryText.cs  | 46 -------------------
 2 files changed, 41 insertions(+), 46 deletions(-)
 delete mode 100644 osu.Game/Users/Drawables/UpdateableCountryText.cs

diff --git a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
index 811628c3c1..54c84e08b8 100644
--- a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
@@ -19,6 +19,20 @@ using osu.Game.Users;
 using osu.Game.Users.Drawables;
 using osuTK;
 
+
+using System;
+// using osu.Framework.Allocation;
+using osu.Framework.Input.Events;
+// using osu.Framework.Graphics;
+// using osu.Framework.Graphics.Containers;
+// using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+// using osu.Game.Graphics.Sprites;
+// using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays;
+using osu.Framework.Graphics.Sprites;
+// using osu.Framework.Extensions;
+
 namespace osu.Game.Overlays.Profile.Header
 {
     public partial class TopHeaderContainer : CompositeDrawable
@@ -158,6 +172,7 @@ namespace osu.Game.Overlays.Profile.Header
                                                         },
                                                         userCountryText = new UpdateableCountryText
                                                         {
+                                                            Font = OsuFont.GetFont(size: 14f, weight: FontWeight.Regular),
                                                             Margin = new MarginPadding { Left = 5 },
                                                             Origin = Anchor.CentreLeft,
                                                             Anchor = Anchor.CentreLeft,
@@ -228,5 +243,31 @@ namespace osu.Game.Overlays.Profile.Header
                 Masking = true;
             }
         }
+
+        private partial class UpdateableCountryText : OsuHoverContainer
+        {
+            public bool ShowPlaceholderOnUnknown = true;
+            public FontUsage Font = default;
+            [Resolved]
+            private RankingsOverlay? rankingsOverlay { get; set; }
+            public UpdateableCountryText()
+            {
+                AutoSizeAxes = Axes.Both;
+            }
+
+            public void load(CountryCode countryCode)
+            {
+                Action = () =>
+                {
+                    rankingsOverlay?.ShowCountry(countryCode);
+                };
+
+                Child = new OsuSpriteText
+                {
+                    Font = Font,
+                    Text = countryCode.GetDescription(),
+                };
+            }
+        }
     }
 }
diff --git a/osu.Game/Users/Drawables/UpdateableCountryText.cs b/osu.Game/Users/Drawables/UpdateableCountryText.cs
deleted file mode 100644
index fd749da707..0000000000
--- a/osu.Game/Users/Drawables/UpdateableCountryText.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System;
-using osu.Framework.Allocation;
-using osu.Framework.Input.Events;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Overlays;
-using osu.Framework.Extensions;
-
-namespace osu.Game.Users.Drawables
-{
-    public partial class UpdateableCountryText : OsuHoverContainer
-    {
-        
-        public bool ShowPlaceholderOnUnknown = true;
-
-        [Resolved]
-        private RankingsOverlay? rankingsOverlay { get; set; }
-        public UpdateableCountryText()
-        {
-            AutoSizeAxes = Axes.Both;
-        }
-
-        // [BackgroundDependencyLoader]
-        public void load(CountryCode countryCode)
-        {
-            Action = () =>
-            {
-                rankingsOverlay?.ShowCountry(countryCode);
-            };
-
-            Child = new OsuSpriteText
-            {
-                Font = OsuFont.GetFont(size: 14f, weight: FontWeight.Regular),
-                Text = countryCode.GetDescription(),
-            };
-        }
-    }
-    
-}
\ No newline at end of file

From 4d144cd5b5fb3e787fd51b75cef459bfab56fbf4 Mon Sep 17 00:00:00 2001
From: _ltn <46729135+rltn@users.noreply.github.com>
Date: Fri, 28 Apr 2023 02:06:13 +0300
Subject: [PATCH 0197/1604] clearing the code

---
 .../Profile/Header/TopHeaderContainer.cs      | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
index 54c84e08b8..3485037925 100644
--- a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
@@ -9,8 +9,10 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
@@ -20,19 +22,6 @@ using osu.Game.Users.Drawables;
 using osuTK;
 
 
-using System;
-// using osu.Framework.Allocation;
-using osu.Framework.Input.Events;
-// using osu.Framework.Graphics;
-// using osu.Framework.Graphics.Containers;
-// using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
-// using osu.Game.Graphics.Sprites;
-// using osu.Game.Graphics.UserInterface;
-using osu.Game.Overlays;
-using osu.Framework.Graphics.Sprites;
-// using osu.Framework.Extensions;
-
 namespace osu.Game.Overlays.Profile.Header
 {
     public partial class TopHeaderContainer : CompositeDrawable
@@ -246,10 +235,12 @@ namespace osu.Game.Overlays.Profile.Header
 
         private partial class UpdateableCountryText : OsuHoverContainer
         {
-            public bool ShowPlaceholderOnUnknown = true;
+
             public FontUsage Font = default;
+
             [Resolved]
             private RankingsOverlay? rankingsOverlay { get; set; }
+
             public UpdateableCountryText()
             {
                 AutoSizeAxes = Axes.Both;

From 17730f05bcf42c6af0c8876c46ae218adf71bb32 Mon Sep 17 00:00:00 2001
From: _ltn <46729135+rltn@users.noreply.github.com>
Date: Fri, 28 Apr 2023 05:47:05 +0300
Subject: [PATCH 0198/1604] remove UpdateableCountryText

---
 .../Profile/Header/TopHeaderContainer.cs      | 31 -------------------
 1 file changed, 31 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
index 3485037925..01fbf137d8 100644
--- a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
@@ -21,7 +21,6 @@ using osu.Game.Users;
 using osu.Game.Users.Drawables;
 using osuTK;
 
-
 namespace osu.Game.Overlays.Profile.Header
 {
     public partial class TopHeaderContainer : CompositeDrawable
@@ -41,7 +40,6 @@ namespace osu.Game.Overlays.Profile.Header
         private ExternalLinkButton openUserExternally = null!;
         private OsuSpriteText titleText = null!;
         private UpdateableFlag userFlag = null!;
-        private UpdateableCountryText userCountryText = null!;
         private GroupBadgeFlow groupBadgeFlow = null!;
         private ToggleCoverButton coverToggle = null!;
 
@@ -204,7 +202,6 @@ namespace osu.Game.Overlays.Profile.Header
             usernameText.Text = user?.Username ?? string.Empty;
             openUserExternally.Link = $@"{api.WebsiteRootUrl}/users/{user?.Id ?? 0}";
             userFlag.CountryCode = user?.CountryCode ?? default;
-            userCountryText.load(user?.CountryCode ?? default);
             supporterTag.SupportLevel = user?.SupportLevel ?? 0;
             titleText.Text = user?.Title ?? string.Empty;
             titleText.Colour = Color4Extensions.FromHex(user?.Colour ?? "fff");
@@ -232,33 +229,5 @@ namespace osu.Game.Overlays.Profile.Header
                 Masking = true;
             }
         }
-
-        private partial class UpdateableCountryText : OsuHoverContainer
-        {
-
-            public FontUsage Font = default;
-
-            [Resolved]
-            private RankingsOverlay? rankingsOverlay { get; set; }
-
-            public UpdateableCountryText()
-            {
-                AutoSizeAxes = Axes.Both;
-            }
-
-            public void load(CountryCode countryCode)
-            {
-                Action = () =>
-                {
-                    rankingsOverlay?.ShowCountry(countryCode);
-                };
-
-                Child = new OsuSpriteText
-                {
-                    Font = Font,
-                    Text = countryCode.GetDescription(),
-                };
-            }
-        }
     }
 }

From 4b0ee392f6d5bb6ec29a0c014fdc199543475e40 Mon Sep 17 00:00:00 2001
From: _ltn <46729135+rltn@users.noreply.github.com>
Date: Fri, 28 Apr 2023 05:48:54 +0300
Subject: [PATCH 0199/1604] add OsuHoverContainer

---
 .../Profile/Header/TopHeaderContainer.cs      | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
index 01fbf137d8..618e487dc3 100644
--- a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
@@ -33,6 +33,9 @@ namespace osu.Game.Overlays.Profile.Header
         [Resolved]
         private IAPIProvider api { get; set; } = null!;
 
+        [Resolved]
+        private RankingsOverlay? rankingsOverlay { get; set; }
+
         private UserCoverBackground cover = null!;
         private SupporterIcon supporterTag = null!;
         private UpdateableAvatar avatar = null!;
@@ -40,6 +43,8 @@ namespace osu.Game.Overlays.Profile.Header
         private ExternalLinkButton openUserExternally = null!;
         private OsuSpriteText titleText = null!;
         private UpdateableFlag userFlag = null!;
+        private OsuHoverContainer userCountryContainer = null!;
+        private OsuSpriteText userCountryText = null!;
         private GroupBadgeFlow groupBadgeFlow = null!;
         private ToggleCoverButton coverToggle = null!;
 
@@ -157,13 +162,20 @@ namespace osu.Game.Overlays.Profile.Header
                                                             Size = new Vector2(28, 20),
                                                             ShowPlaceholderOnUnknown = false,
                                                         },
-                                                        userCountryText = new UpdateableCountryText
+                                                        userCountryContainer = new OsuHoverContainer
                                                         {
-                                                            Font = OsuFont.GetFont(size: 14f, weight: FontWeight.Regular),
                                                             Margin = new MarginPadding { Left = 5 },
                                                             Origin = Anchor.CentreLeft,
                                                             Anchor = Anchor.CentreLeft,
-                                                        }
+                                                            AutoSizeAxes = Axes.Both,
+                                                            Children = new Drawable[]
+                                                            {
+                                                                userCountryText = new OsuSpriteText
+                                                                {
+                                                                    Font = OsuFont.GetFont(size: 14f, weight: FontWeight.Regular),
+                                                                },
+                                                            },
+                                                        },
                                                     }
                                                 },
                                             }
@@ -202,6 +214,8 @@ namespace osu.Game.Overlays.Profile.Header
             usernameText.Text = user?.Username ?? string.Empty;
             openUserExternally.Link = $@"{api.WebsiteRootUrl}/users/{user?.Id ?? 0}";
             userFlag.CountryCode = user?.CountryCode ?? default;
+            userCountryText.Text = (user?.CountryCode ?? default).GetDescription();
+            userCountryContainer.Action = () => rankingsOverlay?.ShowCountry(user?.CountryCode ?? default);
             supporterTag.SupportLevel = user?.SupportLevel ?? 0;
             titleText.Text = user?.Title ?? string.Empty;
             titleText.Colour = Color4Extensions.FromHex(user?.Colour ?? "fff");

From ae85e2a3ff94a6c43282bf7ea084baff1cc060f9 Mon Sep 17 00:00:00 2001
From: Ethan <ethpsa09@gmail.com>
Date: Fri, 28 Apr 2023 19:51:10 +0800
Subject: [PATCH 0200/1604] Update LoginForm.cs

---
 osu.Game/Overlays/Login/LoginForm.cs | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Login/LoginForm.cs b/osu.Game/Overlays/Login/LoginForm.cs
index af145c418c..5f27db90e9 100644
--- a/osu.Game/Overlays/Login/LoginForm.cs
+++ b/osu.Game/Overlays/Login/LoginForm.cs
@@ -42,10 +42,14 @@ namespace osu.Game.Overlays.Login
         private void load(OsuConfigManager config, AccountCreationOverlay accountCreation)
         {
             Direction = FillDirection.Vertical;
-            Spacing = new Vector2(0, 5);
+            Spacing = new Vector2(0, SettingsSection.ITEM_SPACING);
             AutoSizeAxes = Axes.Y;
             RelativeSizeAxes = Axes.X;
-
+            Padding = new MarginPadding
+            {
+                Top = 5,
+                Bottom = 24,
+            };
             ErrorTextFlowContainer errorText;
             LinkFlowContainer forgottenPaswordLink;
 
@@ -81,7 +85,11 @@ namespace osu.Game.Overlays.Login
                 },
                 forgottenPaswordLink = new LinkFlowContainer
                 {
-                    Padding = new MarginPadding { Left = SettingsPanel.CONTENT_MARGINS },
+                    Padding = new MarginPadding
+                    {
+                        Left = SettingsPanel.CONTENT_MARGINS,
+                        Bottom = SettingsSection.ITEM_SPACING
+                    },
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
                 },

From 6929be49b707568074899d822c4df0d3e053cc2d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 28 Apr 2023 22:35:55 +0900
Subject: [PATCH 0201/1604] Change condition for exclusive fullscreen notice to
 only show when using the correct renderer

This avoids the notice showing when running on windows, but using the
newer renderers (where the underlying logic hasn't been tested properly
and can result in false-positives).

Supersedes https://github.com/ppy/osu-framework/pull/5759 as a more
correct implementation.
---
 osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index 2765d2b437..a46205d40d 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -256,7 +256,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                 return;
             }
 
-            if (host.Window is WindowsWindow)
+            if (host.Renderer is IWindowsRenderer)
             {
                 switch (fullscreenCapability.Value)
                 {

From f7c84030ac3c6cd1156f496540169840ed73421d Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Fri, 28 Apr 2023 17:22:34 +0200
Subject: [PATCH 0202/1604] remove bank default value

---
 osu.Game/Audio/HitSampleInfo.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Audio/HitSampleInfo.cs b/osu.Game/Audio/HitSampleInfo.cs
index e9c06152cc..efa5562cb8 100644
--- a/osu.Game/Audio/HitSampleInfo.cs
+++ b/osu.Game/Audio/HitSampleInfo.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
-using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Utils;
 
 namespace osu.Game.Audio
@@ -33,7 +32,7 @@ namespace osu.Game.Audio
         /// <summary>
         /// The bank to load the sample from.
         /// </summary>
-        public readonly string Bank;
+        public readonly string? Bank;
 
         /// <summary>
         /// An optional suffix to provide priority lookup. Falls back to non-suffixed <see cref="Name"/>.
@@ -48,7 +47,7 @@ namespace osu.Game.Audio
         public HitSampleInfo(string name, string? bank = null, string? suffix = null, int volume = 0)
         {
             Name = name;
-            Bank = bank ?? SampleControlPoint.DEFAULT_BANK;
+            Bank = bank;
             Suffix = suffix;
             Volume = volume;
         }

From 2d6c0d2900be5779bc1ceea643458372c403daeb Mon Sep 17 00:00:00 2001
From: _ltn <46729135+rltn@users.noreply.github.com>
Date: Fri, 28 Apr 2023 19:24:07 +0300
Subject: [PATCH 0203/1604] use of Child instead of Children

---
 .../Overlays/Profile/Header/TopHeaderContainer.cs  | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
index 618e487dc3..de678cb5d1 100644
--- a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Graphics.Sprites;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -164,16 +163,13 @@ namespace osu.Game.Overlays.Profile.Header
                                                         },
                                                         userCountryContainer = new OsuHoverContainer
                                                         {
-                                                            Margin = new MarginPadding { Left = 5 },
-                                                            Origin = Anchor.CentreLeft,
-                                                            Anchor = Anchor.CentreLeft,
                                                             AutoSizeAxes = Axes.Both,
-                                                            Children = new Drawable[]
+                                                            Anchor = Anchor.CentreLeft,
+                                                            Origin = Anchor.CentreLeft,
+                                                            Margin = new MarginPadding { Left = 5 },
+                                                            Child = userCountryText = new OsuSpriteText
                                                             {
-                                                                userCountryText = new OsuSpriteText
-                                                                {
-                                                                    Font = OsuFont.GetFont(size: 14f, weight: FontWeight.Regular),
-                                                                },
+                                                                Font = OsuFont.GetFont(size: 14f, weight: FontWeight.Regular),
                                                             },
                                                         },
                                                     }

From 607a04ae7319b823da095c948be9897767ff84bd Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Fri, 28 Apr 2023 17:45:00 +0300
Subject: [PATCH 0204/1604] Fix the issue

---
 osu.Game/Screens/Edit/Editor.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index d89392f757..b5d304a031 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -210,7 +210,10 @@ namespace osu.Game.Screens.Edit
                 // this is a bit haphazard, but guards against setting the lease Beatmap bindable if
                 // the editor has already been exited.
                 if (!ValidForPush)
+                {
+                    beatmapManager.Delete(loadableBeatmap.BeatmapSetInfo);
                     return;
+                }
             }
 
             try

From c5357d30ab0c545a7eb4dd652eeefcb828c1f433 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Fri, 28 Apr 2023 20:36:31 +0300
Subject: [PATCH 0205/1604] Add test

---
 .../Navigation/TestSceneBeatmapEditor.cs      | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditor.cs

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditor.cs b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditor.cs
new file mode 100644
index 0000000000..67835ed0f5
--- /dev/null
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditor.cs
@@ -0,0 +1,57 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using DeepEqual.Syntax;
+using NUnit.Framework;
+using osu.Framework.Screens;
+using osu.Game.Beatmaps;
+using osu.Game.Screens.Edit;
+using osu.Game.Screens.Menu;
+
+namespace osu.Game.Tests.Visual.Navigation
+{
+    public partial class TestSceneBeatmapEditor : OsuGameTestScene
+    {
+        [Test]
+        public void TestCancelNavigationToEditor()
+        {
+            BeatmapSetInfo[] beatmapSets = Array.Empty<BeatmapSetInfo>();
+
+            AddStep("Timestamp current beatmapsets", () =>
+            {
+                Game.Realm.Run(realm =>
+                {
+                    beatmapSets = realm.All<BeatmapSetInfo>().Where(x => !x.DeletePending).ToArray();
+                });
+            });
+
+            AddStep("Open editor and close it while loading", () =>
+            {
+                var task = Task.Run(async () =>
+                {
+                    await Task.Delay(100);
+                    Game.ScreenStack.CurrentScreen.Exit();
+                });
+
+                Game.ScreenStack.Push(new EditorLoader());
+            });
+
+            AddUntilStep("wait for editor", () => Game.ScreenStack.CurrentScreen is MainMenu);
+
+            BeatmapSetInfo[] currentSetInfos = Array.Empty<BeatmapSetInfo>();
+
+            AddStep("Get current beatmaps", () =>
+            {
+                Game.Realm.Run(realm =>
+                {
+                    currentSetInfos = realm.All<BeatmapSetInfo>().Where(x => !x.DeletePending).ToArray();
+                });
+            });
+
+            AddAssert("dummy beatmap didn't appear", () => currentSetInfos.IsDeepEqual(beatmapSets));
+        }
+    }
+}

From d9b3c97179d2f9fd5114909fcb323208ff630f22 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Fri, 28 Apr 2023 21:23:00 +0300
Subject: [PATCH 0206/1604] Fix testing

---
 .../Navigation/TestSceneBeatmapEditor.cs      | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditor.cs b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditor.cs
index 67835ed0f5..9760fc2c97 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditor.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditor.cs
@@ -1,9 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
 using System.Linq;
-using System.Threading.Tasks;
 using DeepEqual.Syntax;
 using NUnit.Framework;
 using osu.Framework.Screens;
@@ -18,7 +16,7 @@ namespace osu.Game.Tests.Visual.Navigation
         [Test]
         public void TestCancelNavigationToEditor()
         {
-            BeatmapSetInfo[] beatmapSets = Array.Empty<BeatmapSetInfo>();
+            BeatmapSetInfo[]? beatmapSets = null;
 
             AddStep("Timestamp current beatmapsets", () =>
             {
@@ -28,20 +26,26 @@ namespace osu.Game.Tests.Visual.Navigation
                 });
             });
 
-            AddStep("Open editor and close it while loading", () =>
+            AddStep("Set current beatmap to default", () =>
             {
-                var task = Task.Run(async () =>
-                {
-                    await Task.Delay(100);
-                    Game.ScreenStack.CurrentScreen.Exit();
-                });
+                Game.Beatmap.SetDefault();
+            });
 
+            AddStep("Open editor loader", () =>
+            {
                 Game.ScreenStack.Push(new EditorLoader());
             });
 
+            AddUntilStep("wait for editor", () => Game.ScreenStack.CurrentScreen is EditorLoader);
+
+            AddStep("close editor while loading", () =>
+            {
+                Game.ScreenStack.CurrentScreen.Exit();
+            });
+
             AddUntilStep("wait for editor", () => Game.ScreenStack.CurrentScreen is MainMenu);
 
-            BeatmapSetInfo[] currentSetInfos = Array.Empty<BeatmapSetInfo>();
+            BeatmapSetInfo[]? currentSetInfos = null;
 
             AddStep("Get current beatmaps", () =>
             {
@@ -51,7 +55,7 @@ namespace osu.Game.Tests.Visual.Navigation
                 });
             });
 
-            AddAssert("dummy beatmap didn't appear", () => currentSetInfos.IsDeepEqual(beatmapSets));
+            AddAssert("dummy beatmap didn't appear", () => currentSetInfos.IsDeepEqual(beatmapSets) && currentSetInfos is not null);
         }
     }
 }

From 428b5fad3c45a545820d3fec8e06e9ce05803020 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 29 Apr 2023 10:34:50 +0900
Subject: [PATCH 0207/1604] Rename test scene to explicitly mention navigation
 testing

---
 ...ceneBeatmapEditor.cs => TestSceneBeatmapEditorNavigation.cs} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename osu.Game.Tests/Visual/Navigation/{TestSceneBeatmapEditor.cs => TestSceneBeatmapEditorNavigation.cs} (96%)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditor.cs b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
similarity index 96%
rename from osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditor.cs
rename to osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
index 9760fc2c97..e1fba1d630 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditor.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
@@ -11,7 +11,7 @@ using osu.Game.Screens.Menu;
 
 namespace osu.Game.Tests.Visual.Navigation
 {
-    public partial class TestSceneBeatmapEditor : OsuGameTestScene
+    public partial class TestSceneBeatmapEditorNavigation : OsuGameTestScene
     {
         [Test]
         public void TestCancelNavigationToEditor()

From a6f01861124b3ba119c830c43178af95945864ad Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 29 Apr 2023 10:49:25 +0900
Subject: [PATCH 0208/1604] Improve legibility and code quality of new test

---
 .../TestSceneBeatmapEditorNavigation.cs       | 48 ++++++-------------
 1 file changed, 14 insertions(+), 34 deletions(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
index e1fba1d630..c76758e6c6 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
@@ -16,46 +16,26 @@ namespace osu.Game.Tests.Visual.Navigation
         [Test]
         public void TestCancelNavigationToEditor()
         {
-            BeatmapSetInfo[]? beatmapSets = null;
+            BeatmapSetInfo[] beatmapSets = null!;
 
-            AddStep("Timestamp current beatmapsets", () =>
+            AddStep("Fetch initial beatmaps", () =>
             {
-                Game.Realm.Run(realm =>
-                {
-                    beatmapSets = realm.All<BeatmapSetInfo>().Where(x => !x.DeletePending).ToArray();
-                });
+                beatmapSets = Game.Realm.Run(realm => realm.All<BeatmapSetInfo>().Where(x => !x.DeletePending).ToArray());
             });
 
-            AddStep("Set current beatmap to default", () =>
+            AddStep("Set current beatmap to default", () => Game.Beatmap.SetDefault());
+
+            AddStep("Push editor loader", () => Game.ScreenStack.Push(new EditorLoader()));
+            AddUntilStep("Wait for loader current", () => Game.ScreenStack.CurrentScreen is EditorLoader);
+            AddStep("Close editor while loading", () => Game.ScreenStack.CurrentScreen.Exit());
+
+            AddUntilStep("Wait for menu", () => Game.ScreenStack.CurrentScreen is MainMenu);
+
+            AddAssert("Check no new beatmaps were made", () =>
             {
-                Game.Beatmap.SetDefault();
+                var beatmapSetsAfter = Game.Realm.Run(realm => realm.All<BeatmapSetInfo>().Where(x => !x.DeletePending).ToArray());
+                return beatmapSetsAfter.SequenceEqual(beatmapSets);
             });
-
-            AddStep("Open editor loader", () =>
-            {
-                Game.ScreenStack.Push(new EditorLoader());
-            });
-
-            AddUntilStep("wait for editor", () => Game.ScreenStack.CurrentScreen is EditorLoader);
-
-            AddStep("close editor while loading", () =>
-            {
-                Game.ScreenStack.CurrentScreen.Exit();
-            });
-
-            AddUntilStep("wait for editor", () => Game.ScreenStack.CurrentScreen is MainMenu);
-
-            BeatmapSetInfo[]? currentSetInfos = null;
-
-            AddStep("Get current beatmaps", () =>
-            {
-                Game.Realm.Run(realm =>
-                {
-                    currentSetInfos = realm.All<BeatmapSetInfo>().Where(x => !x.DeletePending).ToArray();
-                });
-            });
-
-            AddAssert("dummy beatmap didn't appear", () => currentSetInfos.IsDeepEqual(beatmapSets) && currentSetInfos is not null);
         }
     }
 }

From 32f8c674f4d751937db57082cc872bc38a1c7bed Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 29 Apr 2023 11:01:29 +0900
Subject: [PATCH 0209/1604] Extract beatmap retrieval method for more
 legibility

---
 .../Navigation/TestSceneBeatmapEditorNavigation.cs  | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
index c76758e6c6..554da36cc4 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
-using DeepEqual.Syntax;
 using NUnit.Framework;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
@@ -18,10 +17,7 @@ namespace osu.Game.Tests.Visual.Navigation
         {
             BeatmapSetInfo[] beatmapSets = null!;
 
-            AddStep("Fetch initial beatmaps", () =>
-            {
-                beatmapSets = Game.Realm.Run(realm => realm.All<BeatmapSetInfo>().Where(x => !x.DeletePending).ToArray());
-            });
+            AddStep("Fetch initial beatmaps", () => beatmapSets = allBeatmapSets());
 
             AddStep("Set current beatmap to default", () => Game.Beatmap.SetDefault());
 
@@ -30,12 +26,9 @@ namespace osu.Game.Tests.Visual.Navigation
             AddStep("Close editor while loading", () => Game.ScreenStack.CurrentScreen.Exit());
 
             AddUntilStep("Wait for menu", () => Game.ScreenStack.CurrentScreen is MainMenu);
+            AddAssert("Check no new beatmaps were made", () => allBeatmapSets().SequenceEqual(beatmapSets));
 
-            AddAssert("Check no new beatmaps were made", () =>
-            {
-                var beatmapSetsAfter = Game.Realm.Run(realm => realm.All<BeatmapSetInfo>().Where(x => !x.DeletePending).ToArray());
-                return beatmapSetsAfter.SequenceEqual(beatmapSets);
-            });
+            BeatmapSetInfo[] allBeatmapSets() => Game.Realm.Run(realm => realm.All<BeatmapSetInfo>().Where(x => !x.DeletePending).ToArray());
         }
     }
 }

From 26431006448c9d192ac5931fc1fc3cf10f76c2a9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 29 Apr 2023 11:05:10 +0900
Subject: [PATCH 0210/1604] Add xmldoc to new test mentioning failure rate and
 general purpose

---
 .../Visual/Navigation/TestSceneBeatmapEditorNavigation.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
index 554da36cc4..603573058e 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
@@ -12,6 +12,14 @@ namespace osu.Game.Tests.Visual.Navigation
 {
     public partial class TestSceneBeatmapEditorNavigation : OsuGameTestScene
     {
+        /// <summary>
+        /// When entering the editor, a new beatmap is created as part of the asynchronous load process.
+        /// This test ensures that in the case of an early exit from the editor (ie. while it's still loading)
+        /// doesn't leave a dangling beatmap behind.
+        ///
+        /// This may not fail 100% due to timing, but has a pretty high chance of hitting a failure so works well enough
+        /// as a test.
+        /// </summary>
         [Test]
         public void TestCancelNavigationToEditor()
         {

From 3b0ba4b38bc886538d62e56fbbfdf7b081cf5d84 Mon Sep 17 00:00:00 2001
From: Terochi <mates.cernicky@gmail.com>
Date: Sat, 29 Apr 2023 19:52:22 +0200
Subject: [PATCH 0211/1604] Improved logic for `ApplyStateChange` for skin
 editor

---
 .../SkinEditor/SkinEditorChangeHandler.cs     | 65 ++++++++++++++++---
 1 file changed, 55 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinEditorChangeHandler.cs b/osu.Game/Overlays/SkinEditor/SkinEditorChangeHandler.cs
index d1a1850796..151557c9e1 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditorChangeHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditorChangeHandler.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -56,20 +57,64 @@ namespace osu.Game.Overlays.SkinEditor
             if (deserializedContent == null)
                 return;
 
-            SerialisedDrawableInfo[] skinnableInfo = deserializedContent.ToArray();
-            Drawable[] targetComponents = firstTarget.Components.OfType<Drawable>().ToArray();
+            SerialisedDrawableInfo[] skinnableInfos = deserializedContent.ToArray();
+            ISerialisableDrawable[] targetComponents = firstTarget.Components.ToArray();
 
-            if (!skinnableInfo.Select(s => s.Type).SequenceEqual(targetComponents.Select(d => d.GetType())))
+            // Store indexes based on type for later lookup
+
+            var skinnableInfoIndexes = new Dictionary<Type, List<int>>();
+            var targetComponentsIndexes = new Dictionary<Type, List<int>>();
+
+            for (int i = 0; i < skinnableInfos.Length; i++)
             {
-                // Perform a naive full reload for now.
-                firstTarget.Reload(skinnableInfo);
+                Type lookup = skinnableInfos[i].Type;
+
+                if (!skinnableInfoIndexes.TryGetValue(lookup, out List<int>? infoIndexes))
+                    skinnableInfoIndexes.Add(lookup, infoIndexes = new List<int>());
+
+                infoIndexes.Add(i);
             }
-            else
-            {
-                int i = 0;
 
-                foreach (var drawable in targetComponents)
-                    drawable.ApplySerialisedInfo(skinnableInfo[i++]);
+            for (int i = 0; i < targetComponents.Length; i++)
+            {
+                Type lookup = targetComponents[i].GetType();
+
+                if (!targetComponentsIndexes.TryGetValue(lookup, out List<int>? componentIndexes))
+                    targetComponentsIndexes.Add(lookup, componentIndexes = new List<int>());
+
+                componentIndexes.Add(i);
+            }
+
+            foreach ((Type lookup, List<int> infoIndexes) in skinnableInfoIndexes)
+            {
+                if (!targetComponentsIndexes.TryGetValue(lookup, out List<int>? componentIndexes))
+                    componentIndexes = new List<int>(0);
+
+                int j = 0;
+
+                for (int i = 0; i < infoIndexes.Count; i++)
+                {
+                    if (i >= componentIndexes.Count)
+                        // Add new component
+                        firstTarget.Add((ISerialisableDrawable)skinnableInfos[infoIndexes[i]].CreateInstance());
+                    else
+                        // Modify existing component
+                        ((Drawable)targetComponents[componentIndexes[j++]]).ApplySerialisedInfo(skinnableInfos[infoIndexes[i]]);
+                }
+
+                // Remove extra components
+                for (; j < componentIndexes.Count; j++)
+                    firstTarget.Remove(targetComponents[componentIndexes[j]], false);
+            }
+
+            foreach ((Type lookup, List<int> componentIndexes) in targetComponentsIndexes)
+            {
+                if (skinnableInfoIndexes.ContainsKey(lookup))
+                    continue;
+
+                // Remove extra components that weren't removed above
+                for (int i = 0; i < componentIndexes.Count; i++)
+                    firstTarget.Remove(targetComponents[componentIndexes[i]], false);
             }
         }
     }

From 17e4b75dfd5f55756e7d67316566bbb1f195a9dc Mon Sep 17 00:00:00 2001
From: Terochi <mates.cernicky@gmail.com>
Date: Sat, 29 Apr 2023 20:54:19 +0200
Subject: [PATCH 0212/1604] Save first state when editing

---
 osu.Game/Overlays/SkinEditor/SkinEditor.cs | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinEditor.cs b/osu.Game/Overlays/SkinEditor/SkinEditor.cs
index 2b23ce290f..f0ad92d4da 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditor.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditor.cs
@@ -235,10 +235,7 @@ namespace osu.Game.Overlays.SkinEditor
             }, true);
             canPaste.Current.BindValueChanged(paste => pasteMenuItem.Action.Disabled = !paste.NewValue, true);
 
-            SelectedComponents.BindCollectionChanged((_, _) =>
-            {
-                canCopy.Value = canCut.Value = SelectedComponents.Any();
-            }, true);
+            SelectedComponents.BindCollectionChanged((_, _) => canCopy.Value = canCut.Value = SelectedComponents.Any(), true);
 
             clipboard.Content.BindValueChanged(content => canPaste.Value = !string.IsNullOrEmpty(content.NewValue), true);
 
@@ -345,6 +342,7 @@ namespace osu.Game.Overlays.SkinEditor
             changeHandler = new SkinEditorChangeHandler(skinComponentsContainer);
             changeHandler.CanUndo.BindValueChanged(v => undoMenuItem.Action.Disabled = !v.NewValue, true);
             changeHandler.CanRedo.BindValueChanged(v => redoMenuItem.Action.Disabled = !v.NewValue, true);
+            changeHandler.SaveState();
 
             content.Child = new SkinBlueprintContainer(skinComponentsContainer);
 
@@ -479,12 +477,18 @@ namespace osu.Game.Overlays.SkinEditor
 
         protected void Cut()
         {
+            if (!canCut.Value)
+                return;
+
             Copy();
             DeleteItems(SelectedComponents.ToArray());
         }
 
         protected void Copy()
         {
+            if (!canCopy.Value)
+                return;
+
             clipboard.Content.Value = JsonConvert.SerializeObject(SelectedComponents.Cast<Drawable>().Select(s => s.CreateSerialisedInfo()).ToArray());
         }
 
@@ -500,6 +504,9 @@ namespace osu.Game.Overlays.SkinEditor
 
         protected void Paste()
         {
+            if (!canPaste.Value)
+                return;
+
             changeHandler?.BeginChange();
 
             var drawableInfo = JsonConvert.DeserializeObject<SerialisedDrawableInfo[]>(clipboard.Content.Value);

From ffcc8e91b242a22a17701566ac284a62d8f057c1 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Sat, 29 Apr 2023 23:51:49 +0200
Subject: [PATCH 0213/1604] fix legacy parser incorrectly assigning sample info
 for sliders

---
 osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index 68ca6bc506..ba5de6c14b 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -92,7 +92,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
                 }
 
                 if (split.Length > 10)
-                    readCustomSampleBanks(split[10], bankInfo);
+                    readCustomSampleBanks(split[10], bankInfo, true);
 
                 // One node for each repeat + the start and end nodes
                 int nodes = repeatCount + 2;
@@ -182,7 +182,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
             return result;
         }
 
-        private void readCustomSampleBanks(string str, SampleBankInfo bankInfo)
+        private void readCustomSampleBanks(string str, SampleBankInfo bankInfo, bool banksOnly = false)
         {
             if (string.IsNullOrEmpty(str))
                 return;
@@ -202,6 +202,8 @@ namespace osu.Game.Rulesets.Objects.Legacy
             bankInfo.BankForNormal = stringBank;
             bankInfo.BankForAdditions = string.IsNullOrEmpty(stringAddBank) ? stringBank : stringAddBank;
 
+            if (banksOnly) return;
+
             if (split.Length > 2)
                 bankInfo.CustomSampleBank = Parsing.ParseInt(split[2]);
 

From 92efd04f3138b62d49458fb296021e7101fb3105 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Sat, 29 Apr 2023 23:52:24 +0200
Subject: [PATCH 0214/1604] fix sample of drumroll ticks being bankless

---
 osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs           |  5 ++++-
 .../Objects/TaikoStrongableHitObject.cs               |  2 +-
 osu.Game/Rulesets/Objects/HitObject.cs                | 11 +++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
index 5613bb190a..c1a78f46b2 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
@@ -3,9 +3,11 @@
 
 #nullable disable
 
+using System.Linq;
 using osu.Game.Rulesets.Objects.Types;
 using System.Threading;
 using osu.Framework.Bindables;
+using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Formats;
@@ -90,7 +92,8 @@ namespace osu.Game.Rulesets.Taiko.Objects
                     FirstTick = first,
                     TickSpacing = tickSpacing,
                     StartTime = t,
-                    IsStrong = IsStrong
+                    IsStrong = IsStrong,
+                    Samples = Samples.Where(s => s.Name == HitSampleInfo.HIT_FINISH).ToList()
                 });
 
                 first = false;
diff --git a/osu.Game.Rulesets.Taiko/Objects/TaikoStrongableHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/TaikoStrongableHitObject.cs
index d4d59d5d44..0043f231d2 100644
--- a/osu.Game.Rulesets.Taiko/Objects/TaikoStrongableHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/TaikoStrongableHitObject.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Taiko.Objects
             if (IsStrongBindable.Value != strongSamples.Any())
             {
                 if (IsStrongBindable.Value)
-                    Samples.Add(new HitSampleInfo(HitSampleInfo.HIT_FINISH));
+                    Samples.Add(GetSampleInfo(HitSampleInfo.HIT_FINISH));
                 else
                 {
                     foreach (var sample in strongSamples)
diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs
index 095ec1ff1b..774ff9dc1d 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -204,6 +204,17 @@ namespace osu.Game.Rulesets.Objects
 
             return slidingSamples;
         }
+
+        /// <summary>
+        /// Create a SampleInfo based on the sample settings of the hit normal sample in <see cref="Samples"/>.
+        /// </summary>
+        /// <param name="sampleName">The name of the sample.</param>
+        /// <returns>A populated <see cref="HitSampleInfo"/>.</returns>
+        protected HitSampleInfo GetSampleInfo(string sampleName)
+        {
+            var hitnormalSample = Samples.FirstOrDefault(s => s.Name == HitSampleInfo.HIT_NORMAL);
+            return hitnormalSample == null ? new HitSampleInfo(sampleName) : hitnormalSample.With(newName: sampleName);
+        }
     }
 
     public static class HitObjectExtensions

From a6e780a1b9c5740e74c17d9c9f098a9e30e4871f Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Sat, 29 Apr 2023 23:52:30 +0200
Subject: [PATCH 0215/1604] Update CheckMutedObjectsTest.cs

---
 .../Editing/Checks/CheckMutedObjectsTest.cs   | 104 +-----------------
 1 file changed, 6 insertions(+), 98 deletions(-)

diff --git a/osu.Game.Tests/Editing/Checks/CheckMutedObjectsTest.cs b/osu.Game.Tests/Editing/Checks/CheckMutedObjectsTest.cs
index 1e1c214c30..5a3ef619d1 100644
--- a/osu.Game.Tests/Editing/Checks/CheckMutedObjectsTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckMutedObjectsTest.cs
@@ -37,45 +37,6 @@ namespace osu.Game.Tests.Editing.Checks
             cpi.Add(2000, new SampleControlPoint { SampleVolume = volume_muted });
         }
 
-        [Test]
-        public void TestNormalControlPointVolume()
-        {
-            var hitCircle = new HitCircle
-            {
-                StartTime = 0,
-                Samples = new List<HitSampleInfo> { new HitSampleInfo(HitSampleInfo.HIT_NORMAL) }
-            };
-            hitCircle.ApplyDefaults(cpi, new BeatmapDifficulty());
-
-            assertOk(new List<HitObject> { hitCircle });
-        }
-
-        [Test]
-        public void TestLowControlPointVolume()
-        {
-            var hitCircle = new HitCircle
-            {
-                StartTime = 1000,
-                Samples = new List<HitSampleInfo> { new HitSampleInfo(HitSampleInfo.HIT_NORMAL) }
-            };
-            hitCircle.ApplyDefaults(cpi, new BeatmapDifficulty());
-
-            assertLowVolume(new List<HitObject> { hitCircle });
-        }
-
-        [Test]
-        public void TestMutedControlPointVolume()
-        {
-            var hitCircle = new HitCircle
-            {
-                StartTime = 2000,
-                Samples = new List<HitSampleInfo> { new HitSampleInfo(HitSampleInfo.HIT_NORMAL) }
-            };
-            hitCircle.ApplyDefaults(cpi, new BeatmapDifficulty());
-
-            assertMuted(new List<HitObject> { hitCircle });
-        }
-
         [Test]
         public void TestNormalSampleVolume()
         {
@@ -122,7 +83,7 @@ namespace osu.Game.Tests.Editing.Checks
             var sliderHead = new SliderHeadCircle
             {
                 StartTime = 0,
-                Samples = new List<HitSampleInfo> { new HitSampleInfo(HitSampleInfo.HIT_NORMAL) }
+                Samples = new List<HitSampleInfo> { new HitSampleInfo(HitSampleInfo.HIT_NORMAL, volume: volume_regular) }
             };
             sliderHead.ApplyDefaults(cpi, new BeatmapDifficulty());
 
@@ -135,7 +96,7 @@ namespace osu.Game.Tests.Editing.Checks
 
             var slider = new MockNestableHitObject(new List<HitObject> { sliderHead, sliderTick, }, startTime: 0, endTime: 500)
             {
-                Samples = new List<HitSampleInfo> { new HitSampleInfo(HitSampleInfo.HIT_NORMAL) }
+                Samples = new List<HitSampleInfo> { new HitSampleInfo(HitSampleInfo.HIT_NORMAL, volume: volume_regular) }
             };
             slider.ApplyDefaults(cpi, new BeatmapDifficulty());
 
@@ -155,13 +116,13 @@ namespace osu.Game.Tests.Editing.Checks
             var sliderTick = new SliderTick
             {
                 StartTime = 250,
-                Samples = new List<HitSampleInfo> { new HitSampleInfo("slidertick") }
+                Samples = new List<HitSampleInfo> { new HitSampleInfo("slidertick", volume: volume_regular) }
             };
             sliderTick.ApplyDefaults(cpi, new BeatmapDifficulty());
 
             var slider = new MockNestableHitObject(new List<HitObject> { sliderHead, sliderTick, }, startTime: 0, endTime: 500)
             {
-                Samples = new List<HitSampleInfo> { new HitSampleInfo(HitSampleInfo.HIT_NORMAL) } // Applies to the tail.
+                Samples = new List<HitSampleInfo> { new HitSampleInfo(HitSampleInfo.HIT_NORMAL, volume: volume_regular) } // Applies to the tail.
             };
             slider.ApplyDefaults(cpi, new BeatmapDifficulty());
 
@@ -174,14 +135,14 @@ namespace osu.Game.Tests.Editing.Checks
             var sliderHead = new SliderHeadCircle
             {
                 StartTime = 0,
-                Samples = new List<HitSampleInfo> { new HitSampleInfo(HitSampleInfo.HIT_NORMAL) }
+                Samples = new List<HitSampleInfo> { new HitSampleInfo(HitSampleInfo.HIT_NORMAL, volume: volume_regular) }
             };
             sliderHead.ApplyDefaults(cpi, new BeatmapDifficulty());
 
             var sliderTick = new SliderTick
             {
                 StartTime = 250,
-                Samples = new List<HitSampleInfo> { new HitSampleInfo("slidertick") }
+                Samples = new List<HitSampleInfo> { new HitSampleInfo("slidertick", volume: volume_regular) }
             };
             sliderTick.ApplyDefaults(cpi, new BeatmapDifficulty());
 
@@ -194,59 +155,6 @@ namespace osu.Game.Tests.Editing.Checks
             assertMutedPassive(new List<HitObject> { slider });
         }
 
-        [Test]
-        public void TestMutedControlPointVolumeSliderHead()
-        {
-            var sliderHead = new SliderHeadCircle
-            {
-                StartTime = 2000,
-                Samples = new List<HitSampleInfo> { new HitSampleInfo(HitSampleInfo.HIT_NORMAL) }
-            };
-            sliderHead.ApplyDefaults(cpi, new BeatmapDifficulty());
-
-            var sliderTick = new SliderTick
-            {
-                StartTime = 2250,
-                Samples = new List<HitSampleInfo> { new HitSampleInfo("slidertick") }
-            };
-            sliderTick.ApplyDefaults(cpi, new BeatmapDifficulty());
-
-            var slider = new MockNestableHitObject(new List<HitObject> { sliderHead, sliderTick, }, startTime: 2000, endTime: 2500)
-            {
-                Samples = new List<HitSampleInfo> { new HitSampleInfo(HitSampleInfo.HIT_NORMAL, volume: volume_regular) }
-            };
-            slider.ApplyDefaults(cpi, new BeatmapDifficulty());
-
-            assertMuted(new List<HitObject> { slider });
-        }
-
-        [Test]
-        public void TestMutedControlPointVolumeSliderTail()
-        {
-            var sliderHead = new SliderHeadCircle
-            {
-                StartTime = 0,
-                Samples = new List<HitSampleInfo> { new HitSampleInfo(HitSampleInfo.HIT_NORMAL) }
-            };
-            sliderHead.ApplyDefaults(cpi, new BeatmapDifficulty());
-
-            var sliderTick = new SliderTick
-            {
-                StartTime = 250,
-                Samples = new List<HitSampleInfo> { new HitSampleInfo("slidertick") }
-            };
-            sliderTick.ApplyDefaults(cpi, new BeatmapDifficulty());
-
-            // Ends after the 5% control point.
-            var slider = new MockNestableHitObject(new List<HitObject> { sliderHead, sliderTick, }, startTime: 0, endTime: 2500)
-            {
-                Samples = new List<HitSampleInfo> { new HitSampleInfo(HitSampleInfo.HIT_NORMAL) }
-            };
-            slider.ApplyDefaults(cpi, new BeatmapDifficulty());
-
-            assertMutedPassive(new List<HitObject> { slider });
-        }
-
         private void assertOk(List<HitObject> hitObjects)
         {
             Assert.That(check.Run(getContext(hitObjects)), Is.Empty);

From 83111223e0d9ef4ea85c16746a6d79c0e31b6bd2 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Sun, 30 Apr 2023 01:08:52 +0200
Subject: [PATCH 0216/1604] fix null sample

---
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index 91dd7754d0..96128c6981 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -76,7 +76,8 @@ namespace osu.Game.Rulesets.Edit
         {
             // Take the hitnormal sample of the last hit object
             var lastHitNormal = beatmap.HitObjects.LastOrDefault(h => h.GetEndTime() < HitObject.StartTime)?.Samples?.FirstOrDefault(o => o.Name == HitSampleInfo.HIT_NORMAL);
-            HitObject.Samples.Add(lastHitNormal);
+            if (lastHitNormal != null)
+                HitObject.Samples[0] = lastHitNormal;
 
             placementHandler.BeginPlacement(HitObject);
             if (commitStart)

From 9a9e02b110431b32bcf9281db2349ef1418c8abe Mon Sep 17 00:00:00 2001
From: Terochi <mates.cernicky@gmail.com>
Date: Sun, 30 Apr 2023 02:00:35 +0200
Subject: [PATCH 0217/1604] Added tests

---
 .../Visual/Gameplay/TestSceneSkinEditor.cs    | 89 ++++++++++++++-----
 1 file changed, 69 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
index 119b753d70..71eabd776a 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
@@ -2,12 +2,15 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input;
 using osu.Framework.Testing;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Settings;
@@ -97,15 +100,10 @@ namespace osu.Game.Tests.Visual.Gameplay
                 InputManager.PressButton(MouseButton.Left);
             });
 
-            AddStep("Drag to bottom right", () =>
-            {
-                InputManager.MoveMouseTo(box3.ScreenSpaceDrawQuad.TopRight + new Vector2(-box3.ScreenSpaceDrawQuad.Width / 8, box3.ScreenSpaceDrawQuad.Height / 4));
-            });
+            AddStep("Drag to bottom right",
+                () => { InputManager.MoveMouseTo(box3.ScreenSpaceDrawQuad.TopRight + new Vector2(-box3.ScreenSpaceDrawQuad.Width / 8, box3.ScreenSpaceDrawQuad.Height / 4)); });
 
-            AddStep("Release button", () =>
-            {
-                InputManager.ReleaseButton(MouseButton.Left);
-            });
+            AddStep("Release button", () => { InputManager.ReleaseButton(MouseButton.Left); });
 
             AddAssert("First two boxes selected", () => skinEditor.SelectedComponents, () => Is.EqualTo(new[] { box1, box2 }));
 
@@ -115,15 +113,9 @@ namespace osu.Game.Tests.Visual.Gameplay
                 InputManager.PressButton(MouseButton.Left);
             });
 
-            AddStep("Drag to top left", () =>
-            {
-                InputManager.MoveMouseTo(box2.ScreenSpaceDrawQuad.Centre - new Vector2(box2.ScreenSpaceDrawQuad.Width / 4));
-            });
+            AddStep("Drag to top left", () => { InputManager.MoveMouseTo(box2.ScreenSpaceDrawQuad.Centre - new Vector2(box2.ScreenSpaceDrawQuad.Width / 4)); });
 
-            AddStep("Release button", () =>
-            {
-                InputManager.ReleaseButton(MouseButton.Left);
-            });
+            AddStep("Release button", () => { InputManager.ReleaseButton(MouseButton.Left); });
 
             AddAssert("Last two boxes selected", () => skinEditor.SelectedComponents, () => Is.EqualTo(new[] { box2, box3 }));
 
@@ -147,10 +139,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddAssert("Three black boxes added", () => targetContainer.Components.OfType<BigBlackBox>().Count(), () => Is.EqualTo(3));
 
-            AddStep("Store black box blueprints", () =>
-            {
-                blueprints = skinEditor.ChildrenOfType<SkinBlueprint>().Where(b => b.Item is BigBlackBox).ToArray();
-            });
+            AddStep("Store black box blueprints", () => { blueprints = skinEditor.ChildrenOfType<SkinBlueprint>().Where(b => b.Item is BigBlackBox).ToArray(); });
 
             AddAssert("Selection is black box 1", () => skinEditor.SelectedComponents.Single(), () => Is.EqualTo(blueprints[0].Item));
 
@@ -182,6 +171,48 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("all boxes still selected", () => skinEditor.SelectedComponents, () => Has.Count.EqualTo(2));
         }
 
+        [Test]
+        public void TestUndo()
+        {
+            SkinComponentsContainer firstTarget = null!;
+            TestSkinEditorChangeHandler changeHandler = null!;
+            byte[] defaultState = null!;
+            IEnumerable<ISerialisableDrawable> testComponents = null!;
+
+            AddStep("Load necessary things", () =>
+            {
+                firstTarget = Player.ChildrenOfType<SkinComponentsContainer>().First();
+                changeHandler = new TestSkinEditorChangeHandler(firstTarget);
+                changeHandler.SaveState();
+                defaultState = changeHandler.GetCurrentState();
+                testComponents = new[] { targetContainer.Components.First(), targetContainer.Components[targetContainer.Components.Count / 2], targetContainer.Components.Last() };
+            });
+
+            AddStep("Press undo", () => InputManager.Keys(PlatformAction.Undo));
+            AddAssert("Nothing changed", () => defaultState.SequenceEqual(changeHandler.GetCurrentState()));
+
+            AddStep("Add big black boxes", () =>
+            {
+                InputManager.MoveMouseTo(skinEditor.ChildrenOfType<BigBlackBox>().First());
+                InputManager.Click(MouseButton.Left);
+                InputManager.Click(MouseButton.Left);
+                InputManager.Click(MouseButton.Left);
+            });
+            AddStep("Revert changes", () => changeHandler.RestoreState(int.MinValue));
+            AddAssert("Nothing changed", () => defaultState.SequenceEqual(changeHandler.GetCurrentState()));
+
+            AddStep("Select components", () => skinEditor.SelectedComponents.AddRange(testComponents));
+            AddStep("Bring to front", () => skinEditor.BringSelectionToFront());
+
+            AddStep("Revert changes", () => changeHandler.RestoreState(int.MinValue));
+            AddAssert("Nothing changed", () => defaultState.SequenceEqual(changeHandler.GetCurrentState()));
+
+            AddStep("Remove components", () => testComponents.ForEach(c => firstTarget.Remove(c, false)));
+
+            AddStep("Revert changes", () => changeHandler.RestoreState(int.MinValue));
+            AddAssert("Nothing changed", () => defaultState.SequenceEqual(changeHandler.GetCurrentState()));
+        }
+
         [TestCase(false)]
         [TestCase(true)]
         public void TestBringToFront(bool alterSelectionOrder)
@@ -269,5 +300,23 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
+
+        private partial class TestSkinEditorChangeHandler : SkinEditorChangeHandler
+        {
+            public TestSkinEditorChangeHandler(Drawable targetScreen)
+                : base(targetScreen)
+            {
+            }
+
+            public byte[] GetCurrentState()
+            {
+                using var stream = new MemoryStream();
+
+                WriteCurrentStateToStream(stream);
+                byte[] newState = stream.ToArray();
+
+                return newState;
+            }
+        }
     }
 }

From 8ec2154965cd79939daa44adb7d0c678606bfae8 Mon Sep 17 00:00:00 2001
From: Terochi <mates.cernicky@gmail.com>
Date: Sun, 30 Apr 2023 02:01:18 +0200
Subject: [PATCH 0218/1604] Fixed `ApplyStateChange` to happen in correct order

---
 .../SkinEditor/SkinEditorChangeHandler.cs     | 48 +++++++------------
 1 file changed, 18 insertions(+), 30 deletions(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinEditorChangeHandler.cs b/osu.Game/Overlays/SkinEditor/SkinEditorChangeHandler.cs
index 151557c9e1..f38f6b0911 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditorChangeHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditorChangeHandler.cs
@@ -62,19 +62,8 @@ namespace osu.Game.Overlays.SkinEditor
 
             // Store indexes based on type for later lookup
 
-            var skinnableInfoIndexes = new Dictionary<Type, List<int>>();
             var targetComponentsIndexes = new Dictionary<Type, List<int>>();
 
-            for (int i = 0; i < skinnableInfos.Length; i++)
-            {
-                Type lookup = skinnableInfos[i].Type;
-
-                if (!skinnableInfoIndexes.TryGetValue(lookup, out List<int>? infoIndexes))
-                    skinnableInfoIndexes.Add(lookup, infoIndexes = new List<int>());
-
-                infoIndexes.Add(i);
-            }
-
             for (int i = 0; i < targetComponents.Length; i++)
             {
                 Type lookup = targetComponents[i].GetType();
@@ -85,35 +74,34 @@ namespace osu.Game.Overlays.SkinEditor
                 componentIndexes.Add(i);
             }
 
-            foreach ((Type lookup, List<int> infoIndexes) in skinnableInfoIndexes)
+            var indexCounting = new Dictionary<Type, int>();
+
+            var empty = new List<int>(0);
+
+            for (int i = 0; i < skinnableInfos.Length; i++)
             {
+                Type lookup = skinnableInfos[i].Type;
+
                 if (!targetComponentsIndexes.TryGetValue(lookup, out List<int>? componentIndexes))
-                    componentIndexes = new List<int>(0);
+                    componentIndexes = empty;
 
-                int j = 0;
+                if (!indexCounting.ContainsKey(lookup))
+                    indexCounting.Add(lookup, 0);
 
-                for (int i = 0; i < infoIndexes.Count; i++)
-                {
-                    if (i >= componentIndexes.Count)
-                        // Add new component
-                        firstTarget.Add((ISerialisableDrawable)skinnableInfos[infoIndexes[i]].CreateInstance());
-                    else
-                        // Modify existing component
-                        ((Drawable)targetComponents[componentIndexes[j++]]).ApplySerialisedInfo(skinnableInfos[infoIndexes[i]]);
-                }
-
-                // Remove extra components
-                for (; j < componentIndexes.Count; j++)
-                    firstTarget.Remove(targetComponents[componentIndexes[j]], false);
+                if (i >= componentIndexes.Count)
+                    // Add new component
+                    firstTarget.Add((ISerialisableDrawable)skinnableInfos[i].CreateInstance());
+                else
+                    // Modify existing component
+                    ((Drawable)targetComponents[componentIndexes[indexCounting[lookup]++]]).ApplySerialisedInfo(skinnableInfos[i]);
             }
 
             foreach ((Type lookup, List<int> componentIndexes) in targetComponentsIndexes)
             {
-                if (skinnableInfoIndexes.ContainsKey(lookup))
-                    continue;
+                indexCounting.TryGetValue(lookup, out int i);
 
                 // Remove extra components that weren't removed above
-                for (int i = 0; i < componentIndexes.Count; i++)
+                for (; i < componentIndexes.Count; i++)
                     firstTarget.Remove(targetComponents[componentIndexes[i]], false);
             }
         }

From 585318400cacf70533aefef88d2880f30d4f909b Mon Sep 17 00:00:00 2001
From: Terochi <mates.cernicky@gmail.com>
Date: Sun, 30 Apr 2023 02:32:20 +0200
Subject: [PATCH 0219/1604] Refactor tests

---
 .../Visual/Gameplay/TestSceneSkinEditor.cs          | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
index 71eabd776a..45cc329f53 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
@@ -183,15 +183,22 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
                 firstTarget = Player.ChildrenOfType<SkinComponentsContainer>().First();
                 changeHandler = new TestSkinEditorChangeHandler(firstTarget);
+
                 changeHandler.SaveState();
                 defaultState = changeHandler.GetCurrentState();
-                testComponents = new[] { targetContainer.Components.First(), targetContainer.Components[targetContainer.Components.Count / 2], targetContainer.Components.Last() };
+
+                testComponents = new[]
+                {
+                    targetContainer.Components.First(),
+                    targetContainer.Components[targetContainer.Components.Count / 2],
+                    targetContainer.Components.Last()
+                };
             });
 
             AddStep("Press undo", () => InputManager.Keys(PlatformAction.Undo));
             AddAssert("Nothing changed", () => defaultState.SequenceEqual(changeHandler.GetCurrentState()));
 
-            AddStep("Add big black boxes", () =>
+            AddStep("Add components", () =>
             {
                 InputManager.MoveMouseTo(skinEditor.ChildrenOfType<BigBlackBox>().First());
                 InputManager.Click(MouseButton.Left);
@@ -203,12 +210,10 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddStep("Select components", () => skinEditor.SelectedComponents.AddRange(testComponents));
             AddStep("Bring to front", () => skinEditor.BringSelectionToFront());
-
             AddStep("Revert changes", () => changeHandler.RestoreState(int.MinValue));
             AddAssert("Nothing changed", () => defaultState.SequenceEqual(changeHandler.GetCurrentState()));
 
             AddStep("Remove components", () => testComponents.ForEach(c => firstTarget.Remove(c, false)));
-
             AddStep("Revert changes", () => changeHandler.RestoreState(int.MinValue));
             AddAssert("Nothing changed", () => defaultState.SequenceEqual(changeHandler.GetCurrentState()));
         }

From b39a9d816e1881bd40e471aa738fe8d455828871 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 29 Apr 2023 16:05:45 +0900
Subject: [PATCH 0220/1604] Add basic structural requirements for cursor
 ripples

---
 .../Configuration/OsuRulesetConfigManager.cs  |  2 ++
 .../Legacy/OsuLegacySkinTransformer.cs        |  5 +++++
 .../UI/Cursor/CursorRippleVisualiser.cs       | 21 +++++++++++++++++++
 .../UI/Cursor/OsuCursorContainer.cs           |  1 +
 .../UI/OsuSettingsSubsection.cs               |  5 +++++
 .../Localisation/RulesetSettingsStrings.cs    |  5 +++++
 6 files changed, 39 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs

diff --git a/osu.Game.Rulesets.Osu/Configuration/OsuRulesetConfigManager.cs b/osu.Game.Rulesets.Osu/Configuration/OsuRulesetConfigManager.cs
index b8ad61e6dd..2056a50eda 100644
--- a/osu.Game.Rulesets.Osu/Configuration/OsuRulesetConfigManager.cs
+++ b/osu.Game.Rulesets.Osu/Configuration/OsuRulesetConfigManager.cs
@@ -22,6 +22,7 @@ namespace osu.Game.Rulesets.Osu.Configuration
             SetDefault(OsuRulesetSetting.SnakingInSliders, true);
             SetDefault(OsuRulesetSetting.SnakingOutSliders, true);
             SetDefault(OsuRulesetSetting.ShowCursorTrail, true);
+            SetDefault(OsuRulesetSetting.ShowCursorRipples, false);
             SetDefault(OsuRulesetSetting.PlayfieldBorderStyle, PlayfieldBorderStyle.None);
         }
     }
@@ -31,6 +32,7 @@ namespace osu.Game.Rulesets.Osu.Configuration
         SnakingInSliders,
         SnakingOutSliders,
         ShowCursorTrail,
+        ShowCursorRipples,
         PlayfieldBorderStyle,
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index 620540b8ef..279835747f 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -100,6 +100,11 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
                         return null;
 
+                    case OsuSkinComponents.CursorRipple:
+                        // TODO: resize texture to 0.5?? but that might break skins..
+                        if (GetTexture("cursor-ripple") != null)
+                            return this.GetAnimation("cursor-ripple", false, false);
+
                     case OsuSkinComponents.CursorParticles:
                         if (GetTexture("star2") != null)
                             return new LegacyCursorParticles();
diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs b/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs
new file mode 100644
index 0000000000..ef0cae7de8
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs
@@ -0,0 +1,21 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Osu.Configuration;
+
+namespace osu.Game.Rulesets.Osu.UI.Cursor
+{
+    public partial class CursorRippleVisualiser : CompositeDrawable
+    {
+        private readonly Bindable<bool> showRipples = new Bindable<bool>(true);
+
+        [BackgroundDependencyLoader(true)]
+        private void load(OsuRulesetConfigManager rulesetConfig)
+        {
+            rulesetConfig?.BindWith(OsuRulesetSetting.ShowCursorTrail, showRipples);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs b/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
index 5d7648b073..2b541bd345 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
@@ -48,6 +48,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                 Children = new[]
                 {
                     cursorTrail = new SkinnableDrawable(new OsuSkinComponentLookup(OsuSkinComponents.CursorTrail), _ => new DefaultCursorTrail(), confineMode: ConfineMode.NoScaling),
+                    new SkinnableDrawable(new OsuSkinComponentLookup(OsuSkinComponents.CursorRipples), confineMode: ConfineMode.NoScaling),
                     new SkinnableDrawable(new OsuSkinComponentLookup(OsuSkinComponents.CursorParticles), confineMode: ConfineMode.NoScaling),
                 }
             };
diff --git a/osu.Game.Rulesets.Osu/UI/OsuSettingsSubsection.cs b/osu.Game.Rulesets.Osu/UI/OsuSettingsSubsection.cs
index 64c4e7eef6..0e410dbf57 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuSettingsSubsection.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuSettingsSubsection.cs
@@ -43,6 +43,11 @@ namespace osu.Game.Rulesets.Osu.UI
                     LabelText = RulesetSettingsStrings.CursorTrail,
                     Current = config.GetBindable<bool>(OsuRulesetSetting.ShowCursorTrail)
                 },
+                new SettingsCheckbox
+                {
+                    LabelText = RulesetSettingsStrings.CursorRipples,
+                    Current = config.GetBindable<bool>(OsuRulesetSetting.ShowCursorRipples)
+                },
                 new SettingsEnumDropdown<PlayfieldBorderStyle>
                 {
                     LabelText = RulesetSettingsStrings.PlayfieldBorderStyle,
diff --git a/osu.Game/Localisation/RulesetSettingsStrings.cs b/osu.Game/Localisation/RulesetSettingsStrings.cs
index 1b0df6ecf6..52e6a5eaac 100644
--- a/osu.Game/Localisation/RulesetSettingsStrings.cs
+++ b/osu.Game/Localisation/RulesetSettingsStrings.cs
@@ -29,6 +29,11 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString CursorTrail => new TranslatableString(getKey(@"cursor_trail"), @"Cursor trail");
 
+        /// <summary>
+        /// "Cursor ripples"
+        /// </summary>
+        public static LocalisableString CursorRipples => new TranslatableString(getKey(@"cursor_ripples"), @"Cursor ripples");
+
         /// <summary>
         /// "Playfield border style"
         /// </summary>

From a4ae9e409bf1cb5e9c2f614e2967dc3bf82210b7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 29 Apr 2023 16:06:08 +0900
Subject: [PATCH 0221/1604] Implement ripples (legacy and default)

---
 .../TestSceneGameplayCursor.cs                | 13 +++++
 osu.Game.Rulesets.Osu/OsuSkinComponents.cs    |  1 +
 .../Legacy/OsuLegacySkinTransformer.cs        |  2 +
 .../UI/Cursor/CursorRippleVisualiser.cs       | 53 +++++++++++++++++--
 .../UI/Cursor/OsuCursorContainer.cs           |  2 +-
 5 files changed, 67 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
index 907422858e..c84a6ab70f 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
@@ -8,6 +8,7 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -18,6 +19,7 @@ using osu.Framework.Testing.Input;
 using osu.Framework.Utils;
 using osu.Game.Audio;
 using osu.Game.Configuration;
+using osu.Game.Rulesets.Osu.Configuration;
 using osu.Game.Rulesets.Osu.Skinning;
 using osu.Game.Rulesets.Osu.UI.Cursor;
 using osu.Game.Screens.Play;
@@ -40,6 +42,8 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private Drawable background;
 
+        private readonly Bindable<bool> ripples = new Bindable<bool>();
+
         public TestSceneGameplayCursor()
         {
             var ruleset = new OsuRuleset();
@@ -57,6 +61,8 @@ namespace osu.Game.Rulesets.Osu.Tests
                 });
             });
 
+            AddToggleStep("ripples", v => ripples.Value = v);
+
             AddSliderStep("circle size", 0f, 10f, 0f, val =>
             {
                 config.SetValue(OsuSetting.AutoCursorSize, true);
@@ -67,6 +73,13 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddStep("test cursor container", () => loadContent(false));
         }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            var rulesetConfig = (OsuRulesetConfigManager)RulesetConfigs.GetConfigFor(Ruleset.Value.CreateInstance()).AsNonNull();
+            rulesetConfig.BindWith(OsuRulesetSetting.ShowCursorRipples, ripples);
+        }
+
         [TestCase(1, 1)]
         [TestCase(5, 1)]
         [TestCase(10, 1)]
diff --git a/osu.Game.Rulesets.Osu/OsuSkinComponents.cs b/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
index 8fdf3821fa..52fdfea95f 100644
--- a/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
+++ b/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
@@ -10,6 +10,7 @@ namespace osu.Game.Rulesets.Osu
         Cursor,
         CursorTrail,
         CursorParticles,
+        CursorRipple,
         SliderScorePoint,
         ReverseArrow,
         HitCircleText,
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index 279835747f..bf817eda29 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -105,6 +105,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         if (GetTexture("cursor-ripple") != null)
                             return this.GetAnimation("cursor-ripple", false, false);
 
+                        return null;
+
                     case OsuSkinComponents.CursorParticles:
                         if (GetTexture("star2") != null)
                             return new LegacyCursorParticles();
diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs b/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs
index ef0cae7de8..401525efcd 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs
@@ -3,19 +3,66 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Osu.Configuration;
+using osu.Game.Rulesets.Osu.Skinning.Default;
+using osu.Game.Skinning;
+using osuTK;
 
 namespace osu.Game.Rulesets.Osu.UI.Cursor
 {
-    public partial class CursorRippleVisualiser : CompositeDrawable
+    public partial class CursorRippleVisualiser : CompositeDrawable, IKeyBindingHandler<OsuAction>
     {
         private readonly Bindable<bool> showRipples = new Bindable<bool>(true);
 
         [BackgroundDependencyLoader(true)]
-        private void load(OsuRulesetConfigManager rulesetConfig)
+        private void load(OsuRulesetConfigManager? rulesetConfig)
         {
-            rulesetConfig?.BindWith(OsuRulesetSetting.ShowCursorTrail, showRipples);
+            rulesetConfig?.BindWith(OsuRulesetSetting.ShowCursorRipples, showRipples);
+        }
+
+        public bool OnPressed(KeyBindingPressEvent<OsuAction> e)
+        {
+            if (showRipples.Value)
+            {
+                var ripple = new SkinnableDrawable(new OsuSkinComponentLookup(OsuSkinComponents.CursorRipple), _ => new DefaultCursorRipple())
+                {
+                    Blending = BlendingParameters.Additive,
+                    Position = e.MousePosition
+                };
+
+                AddInternal(ripple);
+
+                ripple.ScaleTo(0.05f)
+                      .ScaleTo(0.5f, 700, Easing.Out)
+                      .FadeTo(0.2f)
+                      .FadeOut(700)
+                      .Expire();
+            }
+
+            return false;
+        }
+
+        public void OnReleased(KeyBindingReleaseEvent<OsuAction> e)
+        {
+        }
+
+        public partial class DefaultCursorRipple : CompositeDrawable
+        {
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                InternalChildren = new Drawable[]
+                {
+                    new RingPiece(3)
+                    {
+                        Size = new Vector2(512),
+                    }
+                };
+            }
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs b/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
index 2b541bd345..35fb8e67d8 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                 Children = new[]
                 {
                     cursorTrail = new SkinnableDrawable(new OsuSkinComponentLookup(OsuSkinComponents.CursorTrail), _ => new DefaultCursorTrail(), confineMode: ConfineMode.NoScaling),
-                    new SkinnableDrawable(new OsuSkinComponentLookup(OsuSkinComponents.CursorRipples), confineMode: ConfineMode.NoScaling),
+                    new CursorRippleVisualiser(),
                     new SkinnableDrawable(new OsuSkinComponentLookup(OsuSkinComponents.CursorParticles), confineMode: ConfineMode.NoScaling),
                 }
             };

From c994adfc22a3c7a25985988bd2b9f48ac47c3b58 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 29 Apr 2023 22:00:17 +0900
Subject: [PATCH 0222/1604] Add pooling support for ripples

---
 .../UI/Cursor/CursorRippleVisualiser.cs       | 50 +++++++++++++------
 1 file changed, 35 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs b/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs
index 401525efcd..e13e0d5dfb 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs
@@ -5,6 +5,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Pooling;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Osu.Configuration;
@@ -18,6 +19,8 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
     {
         private readonly Bindable<bool> showRipples = new Bindable<bool>(true);
 
+        private readonly DrawablePool<CursorRipple> ripplePool = new DrawablePool<CursorRipple>(20);
+
         [BackgroundDependencyLoader(true)]
         private void load(OsuRulesetConfigManager? rulesetConfig)
         {
@@ -27,21 +30,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
         public bool OnPressed(KeyBindingPressEvent<OsuAction> e)
         {
             if (showRipples.Value)
-            {
-                var ripple = new SkinnableDrawable(new OsuSkinComponentLookup(OsuSkinComponents.CursorRipple), _ => new DefaultCursorRipple())
-                {
-                    Blending = BlendingParameters.Additive,
-                    Position = e.MousePosition
-                };
-
-                AddInternal(ripple);
-
-                ripple.ScaleTo(0.05f)
-                      .ScaleTo(0.5f, 700, Easing.Out)
-                      .FadeTo(0.2f)
-                      .FadeOut(700)
-                      .Expire();
-            }
+                AddInternal(ripplePool.Get());
 
             return false;
         }
@@ -50,6 +39,37 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
         {
         }
 
+        private partial class CursorRipple : PoolableDrawable
+        {
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                AutoSizeAxes = Axes.Both;
+                Origin = Anchor.Centre;
+
+                InternalChildren = new Drawable[]
+                {
+                    new SkinnableDrawable(new OsuSkinComponentLookup(OsuSkinComponents.CursorRipple), _ => new DefaultCursorRipple())
+                    {
+                        Blending = BlendingParameters.Additive,
+                    }
+                };
+            }
+
+            protected override void PrepareForUse()
+            {
+                base.PrepareForUse();
+
+                ClearTransforms(true);
+
+                this.ScaleTo(0.05f)
+                    .ScaleTo(0.5f, 700, Easing.Out)
+                    .FadeTo(0.2f)
+                    .FadeOut(700)
+                    .Expire();
+            }
+        }
+
         public partial class DefaultCursorRipple : CompositeDrawable
         {
             [BackgroundDependencyLoader]

From 6a62949fcd36e4ee62fdfb8de528901784733cf6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 30 Apr 2023 10:38:21 +0900
Subject: [PATCH 0223/1604] Fix positioning and rewinding support for ripples

---
 .../UI/Cursor/CursorRippleVisualiser.cs          | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs b/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs
index e13e0d5dfb..27e9d1d347 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs
@@ -21,6 +21,11 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
 
         private readonly DrawablePool<CursorRipple> ripplePool = new DrawablePool<CursorRipple>(20);
 
+        public CursorRippleVisualiser()
+        {
+            RelativeSizeAxes = Axes.Both;
+        }
+
         [BackgroundDependencyLoader(true)]
         private void load(OsuRulesetConfigManager? rulesetConfig)
         {
@@ -30,7 +35,12 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
         public bool OnPressed(KeyBindingPressEvent<OsuAction> e)
         {
             if (showRipples.Value)
-                AddInternal(ripplePool.Get());
+            {
+                AddInternal(ripplePool.Get(r =>
+                {
+                    r.Position = e.MousePosition;
+                }));
+            }
 
             return false;
         }
@@ -66,7 +76,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                     .ScaleTo(0.5f, 700, Easing.Out)
                     .FadeTo(0.2f)
                     .FadeOut(700)
-                    .Expire();
+                    .Expire(true);
             }
         }
 
@@ -75,6 +85,8 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
             [BackgroundDependencyLoader]
             private void load()
             {
+                AutoSizeAxes = Axes.Both;
+
                 InternalChildren = new Drawable[]
                 {
                     new RingPiece(3)

From 72b472a75604a97d1f15ee211550bf28e2b4204c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 30 Apr 2023 11:19:03 +0900
Subject: [PATCH 0224/1604] Change default scaling and add note about legacy
 `cursor-ripple` scale

---
 .../Legacy/OsuLegacySkinTransformer.cs        | 19 +++++++++++++++++--
 .../UI/Cursor/CursorRippleVisualiser.cs       |  8 ++++----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index bf817eda29..f049aa088f 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -101,9 +101,24 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         return null;
 
                     case OsuSkinComponents.CursorRipple:
-                        // TODO: resize texture to 0.5?? but that might break skins..
                         if (GetTexture("cursor-ripple") != null)
-                            return this.GetAnimation("cursor-ripple", false, false);
+                        {
+                            var ripple = this.GetAnimation("cursor-ripple", false, false);
+
+                            // In stable this element was scaled down to 50% and opacity 20%, but this makes the elements WAY too big and inflexible.
+                            // If anyone complains about these not being applied, this can be uncommented.
+                            //
+                            // But if no one complains I'd rather fix this in lazer. Wiki documentation doesn't mention size,
+                            // so we might be okay.
+                            //
+                            // if (ripple != null)
+                            // {
+                            //     ripple.Scale = new Vector2(0.5f);
+                            //     ripple.Alpha = 0.2f;
+                            // }
+
+                            return ripple;
+                        }
 
                         return null;
 
diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs b/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs
index 27e9d1d347..465b708b5a 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs
@@ -73,9 +73,8 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                 ClearTransforms(true);
 
                 this.ScaleTo(0.05f)
-                    .ScaleTo(0.5f, 700, Easing.Out)
-                    .FadeTo(0.2f)
-                    .FadeOut(700)
+                    .ScaleTo(1, 700, Easing.Out)
+                    .FadeOutFromOne(700)
                     .Expire(true);
             }
         }
@@ -91,7 +90,8 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                 {
                     new RingPiece(3)
                     {
-                        Size = new Vector2(512),
+                        Size = new Vector2(256),
+                        Alpha = 0.2f,
                     }
                 };
             }

From 949dc1c0f96e31d0a20323d83f3fa8a98ab95592 Mon Sep 17 00:00:00 2001
From: Terochi <mates.cernicky@gmail.com>
Date: Sun, 30 Apr 2023 12:05:55 +0200
Subject: [PATCH 0225/1604] Improved logic

---
 .../Visual/Gameplay/TestSceneSkinEditor.cs    | 25 +++++---
 .../SkinEditor/SkinEditorChangeHandler.cs     | 57 +++++++++----------
 2 files changed, 46 insertions(+), 36 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
index 45cc329f53..4a0be3bb68 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
@@ -172,7 +172,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         [Test]
-        public void TestUndo()
+        public void TestUndoEditHistory()
         {
             SkinComponentsContainer firstTarget = null!;
             TestSkinEditorChangeHandler changeHandler = null!;
@@ -205,17 +205,28 @@ namespace osu.Game.Tests.Visual.Gameplay
                 InputManager.Click(MouseButton.Left);
                 InputManager.Click(MouseButton.Left);
             });
-            AddStep("Revert changes", () => changeHandler.RestoreState(int.MinValue));
-            AddAssert("Nothing changed", () => defaultState.SequenceEqual(changeHandler.GetCurrentState()));
+            revertAndCheckUnchanged();
+
+            AddStep("Move components", () =>
+            {
+                changeHandler.BeginChange();
+                testComponents.ForEach(c => ((Drawable)c).Position += Vector2.One);
+                changeHandler.EndChange();
+            });
+            revertAndCheckUnchanged();
 
             AddStep("Select components", () => skinEditor.SelectedComponents.AddRange(testComponents));
             AddStep("Bring to front", () => skinEditor.BringSelectionToFront());
-            AddStep("Revert changes", () => changeHandler.RestoreState(int.MinValue));
-            AddAssert("Nothing changed", () => defaultState.SequenceEqual(changeHandler.GetCurrentState()));
+            revertAndCheckUnchanged();
 
             AddStep("Remove components", () => testComponents.ForEach(c => firstTarget.Remove(c, false)));
-            AddStep("Revert changes", () => changeHandler.RestoreState(int.MinValue));
-            AddAssert("Nothing changed", () => defaultState.SequenceEqual(changeHandler.GetCurrentState()));
+            revertAndCheckUnchanged();
+
+            void revertAndCheckUnchanged()
+            {
+                AddStep("Revert changes", () => changeHandler.RestoreState(int.MinValue));
+                AddAssert("Nothing changed", () => defaultState.SequenceEqual(changeHandler.GetCurrentState()));
+            }
         }
 
         [TestCase(false)]
diff --git a/osu.Game/Overlays/SkinEditor/SkinEditorChangeHandler.cs b/osu.Game/Overlays/SkinEditor/SkinEditorChangeHandler.cs
index f38f6b0911..6285080d36 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditorChangeHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditorChangeHandler.cs
@@ -60,49 +60,48 @@ namespace osu.Game.Overlays.SkinEditor
             SerialisedDrawableInfo[] skinnableInfos = deserializedContent.ToArray();
             ISerialisableDrawable[] targetComponents = firstTarget.Components.ToArray();
 
-            // Store indexes based on type for later lookup
+            // Store components based on type for later lookup
+            var typedComponents = new Dictionary<Type, List<ISerialisableDrawable>>();
 
-            var targetComponentsIndexes = new Dictionary<Type, List<int>>();
-
-            for (int i = 0; i < targetComponents.Length; i++)
+            foreach (var component in targetComponents)
             {
-                Type lookup = targetComponents[i].GetType();
+                Type lookup = component.GetType();
 
-                if (!targetComponentsIndexes.TryGetValue(lookup, out List<int>? componentIndexes))
-                    targetComponentsIndexes.Add(lookup, componentIndexes = new List<int>());
+                if (!typedComponents.TryGetValue(lookup, out List<ISerialisableDrawable>? typeComponents))
+                    typedComponents.Add(lookup, typeComponents = new List<ISerialisableDrawable>());
 
-                componentIndexes.Add(i);
+                typeComponents.Add(component);
             }
 
-            var indexCounting = new Dictionary<Type, int>();
+            // Remove all components
+            for (int i = targetComponents.Length - 1; i >= 0; i--)
+                firstTarget.Remove(targetComponents[i], false);
 
-            var empty = new List<int>(0);
+            // Keeps count of how many components for each type were already revived
+            Dictionary<Type, int> typedComponentCounter = typedComponents.Keys.ToDictionary(t => t, _ => 0);
 
-            for (int i = 0; i < skinnableInfos.Length; i++)
+            foreach (var skinnableInfo in skinnableInfos)
             {
-                Type lookup = skinnableInfos[i].Type;
+                Type lookup = skinnableInfo.Type;
 
-                if (!targetComponentsIndexes.TryGetValue(lookup, out List<int>? componentIndexes))
-                    componentIndexes = empty;
+                if (!typedComponents.TryGetValue(lookup, out List<ISerialisableDrawable>? typeComponents))
+                {
+                    firstTarget.Add((ISerialisableDrawable)skinnableInfo.CreateInstance());
+                    continue;
+                }
 
-                if (!indexCounting.ContainsKey(lookup))
-                    indexCounting.Add(lookup, 0);
+                int typeComponentsUsed = typedComponentCounter[lookup]++;
 
-                if (i >= componentIndexes.Count)
-                    // Add new component
-                    firstTarget.Add((ISerialisableDrawable)skinnableInfos[i].CreateInstance());
+                ISerialisableDrawable component;
+
+                if (typeComponentsUsed < typeComponents.Count)
+                    // Re-use unused component
+                    ((Drawable)(component = typeComponents[typeComponentsUsed])).ApplySerialisedInfo(skinnableInfo);
                 else
-                    // Modify existing component
-                    ((Drawable)targetComponents[componentIndexes[indexCounting[lookup]++]]).ApplySerialisedInfo(skinnableInfos[i]);
-            }
+                    // Create new one
+                    component = (ISerialisableDrawable)skinnableInfo.CreateInstance();
 
-            foreach ((Type lookup, List<int> componentIndexes) in targetComponentsIndexes)
-            {
-                indexCounting.TryGetValue(lookup, out int i);
-
-                // Remove extra components that weren't removed above
-                for (; i < componentIndexes.Count; i++)
-                    firstTarget.Remove(targetComponents[componentIndexes[i]], false);
+                firstTarget.Add(component);
             }
         }
     }

From 1eb2e35dffb3215b3c58987fa6b244710babc49a Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Sun, 30 Apr 2023 16:03:58 +0200
Subject: [PATCH 0226/1604] fix ticks not being generated by default

---
 osu.Game.Rulesets.Osu/Objects/Slider.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index dd75a86f96..98e536de38 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -142,7 +142,7 @@ namespace osu.Game.Rulesets.Osu.Objects
             set => SliderVelocityBindable.Value = value;
         }
 
-        public bool GenerateTicks { get; set; }
+        public bool GenerateTicks { get; set; } = true;
 
         [JsonIgnore]
         public SliderHeadCircle HeadCircle { get; protected set; }

From e7a478ce9c7e8dc20be47173233f0700fd6d88e9 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Sun, 30 Apr 2023 16:04:03 +0200
Subject: [PATCH 0227/1604] Update convert-samples-expected-conversion.json

---
 .../Testing/Beatmaps/convert-samples-expected-conversion.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/convert-samples-expected-conversion.json b/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/convert-samples-expected-conversion.json
index 6f1d45ad8c..4d298bb671 100644
--- a/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/convert-samples-expected-conversion.json
+++ b/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/convert-samples-expected-conversion.json
@@ -10,7 +10,7 @@
         ["Gameplay/soft-hitnormal"],
         ["Gameplay/drum-hitnormal"]
       ],
-      "Samples": ["Gameplay/-hitnormal"]
+      "Samples": ["Gameplay/normal-hitnormal"]
     }, {
       "StartTime": 1875.0,
       "EndTime": 2750.0,
@@ -19,7 +19,7 @@
         ["Gameplay/soft-hitnormal"],
         ["Gameplay/drum-hitnormal"]
       ],
-      "Samples": ["Gameplay/-hitnormal"]
+      "Samples": ["Gameplay/normal-hitnormal"]
     }]
   }, {
     "StartTime": 3750.0,

From 8f02bd80f967db674c7d1655c3f5f72645b77c76 Mon Sep 17 00:00:00 2001
From: Terochi <mates.cernicky@gmail.com>
Date: Sun, 30 Apr 2023 16:10:59 +0200
Subject: [PATCH 0228/1604] Addressed changes

---
 .../Visual/Gameplay/TestSceneSkinEditor.cs    | 29 +++++++++----
 osu.Game/Overlays/SkinEditor/SkinEditor.cs    | 15 ++-----
 .../SkinEditor/SkinEditorChangeHandler.cs     | 41 +++++++++++--------
 3 files changed, 48 insertions(+), 37 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
index 4a0be3bb68..f7eb42872d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
@@ -100,10 +100,15 @@ namespace osu.Game.Tests.Visual.Gameplay
                 InputManager.PressButton(MouseButton.Left);
             });
 
-            AddStep("Drag to bottom right",
-                () => { InputManager.MoveMouseTo(box3.ScreenSpaceDrawQuad.TopRight + new Vector2(-box3.ScreenSpaceDrawQuad.Width / 8, box3.ScreenSpaceDrawQuad.Height / 4)); });
+            AddStep("Drag to bottom right", () =>
+            {
+                InputManager.MoveMouseTo(box3.ScreenSpaceDrawQuad.TopRight + new Vector2(-box3.ScreenSpaceDrawQuad.Width / 8, box3.ScreenSpaceDrawQuad.Height / 4));
+            });
 
-            AddStep("Release button", () => { InputManager.ReleaseButton(MouseButton.Left); });
+            AddStep("Release button", () =>
+            {
+                InputManager.ReleaseButton(MouseButton.Left);
+            });
 
             AddAssert("First two boxes selected", () => skinEditor.SelectedComponents, () => Is.EqualTo(new[] { box1, box2 }));
 
@@ -113,9 +118,15 @@ namespace osu.Game.Tests.Visual.Gameplay
                 InputManager.PressButton(MouseButton.Left);
             });
 
-            AddStep("Drag to top left", () => { InputManager.MoveMouseTo(box2.ScreenSpaceDrawQuad.Centre - new Vector2(box2.ScreenSpaceDrawQuad.Width / 4)); });
+            AddStep("Drag to top left", () =>
+            {
+                InputManager.MoveMouseTo(box2.ScreenSpaceDrawQuad.Centre - new Vector2(box2.ScreenSpaceDrawQuad.Width / 4));
+            });
 
-            AddStep("Release button", () => { InputManager.ReleaseButton(MouseButton.Left); });
+            AddStep("Release button", () =>
+            {
+                InputManager.ReleaseButton(MouseButton.Left);
+            });
 
             AddAssert("Last two boxes selected", () => skinEditor.SelectedComponents, () => Is.EqualTo(new[] { box2, box3 }));
 
@@ -139,7 +150,10 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddAssert("Three black boxes added", () => targetContainer.Components.OfType<BigBlackBox>().Count(), () => Is.EqualTo(3));
 
-            AddStep("Store black box blueprints", () => { blueprints = skinEditor.ChildrenOfType<SkinBlueprint>().Where(b => b.Item is BigBlackBox).ToArray(); });
+            AddStep("Store black box blueprints", () =>
+            {
+                blueprints = skinEditor.ChildrenOfType<SkinBlueprint>().Where(b => b.Item is BigBlackBox).ToArray();
+            });
 
             AddAssert("Selection is black box 1", () => skinEditor.SelectedComponents.Single(), () => Is.EqualTo(blueprints[0].Item));
 
@@ -184,7 +198,6 @@ namespace osu.Game.Tests.Visual.Gameplay
                 firstTarget = Player.ChildrenOfType<SkinComponentsContainer>().First();
                 changeHandler = new TestSkinEditorChangeHandler(firstTarget);
 
-                changeHandler.SaveState();
                 defaultState = changeHandler.GetCurrentState();
 
                 testComponents = new[]
@@ -225,7 +238,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             void revertAndCheckUnchanged()
             {
                 AddStep("Revert changes", () => changeHandler.RestoreState(int.MinValue));
-                AddAssert("Nothing changed", () => defaultState.SequenceEqual(changeHandler.GetCurrentState()));
+                AddAssert("Current state is same as default", () => defaultState.SequenceEqual(changeHandler.GetCurrentState()));
             }
         }
 
diff --git a/osu.Game/Overlays/SkinEditor/SkinEditor.cs b/osu.Game/Overlays/SkinEditor/SkinEditor.cs
index f0ad92d4da..2b23ce290f 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditor.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditor.cs
@@ -235,7 +235,10 @@ namespace osu.Game.Overlays.SkinEditor
             }, true);
             canPaste.Current.BindValueChanged(paste => pasteMenuItem.Action.Disabled = !paste.NewValue, true);
 
-            SelectedComponents.BindCollectionChanged((_, _) => canCopy.Value = canCut.Value = SelectedComponents.Any(), true);
+            SelectedComponents.BindCollectionChanged((_, _) =>
+            {
+                canCopy.Value = canCut.Value = SelectedComponents.Any();
+            }, true);
 
             clipboard.Content.BindValueChanged(content => canPaste.Value = !string.IsNullOrEmpty(content.NewValue), true);
 
@@ -342,7 +345,6 @@ namespace osu.Game.Overlays.SkinEditor
             changeHandler = new SkinEditorChangeHandler(skinComponentsContainer);
             changeHandler.CanUndo.BindValueChanged(v => undoMenuItem.Action.Disabled = !v.NewValue, true);
             changeHandler.CanRedo.BindValueChanged(v => redoMenuItem.Action.Disabled = !v.NewValue, true);
-            changeHandler.SaveState();
 
             content.Child = new SkinBlueprintContainer(skinComponentsContainer);
 
@@ -477,18 +479,12 @@ namespace osu.Game.Overlays.SkinEditor
 
         protected void Cut()
         {
-            if (!canCut.Value)
-                return;
-
             Copy();
             DeleteItems(SelectedComponents.ToArray());
         }
 
         protected void Copy()
         {
-            if (!canCopy.Value)
-                return;
-
             clipboard.Content.Value = JsonConvert.SerializeObject(SelectedComponents.Cast<Drawable>().Select(s => s.CreateSerialisedInfo()).ToArray());
         }
 
@@ -504,9 +500,6 @@ namespace osu.Game.Overlays.SkinEditor
 
         protected void Paste()
         {
-            if (!canPaste.Value)
-                return;
-
             changeHandler?.BeginChange();
 
             var drawableInfo = JsonConvert.DeserializeObject<SerialisedDrawableInfo[]>(clipboard.Content.Value);
diff --git a/osu.Game/Overlays/SkinEditor/SkinEditorChangeHandler.cs b/osu.Game/Overlays/SkinEditor/SkinEditorChangeHandler.cs
index 6285080d36..8c7f7bbab7 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditorChangeHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditorChangeHandler.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Overlays.SkinEditor
                 return;
 
             components = new BindableList<ISerialisableDrawable> { BindTarget = firstTarget.Components };
-            components.BindCollectionChanged((_, _) => SaveState());
+            components.BindCollectionChanged((_, _) => SaveState(), true);
         }
 
         protected override void WriteCurrentStateToStream(MemoryStream stream)
@@ -61,47 +61,52 @@ namespace osu.Game.Overlays.SkinEditor
             ISerialisableDrawable[] targetComponents = firstTarget.Components.ToArray();
 
             // Store components based on type for later lookup
-            var typedComponents = new Dictionary<Type, List<ISerialisableDrawable>>();
+            var typedComponents = new Dictionary<Type, Stack<Drawable>>();
 
-            foreach (var component in targetComponents)
+            for (int i = targetComponents.Length - 1; i >= 0; i--)
             {
+                Drawable component = (Drawable)targetComponents[i];
                 Type lookup = component.GetType();
 
-                if (!typedComponents.TryGetValue(lookup, out List<ISerialisableDrawable>? typeComponents))
-                    typedComponents.Add(lookup, typeComponents = new List<ISerialisableDrawable>());
+                if (!typedComponents.TryGetValue(lookup, out Stack<Drawable>? typeComponents))
+                    typedComponents.Add(lookup, typeComponents = new Stack<Drawable>());
 
-                typeComponents.Add(component);
+                typeComponents.Push(component);
             }
 
             // Remove all components
             for (int i = targetComponents.Length - 1; i >= 0; i--)
                 firstTarget.Remove(targetComponents[i], false);
 
-            // Keeps count of how many components for each type were already revived
-            Dictionary<Type, int> typedComponentCounter = typedComponents.Keys.ToDictionary(t => t, _ => 0);
-
             foreach (var skinnableInfo in skinnableInfos)
             {
                 Type lookup = skinnableInfo.Type;
 
-                if (!typedComponents.TryGetValue(lookup, out List<ISerialisableDrawable>? typeComponents))
+                if (!typedComponents.TryGetValue(lookup, out Stack<Drawable>? typeComponents))
                 {
                     firstTarget.Add((ISerialisableDrawable)skinnableInfo.CreateInstance());
                     continue;
                 }
 
-                int typeComponentsUsed = typedComponentCounter[lookup]++;
-
-                ISerialisableDrawable component;
-
-                if (typeComponentsUsed < typeComponents.Count)
+                if (typeComponents.TryPop(out Drawable? component))
+                {
                     // Re-use unused component
-                    ((Drawable)(component = typeComponents[typeComponentsUsed])).ApplySerialisedInfo(skinnableInfo);
+                    component.ApplySerialisedInfo(skinnableInfo);
+                }
                 else
+                {
                     // Create new one
-                    component = (ISerialisableDrawable)skinnableInfo.CreateInstance();
+                    component = skinnableInfo.CreateInstance();
+                }
 
-                firstTarget.Add(component);
+                firstTarget.Add((ISerialisableDrawable)component);
+            }
+
+            foreach ((Type _, Stack<Drawable> typeComponents) in typedComponents)
+            {
+                // Dispose extra components
+                foreach (var component in typeComponents)
+                    component.Dispose();
             }
         }
     }

From fb4b681cc527c1b9430d2537e474d77f9035286c Mon Sep 17 00:00:00 2001
From: Terochi <mates.cernicky@gmail.com>
Date: Sun, 30 Apr 2023 16:36:01 +0200
Subject: [PATCH 0229/1604] Use `Queue` instead of `Stack`

---
 .../SkinEditor/SkinEditorChangeHandler.cs       | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinEditorChangeHandler.cs b/osu.Game/Overlays/SkinEditor/SkinEditorChangeHandler.cs
index 8c7f7bbab7..18ffdb0edc 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditorChangeHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditorChangeHandler.cs
@@ -61,17 +61,16 @@ namespace osu.Game.Overlays.SkinEditor
             ISerialisableDrawable[] targetComponents = firstTarget.Components.ToArray();
 
             // Store components based on type for later lookup
-            var typedComponents = new Dictionary<Type, Stack<Drawable>>();
+            var typedComponents = new Dictionary<Type, Queue<Drawable>>();
 
-            for (int i = targetComponents.Length - 1; i >= 0; i--)
+            foreach (ISerialisableDrawable component in targetComponents)
             {
-                Drawable component = (Drawable)targetComponents[i];
                 Type lookup = component.GetType();
 
-                if (!typedComponents.TryGetValue(lookup, out Stack<Drawable>? typeComponents))
-                    typedComponents.Add(lookup, typeComponents = new Stack<Drawable>());
+                if (!typedComponents.TryGetValue(lookup, out Queue<Drawable>? typeComponents))
+                    typedComponents.Add(lookup, typeComponents = new Queue<Drawable>());
 
-                typeComponents.Push(component);
+                typeComponents.Enqueue((Drawable)component);
             }
 
             // Remove all components
@@ -82,13 +81,13 @@ namespace osu.Game.Overlays.SkinEditor
             {
                 Type lookup = skinnableInfo.Type;
 
-                if (!typedComponents.TryGetValue(lookup, out Stack<Drawable>? typeComponents))
+                if (!typedComponents.TryGetValue(lookup, out Queue<Drawable>? typeComponents))
                 {
                     firstTarget.Add((ISerialisableDrawable)skinnableInfo.CreateInstance());
                     continue;
                 }
 
-                if (typeComponents.TryPop(out Drawable? component))
+                if (typeComponents.TryDequeue(out Drawable? component))
                 {
                     // Re-use unused component
                     component.ApplySerialisedInfo(skinnableInfo);
@@ -102,7 +101,7 @@ namespace osu.Game.Overlays.SkinEditor
                 firstTarget.Add((ISerialisableDrawable)component);
             }
 
-            foreach ((Type _, Stack<Drawable> typeComponents) in typedComponents)
+            foreach ((Type _, Queue<Drawable> typeComponents) in typedComponents)
             {
                 // Dispose extra components
                 foreach (var component in typeComponents)

From 79f3cfec91e58bc67cb3a1df1d099fc08e991938 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Sun, 30 Apr 2023 16:43:26 +0200
Subject: [PATCH 0230/1604] fix 0 velocity juicestream

---
 .../Edit/Blueprints/Components/EditablePath.cs                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Edit/Blueprints/Components/EditablePath.cs b/osu.Game.Rulesets.Catch/Edit/Blueprints/Components/EditablePath.cs
index 7a577f8a83..75ee0546dd 100644
--- a/osu.Game.Rulesets.Catch/Edit/Blueprints/Components/EditablePath.cs
+++ b/osu.Game.Rulesets.Catch/Edit/Blueprints/Components/EditablePath.cs
@@ -103,7 +103,7 @@ namespace osu.Game.Rulesets.Catch.Edit.Blueprints.Components
             //
             // The value is clamped here by the bindable min and max values.
             // In case the required velocity is too large, the path is not preserved.
-            svBindable.Value = Math.Ceiling(requiredVelocity / svToVelocityFactor);
+            svBindable.Value = requiredVelocity == 0 ? 1 : Math.Ceiling(requiredVelocity / svToVelocityFactor);
 
             path.ConvertToSliderPath(hitObject.Path, hitObject.LegacyConvertedY, hitObject.Velocity);
 

From d35355970f2aa40dbddb54dee6eacac225ad5f84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 30 Apr 2023 17:23:45 +0200
Subject: [PATCH 0231/1604] Add test case covering failure scenario

---
 .../TestSceneModSelectOverlay.cs              | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 5ccaebd721..f99fe1d8d4 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -14,6 +14,7 @@ using osu.Framework.Localisation;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
 using osu.Game.Overlays.Settings;
 using osu.Game.Rulesets;
@@ -67,6 +68,19 @@ namespace osu.Game.Tests.Visual.UserInterface
                             }
                         }
                     });
+                    r.Add(new ModPreset
+                    {
+                        Name = "Half Time 0.5x",
+                        Description = "Very slow",
+                        Ruleset = r.Find<RulesetInfo>(OsuRuleset.SHORT_NAME),
+                        Mods = new[]
+                        {
+                            new OsuModHalfTime
+                            {
+                                SpeedChange = { Value = 0.5 }
+                            }
+                        }
+                    });
                 });
             });
         }
@@ -566,6 +580,28 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("5 columns visible", () => this.ChildrenOfType<ModColumn>().Count(col => col.IsPresent) == 5);
         }
 
+        [Test]
+        public void TestModMultiplierUpdates()
+        {
+            createScreen();
+
+            AddStep("select mod preset with half time", () =>
+            {
+                InputManager.MoveMouseTo(this.ChildrenOfType<ModPresetPanel>().Single(preset => preset.Preset.Value.Name == "Half Time 0.5x"));
+                InputManager.Click(MouseButton.Left);
+            });
+            AddAssert("difficulty multiplier display shows correct value", () => modSelectOverlay.ChildrenOfType<DifficultyMultiplierDisplay>().Single().Current.Value, () => Is.EqualTo(0.5));
+
+            // this is highly unorthodox in a test, but because the `ModSettingChangeTracker` machinery heavily leans on events and object disposal and re-creation,
+            // it is instrumental in the reproduction of the failure scenario that this test is supposed to cover.
+            AddStep("force collection", GC.Collect);
+
+            AddStep("open customisation area", () => modSelectOverlay.CustomisationButton!.TriggerClick());
+            AddStep("reset half time speed to default", () => modSelectOverlay.ChildrenOfType<ModSettingsArea>().Single()
+                                                                              .ChildrenOfType<RestoreDefaultValueButton<double>>().Single().TriggerClick());
+            AddUntilStep("difficulty multiplier display shows correct value", () => modSelectOverlay.ChildrenOfType<DifficultyMultiplierDisplay>().Single().Current.Value, () => Is.EqualTo(0.7));
+        }
+
         private void waitForColumnLoad() => AddUntilStep("all column content loaded",
             () => modSelectOverlay.ChildrenOfType<ModColumn>().Any() && modSelectOverlay.ChildrenOfType<ModColumn>().All(column => column.IsLoaded && column.ItemsLoaded));
 

From 2e3daf0a541e14fb518292fabcc2ae8dde319e12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 30 Apr 2023 17:24:07 +0200
Subject: [PATCH 0232/1604] Fix leak of `ModSettingChangeTracker` instances

The `SelectedMods.BindValueChanged()` callback in `ModSelectOverlay` can
in some instances run recursively. This is most heavily leaned on in
scenarios where `SelectedMods` is updated by an external component. In
such cases, the mod select overlay needs to replace the mod instances
received externally with mod instances which it owns, so that the changes
made on the overlay can propagate outwards.

This in particular means that prior to this commit, it was possible to
encounter the following scenario:

	modSettingChangeTracker?.Dispose();
	updateFromExternalSelection(); // mutates SelectedMods to perform the replacement
	                               // therefore causing a recursive call

		modSettingChangeTracker?.Dispose();
		// inner call continues
		modSettingChangeTracker = new ModSettingChangeTracker(SelectedMods.Value);

	// outer call continues
	modSettingChangeTracker = new ModSettingChangeTracker(SelectedMods.Value);

This leaks one `modSettingChangeTracker` instance from the inner call,
which is never disposed.

To avoid this, move the disposal to the same side of the recursion that
the creation happens on, changing the call pattern to:

	updateFromExternalSelection(); // mutates SelectedMods to perform the replacement
	                               // therefore causing a recursive call

		modSettingChangeTracker?.Dispose();
		// inner call continues
		modSettingChangeTracker = new ModSettingChangeTracker(SelectedMods.Value);

	modSettingChangeTracker?.Dispose();
	// outer call continues
	modSettingChangeTracker = new ModSettingChangeTracker(SelectedMods.Value);

which, while slightly wasteful, does not cause any leaks.

The solution is definitely suboptimal, but addressing this properly
would entail a major rewrite of the mod instance management in the mods
overlay, which is probably not the wisest move to make right now.
---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index d611fd3c0b..46d3620c9c 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -244,12 +244,12 @@ namespace osu.Game.Overlays.Mods
 
             SelectedMods.BindValueChanged(val =>
             {
-                modSettingChangeTracker?.Dispose();
-
                 updateMultiplier();
                 updateFromExternalSelection();
                 updateCustomisation();
 
+                modSettingChangeTracker?.Dispose();
+
                 if (AllowCustomisation)
                 {
                     modSettingChangeTracker = new ModSettingChangeTracker(SelectedMods.Value);

From 139a1d7e6d6ec8f5d5c13de881f4ddfdd2542bc4 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Sun, 30 Apr 2023 17:46:47 +0200
Subject: [PATCH 0233/1604] fix legacy encoder writing sample info while not
 writing node samples

---
 osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index a681429d02..c5a8cc89be 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -476,16 +476,16 @@ namespace osu.Game.Beatmaps.Formats
 
             if (curveData != null)
             {
-                for (int i = 0; i < curveData.NodeSamples.Count; i++)
+                for (int i = 0; i < curveData.SpanCount() + 1; i++)
                 {
-                    writer.Write(FormattableString.Invariant($"{(int)toLegacyHitSoundType(curveData.NodeSamples[i])}"));
-                    writer.Write(i != curveData.NodeSamples.Count - 1 ? "|" : ",");
+                    writer.Write(FormattableString.Invariant($"{(i < curveData.NodeSamples.Count ? (int)toLegacyHitSoundType(curveData.NodeSamples[i]) : 0)}"));
+                    writer.Write(i != curveData.SpanCount() ? "|" : ",");
                 }
 
-                for (int i = 0; i < curveData.NodeSamples.Count; i++)
+                for (int i = 0; i < curveData.SpanCount() + 1; i++)
                 {
-                    writer.Write(getSampleBank(curveData.NodeSamples[i], true));
-                    writer.Write(i != curveData.NodeSamples.Count - 1 ? "|" : ",");
+                    writer.Write(i < curveData.NodeSamples.Count ? getSampleBank(curveData.NodeSamples[i], true) : "0:0");
+                    writer.Write(i != curveData.SpanCount() ? "|" : ",");
                 }
             }
         }

From 4a0ff046ae302ceb2b2eb379055ec119eb240b4a Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Sun, 30 Apr 2023 19:20:42 +0200
Subject: [PATCH 0234/1604] pass new hitobject properties through beatmap
 converters

---
 osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs | 4 +++-
 osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs     | 6 +++++-
 osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs | 3 ++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
index 7774a7da09..2c8ef9eae0 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
@@ -26,6 +26,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
             var xPositionData = obj as IHasXPosition;
             var yPositionData = obj as IHasYPosition;
             var comboData = obj as IHasCombo;
+            var sliderVelocityData = obj as IHasSliderVelocity;
 
             switch (obj)
             {
@@ -41,7 +42,8 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                         NewCombo = comboData?.NewCombo ?? false,
                         ComboOffset = comboData?.ComboOffset ?? 0,
                         LegacyLastTickOffset = (obj as IHasLegacyLastTickOffset)?.LegacyLastTickOffset ?? 0,
-                        LegacyConvertedY = yPositionData?.Y ?? CatchHitObject.DEFAULT_LEGACY_CONVERT_Y
+                        LegacyConvertedY = yPositionData?.Y ?? CatchHitObject.DEFAULT_LEGACY_CONVERT_Y,
+                        SliderVelocity = sliderVelocityData?.SliderVelocity ?? 1
                     }.Yield();
 
                 case IHasDuration endTime:
diff --git a/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs b/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
index e9518895be..d03ee81f0d 100644
--- a/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
@@ -30,6 +30,8 @@ namespace osu.Game.Rulesets.Osu.Beatmaps
         {
             var positionData = original as IHasPosition;
             var comboData = original as IHasCombo;
+            var sliderVelocityData = original as IHasSliderVelocity;
+            var generateTicksData = original as IHasGenerateTicks;
 
             switch (original)
             {
@@ -47,7 +49,9 @@ namespace osu.Game.Rulesets.Osu.Beatmaps
                         LegacyLastTickOffset = (original as IHasLegacyLastTickOffset)?.LegacyLastTickOffset,
                         // prior to v8, speed multipliers don't adjust for how many ticks are generated over the same distance.
                         // this results in more (or less) ticks being generated in <v8 maps for the same time duration.
-                        TickDistanceMultiplier = beatmap.BeatmapInfo.BeatmapVersion < 8 ? 1f / ((LegacyControlPointInfo)beatmap.ControlPointInfo).DifficultyPointAt(original.StartTime).SliderVelocity : 1
+                        TickDistanceMultiplier = beatmap.BeatmapInfo.BeatmapVersion < 8 ? 1f / ((LegacyControlPointInfo)beatmap.ControlPointInfo).DifficultyPointAt(original.StartTime).SliderVelocity : 1,
+                        GenerateTicks = generateTicksData?.GenerateTicks ?? true,
+                        SliderVelocity = sliderVelocityData?.SliderVelocity ?? 1,
                     }.Yield();
 
                 case IHasDuration endTimeData:
diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index 05fb314342..e298e313df 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -133,7 +133,8 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
                             StartTime = obj.StartTime,
                             Samples = obj.Samples,
                             Duration = taikoDuration,
-                            TickRate = beatmap.Difficulty.SliderTickRate == 3 ? 3 : 4
+                            TickRate = beatmap.Difficulty.SliderTickRate == 3 ? 3 : 4,
+                            SliderVelocity = obj is IHasSliderVelocity velocityData ? velocityData.SliderVelocity : 1
                         };
                     }
 

From 41d4894aa3b58ee87d840cbe462cc06c2d1f6fe8 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Sun, 30 Apr 2023 19:32:24 +0200
Subject: [PATCH 0235/1604] add min and max value to SliderVelocity

---
 osu.Game.Rulesets.Catch/Objects/JuiceStream.cs | 7 ++++++-
 osu.Game.Rulesets.Osu/Objects/Slider.cs        | 7 ++++++-
 osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs    | 7 ++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
index f8af161ad5..169e99c90c 100644
--- a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
@@ -28,7 +28,12 @@ namespace osu.Game.Rulesets.Catch.Objects
 
         public int RepeatCount { get; set; }
 
-        public BindableNumber<double> SliderVelocityBindable { get; } = new BindableDouble(1);
+        public BindableNumber<double> SliderVelocityBindable { get; } = new BindableDouble(1)
+        {
+            Precision = 0.01,
+            MinValue = 0.1,
+            MaxValue = 10
+        };
 
         public double SliderVelocity
         {
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 98e536de38..4189f8ba1e 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -134,7 +134,12 @@ namespace osu.Game.Rulesets.Osu.Objects
         /// </summary>
         public bool OnlyJudgeNestedObjects = true;
 
-        public BindableNumber<double> SliderVelocityBindable { get; } = new BindableDouble(1);
+        public BindableNumber<double> SliderVelocityBindable { get; } = new BindableDouble(1)
+        {
+            Precision = 0.01,
+            MinValue = 0.1,
+            MaxValue = 10
+        };
 
         public double SliderVelocity
         {
diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
index c1a78f46b2..b4a12fd314 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
@@ -38,7 +38,12 @@ namespace osu.Game.Rulesets.Taiko.Objects
         /// </summary>
         public double Velocity { get; private set; }
 
-        public BindableNumber<double> SliderVelocityBindable { get; } = new BindableDouble(1);
+        public BindableNumber<double> SliderVelocityBindable { get; } = new BindableDouble(1)
+        {
+            Precision = 0.01,
+            MinValue = 0.1,
+            MaxValue = 10
+        };
 
         public double SliderVelocity
         {

From 2a947571546bd883716e7a182a52100a68210548 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Mon, 1 May 2023 00:49:01 +0200
Subject: [PATCH 0236/1604] Make sure the first object you place has bank and
 volume

---
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index 96128c6981..bdcb334738 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Rulesets.Edit
             HitObject = hitObject;
 
             // adding the default hit sample should be the case regardless of the ruleset.
-            HitObject.Samples.Add(new HitSampleInfo(HitSampleInfo.HIT_NORMAL));
+            HitObject.Samples.Add(new HitSampleInfo(HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK, volume: 100));
 
             RelativeSizeAxes = Axes.Both;
 

From b8ae508639421a89dbfe0fadb1b433bdaa46d05f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 1 May 2023 13:09:00 +0900
Subject: [PATCH 0237/1604] Fix incorrect starting scale for ripples

---
 osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs b/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs
index 465b708b5a..663c1f54fc 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
 
                 ClearTransforms(true);
 
-                this.ScaleTo(0.05f)
+                this.ScaleTo(0.1f)
                     .ScaleTo(1, 700, Easing.Out)
                     .FadeOutFromOne(700)
                     .Expire(true);

From 5cbfefbcb4d6177a4012527d28d53d56c13ffab0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 1 May 2023 13:18:04 +0900
Subject: [PATCH 0238/1604] Adjust metrics of default ripple to match stable
 default better

---
 osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs b/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs
index 663c1f54fc..cee5574f06 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Pooling;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Osu.Configuration;
+using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Skinning.Default;
 using osu.Game.Skinning;
 using osuTK;
@@ -90,8 +91,8 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                 {
                     new RingPiece(3)
                     {
-                        Size = new Vector2(256),
-                        Alpha = 0.2f,
+                        Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2),
+                        Alpha = 0.1f,
                     }
                 };
             }

From 0a70734331f2ba319c74c9b909ddcca3f338a6a6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 1 May 2023 14:40:48 +0900
Subject: [PATCH 0239/1604] Adjust ripple size with cursor scale (including CS)

---
 .../UI/Cursor/CursorRippleVisualiser.cs        | 18 +++++++++++-------
 .../UI/Cursor/OsuCursorContainer.cs            |  5 ++++-
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs b/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs
index cee5574f06..076d97d06a 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs
@@ -27,6 +27,8 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
             RelativeSizeAxes = Axes.Both;
         }
 
+        public Vector2 CursorScale { get; set; } = Vector2.One;
+
         [BackgroundDependencyLoader(true)]
         private void load(OsuRulesetConfigManager? rulesetConfig)
         {
@@ -40,6 +42,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                 AddInternal(ripplePool.Get(r =>
                 {
                     r.Position = e.MousePosition;
+                    r.Scale = CursorScale;
                 }));
             }
 
@@ -52,18 +55,17 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
 
         private partial class CursorRipple : PoolableDrawable
         {
+            private Drawable ripple = null!;
+
             [BackgroundDependencyLoader]
             private void load()
             {
                 AutoSizeAxes = Axes.Both;
                 Origin = Anchor.Centre;
 
-                InternalChildren = new Drawable[]
+                InternalChild = ripple = new SkinnableDrawable(new OsuSkinComponentLookup(OsuSkinComponents.CursorRipple), _ => new DefaultCursorRipple())
                 {
-                    new SkinnableDrawable(new OsuSkinComponentLookup(OsuSkinComponents.CursorRipple), _ => new DefaultCursorRipple())
-                    {
-                        Blending = BlendingParameters.Additive,
-                    }
+                    Blending = BlendingParameters.Additive,
                 };
             }
 
@@ -73,8 +75,10 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
 
                 ClearTransforms(true);
 
-                this.ScaleTo(0.1f)
-                    .ScaleTo(1, 700, Easing.Out)
+                ripple.ScaleTo(0.1f)
+                      .ScaleTo(1, 700, Easing.Out);
+
+                this
                     .FadeOutFromOne(700)
                     .Expire(true);
             }
diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs b/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
index 35fb8e67d8..bf1ff872dd 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
@@ -40,6 +40,8 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
         private Bindable<float> userCursorScale;
         private Bindable<bool> autoCursorScale;
 
+        private readonly CursorRippleVisualiser rippleVisualiser;
+
         public OsuCursorContainer()
         {
             InternalChild = fadeContainer = new Container
@@ -48,7 +50,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                 Children = new[]
                 {
                     cursorTrail = new SkinnableDrawable(new OsuSkinComponentLookup(OsuSkinComponents.CursorTrail), _ => new DefaultCursorTrail(), confineMode: ConfineMode.NoScaling),
-                    new CursorRippleVisualiser(),
+                    rippleVisualiser = new CursorRippleVisualiser(),
                     new SkinnableDrawable(new OsuSkinComponentLookup(OsuSkinComponents.CursorParticles), confineMode: ConfineMode.NoScaling),
                 }
             };
@@ -83,6 +85,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                 var newScale = new Vector2(e.NewValue);
 
                 ActiveCursor.Scale = newScale;
+                rippleVisualiser.CursorScale = newScale;
                 cursorTrail.Scale = newScale;
             }, true);
 

From ff29189e8951945c6ef701159cc7636a75032d51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 1 May 2023 09:33:37 +0200
Subject: [PATCH 0240/1604] Add custom `cursor-ripple` to cover skinnability in
 test

---
 .../Resources/special-skin/cursor-ripple@2x.png  | Bin 0 -> 2149 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/special-skin/cursor-ripple@2x.png

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/cursor-ripple@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/cursor-ripple@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..258162c4864ddc469ba21697770b2fc8e1297eb5
GIT binary patch
literal 2149
zcmcgsX;4#V6us|}kS8dFF-#Ic5|_5rT2^f>iv$Bgv@GHZ1A?;2AVv@s6p|2B6e7xW
zlxhVxtS~NA5Em3f6%wnCsC65ug_3cob&Xbu8uEHSrtPn`e>!7ka^Ac5o_o&u^4?@q
zY;?p3hfxjyFhUU-76(A#Ed`7{UJ~=_Gq6~fC6~u4<Z|iqJY`1K(sTgNs^Y5P$P2N8
z^)a(&R?KmKEbZI6Hz1zxntOACVDGeg*MyZmg%2f@vLfRW-MM$Pr6Cn_dBV)3(TUv9
z=e&+vor>$>GtPQ{e0-z%ys3EC>aJhf-of7Z^qsf-otCubWW*_atCL+XG%{l}KK3qE
zJJPQx;zpf&wKAq{&gx;c4|)bNUo~(mD5|PpyZGCvv!Ow4S#G-qHl-e(c&MYlBlW|i
zt(K}s<woVMnO=@T{uvqmFFSk}AG_H(L)hHZ;1c6voEvqpXiWdHONAB9^NuvX4u0df
zpIe;1<I(XARp-ZUmxiv>227|wKV7@3M&Kw8h<R%%OVo#Xtxt6I$(y*xenitF9$VVe
z+*1D4$c1r}hOJxZ-k-{0p3z4(n2IEU(T_OHRJ-|WjLF%w|L(fa0}`yvuRZo&M+0{@
z@e-dxY0QSDmyQbRJ`hy2zY`bF_7I)ouDNsebW2z6TS&{A_t34kmoNHs*6Y@;Gvn^B
zcz5z(uwK$9%FF4G5<bVrV!wE1L>Q>S7shd&{f=X2*z(Bu6#$MS$(MqiyF}RJ<tw7X
zdHr09Cl$-HUM|6wI6r(rzFe7;lfEn;<az0f^3&6#tF!W#NFx+cvGYrugs2{@2n(H4
zaPP_8(CD8Qh^Aj3*njvV?PK+b`)TqiBgf7CvF@AkveQLf+rAb|_Inn1xAs6<_lf&Q
zT0CwiG~a%kol%>(ZDDev_IHcKYig<NyWC+nO#1E+RYG=f>qyWfn0mafQXJTG&9a-P
zZ+ju;oVC05gOMGuHLv2Fd!j!x5Dnm<V+(t`PXs?rF4IK7HUrytW<bakxP!*QR0bfB
zgrI=MG6ta2=uCm<R22g<vsn&MzC}VqY>|}@n!fi!HEkh|KDMDWe-<j9JGNAz0ETBf
zhw$DIj+%xYXNrM#j81_lgd+vOlpIL0@-+ZD35~hU^7a-U!JZ*Dg=8t=a*(PaOg<sf
z$N=!egSUV0OVF~J<WP}A>yn9#<6jxP$&`zJdSWLeZrcAtD)9n?HxowT38fCiXBKhX
zNTaMwKn(T~D?S%ZOFaLT+P>07WU6jubmo~!9E0V67oBR26PEa@8Y<dF`kUb?y5!%+
z`WU?5KkfO0PRq$bp~1VRZb#w06HjvWCiV1QRg%uu6j=Rbz(KCJ(&=fflKZ+_8=qaA
zlwI7dbQ@n|a_L>fHiobTSJam)=<3+kH)j3YO6AWl_5pq4je%{<q?yPXv;K7)&~a(j
zMjEIFU)yfHJhYnF7?4V9)>>Id;MBdWWTQYP3+T7>3@7Dgwi+~={G(>p5BOWJ`rCSF
zl>EZLb|b5G(9F7Ed)Zp6ny|Y^vuE%x`{8Fsb{QGBnf0HLakllD6B&zHd_iz*U>6Y&
zn<Yd5Or+6+EwjV+DHAKeB%@bYciSV|w3(evq4i<2Isio~{cVSES<Lzx)RU2B(%USJ
z4!}vX-Wko_LZXgs%`9@tFTs&F9!#uu2j-&1ghmDl4`@Hz6jU)A2{Q!Kq*-%`$`*8f
zKU9N~IHp*K(ioB@Y7byU>Oo~tC6A+%fRn=z4j)1%f_#m}YzH*oM+GvV4bH&G+AS1N
zj3@-8K$&>Jai21TK?KvR_@KzzR<h-XOER)^k*tVuL;5$#?1m)<!Kp}(zo|(`N*Xx2
zWRx&F0$Nh&=nZJd{SOi_BvvS<l9Esy%%njj;FI`TOfO3(cjaTT7b_sseS{|n$BjLn
zWH;OePv==qsI&f=n!=XjFqCtyvE{_z3Y1vPEEV<>0V#bM(d$o4wcb}jV@rKJ(;Bb}
O@S_Ni4m&z6Mf(Thel05i

literal 0
HcmV?d00001


From cef9f73d346cdafb9e4d5c7aa3f4a5a25f82ef1a Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Mon, 1 May 2023 12:31:27 +0200
Subject: [PATCH 0241/1604] dont assign custom sample bank and volume to
 hitobjects in non-mania gamemodes

this makes it easier to edit hitsounds in the stable editor after export because the sample control point effects wont get overwritten by the properties of the hitobject
---
 osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index c5a8cc89be..28f3a8d951 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -520,6 +520,14 @@ namespace osu.Game.Beatmaps.Formats
                 string sampleFilename = samples.FirstOrDefault(s => string.IsNullOrEmpty(s.Name))?.LookupNames.First() ?? string.Empty;
                 int volume = samples.FirstOrDefault()?.Volume ?? 100;
 
+                // We want to ignore custom sample banks and volume when not encoding to the mania game mode,
+                // because they cause unexpected results in the editor and are already satisfied by the control points.
+                if (onlineRulesetID != 3)
+                {
+                    customSampleBank = "0";
+                    volume = 0;
+                }
+
                 sb.Append(':');
                 sb.Append(FormattableString.Invariant($"{customSampleBank}:"));
                 sb.Append(FormattableString.Invariant($"{volume}:"));

From 4d52ce769bcea52ee6e10cbc3826a4d570f48707 Mon Sep 17 00:00:00 2001
From: Terochi <mates.cernicky@gmail.com>
Date: Mon, 1 May 2023 12:53:58 +0200
Subject: [PATCH 0242/1604] Revert `SaveState()` calling on initialization

---
 osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs   | 1 +
 osu.Game/Overlays/SkinEditor/SkinEditorChangeHandler.cs | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
index f7eb42872d..7b37b6624d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
@@ -198,6 +198,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 firstTarget = Player.ChildrenOfType<SkinComponentsContainer>().First();
                 changeHandler = new TestSkinEditorChangeHandler(firstTarget);
 
+                changeHandler.SaveState();
                 defaultState = changeHandler.GetCurrentState();
 
                 testComponents = new[]
diff --git a/osu.Game/Overlays/SkinEditor/SkinEditorChangeHandler.cs b/osu.Game/Overlays/SkinEditor/SkinEditorChangeHandler.cs
index 18ffdb0edc..3dddf639cc 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditorChangeHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditorChangeHandler.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Overlays.SkinEditor
                 return;
 
             components = new BindableList<ISerialisableDrawable> { BindTarget = firstTarget.Components };
-            components.BindCollectionChanged((_, _) => SaveState(), true);
+            components.BindCollectionChanged((_, _) => SaveState());
         }
 
         protected override void WriteCurrentStateToStream(MemoryStream stream)

From 27cfadca16476bc9cbe069294bbc3b141c9cdcc7 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Mon, 1 May 2023 14:14:57 +0200
Subject: [PATCH 0243/1604] add sample info to Banana and SpinnerBonusTick

---
 osu.Game.Rulesets.Catch/Objects/Banana.cs         | 8 +++-----
 osu.Game.Rulesets.Catch/Objects/BananaShower.cs   | 2 +-
 osu.Game.Rulesets.Osu/Objects/Spinner.cs          | 2 +-
 osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs | 6 ------
 osu.Game/Rulesets/Objects/HitObject.cs            | 2 +-
 5 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Banana.cs b/osu.Game.Rulesets.Catch/Objects/Banana.cs
index af03c9acab..e137204c32 100644
--- a/osu.Game.Rulesets.Catch/Objects/Banana.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Banana.cs
@@ -22,11 +22,9 @@ namespace osu.Game.Rulesets.Catch.Objects
 
         public override Judgement CreateJudgement() => new CatchBananaJudgement();
 
-        private static readonly List<HitSampleInfo> samples = new List<HitSampleInfo> { new BananaHitSampleInfo() };
-
-        public Banana()
+        public Banana(int volume = 100)
         {
-            Samples = samples;
+            Samples = new List<HitSampleInfo> { new BananaHitSampleInfo(volume) };
         }
 
         // override any external colour changes with banananana
@@ -53,7 +51,7 @@ namespace osu.Game.Rulesets.Catch.Objects
 
             public override IEnumerable<string> LookupNames => lookup_names;
 
-            public BananaHitSampleInfo(int volume = 0)
+            public BananaHitSampleInfo(int volume = 100)
                 : base(string.Empty, volume: volume)
             {
             }
diff --git a/osu.Game.Rulesets.Catch/Objects/BananaShower.cs b/osu.Game.Rulesets.Catch/Objects/BananaShower.cs
index b45f95a8e6..08febeabbf 100644
--- a/osu.Game.Rulesets.Catch/Objects/BananaShower.cs
+++ b/osu.Game.Rulesets.Catch/Objects/BananaShower.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Catch.Objects
             {
                 cancellationToken.ThrowIfCancellationRequested();
 
-                AddNested(new Banana
+                AddNested(new Banana(GetSampleInfo().Volume)
                 {
                     StartTime = time,
                     BananaIndex = i,
diff --git a/osu.Game.Rulesets.Osu/Objects/Spinner.cs b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
index 55924c19c9..df5898fd67 100644
--- a/osu.Game.Rulesets.Osu/Objects/Spinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Rulesets.Osu.Objects
 
                 AddNested(i < SpinsRequired
                     ? new SpinnerTick { StartTime = startTime, SpinnerDuration = Duration }
-                    : new SpinnerBonusTick { StartTime = startTime, SpinnerDuration = Duration });
+                    : new SpinnerBonusTick { StartTime = startTime, SpinnerDuration = Duration, Samples = new[] { GetSampleInfo("spinnerbonus") } });
             }
         }
 
diff --git a/osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs b/osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs
index 81cdf5755b..00ceccaf7b 100644
--- a/osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs
@@ -3,7 +3,6 @@
 
 #nullable disable
 
-using osu.Game.Audio;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 
@@ -11,11 +10,6 @@ namespace osu.Game.Rulesets.Osu.Objects
 {
     public class SpinnerBonusTick : SpinnerTick
     {
-        public SpinnerBonusTick()
-        {
-            Samples.Add(new HitSampleInfo("spinnerbonus"));
-        }
-
         public override Judgement CreateJudgement() => new OsuSpinnerBonusTickJudgement();
 
         public class OsuSpinnerBonusTickJudgement : OsuSpinnerTickJudgement
diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs
index 774ff9dc1d..a4cb976d50 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -210,7 +210,7 @@ namespace osu.Game.Rulesets.Objects
         /// </summary>
         /// <param name="sampleName">The name of the sample.</param>
         /// <returns>A populated <see cref="HitSampleInfo"/>.</returns>
-        protected HitSampleInfo GetSampleInfo(string sampleName)
+        protected HitSampleInfo GetSampleInfo(string sampleName = HitSampleInfo.HIT_NORMAL)
         {
             var hitnormalSample = Samples.FirstOrDefault(s => s.Name == HitSampleInfo.HIT_NORMAL);
             return hitnormalSample == null ? new HitSampleInfo(sampleName) : hitnormalSample.With(newName: sampleName);

From 8302bb1f37b5c5c18d85134fc0a5834b7c4caaa9 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Mon, 1 May 2023 14:56:29 +0200
Subject: [PATCH 0244/1604] dont encode custom sample bank for objects without
 legacy samples

---
 .../Beatmaps/Formats/LegacyBeatmapEncoder.cs  | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 28f3a8d951..343dd7b082 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -5,7 +5,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -173,9 +172,6 @@ namespace osu.Game.Beatmaps.Formats
 
         private void handleControlPoints(TextWriter writer)
         {
-            if (beatmap.ControlPointInfo.Groups.Count == 0)
-                return;
-
             var legacyControlPoints = new LegacyControlPointInfo();
             foreach (var point in beatmap.ControlPointInfo.AllControlPoints)
                 legacyControlPoints.Add(point.Time, point.DeepClone());
@@ -199,6 +195,8 @@ namespace osu.Game.Beatmaps.Formats
                     legacyControlPoints.Add(point.Time, new DifficultyControlPoint { SliderVelocity = point.ScrollSpeed });
             }
 
+            int lastCustomSampleIndex = 0;
+
             foreach (var group in legacyControlPoints.Groups)
             {
                 var groupTimingPoint = group.ControlPoints.OfType<TimingControlPoint>().FirstOrDefault();
@@ -227,6 +225,12 @@ namespace osu.Game.Beatmaps.Formats
                 // Apply the control point to a hit sample to uncover legacy properties (e.g. suffix)
                 HitSampleInfo tempHitSample = samplePoint.ApplyTo(new ConvertHitObjectParser.LegacyHitSampleInfo(string.Empty));
 
+                // Inherit the previous sample bank if the current sample bank is not set
+                int customSampleBank = toLegacyCustomSampleBank(tempHitSample);
+                if (customSampleBank < 0)
+                    customSampleBank = lastCustomSampleIndex;
+                lastCustomSampleIndex = customSampleBank;
+
                 // Convert effect flags to the legacy format
                 LegacyEffectFlags effectFlags = LegacyEffectFlags.None;
                 if (effectPoint.KiaiMode)
@@ -236,7 +240,7 @@ namespace osu.Game.Beatmaps.Formats
 
                 writer.Write(FormattableString.Invariant($"{timingPoint.TimeSignature.Numerator},"));
                 writer.Write(FormattableString.Invariant($"{(int)toLegacySampleBank(tempHitSample.Bank)},"));
-                writer.Write(FormattableString.Invariant($"{toLegacyCustomSampleBank(tempHitSample)},"));
+                writer.Write(FormattableString.Invariant($"{customSampleBank},"));
                 writer.Write(FormattableString.Invariant($"{tempHitSample.Volume},"));
                 writer.Write(FormattableString.Invariant($"{(isTimingPoint ? '1' : '0')},"));
                 writer.Write(FormattableString.Invariant($"{(int)effectFlags}"));
@@ -276,7 +280,8 @@ namespace osu.Game.Beatmaps.Formats
                         int volume = hitObject.Samples.Max(o => o.Volume);
                         int customIndex = hitObject.Samples.Any(o => o is ConvertHitObjectParser.LegacyHitSampleInfo)
                             ? hitObject.Samples.OfType<ConvertHitObjectParser.LegacyHitSampleInfo>().Max(o => o.CustomSampleBank)
-                            : 0;
+                            : -1;
+
                         yield return new LegacyBeatmapDecoder.LegacySampleControlPoint { Time = hitObject.GetEndTime(), SampleVolume = volume, CustomSampleBank = customIndex };
                     }
 
@@ -516,7 +521,7 @@ namespace osu.Game.Beatmaps.Formats
 
             if (!banksOnly)
             {
-                string customSampleBank = toLegacyCustomSampleBank(samples.FirstOrDefault(s => !string.IsNullOrEmpty(s.Name)));
+                int customSampleBank = toLegacyCustomSampleBank(samples.FirstOrDefault(s => !string.IsNullOrEmpty(s.Name)));
                 string sampleFilename = samples.FirstOrDefault(s => string.IsNullOrEmpty(s.Name))?.LookupNames.First() ?? string.Empty;
                 int volume = samples.FirstOrDefault()?.Volume ?? 100;
 
@@ -524,7 +529,7 @@ namespace osu.Game.Beatmaps.Formats
                 // because they cause unexpected results in the editor and are already satisfied by the control points.
                 if (onlineRulesetID != 3)
                 {
-                    customSampleBank = "0";
+                    customSampleBank = 0;
                     volume = 0;
                 }
 
@@ -580,12 +585,12 @@ namespace osu.Game.Beatmaps.Formats
             }
         }
 
-        private string toLegacyCustomSampleBank(HitSampleInfo hitSampleInfo)
+        private int toLegacyCustomSampleBank(HitSampleInfo hitSampleInfo)
         {
             if (hitSampleInfo is ConvertHitObjectParser.LegacyHitSampleInfo legacy)
-                return legacy.CustomSampleBank.ToString(CultureInfo.InvariantCulture);
+                return legacy.CustomSampleBank;
 
-            return "0";
+            return 0;
         }
     }
 }

From 1dc34ee25de83fd4c2bc73151bfd3fde607519d0 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Mon, 1 May 2023 15:48:54 +0200
Subject: [PATCH 0245/1604] fix infinite repeat count when adjusting length of
 0 length slider

---
 .../Compose/Components/Timeline/TimelineHitObjectBlueprint.cs   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index 4e5087c004..50f941a1e5 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -414,7 +414,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                                     double lengthOfOneRepeat = repeatHitObject.Duration / (repeatHitObject.RepeatCount + 1);
                                     int proposedCount = Math.Max(0, (int)Math.Round(proposedDuration / lengthOfOneRepeat) - 1);
 
-                                    if (proposedCount == repeatHitObject.RepeatCount)
+                                    if (proposedCount == repeatHitObject.RepeatCount || lengthOfOneRepeat == 0)
                                         return;
 
                                     repeatHitObject.RepeatCount = proposedCount;

From dbb2a8980b001c3ca97f31d3b7b9431ea1d30f7c Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Mon, 1 May 2023 15:56:23 +0200
Subject: [PATCH 0246/1604] add test

---
 .../TestSceneTimelineHitObjectBlueprint.cs    | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
index 709d796e97..932e45b1a6 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
@@ -77,5 +77,38 @@ namespace osu.Game.Tests.Visual.Editing
 
             AddAssert("object has non-zero duration", () => EditorBeatmap.HitObjects.OfType<IHasDuration>().Single().Duration > 0);
         }
+
+        [Test]
+        public void TestDisallowRepeatsOnZeroDurationObjects()
+        {
+            DragArea dragArea;
+
+            AddStep("add zero length slider", () =>
+            {
+                EditorBeatmap.Clear();
+                EditorBeatmap.Add(new Slider
+                {
+                    Position = new Vector2(256, 256),
+                    StartTime = 2700
+                });
+            });
+
+            AddStep("hold down drag bar", () =>
+            {
+                // distinguishes between the actual drag bar and its "underlay shadow".
+                dragArea = this.ChildrenOfType<DragArea>().Single(bar => bar.HandlePositionalInput);
+                InputManager.MoveMouseTo(dragArea);
+                InputManager.PressButton(MouseButton.Left);
+            });
+
+            AddStep("try to extend drag bar", () =>
+            {
+                var blueprint = this.ChildrenOfType<TimelineHitObjectBlueprint>().Single();
+                InputManager.MoveMouseTo(blueprint.SelectionQuad.TopLeft + new Vector2(100, 0));
+                InputManager.ReleaseButton(MouseButton.Left);
+            });
+
+            AddAssert("object has zero repeats", () => EditorBeatmap.HitObjects.OfType<IHasRepeats>().Single().RepeatCount == 0);
+        }
     }
 }

From 8c21fddb5e1d98a0158e664b44b0c7331c2338f7 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Mon, 1 May 2023 16:53:38 +0200
Subject: [PATCH 0247/1604] remove all redundancies from encoded control points

---
 .../Beatmaps/Formats/LegacyBeatmapEncoder.cs  | 72 ++++++++++++++-----
 1 file changed, 54 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 343dd7b082..6b228a56a1 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -170,6 +171,24 @@ namespace osu.Game.Beatmaps.Formats
                 writer.WriteLine(FormattableString.Invariant($"{(int)LegacyEventType.Break},{b.StartTime},{b.EndTime}"));
         }
 
+        private struct LegacyControlPointProperties
+        {
+            internal double SliderVelocity { get; set; }
+            internal int TimingSignature { get; init; }
+            internal int SampleBank { get; init; }
+            internal int CustomSampleBank { get; init; }
+            internal int SampleVolume { get; init; }
+            internal LegacyEffectFlags EffectFlags { get; init; }
+
+            internal bool IsRedundant(LegacyControlPointProperties other) =>
+                SliderVelocity == other.SliderVelocity &&
+                TimingSignature == other.TimingSignature &&
+                SampleBank == other.SampleBank &&
+                CustomSampleBank == other.CustomSampleBank &&
+                SampleVolume == other.SampleVolume &&
+                EffectFlags == other.EffectFlags;
+        }
+
         private void handleControlPoints(TextWriter writer)
         {
             var legacyControlPoints = new LegacyControlPointInfo();
@@ -195,41 +214,44 @@ namespace osu.Game.Beatmaps.Formats
                     legacyControlPoints.Add(point.Time, new DifficultyControlPoint { SliderVelocity = point.ScrollSpeed });
             }
 
-            int lastCustomSampleIndex = 0;
+            LegacyControlPointProperties lastControlPointProperties = new LegacyControlPointProperties();
 
             foreach (var group in legacyControlPoints.Groups)
             {
                 var groupTimingPoint = group.ControlPoints.OfType<TimingControlPoint>().FirstOrDefault();
+                var controlPointProperties = getLegacyControlPointProperties(group, groupTimingPoint != null);
 
                 // If the group contains a timing control point, it needs to be output separately.
                 if (groupTimingPoint != null)
                 {
                     writer.Write(FormattableString.Invariant($"{groupTimingPoint.Time},"));
                     writer.Write(FormattableString.Invariant($"{groupTimingPoint.BeatLength},"));
-                    outputControlPointAt(groupTimingPoint.Time, true);
+                    outputControlPointAt(controlPointProperties, true);
+                    lastControlPointProperties = controlPointProperties;
+                    lastControlPointProperties.SliderVelocity = 1;
                 }
 
+                if (controlPointProperties.IsRedundant(lastControlPointProperties))
+                    continue;
+
                 // Output any remaining effects as secondary non-timing control point.
-                var difficultyPoint = legacyControlPoints.DifficultyPointAt(group.Time);
                 writer.Write(FormattableString.Invariant($"{group.Time},"));
-                writer.Write(FormattableString.Invariant($"{-100 / difficultyPoint.SliderVelocity},"));
-                outputControlPointAt(group.Time, false);
+                writer.Write(FormattableString.Invariant($"{-100 / controlPointProperties.SliderVelocity},"));
+                outputControlPointAt(controlPointProperties, false);
+                lastControlPointProperties = controlPointProperties;
             }
 
-            void outputControlPointAt(double time, bool isTimingPoint)
+            LegacyControlPointProperties getLegacyControlPointProperties(ControlPointGroup group, bool updateSampleBank)
             {
+                double time = group.Time;
+                var timingPoint = legacyControlPoints.TimingPointAt(time);
+                var difficultyPoint = legacyControlPoints.DifficultyPointAt(time);
                 var samplePoint = legacyControlPoints.SamplePointAt(time);
                 var effectPoint = legacyControlPoints.EffectPointAt(time);
-                var timingPoint = legacyControlPoints.TimingPointAt(time);
 
                 // Apply the control point to a hit sample to uncover legacy properties (e.g. suffix)
                 HitSampleInfo tempHitSample = samplePoint.ApplyTo(new ConvertHitObjectParser.LegacyHitSampleInfo(string.Empty));
-
-                // Inherit the previous sample bank if the current sample bank is not set
                 int customSampleBank = toLegacyCustomSampleBank(tempHitSample);
-                if (customSampleBank < 0)
-                    customSampleBank = lastCustomSampleIndex;
-                lastCustomSampleIndex = customSampleBank;
 
                 // Convert effect flags to the legacy format
                 LegacyEffectFlags effectFlags = LegacyEffectFlags.None;
@@ -238,12 +260,26 @@ namespace osu.Game.Beatmaps.Formats
                 if (timingPoint.OmitFirstBarLine)
                     effectFlags |= LegacyEffectFlags.OmitFirstBarLine;
 
-                writer.Write(FormattableString.Invariant($"{timingPoint.TimeSignature.Numerator},"));
-                writer.Write(FormattableString.Invariant($"{(int)toLegacySampleBank(tempHitSample.Bank)},"));
-                writer.Write(FormattableString.Invariant($"{customSampleBank},"));
-                writer.Write(FormattableString.Invariant($"{tempHitSample.Volume},"));
-                writer.Write(FormattableString.Invariant($"{(isTimingPoint ? '1' : '0')},"));
-                writer.Write(FormattableString.Invariant($"{(int)effectFlags}"));
+                return new LegacyControlPointProperties
+                {
+                    SliderVelocity = difficultyPoint.SliderVelocity,
+                    TimingSignature = timingPoint.TimeSignature.Numerator,
+                    SampleBank = updateSampleBank ? (int)toLegacySampleBank(tempHitSample.Bank) : lastControlPointProperties.SampleBank,
+                    // Inherit the previous custom sample bank if the current custom sample bank is not set
+                    CustomSampleBank = customSampleBank >= 0 ? customSampleBank : lastControlPointProperties.CustomSampleBank,
+                    SampleVolume = tempHitSample.Volume,
+                    EffectFlags = effectFlags
+                };
+            }
+
+            void outputControlPointAt(LegacyControlPointProperties controlPoint, bool isTimingPoint)
+            {
+                writer.Write(FormattableString.Invariant($"{controlPoint.TimingSignature.ToString(CultureInfo.InvariantCulture)},"));
+                writer.Write(FormattableString.Invariant($"{controlPoint.SampleBank.ToString(CultureInfo.InvariantCulture)},"));
+                writer.Write(FormattableString.Invariant($"{controlPoint.CustomSampleBank.ToString(CultureInfo.InvariantCulture)},"));
+                writer.Write(FormattableString.Invariant($"{controlPoint.SampleVolume.ToString(CultureInfo.InvariantCulture)},"));
+                writer.Write(FormattableString.Invariant($"{(isTimingPoint ? "1" : "0")},"));
+                writer.Write(FormattableString.Invariant($"{((int)controlPoint.EffectFlags).ToString(CultureInfo.InvariantCulture)}"));
                 writer.WriteLine();
             }
 

From 8ab3a87b13b7a7d0efce52d8db67b2e8af9f6a81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 1 May 2023 17:13:09 +0200
Subject: [PATCH 0248/1604] Add failing test case covering online ID reset on
 save

This test scene passes at e58e1151f3c610d8019e1f1e408a1cb55d204c24 and
fails at current master, due to an inadvertent regression caused by
e72f103c1759e61c3afa7080f962c639265996c3.

As it turns out, the online lookup flow that was causing UI thread
freezes when saving beatmaps in the editor, was also responsible for
resetting the online ID of locally-modified beatmaps if online lookup
failed.
---
 ...TestSceneLocallyModifyingOnlineBeatmaps.cs | 56 +++++++++++++++++++
 .../Tests/Visual/EditorSavingTestScene.cs     | 27 ++++++++-
 2 files changed, 80 insertions(+), 3 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Editing/TestSceneLocallyModifyingOnlineBeatmaps.cs

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneLocallyModifyingOnlineBeatmaps.cs b/osu.Game.Tests/Visual/Editing/TestSceneLocallyModifyingOnlineBeatmaps.cs
new file mode 100644
index 0000000000..be9bbcfdd8
--- /dev/null
+++ b/osu.Game.Tests/Visual/Editing/TestSceneLocallyModifyingOnlineBeatmaps.cs
@@ -0,0 +1,56 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Linq;
+using System.Net;
+using NUnit.Framework;
+using osu.Framework.Extensions;
+using osu.Game.Database;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Tests.Resources;
+
+namespace osu.Game.Tests.Visual.Editing
+{
+    public partial class TestSceneLocallyModifyingOnlineBeatmaps : EditorSavingTestScene
+    {
+        private DummyAPIAccess dummyAPI => (DummyAPIAccess)API;
+
+        public override void SetUpSteps()
+        {
+            CreateInitialBeatmap = () =>
+            {
+                var importedSet = Game.BeatmapManager.Import(new ImportTask(TestResources.GetTestBeatmapForImport())).GetResultSafely();
+                return Game.BeatmapManager.GetWorkingBeatmap(importedSet!.Value.Beatmaps.First());
+            };
+
+            base.SetUpSteps();
+        }
+
+        [Test]
+        public void TestLocallyModifyingOnlineBeatmap()
+        {
+            AddAssert("editor beatmap has online ID", () => EditorBeatmap.BeatmapInfo.OnlineID, () => Is.GreaterThan(0));
+
+            AddStep("delete first hitobject", () => EditorBeatmap.RemoveAt(0));
+
+            AddStep("mock online lookup failure", () =>
+            {
+                dummyAPI.HandleRequest = req =>
+                {
+                    if (req is GetBeatmapRequest)
+                    {
+                        req.TriggerFailure(new APIException("Beatmap not found", new WebException("NotFound")));
+                        return true;
+                    }
+
+                    return false;
+                };
+            });
+            SaveEditor();
+
+            ReloadEditorToSameBeatmap();
+            AddAssert("editor beatmap online ID reset", () => EditorBeatmap.BeatmapInfo.OnlineID, () => Is.EqualTo(-1));
+        }
+    }
+}
diff --git a/osu.Game/Tests/Visual/EditorSavingTestScene.cs b/osu.Game/Tests/Visual/EditorSavingTestScene.cs
index cd9e9e1d52..78188d7cf7 100644
--- a/osu.Game/Tests/Visual/EditorSavingTestScene.cs
+++ b/osu.Game/Tests/Visual/EditorSavingTestScene.cs
@@ -3,9 +3,12 @@
 
 #nullable disable
 
+using System;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Input;
 using osu.Framework.Testing;
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Setup;
@@ -24,18 +27,27 @@ namespace osu.Game.Tests.Visual
 
         protected EditorBeatmap EditorBeatmap => (EditorBeatmap)Editor.Dependencies.Get(typeof(EditorBeatmap));
 
+        [CanBeNull]
+        protected Func<WorkingBeatmap> CreateInitialBeatmap { get; set; }
+
         [SetUpSteps]
         public override void SetUpSteps()
         {
             base.SetUpSteps();
 
-            AddStep("set default beatmap", () => Game.Beatmap.SetDefault());
+            if (CreateInitialBeatmap == null)
+                AddStep("set default beatmap", () => Game.Beatmap.SetDefault());
+            else
+            {
+                AddStep("set test beatmap", () => Game.Beatmap.Value = CreateInitialBeatmap?.Invoke());
+            }
 
             PushAndConfirm(() => new EditorLoader());
 
             AddUntilStep("wait for editor load", () => Editor?.IsLoaded == true);
 
-            AddUntilStep("wait for metadata screen load", () => Editor.ChildrenOfType<MetadataSection>().FirstOrDefault()?.IsLoaded == true);
+            if (CreateInitialBeatmap == null)
+                AddUntilStep("wait for metadata screen load", () => Editor.ChildrenOfType<MetadataSection>().FirstOrDefault()?.IsLoaded == true);
 
             // We intentionally switch away from the metadata screen, else there is a feedback loop with the textbox handling which causes metadata changes below to get overwritten.
 
@@ -50,6 +62,14 @@ namespace osu.Game.Tests.Visual
 
         protected void ReloadEditorToSameBeatmap()
         {
+            Guid beatmapSetGuid = Guid.Empty;
+            Guid beatmapGuid = Guid.Empty;
+
+            AddStep("Store beatmap GUIDs", () =>
+            {
+                beatmapSetGuid = EditorBeatmap.BeatmapInfo.BeatmapSet!.ID;
+                beatmapGuid = EditorBeatmap.BeatmapInfo.ID;
+            });
             AddStep("Exit", () => InputManager.Key(Key.Escape));
 
             AddUntilStep("Wait for main menu", () => Game.ScreenStack.CurrentScreen is MainMenu);
@@ -59,7 +79,8 @@ namespace osu.Game.Tests.Visual
             PushAndConfirm(() => songSelect = new PlaySongSelect());
             AddUntilStep("wait for carousel load", () => songSelect.BeatmapSetsLoaded);
 
-            AddUntilStep("Wait for beatmap selected", () => !Game.Beatmap.IsDefault);
+            AddStep("Present same beatmap", () => Game.PresentBeatmap(Game.BeatmapManager.QueryBeatmapSet(set => set.ID == beatmapSetGuid)!.Value, beatmap => beatmap.ID == beatmapGuid));
+            AddUntilStep("Wait for beatmap selected", () => Game.Beatmap.Value.BeatmapInfo.ID == beatmapGuid);
             AddStep("Open options", () => InputManager.Key(Key.F3));
             AddStep("Enter editor", () => InputManager.Key(Key.Number5));
 

From f470b2c9cc379b24be498b4865f0f82f6fa41a7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 1 May 2023 17:24:58 +0200
Subject: [PATCH 0249/1604] Always reset online info when saving local beatmap

---
 osu.Game/Beatmaps/BeatmapManager.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 6af6a25579..3f2ab9b391 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -440,6 +440,7 @@ namespace osu.Game.Beatmaps
 
                 beatmapInfo.LastLocalUpdate = DateTimeOffset.Now;
                 beatmapInfo.Status = BeatmapOnlineStatus.LocallyModified;
+                beatmapInfo.ResetOnlineInfo();
 
                 AddFile(setInfo, stream, createBeatmapFilenameFromMetadata(beatmapInfo));
 

From 1fb4c814f4446eefa768e9f2f0f73af0334c64f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 1 May 2023 17:31:55 +0200
Subject: [PATCH 0250/1604] Remove no longer needed API call mocking

The online ID will be reset unconditionally after any local change is
made to any beatmap. That behaviour no longer depends on online lookups
succeeding or failing.

This may change at a later date when beatmap submission is integrated
into lazer - the idea is that online IDs would get re-populated on local
beatmaps once they are submitted to web.
---
 ...TestSceneLocallyModifyingOnlineBeatmaps.cs | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneLocallyModifyingOnlineBeatmaps.cs b/osu.Game.Tests/Visual/Editing/TestSceneLocallyModifyingOnlineBeatmaps.cs
index be9bbcfdd8..7f9a69833c 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneLocallyModifyingOnlineBeatmaps.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneLocallyModifyingOnlineBeatmaps.cs
@@ -2,20 +2,15 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
-using System.Net;
 using NUnit.Framework;
 using osu.Framework.Extensions;
 using osu.Game.Database;
-using osu.Game.Online.API;
-using osu.Game.Online.API.Requests;
 using osu.Game.Tests.Resources;
 
 namespace osu.Game.Tests.Visual.Editing
 {
     public partial class TestSceneLocallyModifyingOnlineBeatmaps : EditorSavingTestScene
     {
-        private DummyAPIAccess dummyAPI => (DummyAPIAccess)API;
-
         public override void SetUpSteps()
         {
             CreateInitialBeatmap = () =>
@@ -33,20 +28,6 @@ namespace osu.Game.Tests.Visual.Editing
             AddAssert("editor beatmap has online ID", () => EditorBeatmap.BeatmapInfo.OnlineID, () => Is.GreaterThan(0));
 
             AddStep("delete first hitobject", () => EditorBeatmap.RemoveAt(0));
-
-            AddStep("mock online lookup failure", () =>
-            {
-                dummyAPI.HandleRequest = req =>
-                {
-                    if (req is GetBeatmapRequest)
-                    {
-                        req.TriggerFailure(new APIException("Beatmap not found", new WebException("NotFound")));
-                        return true;
-                    }
-
-                    return false;
-                };
-            });
             SaveEditor();
 
             ReloadEditorToSameBeatmap();

From cf5211aec922852673c77dcedae081c89ca005e1 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Mon, 1 May 2023 19:22:52 +0200
Subject: [PATCH 0251/1604] Enable current distance snap when exactly on a hit
 object

---
 osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs b/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
index aa47b4f424..09c6af3820 100644
--- a/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
@@ -93,7 +93,7 @@ namespace osu.Game.Rulesets.Edit
 
         private (HitObject before, HitObject after)? getObjectsOnEitherSideOfCurrentTime()
         {
-            HitObject lastBefore = Playfield.HitObjectContainer.AliveObjects.LastOrDefault(h => h.HitObject.StartTime <= EditorClock.CurrentTime)?.HitObject;
+            HitObject lastBefore = Playfield.HitObjectContainer.AliveObjects.LastOrDefault(h => h.HitObject.StartTime < EditorClock.CurrentTime)?.HitObject;
 
             if (lastBefore == null)
                 return null;

From 436ebdcfcb1d556c6bad05dea472aa9f4f41959a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 1 May 2023 19:06:25 +0200
Subject: [PATCH 0252/1604] Fix beatmap leaderboard test failure

Because the online info reset (which includes online ID reset) was
happening after encoding,
`TestSceneBeatmapLeaderboard.TestLocalScoresDisplayOnBeatmapEdit()`
started failing, as the hash no longer matched expectations after the
first save of the map.
---
 osu.Game/Beatmaps/BeatmapManager.cs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 3f2ab9b391..ae62564b0d 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -415,6 +415,13 @@ namespace osu.Game.Beatmaps
             // All changes to metadata are made in the provided beatmapInfo, so this should be copied to the `IBeatmap` before encoding.
             beatmapContent.BeatmapInfo = beatmapInfo;
 
+            // Since now this is a locally-modified beatmap, we also set all relevant flags to indicate this.
+            // Importantly, the `ResetOnlineInfo()` call must happen before encoding, as online ID is encoded into the `.osu` file,
+            // which influences the beatmap checksums.
+            beatmapInfo.LastLocalUpdate = DateTimeOffset.Now;
+            beatmapInfo.Status = BeatmapOnlineStatus.LocallyModified;
+            beatmapInfo.ResetOnlineInfo();
+
             using (var stream = new MemoryStream())
             {
                 using (var sw = new StreamWriter(stream, Encoding.UTF8, 1024, true))
@@ -438,10 +445,6 @@ namespace osu.Game.Beatmaps
                 beatmapInfo.MD5Hash = stream.ComputeMD5Hash();
                 beatmapInfo.Hash = stream.ComputeSHA2Hash();
 
-                beatmapInfo.LastLocalUpdate = DateTimeOffset.Now;
-                beatmapInfo.Status = BeatmapOnlineStatus.LocallyModified;
-                beatmapInfo.ResetOnlineInfo();
-
                 AddFile(setInfo, stream, createBeatmapFilenameFromMetadata(beatmapInfo));
 
                 updateHashAndMarkDirty(setInfo);

From 87db89114368d55a4029ff45109a0a9b9002c268 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 May 2023 13:12:08 +0900
Subject: [PATCH 0253/1604] Adjust test to reliabily fail

---
 .../Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
index 932e45b1a6..08e036248b 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
@@ -105,9 +105,10 @@ namespace osu.Game.Tests.Visual.Editing
             {
                 var blueprint = this.ChildrenOfType<TimelineHitObjectBlueprint>().Single();
                 InputManager.MoveMouseTo(blueprint.SelectionQuad.TopLeft + new Vector2(100, 0));
-                InputManager.ReleaseButton(MouseButton.Left);
             });
 
+            AddStep("release button", () => InputManager.PressButton(MouseButton.Left));
+
             AddAssert("object has zero repeats", () => EditorBeatmap.HitObjects.OfType<IHasRepeats>().Single().RepeatCount == 0);
         }
     }

From 63890ef6feb9b8fffd28152545aaf88d0aefe9ee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 May 2023 13:24:19 +0900
Subject: [PATCH 0254/1604] Fix audio offset tooltip potentially showing "-0
 ms"

Closes https://github.com/ppy/osu/issues/23339.
---
 osu.Game/Graphics/UserInterface/TimeSlider.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/UserInterface/TimeSlider.cs b/osu.Game/Graphics/UserInterface/TimeSlider.cs
index e4058827f3..e6e7ae9305 100644
--- a/osu.Game/Graphics/UserInterface/TimeSlider.cs
+++ b/osu.Game/Graphics/UserInterface/TimeSlider.cs
@@ -12,6 +12,6 @@ namespace osu.Game.Graphics.UserInterface
     /// </summary>
     public partial class TimeSlider : RoundedSliderBar<double>
     {
-        public override LocalisableString TooltipText => $"{Current.Value:N0} ms";
+        public override LocalisableString TooltipText => $"{base.TooltipText} ms";
     }
 }

From e808e7316b320c3b9f4105ed2f79081bf8203283 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 May 2023 13:29:30 +0900
Subject: [PATCH 0255/1604] Mark delegate value unused and add comment to avoid
 future regression

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 46d3620c9c..38ae8c68cb 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -242,7 +242,7 @@ namespace osu.Game.Overlays.Mods
             if (AllowCustomisation)
                 ((IBindable<IReadOnlyList<Mod>>)modSettingsArea.SelectedMods).BindTo(SelectedMods);
 
-            SelectedMods.BindValueChanged(val =>
+            SelectedMods.BindValueChanged(_ =>
             {
                 updateMultiplier();
                 updateFromExternalSelection();
@@ -252,6 +252,10 @@ namespace osu.Game.Overlays.Mods
 
                 if (AllowCustomisation)
                 {
+                    // Importantly, use SelectedMods.Value here (and not the ValueChanged NewValue) as the latter can
+                    // potentially be stale, due to complexities in the way change trackers work.
+                    //
+                    // See https://github.com/ppy/osu/pull/23284#issuecomment-1529056988
                     modSettingChangeTracker = new ModSettingChangeTracker(SelectedMods.Value);
                     modSettingChangeTracker.SettingChanged += _ => updateMultiplier();
                 }

From 37a5dde8592c48edebdc3ffaa36da96da75d226c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 May 2023 13:47:49 +0900
Subject: [PATCH 0256/1604] Fix `BeatmapAttributeText` not supporting unicode
 artist/title

---
 osu.Game/Skinning/Components/BeatmapAttributeText.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/Components/BeatmapAttributeText.cs b/osu.Game/Skinning/Components/BeatmapAttributeText.cs
index 2c16a67cac..6523039a3f 100644
--- a/osu.Game/Skinning/Components/BeatmapAttributeText.cs
+++ b/osu.Game/Skinning/Components/BeatmapAttributeText.cs
@@ -84,8 +84,8 @@ namespace osu.Game.Skinning.Components
 
         private void updateBeatmapContent(WorkingBeatmap workingBeatmap)
         {
-            valueDictionary[BeatmapAttribute.Title] = workingBeatmap.BeatmapInfo.Metadata.Title;
-            valueDictionary[BeatmapAttribute.Artist] = workingBeatmap.BeatmapInfo.Metadata.Artist;
+            valueDictionary[BeatmapAttribute.Title] = new RomanisableString(workingBeatmap.BeatmapInfo.Metadata.TitleUnicode, workingBeatmap.BeatmapInfo.Metadata.Title);
+            valueDictionary[BeatmapAttribute.Artist] = new RomanisableString(workingBeatmap.BeatmapInfo.Metadata.ArtistUnicode, workingBeatmap.BeatmapInfo.Metadata.Artist);
             valueDictionary[BeatmapAttribute.DifficultyName] = workingBeatmap.BeatmapInfo.DifficultyName;
             valueDictionary[BeatmapAttribute.Creator] = workingBeatmap.BeatmapInfo.Metadata.Author.Username;
             valueDictionary[BeatmapAttribute.Length] = TimeSpan.FromMilliseconds(workingBeatmap.BeatmapInfo.Length).ToFormattedDuration();

From ad40099e3280d0929ce13b2adca488354bef9f81 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 May 2023 14:00:52 +0900
Subject: [PATCH 0257/1604] Ensure negative sign is only applied when the
 post-rounded result is negative

---
 osu.Game/Graphics/UserInterface/OsuSliderBar.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
index 0c36d73085..0e26029ffa 100644
--- a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
+++ b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
@@ -97,7 +97,9 @@ namespace osu.Game.Graphics.UserInterface
             // Find the number of significant digits (we could have less than 5 after normalize())
             int significantDigits = FormatUtils.FindPrecision(decimalPrecision);
 
-            return floatValue.ToString($"N{significantDigits}");
+            string negativeSign = Math.Round(floatValue, significantDigits) < 0 ? "-" : string.Empty;
+
+            return $"{negativeSign}{Math.Abs(floatValue).ToString($"N{significantDigits}")}";
         }
 
         /// <summary>

From 736be6a73ba2c9ff5332b39f828f0310a8d76851 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 May 2023 14:11:16 +0900
Subject: [PATCH 0258/1604] Refactor slightly for readability

---
 osu.Game/Overlays/Music/PlaylistItem.cs | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/Music/PlaylistItem.cs b/osu.Game/Overlays/Music/PlaylistItem.cs
index 4a39cc06c8..90fdfd0491 100644
--- a/osu.Game/Overlays/Music/PlaylistItem.cs
+++ b/osu.Game/Overlays/Music/PlaylistItem.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Overlays.Music
                 var artist = new RomanisableString(metadata.ArtistUnicode, metadata.Artist);
 
                 titlePart = text.AddText(title, sprite => sprite.Font = OsuFont.GetFont(weight: FontWeight.Regular));
-                titlePart.DrawablePartsRecreated += _ => updateSelectionState(SelectedSet.Value, instant: true);
+                titlePart.DrawablePartsRecreated += _ => updateSelectionState(SelectedSet.Value, applyImmediately: true);
 
                 text.AddText(@"  "); // to separate the title from the artist.
                 text.AddText(artist, sprite =>
@@ -66,24 +66,25 @@ namespace osu.Game.Overlays.Music
                     sprite.Padding = new MarginPadding { Top = 1 };
                 });
 
-                SelectedSet.BindValueChanged(set => updateSelectionState(set.NewValue, instant: false));
-                updateSelectionState(SelectedSet.Value, instant: true);
+                SelectedSet.BindValueChanged(set => updateSelectionState(set.NewValue));
+                updateSelectionState(SelectedSet.Value, applyImmediately: true);
             });
         }
 
         private bool selected;
 
-        private void updateSelectionState(Live<BeatmapSetInfo> selectedSet, bool instant)
+        private void updateSelectionState(Live<BeatmapSetInfo> selectedSet, bool applyImmediately = false)
         {
-            bool newSelected = selectedSet?.Equals(Model) == true;
+            bool wasSelected = selected;
+            selected = selectedSet?.Equals(Model) == true;
 
-            if (newSelected == selected && !instant) // instant updates should forcibly set correct state regardless of previous state.
+            // Immediate updates should forcibly set correct state regardless of previous state.
+            // This ensures that the initial state is correctly applied.
+            if (wasSelected == selected && !applyImmediately)
                 return;
 
-            selected = newSelected;
-
             foreach (Drawable s in titlePart.Drawables)
-                s.FadeColour(selected ? colours.Yellow : Color4.White, instant ? 0 : FADE_DURATION);
+                s.FadeColour(selected ? colours.Yellow : Color4.White, applyImmediately ? 0 : FADE_DURATION);
         }
 
         protected override Drawable CreateContent() => new DelayedLoadWrapper(text = new OsuTextFlowContainer

From 7a840e1d8227a3e2dd5073afd27305c47dc7f494 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 May 2023 14:29:26 +0900
Subject: [PATCH 0259/1604] Remove unnecessary `TransferValue` spec

---
 osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index 0515e8dc97..ad47039579 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -171,7 +171,6 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                             Current = scalingBackgroundDim,
                             KeyboardStep = 0.01f,
                             DisplayAsPercentage = true,
-                            TransferValueOnCommit = false
                         },
                     }
                 },

From ab4f66fad331aa7d048f8f1365ec12f25071098b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 May 2023 14:31:39 +0900
Subject: [PATCH 0260/1604] Minor readability refactors

---
 osu.Game/Graphics/Containers/ScalingContainer.cs         | 2 +-
 .../Settings/Sections/Graphics/LayoutSettings.cs         | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Graphics/Containers/ScalingContainer.cs b/osu.Game/Graphics/Containers/ScalingContainer.cs
index bd52c8bb32..84eb382d34 100644
--- a/osu.Game/Graphics/Containers/ScalingContainer.cs
+++ b/osu.Game/Graphics/Containers/ScalingContainer.cs
@@ -155,7 +155,7 @@ namespace osu.Game.Graphics.Containers
 
         private bool requiresBackgroundVisible => (scalingMode.Value == ScalingMode.Everything || scalingMode.Value == ScalingMode.ExcludeOverlays)
                                                   && (sizeX.Value != 1 || sizeY.Value != 1)
-                                                  && scalingMenuBackgroundDim.Value != 1f;
+                                                  && scalingMenuBackgroundDim.Value < 1;
 
         private void updateSize()
         {
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index ad47039579..2e26d15105 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -230,11 +230,12 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                     if (s == dimSlider)
                     {
                         s.CanBeShown.Value = scalingMode.Value == ScalingMode.Everything || scalingMode.Value == ScalingMode.ExcludeOverlays;
-                        return;
                     }
-
-                    s.TransferValueOnCommit = scalingMode.Value == ScalingMode.Everything;
-                    s.CanBeShown.Value = scalingMode.Value != ScalingMode.Off;
+                    else
+                    {
+                        s.TransferValueOnCommit = scalingMode.Value == ScalingMode.Everything;
+                        s.CanBeShown.Value = scalingMode.Value != ScalingMode.Off;
+                    }
                 });
             }
         }

From 57f48e070359f65100e33838091ee72f28d6cc68 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 May 2023 14:33:57 +0900
Subject: [PATCH 0261/1604] Start colour black to ensure initial appear
 transition doesn't look silly

---
 osu.Game/Graphics/Containers/ScalingContainer.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Graphics/Containers/ScalingContainer.cs b/osu.Game/Graphics/Containers/ScalingContainer.cs
index 84eb382d34..c47aba2f0c 100644
--- a/osu.Game/Graphics/Containers/ScalingContainer.cs
+++ b/osu.Game/Graphics/Containers/ScalingContainer.cs
@@ -15,6 +15,7 @@ using osu.Game.Configuration;
 using osu.Game.Screens;
 using osu.Game.Screens.Backgrounds;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Graphics.Containers
 {
@@ -169,6 +170,7 @@ namespace osu.Game.Graphics.Containers
                         AddInternal(backgroundStack = new BackgroundScreenStack
                         {
                             Alpha = 0,
+                            Colour = Color4.Black,
                             Depth = float.MaxValue
                         });
 

From 8a536c1cdb75496ad56b056baa83fc2d14376deb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 May 2023 15:09:24 +0900
Subject: [PATCH 0262/1604] Fix non-block namespace usage

---
 .../Timeline/HitObjectPointPiece.cs           | 83 ++++++++++---------
 1 file changed, 42 insertions(+), 41 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/HitObjectPointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/HitObjectPointPiece.cs
index f7854705a4..4b357d3a62 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/HitObjectPointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/HitObjectPointPiece.cs
@@ -11,51 +11,52 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osuTK.Graphics;
 
-namespace osu.Game.Screens.Edit.Compose.Components.Timeline;
-
-public partial class HitObjectPointPiece : CircularContainer
+namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
-    protected OsuSpriteText Label { get; private set; }
-
-    [BackgroundDependencyLoader]
-    private void load(OsuColour colours)
+    public partial class HitObjectPointPiece : CircularContainer
     {
-        AutoSizeAxes = Axes.Both;
+        protected OsuSpriteText Label { get; private set; }
 
-        Color4 colour = GetRepresentingColour(colours);
-
-        InternalChildren = new Drawable[]
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
         {
-            new Container
-            {
-                AutoSizeAxes = Axes.X,
-                Height = 16,
-                Masking = true,
-                CornerRadius = 8,
-                Anchor = Anchor.BottomCentre,
-                Origin = Anchor.BottomCentre,
-                Children = new Drawable[]
-                {
-                    new Box
-                    {
-                        Colour = colour,
-                        RelativeSizeAxes = Axes.Both,
-                    },
-                    Label = new OsuSpriteText
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        Padding = new MarginPadding(5),
-                        Font = OsuFont.Default.With(size: 12, weight: FontWeight.SemiBold),
-                        Colour = colours.B5,
-                    }
-                }
-            },
-        };
-    }
+            AutoSizeAxes = Axes.Both;
 
-    protected virtual Color4 GetRepresentingColour(OsuColour colours)
-    {
-        return colours.Yellow;
+            Color4 colour = GetRepresentingColour(colours);
+
+            InternalChildren = new Drawable[]
+            {
+                new Container
+                {
+                    AutoSizeAxes = Axes.X,
+                    Height = 16,
+                    Masking = true,
+                    CornerRadius = 8,
+                    Anchor = Anchor.BottomCentre,
+                    Origin = Anchor.BottomCentre,
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            Colour = colour,
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                        Label = new OsuSpriteText
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Padding = new MarginPadding(5),
+                            Font = OsuFont.Default.With(size: 12, weight: FontWeight.SemiBold),
+                            Colour = colours.B5,
+                        }
+                    }
+                },
+            };
+        }
+
+        protected virtual Color4 GetRepresentingColour(OsuColour colours)
+        {
+            return colours.Yellow;
+        }
     }
 }

From 67f83f246b1c65c62416a24375ef580139d046dc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 May 2023 15:36:01 +0900
Subject: [PATCH 0263/1604] Add more padding around playfield in editor to
 avoid overlap with tool areas

Closes #23130.
---
 osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs |  9 +++++++--
 osu.Game/Rulesets/Edit/HitObjectComposer.cs        | 12 ++++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index 7a70257f3a..ff1e208186 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -13,8 +13,8 @@ using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Utils;
 using osu.Framework.Input.Events;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
@@ -62,7 +62,12 @@ namespace osu.Game.Rulesets.Osu.Edit
         private void load()
         {
             // Give a bit of breathing room around the playfield content.
-            PlayfieldContentContainer.Padding = new MarginPadding(10);
+            PlayfieldContentContainer.Padding = new MarginPadding
+            {
+                Vertical = 10,
+                Left = TOOLBOX_CONTRACTED_SIZE_LEFT + 10,
+                Right = TOOLBOX_CONTRACTED_SIZE_RIGHT + 10,
+            };
 
             LayerBelowRuleset.AddRange(new Drawable[]
             {
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 653861c11c..e2dbd2acdc 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -116,6 +116,11 @@ namespace osu.Game.Rulesets.Edit
                 PlayfieldContentContainer = new Container
                 {
                     Name = "Content",
+                    Padding = new MarginPadding
+                    {
+                        Left = TOOLBOX_CONTRACTED_SIZE_LEFT,
+                        Right = TOOLBOX_CONTRACTED_SIZE_RIGHT,
+                    },
                     RelativeSizeAxes = Axes.Both,
                     Children = new Drawable[]
                     {
@@ -138,7 +143,7 @@ namespace osu.Game.Rulesets.Edit
                             Colour = colourProvider.Background5,
                             RelativeSizeAxes = Axes.Both,
                         },
-                        LeftToolbox = new ExpandingToolboxContainer(60, 200)
+                        LeftToolbox = new ExpandingToolboxContainer(TOOLBOX_CONTRACTED_SIZE_LEFT, 200)
                         {
                             Children = new Drawable[]
                             {
@@ -173,7 +178,7 @@ namespace osu.Game.Rulesets.Edit
                             Colour = colourProvider.Background5,
                             RelativeSizeAxes = Axes.Both,
                         },
-                        RightToolbox = new ExpandingToolboxContainer(130, 250)
+                        RightToolbox = new ExpandingToolboxContainer(TOOLBOX_CONTRACTED_SIZE_RIGHT, 250)
                         {
                             Child = new EditorToolboxGroup("inspector")
                             {
@@ -450,6 +455,9 @@ namespace osu.Game.Rulesets.Edit
     [Cached]
     public abstract partial class HitObjectComposer : CompositeDrawable, IPositionSnapProvider
     {
+        public const float TOOLBOX_CONTRACTED_SIZE_LEFT = 60;
+        public const float TOOLBOX_CONTRACTED_SIZE_RIGHT = 130;
+
         public readonly Ruleset Ruleset;
 
         protected HitObjectComposer(Ruleset ruleset)

From c2ad8c23201814a3ce3103584e2bacc51c30b020 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Tue, 2 May 2023 08:41:30 +0200
Subject: [PATCH 0264/1604] Fix comment 1
 osu.Game/Rulesets/Objects/Types/IHasGenerateTicks.cs

Co-authored-by: Dean Herbert <pe@ppy.sh>
---
 osu.Game/Rulesets/Objects/Types/IHasGenerateTicks.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Objects/Types/IHasGenerateTicks.cs b/osu.Game/Rulesets/Objects/Types/IHasGenerateTicks.cs
index 5de7d348c5..c587654cda 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasGenerateTicks.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasGenerateTicks.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Objects.Types
     public interface IHasGenerateTicks
     {
         /// <summary>
-        /// Whether or not slider ticks should be generated at this control point.
+        /// Whether or not slider ticks should be generated by this object.
         /// This exists for backwards compatibility with maps that abuse NaN slider velocity behavior on osu!stable (e.g. /b/2628991).
         /// </summary>
         public bool GenerateTicks { get; set; }

From 2e018c8b0696b2394465ef31d1f49aad7c514627 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Tue, 2 May 2023 08:41:47 +0200
Subject: [PATCH 0265/1604] Fix comment 2
 osu.Game/Rulesets/Objects/Types/IHasGenerateTicks.cs

Co-authored-by: Dean Herbert <pe@ppy.sh>
---
 osu.Game/Rulesets/Objects/Types/IHasGenerateTicks.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Objects/Types/IHasGenerateTicks.cs b/osu.Game/Rulesets/Objects/Types/IHasGenerateTicks.cs
index c587654cda..3ac8b8a086 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasGenerateTicks.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasGenerateTicks.cs
@@ -4,7 +4,7 @@
 namespace osu.Game.Rulesets.Objects.Types
 {
     /// <summary>
-    /// A type of <see cref="HitObject"/> which may or may not generate ticks.
+    /// A type of <see cref="HitObject"/> which explicitly specifies whether it should generate ticks.
     /// </summary>
     public interface IHasGenerateTicks
     {

From bd72c67d68aa3bc4bc18f70cd0fd6a4c8c9eb9d2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 May 2023 15:47:35 +0900
Subject: [PATCH 0266/1604] Increase the rate of slider ball fade on argon
 skins to match other implementations

---
 osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderBall.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderBall.cs
index d6ce793c7e..461b4a3b45 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderBall.cs
@@ -98,7 +98,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
 
             using (BeginAbsoluteSequence(drawableObject.HitStateUpdateTime))
             {
-                this.FadeOut(duration, Easing.OutQuint);
+                // intentionally pile on an extra FadeOut to make it happen much faster
+                this.FadeOut(duration / 4, Easing.OutQuint);
                 icon.ScaleTo(defaultIconScale * icon_scale, duration, Easing.OutQuint);
             }
         }

From e3c51b96526223674cada703130544646b768f97 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 May 2023 16:26:56 +0900
Subject: [PATCH 0267/1604] Add ability to toggle snaking in slider test scene

---
 .../TestSceneSlider.cs                        | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
index 1e9f931b74..4ad78a3190 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
@@ -15,6 +15,10 @@ using osuTK.Graphics;
 using osu.Game.Rulesets.Mods;
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions.ObjectExtensions;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps.Legacy;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
@@ -22,6 +26,7 @@ using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu.Configuration;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
@@ -30,6 +35,27 @@ namespace osu.Game.Rulesets.Osu.Tests
     {
         private int depthIndex;
 
+        private readonly BindableBool snakingIn = new BindableBool();
+        private readonly BindableBool snakingOut = new BindableBool();
+
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddToggleStep("toggle snaking", v =>
+            {
+                snakingIn.Value = v;
+                snakingOut.Value = v;
+            });
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            var config = (OsuRulesetConfigManager)RulesetConfigs.GetConfigFor(Ruleset.Value.CreateInstance()).AsNonNull();
+            config.BindWith(OsuRulesetSetting.SnakingInSliders, snakingIn);
+            config.BindWith(OsuRulesetSetting.SnakingOutSliders, snakingOut);
+        }
+
         [Test]
         public void TestVariousSliders()
         {

From 1a04be15c74b009bb9e329bf0d35b0031abe5328 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 May 2023 16:27:17 +0900
Subject: [PATCH 0268/1604] Fix fade in delay for first slider end circle being
 incorrect when snaking disabled

---
 .../Objects/Drawables/DrawableSliderRepeat.cs         | 11 +++++++----
 .../Objects/Drawables/DrawableSliderTail.cs           |  8 +++++++-
 osu.Game.Rulesets.Osu/Objects/SliderEndCircle.cs      |  5 +----
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index 3446d41fb4..d474db0526 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -87,12 +87,15 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         protected override void UpdateInitialTransforms()
         {
+            // When snaking in is enabled, the first end circle needs to be delayed until the snaking completes.
+            bool delayFadeIn = DrawableSlider.SliderBody!.SnakingIn.Value && HitObject.RepeatIndex == 0;
+
             animDuration = Math.Min(300, HitObject.SpanDuration);
 
-            this.Animate(
-                d => d.FadeIn(animDuration),
-                d => d.ScaleTo(0.5f).ScaleTo(1f, animDuration * 2, Easing.OutElasticHalf)
-            );
+            this
+                .FadeOut()
+                .Delay(delayFadeIn ? Slider!.TimePreempt / 3f : 0)
+                .FadeIn(HitObject.RepeatIndex == 0 ? HitObject.TimeFadeIn : animDuration);
         }
 
         protected override void UpdateHitStateTransforms(ArmedState state)
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index 2c1b68e05a..da4feae242 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -91,7 +91,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.UpdateInitialTransforms();
 
-            CirclePiece.FadeInFromZero(HitObject.TimeFadeIn);
+            // When snaking in is enabled, the first end circle needs to be delayed until the snaking completes.
+            bool delayFadeIn = DrawableSlider.SliderBody!.SnakingIn.Value && HitObject.RepeatIndex == 0;
+
+            CirclePiece
+                .FadeOut()
+                .Delay(delayFadeIn ? Slider!.TimePreempt / 3f : 0)
+                .FadeIn(HitObject.TimeFadeIn);
         }
 
         protected override void UpdateHitStateTransforms(ArmedState state)
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderEndCircle.cs b/osu.Game.Rulesets.Osu/Objects/SliderEndCircle.cs
index 35bec92354..b5374333c9 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderEndCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderEndCircle.cs
@@ -39,11 +39,8 @@ namespace osu.Game.Rulesets.Osu.Objects
             }
             else
             {
-                // taken from osu-stable
-                const float first_end_circle_preempt_adjust = 2 / 3f;
-
                 // The first end circle should fade in with the slider.
-                TimePreempt = (StartTime - slider.StartTime) + slider.TimePreempt * first_end_circle_preempt_adjust;
+                TimePreempt = (StartTime - slider.StartTime) + slider.TimePreempt;
             }
         }
 

From a619812cab7f881c2968db977e2bb5322299b03e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 May 2023 16:36:43 +0900
Subject: [PATCH 0269/1604] Fix nullability and remove extra preempt from
 `SliderEndCircle` calculation

---
 .../Objects/Drawables/DrawableSliderRepeat.cs                 | 4 ++--
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs | 4 ++--
 osu.Game.Rulesets.Osu/Objects/SliderEndCircle.cs              | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index d474db0526..fc4863f164 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -88,13 +88,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         protected override void UpdateInitialTransforms()
         {
             // When snaking in is enabled, the first end circle needs to be delayed until the snaking completes.
-            bool delayFadeIn = DrawableSlider.SliderBody!.SnakingIn.Value && HitObject.RepeatIndex == 0;
+            bool delayFadeIn = DrawableSlider.SliderBody?.SnakingIn.Value == true && HitObject.RepeatIndex == 0;
 
             animDuration = Math.Min(300, HitObject.SpanDuration);
 
             this
                 .FadeOut()
-                .Delay(delayFadeIn ? Slider!.TimePreempt / 3f : 0)
+                .Delay(delayFadeIn ? (Slider?.TimePreempt ?? 0) / 3 : 0)
                 .FadeIn(HitObject.RepeatIndex == 0 ? HitObject.TimeFadeIn : animDuration);
         }
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index da4feae242..d9501f7d58 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -92,11 +92,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             base.UpdateInitialTransforms();
 
             // When snaking in is enabled, the first end circle needs to be delayed until the snaking completes.
-            bool delayFadeIn = DrawableSlider.SliderBody!.SnakingIn.Value && HitObject.RepeatIndex == 0;
+            bool delayFadeIn = DrawableSlider.SliderBody?.SnakingIn.Value == true && HitObject.RepeatIndex == 0;
 
             CirclePiece
                 .FadeOut()
-                .Delay(delayFadeIn ? Slider!.TimePreempt / 3f : 0)
+                .Delay(delayFadeIn ? (Slider?.TimePreempt ?? 0) / 3 : 0)
                 .FadeIn(HitObject.TimeFadeIn);
         }
 
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderEndCircle.cs b/osu.Game.Rulesets.Osu/Objects/SliderEndCircle.cs
index b5374333c9..f52c3ab382 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderEndCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderEndCircle.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Osu.Objects
             else
             {
                 // The first end circle should fade in with the slider.
-                TimePreempt = (StartTime - slider.StartTime) + slider.TimePreempt;
+                TimePreempt += StartTime - slider.StartTime;
             }
         }
 

From 414b80d44e78ee5495aa18ae3afd7661b9fe32a7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 May 2023 17:00:54 +0900
Subject: [PATCH 0270/1604] Change flashlight depth in a more standard way

---
 osu.Game/Rulesets/Mods/ModFlashlight.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModFlashlight.cs b/osu.Game/Rulesets/Mods/ModFlashlight.cs
index 9527e8ab5d..215fc877dc 100644
--- a/osu.Game/Rulesets/Mods/ModFlashlight.cs
+++ b/osu.Game/Rulesets/Mods/ModFlashlight.cs
@@ -82,12 +82,12 @@ namespace osu.Game.Rulesets.Mods
 
             flashlight.RelativeSizeAxes = Axes.Both;
             flashlight.Colour = Color4.Black;
+            // Flashlight mods should always draw above any other mod adding overlays.
+            flashlight.Depth = float.MinValue;
 
             flashlight.Combo.BindTo(Combo);
 
             drawableRuleset.Overlays.Add(flashlight);
-            // Stop flashlight from being drawn underneath other mods that generate HitObjects.
-            drawableRuleset.Overlays.ChangeChildDepth(flashlight, float.MinValue);
         }
 
         protected abstract Flashlight CreateFlashlight();

From fb0e90913db89e8ffc80fc17056d8ed1f4cbfecc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 May 2023 17:07:12 +0900
Subject: [PATCH 0271/1604] Ensure lifetime start is also updated when
 reverting judgements

---
 osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
index 0fc27c8f1d..bfc6c24fa5 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
@@ -111,7 +111,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                 BubbleDrawable? lastBubble = bubbleContainer.OfType<BubbleDrawable>().LastOrDefault();
 
                 lastBubble?.ClearTransforms();
-                lastBubble?.Expire();
+                lastBubble?.Expire(true);
             };
         }
 

From 7830711c8e97b83852f705dbad25d50cc71a1604 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 May 2023 17:07:22 +0900
Subject: [PATCH 0272/1604] Tidy up various code quality issues in
 `OsuModBubbles`

---
 osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs | 22 ++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
index bfc6c24fa5..9ae38de7c9 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
@@ -165,15 +165,15 @@ namespace osu.Game.Rulesets.Osu.Mods
                 ColourInfo colourDarker = DrawableOsuHitObject.AccentColour.Value.Darken(0.1f);
 
                 // The absolute length of the bubble's animation, can be used in fractions for animations of partial length
-                double getAnimationDuration = 1700 + Math.Pow(FadeTime, 1.07f);
+                double duration = 1700 + Math.Pow(FadeTime, 1.07f);
 
                 // Main bubble scaling based on combo
                 this.FadeTo(1)
-                    .ScaleTo(MaxSize, getAnimationDuration * 0.8f)
+                    .ScaleTo(MaxSize, duration * 0.8f)
                     .Then()
                     // Pop at the end of the bubbles life time
-                    .ScaleTo(MaxSize * 1.5f, getAnimationDuration * 0.2f, Easing.OutQuint)
-                    .FadeOut(getAnimationDuration * 0.2f, Easing.OutCirc).Expire();
+                    .ScaleTo(MaxSize * 1.5f, duration * 0.2f, Easing.OutQuint)
+                    .FadeOut(duration * 0.2f, Easing.OutCirc).Expire();
 
                 if (!DrawableOsuHitObject.IsHit) return;
 
@@ -182,28 +182,28 @@ namespace osu.Game.Rulesets.Osu.Mods
 
                 colourBox.FadeColour(colourDarker);
 
-                content.TransformTo(nameof(BorderColour), colourDarker, getAnimationDuration * 0.3f, Easing.OutQuint);
+                content.TransformTo(nameof(BorderColour), colourDarker, duration * 0.3f, Easing.OutQuint);
                 // Ripple effect utilises the border to reduce drawable count
-                content.TransformTo(nameof(BorderThickness), 2f, getAnimationDuration * 0.3f, Easing.OutQuint)
+                content.TransformTo(nameof(BorderThickness), 2f, duration * 0.3f, Easing.OutQuint)
                        // Avoids transparency overlap issues during the bubble "pop"
                        .Then().Schedule(() => content.BorderThickness = 0);
             }
 
-            private Vector2 getPosition(DrawableOsuHitObject drawableOsuHitObject)
+            private Vector2 getPosition(DrawableOsuHitObject drawableObject)
             {
-                switch (drawableOsuHitObject)
+                switch (drawableObject)
                 {
                     // SliderHeads are derived from HitCircles,
                     // so we must handle them before to avoid them using the wrong positioning logic
                     case DrawableSliderHead:
-                        return drawableOsuHitObject.HitObject.Position;
+                        return drawableObject.HitObject.Position;
 
                     // Using hitobject position will cause issues with HitCircle placement due to stack leniency.
                     case DrawableHitCircle:
-                        return drawableOsuHitObject.Position;
+                        return drawableObject.Position;
 
                     default:
-                        return drawableOsuHitObject.HitObject.Position;
+                        return drawableObject.HitObject.Position;
                 }
             }
         }

From e44672bdd5f4f11ae0d309c20df29271d4203f05 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 May 2023 17:08:49 +0900
Subject: [PATCH 0273/1604] Avoid using `Schedule` in transforms (doesn't
 handle rewind well)

---
 osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
index 9ae38de7c9..12e2090f89 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
@@ -185,8 +185,9 @@ namespace osu.Game.Rulesets.Osu.Mods
                 content.TransformTo(nameof(BorderColour), colourDarker, duration * 0.3f, Easing.OutQuint);
                 // Ripple effect utilises the border to reduce drawable count
                 content.TransformTo(nameof(BorderThickness), 2f, duration * 0.3f, Easing.OutQuint)
+                       .Then()
                        // Avoids transparency overlap issues during the bubble "pop"
-                       .Then().Schedule(() => content.BorderThickness = 0);
+                       .TransformTo(nameof(BorderThickness), 0f);
             }
 
             private Vector2 getPosition(DrawableOsuHitObject drawableObject)

From 8160d562640f4c3f40d8d4b01a68306f8177e31c Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 2 May 2023 11:51:05 +0300
Subject: [PATCH 0274/1604] Update test shaders

---
 .../Resources/Shaders/sh_TestFragment.fs      | 15 ++++---
 .../Resources/Shaders/sh_TestVertex.vs        | 42 ++++++++-----------
 2 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/osu.Game.Tests/Resources/Shaders/sh_TestFragment.fs b/osu.Game.Tests/Resources/Shaders/sh_TestFragment.fs
index c70ad751be..99b85d0502 100644
--- a/osu.Game.Tests/Resources/Shaders/sh_TestFragment.fs
+++ b/osu.Game.Tests/Resources/Shaders/sh_TestFragment.fs
@@ -1,11 +1,14 @@
-#include "sh_Utils.h"
+#define HIGH_PRECISION_VERTEX
 
-varying mediump vec2 v_TexCoord;
-varying mediump vec4 v_TexRect;
+#include "sh_Utils.h"
+#include "sh_Masking.h"
+
+layout(location = 2) in highp vec2 v_TexCoord;
+
+layout(location = 0) out vec4 o_Colour;
 
 void main(void)
 {
-    float hueValue = v_TexCoord.x / (v_TexRect[2] - v_TexRect[0]);
-    gl_FragColor = hsv2rgb(vec4(hueValue, 1, 1, 1));
+    highp float hueValue = v_TexCoord.x / (v_TexRect[2] - v_TexRect[0]);
+    o_Colour = getRoundedColor(hsv2rgb(vec4(hueValue, 1, 1, 1)), v_TexCoord);
 }
-
diff --git a/osu.Game.Tests/Resources/Shaders/sh_TestVertex.vs b/osu.Game.Tests/Resources/Shaders/sh_TestVertex.vs
index 4485356fa4..505554bb33 100644
--- a/osu.Game.Tests/Resources/Shaders/sh_TestVertex.vs
+++ b/osu.Game.Tests/Resources/Shaders/sh_TestVertex.vs
@@ -1,31 +1,25 @@
-#include "sh_Utils.h"
+layout(location = 0) in highp vec2 m_Position;
+layout(location = 1) in lowp vec4 m_Colour;
+layout(location = 2) in highp vec2 m_TexCoord;
+layout(location = 3) in highp vec4 m_TexRect;
+layout(location = 4) in mediump vec2 m_BlendRange;
 
-attribute highp vec2 m_Position;
-attribute lowp vec4 m_Colour;
-attribute mediump vec2 m_TexCoord;
-attribute mediump vec4 m_TexRect;
-attribute mediump vec2 m_BlendRange;
-
-varying highp vec2 v_MaskingPosition;
-varying lowp vec4 v_Colour;
-varying mediump vec2 v_TexCoord;
-varying mediump vec4 v_TexRect;
-varying mediump vec2 v_BlendRange;
-
-uniform highp mat4 g_ProjMatrix;
-uniform highp mat3 g_ToMaskingSpace;
+layout(location = 0) out highp vec2 v_MaskingPosition;
+layout(location = 1) out lowp vec4 v_Colour;
+layout(location = 2) out highp vec2 v_TexCoord;
+layout(location = 3) out highp vec4 v_TexRect;
+layout(location = 4) out mediump vec2 v_BlendRange;
 
 void main(void)
 {
-    // Transform from screen space to masking space.
-    highp vec3 maskingPos = g_ToMaskingSpace * vec3(m_Position, 1.0);
-    v_MaskingPosition = maskingPos.xy / maskingPos.z;
+	// Transform from screen space to masking space.
+	highp vec3 maskingPos = g_ToMaskingSpace * vec3(m_Position, 1.0);
+	v_MaskingPosition = maskingPos.xy / maskingPos.z;
 
-    v_Colour = m_Colour;
-    v_TexCoord = m_TexCoord;
-    v_TexRect = m_TexRect;
-    v_BlendRange = m_BlendRange;
+	v_Colour = m_Colour;
+	v_TexCoord = m_TexCoord;
+	v_TexRect = m_TexRect;
+	v_BlendRange = m_BlendRange;
 
-    gl_Position = gProjMatrix * vec4(m_Position, 1.0, 1.0);
+	gl_Position = g_ProjMatrix * vec4(m_Position, 1.0, 1.0);
 }
-

From ba5088f71a57bf7d26eac4f6d319b9c0eb08d438 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 2 May 2023 11:55:05 +0300
Subject: [PATCH 0275/1604] Add missing ruleset shader tests

---
 osu.Game.Tests/Testing/TestSceneRulesetDependencies.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tests/Testing/TestSceneRulesetDependencies.cs b/osu.Game.Tests/Testing/TestSceneRulesetDependencies.cs
index 585a3f95e7..f0a9ce7beb 100644
--- a/osu.Game.Tests/Testing/TestSceneRulesetDependencies.cs
+++ b/osu.Game.Tests/Testing/TestSceneRulesetDependencies.cs
@@ -53,6 +53,8 @@ namespace osu.Game.Tests.Testing
             {
                 Dependencies.Get<ShaderManager>().GetRawData(@"sh_TestVertex.vs");
                 Dependencies.Get<ShaderManager>().GetRawData(@"sh_TestFragment.fs");
+                Dependencies.Get<ShaderManager>().Load(@"TestVertex", @"TestFragment");
+                Dependencies.Get<ShaderManager>().Load(VertexShaderDescriptor.TEXTURE_2, @"TestFragment");
             });
         }
 

From d2d81bb82c6fe9fcca7e7c8f4ac3879994aa8aa4 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Tue, 2 May 2023 12:29:11 +0200
Subject: [PATCH 0276/1604] remove redundant zero check in sv calculation

---
 .../Edit/Blueprints/Components/EditablePath.cs                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Edit/Blueprints/Components/EditablePath.cs b/osu.Game.Rulesets.Catch/Edit/Blueprints/Components/EditablePath.cs
index 75ee0546dd..7a577f8a83 100644
--- a/osu.Game.Rulesets.Catch/Edit/Blueprints/Components/EditablePath.cs
+++ b/osu.Game.Rulesets.Catch/Edit/Blueprints/Components/EditablePath.cs
@@ -103,7 +103,7 @@ namespace osu.Game.Rulesets.Catch.Edit.Blueprints.Components
             //
             // The value is clamped here by the bindable min and max values.
             // In case the required velocity is too large, the path is not preserved.
-            svBindable.Value = requiredVelocity == 0 ? 1 : Math.Ceiling(requiredVelocity / svToVelocityFactor);
+            svBindable.Value = Math.Ceiling(requiredVelocity / svToVelocityFactor);
 
             path.ConvertToSliderPath(hitObject.Path, hitObject.LegacyConvertedY, hitObject.Velocity);
 

From 90d98cd3294ec30533017d83382d60525305f98c Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Tue, 2 May 2023 12:41:39 +0200
Subject: [PATCH 0277/1604] remove constructor argument from Banana

---
 osu.Game.Rulesets.Catch/Objects/Banana.cs       | 8 +++++---
 osu.Game.Rulesets.Catch/Objects/BananaShower.cs | 5 ++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Banana.cs b/osu.Game.Rulesets.Catch/Objects/Banana.cs
index e137204c32..e4aa778902 100644
--- a/osu.Game.Rulesets.Catch/Objects/Banana.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Banana.cs
@@ -22,9 +22,11 @@ namespace osu.Game.Rulesets.Catch.Objects
 
         public override Judgement CreateJudgement() => new CatchBananaJudgement();
 
-        public Banana(int volume = 100)
+        private static readonly List<HitSampleInfo> samples = new List<HitSampleInfo> { new BananaHitSampleInfo() };
+
+        public Banana()
         {
-            Samples = new List<HitSampleInfo> { new BananaHitSampleInfo(volume) };
+            Samples = samples;
         }
 
         // override any external colour changes with banananana
@@ -45,7 +47,7 @@ namespace osu.Game.Rulesets.Catch.Objects
             }
         }
 
-        private class BananaHitSampleInfo : HitSampleInfo, IEquatable<BananaHitSampleInfo>
+        public class BananaHitSampleInfo : HitSampleInfo, IEquatable<BananaHitSampleInfo>
         {
             private static readonly string[] lookup_names = { "Gameplay/metronomelow", "Gameplay/catch-banana" };
 
diff --git a/osu.Game.Rulesets.Catch/Objects/BananaShower.cs b/osu.Game.Rulesets.Catch/Objects/BananaShower.cs
index 08febeabbf..5bd4ac86f5 100644
--- a/osu.Game.Rulesets.Catch/Objects/BananaShower.cs
+++ b/osu.Game.Rulesets.Catch/Objects/BananaShower.cs
@@ -1,7 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
 using System.Threading;
+using osu.Game.Audio;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Types;
 
@@ -35,10 +37,11 @@ namespace osu.Game.Rulesets.Catch.Objects
             {
                 cancellationToken.ThrowIfCancellationRequested();
 
-                AddNested(new Banana(GetSampleInfo().Volume)
+                AddNested(new Banana
                 {
                     StartTime = time,
                     BananaIndex = i,
+                    Samples = new List<HitSampleInfo> { new Banana.BananaHitSampleInfo(GetSampleInfo().Volume) }
                 });
 
                 time += spacing;

From a6ca0497399d5e83faca452782c49fa74c2c406a Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Tue, 2 May 2023 14:15:33 +0300
Subject: [PATCH 0278/1604] Manually implement @bdach prototype

---
 .../UserInterface/TestSceneModColumn.cs       |  2 +-
 .../Mods/Input/ClassicModHotkeyHandler.cs     |  2 +-
 .../Mods/Input/SequentialModHotkeyHandler.cs  |  2 +-
 osu.Game/Overlays/Mods/ModColumn.cs           | 12 +++---
 osu.Game/Overlays/Mods/ModPanel.cs            | 30 +++++++++++---
 osu.Game/Overlays/Mods/ModPresetPanel.cs      | 11 ++++++
 osu.Game/Overlays/Mods/ModSelectColumn.cs     |  9 ++++-
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    | 39 ++++++++++++-------
 osu.Game/Overlays/Mods/ModSelectPanel.cs      | 26 ++++++++++++-
 osu.Game/Overlays/Mods/ModState.cs            | 11 +++++-
 osu.Game/Overlays/Mods/SelectAllModsButton.cs |  2 +-
 11 files changed, 112 insertions(+), 34 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs
index a11000214c..3f5676ee24 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs
@@ -291,7 +291,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         private void setFilter(Func<Mod, bool>? filter)
         {
             foreach (var modState in this.ChildrenOfType<ModColumn>().Single().AvailableMods)
-                modState.Filtered.Value = filter?.Invoke(modState.Mod) == false;
+                modState.MatchingFilter.Value = filter?.Invoke(modState.Mod) == false;
         }
 
         private partial class TestModColumn : ModColumn
diff --git a/osu.Game/Overlays/Mods/Input/ClassicModHotkeyHandler.cs b/osu.Game/Overlays/Mods/Input/ClassicModHotkeyHandler.cs
index 4f3c18fc43..566e741880 100644
--- a/osu.Game/Overlays/Mods/Input/ClassicModHotkeyHandler.cs
+++ b/osu.Game/Overlays/Mods/Input/ClassicModHotkeyHandler.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Overlays.Mods.Input
             if (!mod_type_lookup.TryGetValue(e.Key, out var typesToMatch))
                 return false;
 
-            var matchingMods = availableMods.Where(modState => matches(modState, typesToMatch) && !modState.Filtered.Value).ToArray();
+            var matchingMods = availableMods.Where(modState => matches(modState, typesToMatch) && modState.MatchingFilter.Value).ToArray();
 
             if (matchingMods.Length == 0)
                 return false;
diff --git a/osu.Game/Overlays/Mods/Input/SequentialModHotkeyHandler.cs b/osu.Game/Overlays/Mods/Input/SequentialModHotkeyHandler.cs
index dedb556304..b4ec8ad4c8 100644
--- a/osu.Game/Overlays/Mods/Input/SequentialModHotkeyHandler.cs
+++ b/osu.Game/Overlays/Mods/Input/SequentialModHotkeyHandler.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Overlays.Mods.Input
             if (index < 0)
                 return false;
 
-            var modState = availableMods.Where(modState => !modState.Filtered.Value).ElementAtOrDefault(index);
+            var modState = availableMods.Where(modState => modState.MatchingFilter.Value).ElementAtOrDefault(index);
             if (modState == null)
                 return false;
 
diff --git a/osu.Game/Overlays/Mods/ModColumn.cs b/osu.Game/Overlays/Mods/ModColumn.cs
index 5d9f616e5f..df2a7780d3 100644
--- a/osu.Game/Overlays/Mods/ModColumn.cs
+++ b/osu.Game/Overlays/Mods/ModColumn.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Overlays.Mods
                 foreach (var mod in availableMods)
                 {
                     mod.Active.BindValueChanged(_ => updateState());
-                    mod.Filtered.BindValueChanged(_ => updateState());
+                    mod.MatchingFilter.BindValueChanged(_ => updateState());
                 }
 
                 updateState();
@@ -145,12 +145,12 @@ namespace osu.Game.Overlays.Mods
 
         private void updateState()
         {
-            Alpha = availableMods.All(mod => mod.Filtered.Value) ? 0 : 1;
+            Alpha = availableMods.All(mod => !mod.MatchingFilter.Value) ? 0 : 1;
 
             if (toggleAllCheckbox != null && !SelectionAnimationRunning)
             {
-                toggleAllCheckbox.Alpha = availableMods.Any(panel => !panel.Filtered.Value) ? 1 : 0;
-                toggleAllCheckbox.Current.Value = availableMods.Where(panel => !panel.Filtered.Value).All(panel => panel.Active.Value);
+                toggleAllCheckbox.Alpha = availableMods.Any(panel => panel.MatchingFilter.Value) ? 1 : 0;
+                toggleAllCheckbox.Current.Value = availableMods.Where(panel => panel.MatchingFilter.Value).All(panel => panel.Active.Value);
             }
         }
 
@@ -195,7 +195,7 @@ namespace osu.Game.Overlays.Mods
         {
             pendingSelectionOperations.Clear();
 
-            foreach (var button in availableMods.Where(b => !b.Active.Value && !b.Filtered.Value))
+            foreach (var button in availableMods.Where(b => !b.Active.Value && b.MatchingFilter.Value))
                 pendingSelectionOperations.Enqueue(() => button.Active.Value = true);
         }
 
@@ -206,7 +206,7 @@ namespace osu.Game.Overlays.Mods
         {
             pendingSelectionOperations.Clear();
 
-            foreach (var button in availableMods.Where(b => b.Active.Value && !b.Filtered.Value))
+            foreach (var button in availableMods.Where(b => b.Active.Value && b.MatchingFilter.Value))
                 pendingSelectionOperations.Enqueue(() => button.Active.Value = false);
         }
 
diff --git a/osu.Game/Overlays/Mods/ModPanel.cs b/osu.Game/Overlays/Mods/ModPanel.cs
index b5fee9d116..a5ff52dfd2 100644
--- a/osu.Game/Overlays/Mods/ModPanel.cs
+++ b/osu.Game/Overlays/Mods/ModPanel.cs
@@ -1,9 +1,12 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
@@ -11,11 +14,10 @@ using osuTK;
 
 namespace osu.Game.Overlays.Mods
 {
-    public partial class ModPanel : ModSelectPanel
+    public partial class ModPanel : ModSelectPanel, IConditionalFilterable
     {
         public Mod Mod => modState.Mod;
         public override BindableBool Active => modState.Active;
-        public BindableBool Filtered => modState.Filtered;
 
         protected override float IdleSwitchWidth => 54;
         protected override float ExpandedSwitchWidth => 70;
@@ -54,7 +56,7 @@ namespace osu.Game.Overlays.Mods
         {
             base.LoadComplete();
 
-            Filtered.BindValueChanged(_ => updateFilterState(), true);
+            canBeShown.BindTo(modState.ValidForSelection);
         }
 
         protected override void Select()
@@ -71,11 +73,29 @@ namespace osu.Game.Overlays.Mods
 
         #region Filtering support
 
-        private void updateFilterState()
+        public override IEnumerable<LocalisableString> FilterTerms => new[]
         {
-            this.FadeTo(Filtered.Value ? 0 : 1);
+            Mod.Name,
+            Mod.Acronym,
+            Mod.Description
+        };
+
+        public override bool MatchingFilter
+        {
+            get => modState.MatchingFilter.Value;
+            set
+            {
+                if (modState.MatchingFilter.Value == value)
+                    return;
+
+                modState.MatchingFilter.Value = value;
+                this.FadeTo(value ? 1 : 0);
+            }
         }
 
+        private readonly BindableBool canBeShown = new BindableBool(true);
+        IBindable<bool> IConditionalFilterable.CanBeShown => canBeShown;
+
         #endregion
     }
 }
diff --git a/osu.Game/Overlays/Mods/ModPresetPanel.cs b/osu.Game/Overlays/Mods/ModPresetPanel.cs
index 6e12e34124..5b6146e106 100644
--- a/osu.Game/Overlays/Mods/ModPresetPanel.cs
+++ b/osu.Game/Overlays/Mods/ModPresetPanel.cs
@@ -8,6 +8,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Localisation;
 using osu.Game.Configuration;
 using osu.Game.Database;
 using osu.Game.Graphics;
@@ -80,6 +81,16 @@ namespace osu.Game.Overlays.Mods
             Active.Value = new HashSet<Mod>(Preset.Value.Mods).SetEquals(selectedMods.Value);
         }
 
+        #region Filtering support
+
+        public override IEnumerable<LocalisableString> FilterTerms => new LocalisableString[]
+        {
+            Preset.Value.Name,
+            Preset.Value.Description
+        };
+
+        #endregion
+
         #region IHasCustomTooltip
 
         public ModPreset TooltipContent => Preset.Value;
diff --git a/osu.Game/Overlays/Mods/ModSelectColumn.cs b/osu.Game/Overlays/Mods/ModSelectColumn.cs
index e6d7bcd97d..8bf3fd404f 100644
--- a/osu.Game/Overlays/Mods/ModSelectColumn.cs
+++ b/osu.Game/Overlays/Mods/ModSelectColumn.cs
@@ -43,10 +43,15 @@ namespace osu.Game.Overlays.Mods
         /// </summary>
         public readonly Bindable<bool> Active = new BindableBool(true);
 
+        public string SearchTerm
+        {
+            set => ItemsFlow.SearchTerm = value;
+        }
+
         protected override bool ReceivePositionalInputAtSubTree(Vector2 screenSpacePos) => base.ReceivePositionalInputAtSubTree(screenSpacePos) && Active.Value;
 
         protected readonly Container ControlContainer;
-        protected readonly FillFlowContainer ItemsFlow;
+        protected readonly SearchContainer ItemsFlow;
 
         private readonly TextFlowContainer headerText;
         private readonly Box headerBackground;
@@ -150,7 +155,7 @@ namespace osu.Game.Overlays.Mods
                                                     RelativeSizeAxes = Axes.Both,
                                                     ClampExtension = 100,
                                                     ScrollbarOverlapsContent = false,
-                                                    Child = ItemsFlow = new FillFlowContainer
+                                                    Child = ItemsFlow = new SearchContainer
                                                     {
                                                         RelativeSizeAxes = Axes.X,
                                                         AutoSizeAxes = Axes.Y,
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 31f2c87100..12e894cfba 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -108,6 +108,8 @@ namespace osu.Game.Overlays.Mods
         private ColumnFlowContainer columnFlow = null!;
         private FillFlowContainer<ShearedButton> footerButtonFlow = null!;
 
+        private Container aboveColumnsContent = null!;
+        private ShearedSearchTextBox searchTextBox = null!;
         private DifficultyMultiplierDisplay? multiplierDisplay;
 
         private ModSearch? modSearch;
@@ -148,6 +150,17 @@ namespace osu.Game.Overlays.Mods
 
             MainAreaContent.AddRange(new Drawable[]
             {
+                aboveColumnsContent = new Container
+                {
+                    RelativeSizeAxes = Axes.X,
+                    Height = ModsEffectDisplay.HEIGHT,
+                    Padding = new MarginPadding { Horizontal = 100 },
+                    Child = searchTextBox = new ShearedSearchTextBox
+                    {
+                        HoldFocus = false,
+                        Width = 300
+                    }
+                },
                 new OsuContextMenuContainer
                 {
                     RelativeSizeAxes = Axes.Both,
@@ -188,18 +201,10 @@ namespace osu.Game.Overlays.Mods
 
             if (ShowTotalMultiplier)
             {
-                MainAreaContent.Add(new Container
+                aboveColumnsContent.Add(multiplierDisplay = new DifficultyMultiplierDisplay
                 {
-                    Anchor = Anchor.TopLeft,
-                    Origin = Anchor.TopLeft,
-                    AutoSizeAxes = Axes.X,
-                    Height = ModsEffectDisplay.HEIGHT,
-                    Margin = new MarginPadding { Horizontal = 100 },
-                    Child = multiplierDisplay = new DifficultyMultiplierDisplay
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre
-                    }
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre
                 });
             }
 
@@ -271,6 +276,12 @@ namespace osu.Game.Overlays.Mods
 
             customisationVisible.BindValueChanged(_ => updateCustomisationVisualState(), true);
 
+            searchTextBox.Current.BindValueChanged(query =>
+            {
+                foreach (var column in columnFlow.Columns)
+                    column.SearchTerm = query.NewValue;
+            }, true);
+
             // Start scrolled slightly to the right to give the user a sense that
             // there is more horizontal content available.
             ScheduleAfterChildren(() =>
@@ -352,7 +363,7 @@ namespace osu.Game.Overlays.Mods
         private void filterMods()
         {
             foreach (var modState in allAvailableMods)
-                modState.Filtered.Value = !modState.Mod.HasImplementation || !IsValidMod.Invoke(modState.Mod);
+                modState.ValidForSelection.Value = modState.Mod.HasImplementation && IsValidMod.Invoke(modState.Mod);
         }
 
         private void updateMultiplier()
@@ -487,7 +498,7 @@ namespace osu.Game.Overlays.Mods
             {
                 var column = columnFlow[i].Column;
 
-                bool allFiltered = column is ModColumn modColumn && modColumn.AvailableMods.All(modState => modState.Filtered.Value);
+                bool allFiltered = column is ModColumn modColumn && modColumn.AvailableMods.All(modState => !modState.MatchingFilter.Value);
 
                 double delay = allFiltered ? 0 : nonFilteredColumnCount * 30;
                 double duration = allFiltered ? 0 : fade_in_duration;
@@ -549,7 +560,7 @@ namespace osu.Game.Overlays.Mods
 
                 if (column is ModColumn modColumn)
                 {
-                    allFiltered = modColumn.AvailableMods.All(modState => modState.Filtered.Value);
+                    allFiltered = modColumn.AvailableMods.All(modState => !modState.MatchingFilter.Value);
                     modColumn.FlushPendingSelections();
                 }
 
diff --git a/osu.Game/Overlays/Mods/ModSelectPanel.cs b/osu.Game/Overlays/Mods/ModSelectPanel.cs
index 81285833bd..90663d083c 100644
--- a/osu.Game/Overlays/Mods/ModSelectPanel.cs
+++ b/osu.Game/Overlays/Mods/ModSelectPanel.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
@@ -24,7 +25,7 @@ using osuTK.Input;
 
 namespace osu.Game.Overlays.Mods
 {
-    public abstract partial class ModSelectPanel : OsuClickableContainer, IHasAccentColour
+    public abstract partial class ModSelectPanel : OsuClickableContainer, IHasAccentColour, IFilterable
     {
         public abstract BindableBool Active { get; }
 
@@ -263,5 +264,28 @@ namespace osu.Game.Overlays.Mods
             TextBackground.FadeColour(foregroundColour, transitionDuration, Easing.OutQuint);
             TextFlow.FadeColour(textColour, transitionDuration, Easing.OutQuint);
         }
+
+        #region IFilterable
+
+        public abstract IEnumerable<LocalisableString> FilterTerms { get; }
+
+        private bool matchingFilter;
+
+        public virtual bool MatchingFilter
+        {
+            get => matchingFilter;
+            set
+            {
+                if (matchingFilter == value)
+                    return;
+
+                matchingFilter = value;
+                this.FadeTo(value ? 1 : 0);
+            }
+        }
+
+        public bool FilteringActive { set { } }
+
+        #endregion
     }
 }
diff --git a/osu.Game/Overlays/Mods/ModState.cs b/osu.Game/Overlays/Mods/ModState.cs
index 3ee890e876..35b264fe71 100644
--- a/osu.Game/Overlays/Mods/ModState.cs
+++ b/osu.Game/Overlays/Mods/ModState.cs
@@ -32,9 +32,16 @@ namespace osu.Game.Overlays.Mods
         public bool PendingConfiguration { get; set; }
 
         /// <summary>
-        /// Whether the mod is currently filtered out due to not matching imposed criteria.
+        /// Whether the mod is currently valid for selection.
+        /// This can be <see langword="false"/> in scenarios such as the free mod select overlay, where not all mods are selectable
+        /// regardless of search criteria imposed by the user selecting.
         /// </summary>
-        public BindableBool Filtered { get; } = new BindableBool();
+        public BindableBool ValidForSelection { get; } = new BindableBool(true);
+
+        /// <summary>
+        /// Whether the mod is matching the current filter, i.e. it is available for user selection.
+        /// </summary>
+        public BindableBool MatchingFilter { get; } = new BindableBool(true);
 
         public ModState(Mod mod)
         {
diff --git a/osu.Game/Overlays/Mods/SelectAllModsButton.cs b/osu.Game/Overlays/Mods/SelectAllModsButton.cs
index f4b8025227..212563de7d 100644
--- a/osu.Game/Overlays/Mods/SelectAllModsButton.cs
+++ b/osu.Game/Overlays/Mods/SelectAllModsButton.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Overlays.Mods
         {
             Enabled.Value = availableMods.Value
                                          .SelectMany(pair => pair.Value)
-                                         .Any(modState => !modState.Active.Value && !modState.Filtered.Value);
+                                         .Any(modState => !modState.Active.Value && !modState.MatchingFilter.Value);
         }
 
         public bool OnPressed(KeyBindingPressEvent<PlatformAction> e)

From 95badb9455218c2c2d1d755eb9bf1668c7624984 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 2 May 2023 18:35:06 +0200
Subject: [PATCH 0279/1604] Adjust composer tests to new screen layout

`TestSceneHitObjectComposer.TestPlacementFailsWhenClickingButton()` was
attempting to cover the case of the user clicking a toolbox button which
was in front of the playfield, and ensure that the click did not result
in a placement. However, since the paddings in
67f83f246b1c65c62416a24375ef580139d046dc were added, it is impossible
for a toolbox button to be in front of the playfield in the collapsed
state, which the test was relying on.

The test scenario is still however relevant in the case of the toolbox
being expanded, as in that state the toolbux buttons may very well end
up being in front of the playfield, and they still should not result in
a hitobject being placed. To ensure that this is the case, add a few
extra test steps ensuring that the toolbox is expanded first before
trying to retrieve an overlapping button.
---
 .../Visual/Editing/TestSceneHitObjectComposer.cs       | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs
index 7ab0188114..9bdb9a513c 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs
@@ -108,12 +108,16 @@ namespace osu.Game.Tests.Visual.Editing
 
             AddStep("Change to hitcircle", () => hitObjectComposer.ChildrenOfType<EditorRadioButton>().First(d => d.Button.Label == "HitCircle").TriggerClick());
 
+            ExpandingToolboxContainer toolboxContainer = null!;
+
+            AddStep("move mouse to toolbox", () => InputManager.MoveMouseTo(toolboxContainer = hitObjectComposer.ChildrenOfType<ExpandingToolboxContainer>().First()));
+            AddUntilStep("toolbox is expanded", () => toolboxContainer.Expanded.Value);
+            AddUntilStep("wait for toolbox to expand", () => toolboxContainer.LatestTransformEndTime, () => Is.EqualTo(Time.Current));
+
             AddStep("move mouse to overlapping toggle button", () =>
             {
                 var playfield = hitObjectComposer.Playfield.ScreenSpaceDrawQuad;
-                var button = hitObjectComposer
-                             .ChildrenOfType<ExpandingToolboxContainer>().First()
-                             .ChildrenOfType<DrawableTernaryButton>().First(b => playfield.Contains(b.ScreenSpaceDrawQuad.Centre));
+                var button = toolboxContainer.ChildrenOfType<DrawableTernaryButton>().First(b => playfield.Contains(b.ScreenSpaceDrawQuad.Centre));
 
                 InputManager.MoveMouseTo(button);
             });

From 9c4312b407bb208917a8abf42283018bdf47bd56 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 May 2023 12:37:07 +0900
Subject: [PATCH 0280/1604] Add support for flipping colour of reverse arrow on
 legacy default skin when combo colour is too bright

---
 .../Skinning/Legacy/LegacyReverseArrow.cs      | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
index fbe094ef81..e6166e9441 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
@@ -3,11 +3,13 @@
 
 using System.Diagnostics;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Skinning;
+using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
@@ -18,6 +20,12 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
         private Drawable proxy = null!;
 
+        private Bindable<Color4> accentColour = null!;
+
+        private bool textureIsDefaultSkin;
+
+        private Drawable arrow = null!;
+
         [BackgroundDependencyLoader]
         private void load(ISkinSource skinSource)
         {
@@ -26,7 +34,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             string lookupName = new OsuSkinComponentLookup(OsuSkinComponents.ReverseArrow).LookupName;
 
             var skin = skinSource.FindProvider(s => s.GetTexture(lookupName) != null);
-            InternalChild = skin?.GetAnimation(lookupName, true, true) ?? Empty();
+
+            InternalChild = arrow = (skin?.GetAnimation(lookupName, true, true) ?? Empty());
+            textureIsDefaultSkin = skin is ISkinTransformer transformer && transformer.Skin is DefaultLegacySkin;
         }
 
         protected override void LoadComplete()
@@ -39,6 +49,12 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             {
                 drawableHitObject.HitObjectApplied += onHitObjectApplied;
                 onHitObjectApplied(drawableHitObject);
+
+                accentColour = drawableHitObject.AccentColour.GetBoundCopy();
+                accentColour.BindValueChanged(c =>
+                {
+                    arrow.Colour = textureIsDefaultSkin && c.NewValue.R + c.NewValue.G + c.NewValue.B > (600 / 255f) ? Color4.Black : Color4.White;
+                }, true);
             }
         }
 

From 16c624fb61a7dd02460e799dd48570162f3eb2a7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 May 2023 13:02:05 +0900
Subject: [PATCH 0281/1604] Ensure `static` banana samples are not mutated

---
 osu.Game.Rulesets.Catch/Objects/Banana.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Banana.cs b/osu.Game.Rulesets.Catch/Objects/Banana.cs
index e4aa778902..4c66c054e1 100644
--- a/osu.Game.Rulesets.Catch/Objects/Banana.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Banana.cs
@@ -22,11 +22,11 @@ namespace osu.Game.Rulesets.Catch.Objects
 
         public override Judgement CreateJudgement() => new CatchBananaJudgement();
 
-        private static readonly List<HitSampleInfo> samples = new List<HitSampleInfo> { new BananaHitSampleInfo() };
+        private static readonly IList<HitSampleInfo> default_banana_samples = new List<HitSampleInfo> { new BananaHitSampleInfo() }.AsReadOnly();
 
         public Banana()
         {
-            Samples = samples;
+            Samples = default_banana_samples;
         }
 
         // override any external colour changes with banananana

From 588a4e6196cc038928fa0d68481b72cae0cba4e9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 May 2023 13:19:13 +0900
Subject: [PATCH 0282/1604] Move pragma disable to top of
 `LegacyBeatmapDecoder`

Makes more sense as it's used multiple times in the class.
---
 osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index d20f7e198b..9dcd97459f 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -3,6 +3,8 @@
 
 #nullable disable
 
+#pragma warning disable 618
+
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -102,9 +104,8 @@ namespace osu.Game.Beatmaps.Formats
             var legacyInfo = beatmap.ControlPointInfo as LegacyControlPointInfo;
 
             DifficultyControlPoint difficultyControlPoint = legacyInfo != null ? legacyInfo.DifficultyPointAt(hitObject.StartTime) : DifficultyControlPoint.DEFAULT;
-#pragma warning disable 618
+
             if (difficultyControlPoint is LegacyDifficultyControlPoint legacyDifficultyControlPoint)
-#pragma warning restore 618
             {
                 hitObject.LegacyBpmMultiplier = legacyDifficultyControlPoint.BpmMultiplier;
                 if (hitObject is IHasGenerateTicks hasGenerateTicks)
@@ -494,9 +495,7 @@ namespace osu.Game.Beatmaps.Formats
 
             int onlineRulesetID = beatmap.BeatmapInfo.Ruleset.OnlineID;
 
-#pragma warning disable 618
             addControlPoint(time, new LegacyDifficultyControlPoint(onlineRulesetID, beatLength)
-#pragma warning restore 618
             {
                 SliderVelocity = speedMultiplier,
             }, timingChange);

From cca15f930c5ab8a4ef7a3558613bf4bf12f84d33 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 May 2023 13:26:50 +0900
Subject: [PATCH 0283/1604] Refactor `applyLegacyInfoAndDefaults` for
 legibility

---
 .../Beatmaps/Formats/LegacyBeatmapDecoder.cs  | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index 9dcd97459f..90be90fcaf 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -101,9 +101,14 @@ namespace osu.Game.Beatmaps.Formats
 
         private void applyLegacyInfoAndDefaults(HitObject hitObject)
         {
-            var legacyInfo = beatmap.ControlPointInfo as LegacyControlPointInfo;
+            DifficultyControlPoint difficultyControlPoint = DifficultyControlPoint.DEFAULT;
+            SampleControlPoint sampleControlPoint = SampleControlPoint.DEFAULT;
 
-            DifficultyControlPoint difficultyControlPoint = legacyInfo != null ? legacyInfo.DifficultyPointAt(hitObject.StartTime) : DifficultyControlPoint.DEFAULT;
+            if (beatmap.ControlPointInfo is LegacyControlPointInfo legacyInfo)
+            {
+                difficultyControlPoint = legacyInfo.DifficultyPointAt(hitObject.StartTime);
+                sampleControlPoint = legacyInfo.SamplePointAt(hitObject.GetEndTime() + control_point_leniency);
+            }
 
             if (difficultyControlPoint is LegacyDifficultyControlPoint legacyDifficultyControlPoint)
             {
@@ -117,18 +122,17 @@ namespace osu.Game.Beatmaps.Formats
 
             hitObject.ApplyDefaults(beatmap.ControlPointInfo, beatmap.Difficulty);
 
-            SampleControlPoint sampleControlPoint = legacyInfo != null ? legacyInfo.SamplePointAt(hitObject.GetEndTime() + control_point_leniency) : SampleControlPoint.DEFAULT;
-
             hitObject.Samples = hitObject.Samples.Select(o => sampleControlPoint.ApplyTo(o)).ToList();
 
-            if (hitObject is not IHasRepeats hasRepeats) return;
-
-            for (int i = 0; i < hasRepeats.NodeSamples.Count; i++)
+            if (hitObject is IHasRepeats hasRepeats)
             {
-                double time = hitObject.StartTime + i * hasRepeats.Duration / hasRepeats.SpanCount() + control_point_leniency;
-                sampleControlPoint = legacyInfo != null ? legacyInfo.SamplePointAt(time) : SampleControlPoint.DEFAULT;
+                for (int i = 0; i < hasRepeats.NodeSamples.Count; i++)
+                {
+                    double time = hitObject.StartTime + i * hasRepeats.Duration / hasRepeats.SpanCount() + control_point_leniency;
+                    sampleControlPoint = (beatmap.ControlPointInfo as LegacyControlPointInfo)?.SamplePointAt(time) ?? SampleControlPoint.DEFAULT;
 
-                hasRepeats.NodeSamples[i] = hasRepeats.NodeSamples[i].Select(o => sampleControlPoint.ApplyTo(o)).ToList();
+                    hasRepeats.NodeSamples[i] = hasRepeats.NodeSamples[i].Select(o => sampleControlPoint.ApplyTo(o)).ToList();
+                }
             }
         }
 

From 48fd99818ea448a6f21fa2ecb9e67bd8ef260e0e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 May 2023 13:30:45 +0900
Subject: [PATCH 0284/1604] Split out default and sample application

---
 .../Beatmaps/Formats/LegacyBeatmapDecoder.cs  | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index 90be90fcaf..5e98025c9a 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -95,20 +95,14 @@ namespace osu.Game.Beatmaps.Formats
 
             foreach (var hitObject in this.beatmap.HitObjects)
             {
-                applyLegacyInfoAndDefaults(hitObject);
+                applyDefaults(hitObject);
+                applySamples(hitObject);
             }
         }
 
-        private void applyLegacyInfoAndDefaults(HitObject hitObject)
+        private void applyDefaults(HitObject hitObject)
         {
-            DifficultyControlPoint difficultyControlPoint = DifficultyControlPoint.DEFAULT;
-            SampleControlPoint sampleControlPoint = SampleControlPoint.DEFAULT;
-
-            if (beatmap.ControlPointInfo is LegacyControlPointInfo legacyInfo)
-            {
-                difficultyControlPoint = legacyInfo.DifficultyPointAt(hitObject.StartTime);
-                sampleControlPoint = legacyInfo.SamplePointAt(hitObject.GetEndTime() + control_point_leniency);
-            }
+            DifficultyControlPoint difficultyControlPoint = (beatmap.ControlPointInfo as LegacyControlPointInfo)?.DifficultyPointAt(hitObject.StartTime) ?? DifficultyControlPoint.DEFAULT;
 
             if (difficultyControlPoint is LegacyDifficultyControlPoint legacyDifficultyControlPoint)
             {
@@ -121,6 +115,11 @@ namespace osu.Game.Beatmaps.Formats
                 hasSliderVelocity.SliderVelocity = difficultyControlPoint.SliderVelocity;
 
             hitObject.ApplyDefaults(beatmap.ControlPointInfo, beatmap.Difficulty);
+        }
+
+        private void applySamples(HitObject hitObject)
+        {
+            SampleControlPoint sampleControlPoint = (beatmap.ControlPointInfo as LegacyControlPointInfo)?.SamplePointAt(hitObject.GetEndTime() + control_point_leniency) ?? SampleControlPoint.DEFAULT;
 
             hitObject.Samples = hitObject.Samples.Select(o => sampleControlPoint.ApplyTo(o)).ToList();
 
@@ -129,9 +128,9 @@ namespace osu.Game.Beatmaps.Formats
                 for (int i = 0; i < hasRepeats.NodeSamples.Count; i++)
                 {
                     double time = hitObject.StartTime + i * hasRepeats.Duration / hasRepeats.SpanCount() + control_point_leniency;
-                    sampleControlPoint = (beatmap.ControlPointInfo as LegacyControlPointInfo)?.SamplePointAt(time) ?? SampleControlPoint.DEFAULT;
+                    var nodeSamplePoint = (beatmap.ControlPointInfo as LegacyControlPointInfo)?.SamplePointAt(time) ?? SampleControlPoint.DEFAULT;
 
-                    hasRepeats.NodeSamples[i] = hasRepeats.NodeSamples[i].Select(o => sampleControlPoint.ApplyTo(o)).ToList();
+                    hasRepeats.NodeSamples[i] = hasRepeats.NodeSamples[i].Select(o => nodeSamplePoint.ApplyTo(o)).ToList();
                 }
             }
         }

From f930c4bd0aaa4137ce2c2fbcbe5870a7d919fefb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 May 2023 13:33:31 +0900
Subject: [PATCH 0285/1604] Move `struct` to bottom of file

---
 .../Beatmaps/Formats/LegacyBeatmapEncoder.cs  | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 6b228a56a1..7fbcca9adb 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -92,7 +92,8 @@ namespace osu.Game.Beatmaps.Formats
             writer.WriteLine(FormattableString.Invariant($"AudioLeadIn: {beatmap.BeatmapInfo.AudioLeadIn}"));
             writer.WriteLine(FormattableString.Invariant($"PreviewTime: {beatmap.Metadata.PreviewTime}"));
             writer.WriteLine(FormattableString.Invariant($"Countdown: {(int)beatmap.BeatmapInfo.Countdown}"));
-            writer.WriteLine(FormattableString.Invariant($"SampleSet: {toLegacySampleBank(((beatmap.ControlPointInfo as LegacyControlPointInfo)?.SamplePoints?.FirstOrDefault() ?? SampleControlPoint.DEFAULT).SampleBank)}"));
+            writer.WriteLine(FormattableString.Invariant(
+                $"SampleSet: {toLegacySampleBank(((beatmap.ControlPointInfo as LegacyControlPointInfo)?.SamplePoints?.FirstOrDefault() ?? SampleControlPoint.DEFAULT).SampleBank)}"));
             writer.WriteLine(FormattableString.Invariant($"StackLeniency: {beatmap.BeatmapInfo.StackLeniency}"));
             writer.WriteLine(FormattableString.Invariant($"Mode: {onlineRulesetID}"));
             writer.WriteLine(FormattableString.Invariant($"LetterboxInBreaks: {(beatmap.BeatmapInfo.LetterboxInBreaks ? '1' : '0')}"));
@@ -171,24 +172,6 @@ namespace osu.Game.Beatmaps.Formats
                 writer.WriteLine(FormattableString.Invariant($"{(int)LegacyEventType.Break},{b.StartTime},{b.EndTime}"));
         }
 
-        private struct LegacyControlPointProperties
-        {
-            internal double SliderVelocity { get; set; }
-            internal int TimingSignature { get; init; }
-            internal int SampleBank { get; init; }
-            internal int CustomSampleBank { get; init; }
-            internal int SampleVolume { get; init; }
-            internal LegacyEffectFlags EffectFlags { get; init; }
-
-            internal bool IsRedundant(LegacyControlPointProperties other) =>
-                SliderVelocity == other.SliderVelocity &&
-                TimingSignature == other.TimingSignature &&
-                SampleBank == other.SampleBank &&
-                CustomSampleBank == other.CustomSampleBank &&
-                SampleVolume == other.SampleVolume &&
-                EffectFlags == other.EffectFlags;
-        }
-
         private void handleControlPoints(TextWriter writer)
         {
             var legacyControlPoints = new LegacyControlPointInfo();
@@ -243,11 +226,10 @@ namespace osu.Game.Beatmaps.Formats
 
             LegacyControlPointProperties getLegacyControlPointProperties(ControlPointGroup group, bool updateSampleBank)
             {
-                double time = group.Time;
-                var timingPoint = legacyControlPoints.TimingPointAt(time);
-                var difficultyPoint = legacyControlPoints.DifficultyPointAt(time);
-                var samplePoint = legacyControlPoints.SamplePointAt(time);
-                var effectPoint = legacyControlPoints.EffectPointAt(time);
+                var timingPoint = legacyControlPoints.TimingPointAt(group.Time);
+                var difficultyPoint = legacyControlPoints.DifficultyPointAt(group.Time);
+                var samplePoint = legacyControlPoints.SamplePointAt(group.Time);
+                var effectPoint = legacyControlPoints.EffectPointAt(group.Time);
 
                 // Apply the control point to a hit sample to uncover legacy properties (e.g. suffix)
                 HitSampleInfo tempHitSample = samplePoint.ApplyTo(new ConvertHitObjectParser.LegacyHitSampleInfo(string.Empty));
@@ -628,5 +610,23 @@ namespace osu.Game.Beatmaps.Formats
 
             return 0;
         }
+
+        private struct LegacyControlPointProperties
+        {
+            internal double SliderVelocity { get; set; }
+            internal int TimingSignature { get; init; }
+            internal int SampleBank { get; init; }
+            internal int CustomSampleBank { get; init; }
+            internal int SampleVolume { get; init; }
+            internal LegacyEffectFlags EffectFlags { get; init; }
+
+            internal bool IsRedundant(LegacyControlPointProperties other) =>
+                SliderVelocity == other.SliderVelocity &&
+                TimingSignature == other.TimingSignature &&
+                SampleBank == other.SampleBank &&
+                CustomSampleBank == other.CustomSampleBank &&
+                SampleVolume == other.SampleVolume &&
+                EffectFlags == other.EffectFlags;
+        }
     }
 }

From 384693a431757767d27594ef8906cd3d1ace0861 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 May 2023 14:30:57 +0900
Subject: [PATCH 0286/1604] Fix test failure in `MultiplayerMatchSongSelect`
 due to multiple overlays present

https://github.com/ppy/osu/actions/runs/4868337922/jobs/8681736995?pr=23308.
---
 .../Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
index c0b6a0beab..9b130071cc 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
@@ -98,6 +98,10 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddStep($"select {requiredMod.ReadableName()} as required", () => songSelect.Mods.Value = new[] { (Mod)Activator.CreateInstance(requiredMod) });
 
             AddAssert("freemods empty", () => songSelect.FreeMods.Value.Count == 0);
+
+            // A previous test's mod overlay could still be fading out.
+            AddUntilStep("wait for only one freemod overlay", () => this.ChildrenOfType<FreeModSelectOverlay>().Count() == 1);
+
             assertHasFreeModButton(allowedMod, false);
             assertHasFreeModButton(requiredMod, false);
         }

From a3efae36907fc596061ffadf7e552d6c078c360a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 May 2023 14:33:30 +0900
Subject: [PATCH 0287/1604] Fix potentially incorrect thread access in
 `OsuTabControlCheckbox`

https://github.com/ppy/osu/actions/runs/4868337922/jobs/8681736829.
---
 .../UserInterface/OsuTabControlCheckbox.cs    | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs b/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs
index fa58ae27f2..71bc18737f 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs
@@ -49,11 +49,10 @@ namespace osu.Game.Graphics.UserInterface
         private const float transition_length = 500;
         private Sample sampleChecked;
         private Sample sampleUnchecked;
+        private readonly SpriteIcon icon;
 
         public OsuTabControlCheckbox()
         {
-            SpriteIcon icon;
-
             AutoSizeAxes = Axes.Both;
 
             Children = new Drawable[]
@@ -85,14 +84,6 @@ namespace osu.Game.Graphics.UserInterface
                     Anchor = Anchor.BottomLeft,
                 }
             };
-
-            Current.ValueChanged += selected =>
-            {
-                icon.Icon = selected.NewValue ? FontAwesome.Regular.CheckCircle : FontAwesome.Regular.Circle;
-                text.Font = text.Font.With(weight: selected.NewValue ? FontWeight.Bold : FontWeight.Medium);
-
-                updateFade();
-            };
         }
 
         [BackgroundDependencyLoader]
@@ -103,6 +94,14 @@ namespace osu.Game.Graphics.UserInterface
 
             sampleChecked = audio.Samples.Get(@"UI/check-on");
             sampleUnchecked = audio.Samples.Get(@"UI/check-off");
+
+            Current.ValueChanged += selected =>
+            {
+                icon.Icon = selected.NewValue ? FontAwesome.Regular.CheckCircle : FontAwesome.Regular.Circle;
+                text.Font = text.Font.With(weight: selected.NewValue ? FontWeight.Bold : FontWeight.Medium);
+
+                updateFade();
+            };
         }
 
         protected override bool OnHover(HoverEvent e)

From bede1292de37f4be3270c2e86c215783e3ef52d8 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 2 May 2023 22:24:07 -0700
Subject: [PATCH 0288/1604] Fix overlay scroll back button not absorbing hover
 from behind

---
 osu.Game/Overlays/OverlayScrollContainer.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Overlays/OverlayScrollContainer.cs b/osu.Game/Overlays/OverlayScrollContainer.cs
index 9752e04f44..ba7486a57f 100644
--- a/osu.Game/Overlays/OverlayScrollContainer.cs
+++ b/osu.Game/Overlays/OverlayScrollContainer.cs
@@ -185,6 +185,8 @@ namespace osu.Game.Overlays
                 content.ScaleTo(1, 1000, Easing.OutElastic);
                 base.OnMouseUp(e);
             }
+
+            protected override bool OnHover(HoverEvent e) => true;
         }
     }
 }

From 1c74f6e8ea60fe91335c95883bc8d434e51b07ac Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 2 May 2023 22:54:42 -0700
Subject: [PATCH 0289/1604] Fix regressed button hover fade in

---
 osu.Game/Overlays/OverlayScrollContainer.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/OverlayScrollContainer.cs b/osu.Game/Overlays/OverlayScrollContainer.cs
index ba7486a57f..2a615f0e12 100644
--- a/osu.Game/Overlays/OverlayScrollContainer.cs
+++ b/osu.Game/Overlays/OverlayScrollContainer.cs
@@ -186,7 +186,11 @@ namespace osu.Game.Overlays
                 base.OnMouseUp(e);
             }
 
-            protected override bool OnHover(HoverEvent e) => true;
+            protected override bool OnHover(HoverEvent e)
+            {
+                base.OnHover(e);
+                return true;
+            }
         }
     }
 }

From 453143813fafc7a62736ab473a883a194d7e643d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 May 2023 14:57:31 +0900
Subject: [PATCH 0290/1604] Extend input handling of osu! logo to full border
 area

This is the easiest way to make this happen. It does mean the pink area
is being drawn behind the white border, but I haven't found a scenario
where this is noticeable.

Closes #4217.
---
 osu.Game/Screens/Menu/OsuLogo.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs
index 9430a1cda8..33dc23d88d 100644
--- a/osu.Game/Screens/Menu/OsuLogo.cs
+++ b/osu.Game/Screens/Menu/OsuLogo.cs
@@ -35,6 +35,12 @@ namespace osu.Game.Screens.Menu
 
         private const double transition_length = 300;
 
+        /// <summary>
+        /// The osu! logo sprite has a shadow included in its texture.
+        /// This adjustment vector is used to match the precise edge of the border of the logo.
+        /// </summary>
+        private static readonly Vector2 scale_adjust = new Vector2(0.96f);
+
         private readonly Sprite logo;
         private readonly CircularContainer logoContainer;
         private readonly Container logoBounceContainer;
@@ -150,7 +156,7 @@ namespace osu.Game.Screens.Menu
                                                     Origin = Anchor.Centre,
                                                     Anchor = Anchor.Centre,
                                                     Alpha = visualizer_default_alpha,
-                                                    Size = new Vector2(0.96f)
+                                                    Size = scale_adjust
                                                 },
                                                 new Container
                                                 {
@@ -162,7 +168,7 @@ namespace osu.Game.Screens.Menu
                                                             Anchor = Anchor.Centre,
                                                             Origin = Anchor.Centre,
                                                             RelativeSizeAxes = Axes.Both,
-                                                            Scale = new Vector2(0.88f),
+                                                            Scale = scale_adjust,
                                                             Masking = true,
                                                             Children = new Drawable[]
                                                             {

From 6a59ded1bad631e2b3ce508b4050b0a937126037 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 May 2023 15:18:37 +0900
Subject: [PATCH 0291/1604] Move logic to `Update` instead

---
 .../Objects/Drawables/DrawableHoldNote.cs            | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index b2c84b140b..20daab2447 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -219,6 +219,9 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             if (Time.Current < releaseTime)
                 releaseTime = null;
 
+            if (Time.Current < HoldStartTime)
+                endHold();
+
             // Pad the full size container so its contents (i.e. the masking container) reach under the tail.
             // This is required for the tail to not be masked away, since it lies outside the bounds of the hold note.
             sizingContainer.Padding = new MarginPadding
@@ -322,15 +325,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             if (e.Action != Action.Value)
                 return;
 
-            // do not run any of this logic when rewinding, as it inverts order of presses/releases.
-            if (Time.Elapsed < 0)
-            {
-                // Except for the IsHitting state, as this handles animations that need to be reapplied
-                // after rewind.
-                isHitting.Value = false;
-                return;
-            }
-
             // Make sure a hold was started
             if (HoldStartTime == null)
                 return;

From 5f781bd6de1ef4c2e067eec5e985722500b7b192 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 3 May 2023 09:26:54 +0200
Subject: [PATCH 0292/1604] Move callback to `LoadComplete()`

Is the more correct place for `BindValueChanged()` callbacks.
---
 osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs b/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs
index 71bc18737f..8eb6b792c6 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs
@@ -94,14 +94,19 @@ namespace osu.Game.Graphics.UserInterface
 
             sampleChecked = audio.Samples.Get(@"UI/check-on");
             sampleUnchecked = audio.Samples.Get(@"UI/check-off");
+        }
 
-            Current.ValueChanged += selected =>
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Current.BindValueChanged(selected =>
             {
                 icon.Icon = selected.NewValue ? FontAwesome.Regular.CheckCircle : FontAwesome.Regular.Circle;
                 text.Font = text.Font.With(weight: selected.NewValue ? FontWeight.Bold : FontWeight.Medium);
 
                 updateFade();
-            };
+            });
         }
 
         protected override bool OnHover(HoverEvent e)

From de1b28bcb284e9e07b4b36eb9a3513a5f7228732 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 3 May 2023 09:27:23 +0200
Subject: [PATCH 0293/1604] Fix incorrect initial state of checkbox

This only ever barely used to work without the `(..., true)`
in `master` because of haphazard operation ordering.
---
 osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs b/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs
index 8eb6b792c6..c9e1f74917 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs
@@ -106,7 +106,7 @@ namespace osu.Game.Graphics.UserInterface
                 text.Font = text.Font.With(weight: selected.NewValue ? FontWeight.Bold : FontWeight.Medium);
 
                 updateFade();
-            });
+            }, true);
         }
 
         protected override bool OnHover(HoverEvent e)

From 5757eb75299234da77876e70de818ae53d4e8728 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 May 2023 18:20:12 +0900
Subject: [PATCH 0294/1604] Update a few more instances of `0.96f` scale
 constants

---
 osu.Game/Screens/Menu/IntroWelcome.cs | 2 +-
 osu.Game/Screens/Menu/OsuLogo.cs      | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroWelcome.cs b/osu.Game/Screens/Menu/IntroWelcome.cs
index da44161507..2a6ebecb92 100644
--- a/osu.Game/Screens/Menu/IntroWelcome.cs
+++ b/osu.Game/Screens/Menu/IntroWelcome.cs
@@ -131,7 +131,7 @@ namespace osu.Game.Screens.Menu
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,
                                 Colour = Color4.DarkBlue,
-                                Size = new Vector2(0.96f)
+                                Size = OsuLogo.SCALE_ADJUST,
                             },
                             new Circle
                             {
diff --git a/osu.Game/Screens/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs
index 33dc23d88d..277b8bf888 100644
--- a/osu.Game/Screens/Menu/OsuLogo.cs
+++ b/osu.Game/Screens/Menu/OsuLogo.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Screens.Menu
         /// The osu! logo sprite has a shadow included in its texture.
         /// This adjustment vector is used to match the precise edge of the border of the logo.
         /// </summary>
-        private static readonly Vector2 scale_adjust = new Vector2(0.96f);
+        public static readonly Vector2 SCALE_ADJUST = new Vector2(0.96f);
 
         private readonly Sprite logo;
         private readonly CircularContainer logoContainer;
@@ -156,7 +156,7 @@ namespace osu.Game.Screens.Menu
                                                     Origin = Anchor.Centre,
                                                     Anchor = Anchor.Centre,
                                                     Alpha = visualizer_default_alpha,
-                                                    Size = scale_adjust
+                                                    Size = SCALE_ADJUST
                                                 },
                                                 new Container
                                                 {
@@ -168,7 +168,7 @@ namespace osu.Game.Screens.Menu
                                                             Anchor = Anchor.Centre,
                                                             Origin = Anchor.Centre,
                                                             RelativeSizeAxes = Axes.Both,
-                                                            Scale = scale_adjust,
+                                                            Scale = SCALE_ADJUST,
                                                             Masking = true,
                                                             Children = new Drawable[]
                                                             {
@@ -412,7 +412,7 @@ namespace osu.Game.Screens.Menu
         public void Impact()
         {
             impactContainer.FadeOutFromOne(250, Easing.In);
-            impactContainer.ScaleTo(0.96f);
+            impactContainer.ScaleTo(SCALE_ADJUST);
             impactContainer.ScaleTo(1.12f, 250);
         }
 

From cd31cff8cdd4c26c64183f640178b604e638682e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 May 2023 18:41:29 +0900
Subject: [PATCH 0295/1604] Fix event subscriptions not being cleaned up in
 `DrawableCarouselBeatmap`

The handling of cleanup is performed only the `Item_Set` method. This
was already correctly called for `DrawableCarouselBeatmapSet`, but not
for the class in question here.

This would cause runaway memory usage at song select when opening many
beatmaps to show their difficulties. For simplicity, we don't yet pool
these (and generate the drawables each time a set is opened) which isn't
great but likely will be improved upon when we update the visual /
filtering of the carousel. But this simplicity caused the memory usage
to blow out until exiting back to the main menu when cleanup would
finally occur.
---
 osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index f08d14720b..55d442215b 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -250,6 +250,9 @@ namespace osu.Game.Screens.Select.Carousel
         {
             base.Dispose(isDisposing);
             starDifficultyCancellationSource?.Cancel();
+
+            // This is important to clean up event subscriptions.
+            Item = null;
         }
     }
 }

From 444f66b0eefdce3c4defaf46fffa927a886f6f51 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 May 2023 18:45:09 +0900
Subject: [PATCH 0296/1604] Move to base class for added safety

---
 .../Screens/Select/Carousel/DrawableCarouselBeatmap.cs |  3 ---
 .../Screens/Select/Carousel/DrawableCarouselItem.cs    | 10 +++++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index 55d442215b..f08d14720b 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -250,9 +250,6 @@ namespace osu.Game.Screens.Select.Carousel
         {
             base.Dispose(isDisposing);
             starDifficultyCancellationSource?.Cancel();
-
-            // This is important to clean up event subscriptions.
-            Item = null;
         }
     }
 }
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
index f065926eb7..0c3de5848b 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Screens.Select.Carousel
 
                 item = value;
 
-                if (IsLoaded)
+                if (IsLoaded && !IsDisposed)
                     UpdateItem();
             }
         }
@@ -165,5 +165,13 @@ namespace osu.Game.Screens.Select.Carousel
             Item.State.Value = CarouselItemState.Selected;
             return true;
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            // This is important to clean up event subscriptions.
+            Item = null;
+        }
     }
 }

From b28d7b1a928cbda8ee6da8a682683ea9dbd7376f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 May 2023 18:51:02 +0900
Subject: [PATCH 0297/1604] Fix non-block namespace

---
 .../Online/API/Requests/ChatReportRequest.cs  | 53 ++++++++++---------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/osu.Game/Online/API/Requests/ChatReportRequest.cs b/osu.Game/Online/API/Requests/ChatReportRequest.cs
index 01cb455183..85e5559e01 100644
--- a/osu.Game/Online/API/Requests/ChatReportRequest.cs
+++ b/osu.Game/Online/API/Requests/ChatReportRequest.cs
@@ -5,33 +5,34 @@ using System.Net.Http;
 using osu.Framework.IO.Network;
 using osu.Game.Overlays.Chat;
 
-namespace osu.Game.Online.API.Requests;
-
-public class ChatReportRequest : APIRequest
+namespace osu.Game.Online.API.Requests
 {
-    public readonly long? MessageId;
-    public readonly ChatReportReason Reason;
-    public readonly string Comment;
-
-    public ChatReportRequest(long? id, ChatReportReason reason, string comment)
+    public class ChatReportRequest : APIRequest
     {
-        MessageId = id;
-        Reason = reason;
-        Comment = comment;
+        public readonly long? MessageId;
+        public readonly ChatReportReason Reason;
+        public readonly string Comment;
+
+        public ChatReportRequest(long? id, ChatReportReason reason, string comment)
+        {
+            MessageId = id;
+            Reason = reason;
+            Comment = comment;
+        }
+
+        protected override WebRequest CreateWebRequest()
+        {
+            var req = base.CreateWebRequest();
+            req.Method = HttpMethod.Post;
+
+            req.AddParameter(@"reportable_type", @"message");
+            req.AddParameter(@"reportable_id", $"{MessageId}");
+            req.AddParameter(@"reason", Reason.ToString());
+            req.AddParameter(@"comments", Comment);
+
+            return req;
+        }
+
+        protected override string Target => @"reports";
     }
-
-    protected override WebRequest CreateWebRequest()
-    {
-        var req = base.CreateWebRequest();
-        req.Method = HttpMethod.Post;
-
-        req.AddParameter(@"reportable_type", @"message");
-        req.AddParameter(@"reportable_id", $"{MessageId}");
-        req.AddParameter(@"reason", Reason.ToString());
-        req.AddParameter(@"comments", Comment);
-
-        return req;
-    }
-
-    protected override string Target => @"reports";
 }

From b932e4d98690f9935aa1d50df4dd8757f9380928 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 May 2023 18:53:22 +0900
Subject: [PATCH 0298/1604] Rename `DrawableUsername` to `DrawableChatUsername`
 and only pass message ID

---
 osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs |  2 +-
 osu.Game/Overlays/Chat/ChatLine.cs                   |  4 ++--
 .../{DrawableUsername.cs => DrawableChatUsername.cs} | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)
 rename osu.Game/Overlays/Chat/{DrawableUsername.cs => DrawableChatUsername.cs} (96%)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
index faf48ef854..e9e2cc63c2 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
@@ -616,7 +616,7 @@ namespace osu.Game.Tests.Visual.Online
                 };
             });
 
-            AddStep("Show report popover", () => this.ChildrenOfType<DrawableUsername>().First().ShowPopover());
+            AddStep("Show report popover", () => this.ChildrenOfType<DrawableChatUsername>().First().ShowPopover());
 
             AddStep("Set report reason to other", () =>
             {
diff --git a/osu.Game/Overlays/Chat/ChatLine.cs b/osu.Game/Overlays/Chat/ChatLine.cs
index 0e69501ae9..dca34128d1 100644
--- a/osu.Game/Overlays/Chat/ChatLine.cs
+++ b/osu.Game/Overlays/Chat/ChatLine.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Overlays.Chat
 
         private readonly OsuSpriteText drawableTimestamp;
 
-        private readonly DrawableUsername drawableUsername;
+        private readonly DrawableChatUsername drawableUsername;
 
         private readonly LinkFlowContainer drawableContentFlow;
 
@@ -92,7 +92,7 @@ namespace osu.Game.Overlays.Chat
                             Font = OsuFont.GetFont(size: FontSize * 0.75f, weight: FontWeight.SemiBold, fixedWidth: true),
                             AlwaysPresent = true,
                         },
-                        drawableUsername = new DrawableUsername(message)
+                        drawableUsername = new DrawableChatUsername(message.Sender, message.Id)
                         {
                             Width = UsernameWidth,
                             FontSize = FontSize,
diff --git a/osu.Game/Overlays/Chat/DrawableUsername.cs b/osu.Game/Overlays/Chat/DrawableChatUsername.cs
similarity index 96%
rename from osu.Game/Overlays/Chat/DrawableUsername.cs
rename to osu.Game/Overlays/Chat/DrawableChatUsername.cs
index 25967003e9..4ba5c9769a 100644
--- a/osu.Game/Overlays/Chat/DrawableUsername.cs
+++ b/osu.Game/Overlays/Chat/DrawableChatUsername.cs
@@ -31,7 +31,7 @@ using ChatStrings = osu.Game.Localisation.ChatStrings;
 
 namespace osu.Game.Overlays.Chat
 {
-    public partial class DrawableUsername : OsuClickableContainer, IHasContextMenu, IHasPopover
+    public partial class DrawableChatUsername : OsuClickableContainer, IHasContextMenu, IHasPopover
     {
         public Color4 AccentColour { get; }
 
@@ -73,15 +73,15 @@ namespace osu.Game.Overlays.Chat
         private Bindable<Channel?>? currentChannel { get; set; }
 
         private readonly APIUser user;
-        private readonly Message message;
+        private readonly long? messageId;
         private readonly OsuSpriteText drawableText;
 
         private readonly Drawable colouredDrawable;
 
-        public DrawableUsername(Message message)
+        public DrawableChatUsername(APIUser user, long? messageId)
         {
-            this.message = message;
-            user = message.Sender;
+            this.user = user;
+            this.messageId = messageId;
 
             Action = openUserProfile;
 
@@ -182,7 +182,7 @@ namespace osu.Game.Overlays.Chat
 
         private void report(ChatReportReason reason, string comments)
         {
-            var request = new ChatReportRequest(message.Id, reason, comments);
+            var request = new ChatReportRequest(messageId, reason, comments);
 
             request.Failure += _ => Schedule(() =>
             {

From be15d07b1734b853d1424c996b3e0de10a94c213 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 May 2023 18:59:39 +0900
Subject: [PATCH 0299/1604] Tidy up various implementation details

---
 osu.Game/Graphics/UserInterfaceV2/ReportPopover.cs |  7 ++++---
 osu.Game/Overlays/Chat/DrawableChatUsername.cs     | 10 +++++-----
 osu.Game/Overlays/Comments/CommentReportButton.cs  | 10 +++++-----
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Graphics/UserInterfaceV2/ReportPopover.cs b/osu.Game/Graphics/UserInterfaceV2/ReportPopover.cs
index 46006402ad..a5c60bb9e6 100644
--- a/osu.Game/Graphics/UserInterfaceV2/ReportPopover.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/ReportPopover.cs
@@ -24,11 +24,12 @@ namespace osu.Game.Graphics.UserInterfaceV2
         private OsuEnumDropdown<T> reasonDropdown = null!;
         private OsuTextBox commentsTextBox = null!;
         private RoundedButton submitButton = null!;
-        public LocalisableString Header;
+
+        private readonly LocalisableString header;
 
         protected ReportPopover(LocalisableString headerString)
         {
-            Header = headerString;
+            header = headerString;
         }
 
         [BackgroundDependencyLoader]
@@ -53,7 +54,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
                     {
                         Origin = Anchor.TopCentre,
                         Anchor = Anchor.TopCentre,
-                        Text = Header,
+                        Text = header,
                         Font = OsuFont.Torus.With(size: 25),
                         Margin = new MarginPadding { Bottom = 10 }
                     },
diff --git a/osu.Game/Overlays/Chat/DrawableChatUsername.cs b/osu.Game/Overlays/Chat/DrawableChatUsername.cs
index 4ba5c9769a..b3bbc74be7 100644
--- a/osu.Game/Overlays/Chat/DrawableChatUsername.cs
+++ b/osu.Game/Overlays/Chat/DrawableChatUsername.cs
@@ -180,6 +180,11 @@ namespace osu.Game.Overlays.Chat
             }
         }
 
+        public Popover GetPopover() => new ReportChatPopover(user)
+        {
+            Action = report
+        };
+
         private void report(ChatReportReason reason, string comments)
         {
             var request = new ChatReportRequest(messageId, reason, comments);
@@ -260,10 +265,5 @@ namespace osu.Game.Overlays.Chat
             Color4Extensions.FromHex("812a96"),
             Color4Extensions.FromHex("992861"),
         };
-
-        public Popover GetPopover() => new ReportChatPopover(user)
-        {
-            Action = report
-        };
     }
 }
diff --git a/osu.Game/Overlays/Comments/CommentReportButton.cs b/osu.Game/Overlays/Comments/CommentReportButton.cs
index ba5319094b..e4d4d671da 100644
--- a/osu.Game/Overlays/Comments/CommentReportButton.cs
+++ b/osu.Game/Overlays/Comments/CommentReportButton.cs
@@ -57,6 +57,11 @@ namespace osu.Game.Overlays.Comments
             link.AddLink(ReportStrings.CommentButton.ToLower(), this.ShowPopover);
         }
 
+        public Popover GetPopover() => new ReportCommentPopover(comment)
+        {
+            Action = report
+        };
+
         private void report(CommentReportReason reason, string comments)
         {
             var request = new CommentReportRequest(comment.Id, reason, comments);
@@ -83,10 +88,5 @@ namespace osu.Game.Overlays.Comments
 
             api.Queue(request);
         }
-
-        public Popover GetPopover() => new ReportCommentPopover(comment)
-        {
-            Action = report
-        };
     }
 }

From f0d35eb12be0262e892b4fc614128860007107c7 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Wed, 3 May 2023 13:12:11 +0300
Subject: [PATCH 0300/1604] Update testing

---
 .../TestSceneMultiplayerMatchSongSelect.cs           |  2 +-
 .../TestSceneMultiplayerMatchSubScreen.cs            |  2 +-
 .../Visual/UserInterface/TestSceneModColumn.cs       | 12 ++++++------
 .../UserInterface/TestSceneModSelectOverlay.cs       | 12 ++++++------
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
index c0b6a0beab..dd1400b36e 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
@@ -108,7 +108,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 () => this.ChildrenOfType<FreeModSelectOverlay>()
                           .Single()
                           .ChildrenOfType<ModPanel>()
-                          .Where(panel => !panel.Filtered.Value)
+                          .Where(panel => panel.MatchingFilter)
                           .All(b => b.Mod.GetType() != type));
         }
 
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
index 8816787ceb..8fd16fb723 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
@@ -203,7 +203,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddUntilStep("mod select contains only double time mod",
                 () => this.ChildrenOfType<RoomSubScreen>().Single().UserModsSelectOverlay
                           .ChildrenOfType<ModPanel>()
-                          .SingleOrDefault(panel => !panel.Filtered.Value)?.Mod is OsuModDoubleTime);
+                          .SingleOrDefault(panel => panel.MatchingFilter)?.Mod is OsuModDoubleTime);
         }
 
         [Test]
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs
index 3f5676ee24..ec6084aa8e 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs
@@ -106,26 +106,26 @@ namespace osu.Game.Tests.Visual.UserInterface
             });
 
             AddStep("set filter", () => setFilter(mod => mod.Name.Contains("Wind", StringComparison.CurrentCultureIgnoreCase)));
-            AddUntilStep("two panels visible", () => column.ChildrenOfType<ModPanel>().Count(panel => !panel.Filtered.Value) == 2);
+            AddUntilStep("two panels visible", () => column.ChildrenOfType<ModPanel>().Count(panel => panel.MatchingFilter) == 2);
 
             clickToggle();
             AddUntilStep("wait for animation", () => !column.SelectionAnimationRunning);
-            AddAssert("only visible items selected", () => column.ChildrenOfType<ModPanel>().Where(panel => panel.Active.Value).All(panel => !panel.Filtered.Value));
+            AddAssert("only visible items selected", () => column.ChildrenOfType<ModPanel>().Where(panel => panel.Active.Value).All(panel => panel.MatchingFilter));
 
             AddStep("unset filter", () => setFilter(null));
-            AddUntilStep("all panels visible", () => column.ChildrenOfType<ModPanel>().All(panel => !panel.Filtered.Value));
+            AddUntilStep("all panels visible", () => column.ChildrenOfType<ModPanel>().All(panel => panel.MatchingFilter));
             AddAssert("checkbox not selected", () => !column.ChildrenOfType<OsuCheckbox>().Single().Current.Value);
 
             AddStep("set filter", () => setFilter(mod => mod.Name.Contains("Wind", StringComparison.CurrentCultureIgnoreCase)));
-            AddUntilStep("two panels visible", () => column.ChildrenOfType<ModPanel>().Count(panel => !panel.Filtered.Value) == 2);
+            AddUntilStep("two panels visible", () => column.ChildrenOfType<ModPanel>().Count(panel => panel.MatchingFilter) == 2);
             AddAssert("checkbox selected", () => column.ChildrenOfType<OsuCheckbox>().Single().Current.Value);
 
             AddStep("filter out everything", () => setFilter(_ => false));
-            AddUntilStep("no panels visible", () => column.ChildrenOfType<ModPanel>().All(panel => panel.Filtered.Value));
+            AddUntilStep("no panels visible", () => column.ChildrenOfType<ModPanel>().All(panel => !panel.MatchingFilter));
             AddUntilStep("checkbox hidden", () => !column.ChildrenOfType<OsuCheckbox>().Single().IsPresent);
 
             AddStep("inset filter", () => setFilter(null));
-            AddUntilStep("all panels visible", () => column.ChildrenOfType<ModPanel>().All(panel => !panel.Filtered.Value));
+            AddUntilStep("all panels visible", () => column.ChildrenOfType<ModPanel>().All(panel => panel.MatchingFilter));
             AddUntilStep("checkbox visible", () => column.ChildrenOfType<OsuCheckbox>().Single().IsPresent);
 
             void clickToggle() => AddStep("click toggle", () =>
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 5ccaebd721..9c6ec653e9 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -431,15 +431,15 @@ namespace osu.Game.Tests.Visual.UserInterface
             createScreen();
             changeRuleset(0);
 
-            AddAssert("double time visible", () => modSelectOverlay.ChildrenOfType<ModPanel>().Where(panel => panel.Mod is OsuModDoubleTime).Any(panel => !panel.Filtered.Value));
+            AddAssert("double time visible", () => modSelectOverlay.ChildrenOfType<ModPanel>().Where(panel => panel.Mod is OsuModDoubleTime).Any(panel => panel.MatchingFilter));
 
             AddStep("make double time invalid", () => modSelectOverlay.IsValidMod = m => !(m is OsuModDoubleTime));
-            AddUntilStep("double time not visible", () => modSelectOverlay.ChildrenOfType<ModPanel>().Where(panel => panel.Mod is OsuModDoubleTime).All(panel => panel.Filtered.Value));
-            AddAssert("nightcore still visible", () => modSelectOverlay.ChildrenOfType<ModPanel>().Where(panel => panel.Mod is OsuModNightcore).Any(panel => !panel.Filtered.Value));
+            AddUntilStep("double time not visible", () => modSelectOverlay.ChildrenOfType<ModPanel>().Where(panel => panel.Mod is OsuModDoubleTime).All(panel => !panel.MatchingFilter));
+            AddAssert("nightcore still visible", () => modSelectOverlay.ChildrenOfType<ModPanel>().Where(panel => panel.Mod is OsuModNightcore).Any(panel => panel.MatchingFilter));
 
             AddStep("make double time valid again", () => modSelectOverlay.IsValidMod = _ => true);
-            AddUntilStep("double time visible", () => modSelectOverlay.ChildrenOfType<ModPanel>().Where(panel => panel.Mod is OsuModDoubleTime).Any(panel => !panel.Filtered.Value));
-            AddAssert("nightcore still visible", () => modSelectOverlay.ChildrenOfType<ModPanel>().Where(b => b.Mod is OsuModNightcore).Any(panel => !panel.Filtered.Value));
+            AddUntilStep("double time visible", () => modSelectOverlay.ChildrenOfType<ModPanel>().Where(panel => panel.Mod is OsuModDoubleTime).Any(panel => panel.MatchingFilter));
+            AddAssert("nightcore still visible", () => modSelectOverlay.ChildrenOfType<ModPanel>().Where(b => b.Mod is OsuModNightcore).Any(panel => panel.MatchingFilter));
         }
 
         [Test]
@@ -465,7 +465,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("set ruleset", () => Ruleset.Value = testRuleset.RulesetInfo);
             waitForColumnLoad();
 
-            AddAssert("unimplemented mod panel is filtered", () => getPanelForMod(typeof(TestUnimplementedMod)).Filtered.Value);
+            AddAssert("unimplemented mod panel is filtered", () => !getPanelForMod(typeof(TestUnimplementedMod)).MatchingFilter);
         }
 
         [Test]

From 152d2678d52c74d562c1c959da5502c960664ed1 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Wed, 3 May 2023 14:00:46 +0300
Subject: [PATCH 0301/1604] Fix `ModSelectColumn` completely disappear from
 `ModSelectOverlay`

---
 osu.Game/Overlays/Mods/ModSearch.cs          | 10 --------
 osu.Game/Overlays/Mods/ModSearchContainer.cs | 25 ++++++++++++++++++++
 osu.Game/Overlays/Mods/ModSelectColumn.cs    |  6 ++---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs   |  4 ++--
 4 files changed, 30 insertions(+), 15 deletions(-)
 delete mode 100644 osu.Game/Overlays/Mods/ModSearch.cs
 create mode 100644 osu.Game/Overlays/Mods/ModSearchContainer.cs

diff --git a/osu.Game/Overlays/Mods/ModSearch.cs b/osu.Game/Overlays/Mods/ModSearch.cs
deleted file mode 100644
index 0a82d967af..0000000000
--- a/osu.Game/Overlays/Mods/ModSearch.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Framework.Graphics.Containers;
-
-namespace osu.Game.Overlays.Mods;
-
-public partial class ModSearch : Container
-{
-}
diff --git a/osu.Game/Overlays/Mods/ModSearchContainer.cs b/osu.Game/Overlays/Mods/ModSearchContainer.cs
new file mode 100644
index 0000000000..29cc7d8132
--- /dev/null
+++ b/osu.Game/Overlays/Mods/ModSearchContainer.cs
@@ -0,0 +1,25 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics.Containers;
+
+namespace osu.Game.Overlays.Mods;
+
+public partial class ModSearchContainer : SearchContainer
+{
+    /// <summary>
+    /// A string that should match the <see cref="IFilterable"/> children
+    /// </summary>
+    public string ForcedSearchTerm
+    {
+        get => SearchTerm;
+        set
+        {
+            if (value == SearchTerm)
+                return;
+
+            SearchTerm = value;
+            Update();
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Mods/ModSelectColumn.cs b/osu.Game/Overlays/Mods/ModSelectColumn.cs
index 8bf3fd404f..c80eb8c09c 100644
--- a/osu.Game/Overlays/Mods/ModSelectColumn.cs
+++ b/osu.Game/Overlays/Mods/ModSelectColumn.cs
@@ -45,13 +45,13 @@ namespace osu.Game.Overlays.Mods
 
         public string SearchTerm
         {
-            set => ItemsFlow.SearchTerm = value;
+            set => ItemsFlow.ForcedSearchTerm = value;
         }
 
         protected override bool ReceivePositionalInputAtSubTree(Vector2 screenSpacePos) => base.ReceivePositionalInputAtSubTree(screenSpacePos) && Active.Value;
 
         protected readonly Container ControlContainer;
-        protected readonly SearchContainer ItemsFlow;
+        protected readonly ModSearchContainer ItemsFlow;
 
         private readonly TextFlowContainer headerText;
         private readonly Box headerBackground;
@@ -155,7 +155,7 @@ namespace osu.Game.Overlays.Mods
                                                     RelativeSizeAxes = Axes.Both,
                                                     ClampExtension = 100,
                                                     ScrollbarOverlapsContent = false,
-                                                    Child = ItemsFlow = new SearchContainer
+                                                    Child = ItemsFlow = new ModSearchContainer
                                                     {
                                                         RelativeSizeAxes = Axes.X,
                                                         AutoSizeAxes = Axes.Y,
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 12e894cfba..9efcd24048 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -112,7 +112,7 @@ namespace osu.Game.Overlays.Mods
         private ShearedSearchTextBox searchTextBox = null!;
         private DifficultyMultiplierDisplay? multiplierDisplay;
 
-        private ModSearch? modSearch;
+        private ModSearchContainer? modSearch;
 
         protected ShearedButton BackButton { get; private set; } = null!;
         protected ShearedToggleButton? CustomisationButton { get; private set; }
@@ -215,7 +215,7 @@ namespace osu.Game.Overlays.Mods
                 AutoSizeAxes = Axes.X,
                 Height = ModsEffectDisplay.HEIGHT,
                 Margin = new MarginPadding { Horizontal = 100 },
-                Child = modSearch = new ModSearch()
+                Child = modSearch = new ModSearchContainer()
             });
 
             FooterContent.Child = footerButtonFlow = new FillFlowContainer<ShearedButton>

From 25bf4e68ec32b5fa68f40280aed8246cefcd42e8 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Wed, 3 May 2023 22:53:13 +0900
Subject: [PATCH 0302/1604] remove useless wait

---
 osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
index e9e2cc63c2..041556a5a6 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
@@ -631,7 +631,6 @@ namespace osu.Game.Tests.Visual.Online
                 InputManager.Click(MouseButton.Left);
             });
 
-            AddWaitStep("Wait", 3);
             AddAssert("Nothing happened", () => this.ChildrenOfType<ReportChatPopover>().Any());
             AddStep("Set report data", () =>
             {

From 3a15783a3c53e610b86ff71c891df125d3651bb1 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Wed, 3 May 2023 22:56:47 +0900
Subject: [PATCH 0303/1604] remove wait, use AddUntilStep

---
 .../Visual/UserInterface/TestSceneModPresetColumn.cs     | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
index c4c5584c5e..55fe142d9f 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
@@ -301,7 +301,6 @@ namespace osu.Game.Tests.Visual.UserInterface
                 InputManager.Click(MouseButton.Left);
             });
 
-            AddWaitStep("wait some", 3);
             AddAssert("present is not changed", () => panel.Preset.Value.Name == presetName);
             AddUntilStep("popover is unchanged", () => this.ChildrenOfType<OsuPopover>().FirstOrDefault() == popover);
             AddStep("edit preset name", () => popover.ChildrenOfType<LabelledTextBox>().First().Current.Value = "something new");
@@ -357,8 +356,8 @@ namespace osu.Game.Tests.Visual.UserInterface
                 InputManager.MoveMouseTo(popover.ChildrenOfType<ShearedButton>().ElementAt(1));
                 InputManager.Click(MouseButton.Left);
             });
-            AddWaitStep("wait some", 3);
-            AddAssert("present mod not changed", () =>
+
+            AddUntilStep("present mod not changed", () =>
                 new HashSet<Mod>(this.ChildrenOfType<ModPresetPanel>().First().Preset.Value.Mods).SetEquals(previousMod));
 
             AddStep("select mods", () => SelectedMods.Value = mods);
@@ -388,8 +387,8 @@ namespace osu.Game.Tests.Visual.UserInterface
                 InputManager.MoveMouseTo(popover.ChildrenOfType<ShearedButton>().ElementAt(1));
                 InputManager.Click(MouseButton.Left);
             });
-            AddWaitStep("wait some", 3);
-            AddAssert("present mod is changed", () =>
+
+            AddUntilStep("present mod is changed", () =>
                 new HashSet<Mod>(this.ChildrenOfType<ModPresetPanel>().First().Preset.Value.Mods).SetEquals(mods));
         }
 

From c609e6345cf6c3b41b57917fe1dac841b1be9a4c Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Wed, 3 May 2023 23:01:31 +0900
Subject: [PATCH 0304/1604] remove `Use Current Mods` menu item

---
 .../UserInterface/TestSceneModPresetColumn.cs | 44 -------------------
 osu.Game/Overlays/Mods/ModPresetPanel.cs      | 21 ++-------
 2 files changed, 4 insertions(+), 61 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
index 55fe142d9f..0cbbe00311 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
@@ -392,50 +392,6 @@ namespace osu.Game.Tests.Visual.UserInterface
                 new HashSet<Mod>(this.ChildrenOfType<ModPresetPanel>().First().Preset.Value.Mods).SetEquals(mods));
         }
 
-        [Test]
-        public void TestEditPresetModInContextMenu()
-        {
-            ModPresetColumn modPresetColumn = null!;
-            var mods = new Mod[] { new OsuModHidden() };
-
-            AddStep("clear mods", () => SelectedMods.Value = Array.Empty<Mod>());
-            AddStep("create content", () => Child = modPresetColumn = new ModPresetColumn
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-            });
-
-            AddUntilStep("items loaded", () => modPresetColumn.IsLoaded && modPresetColumn.ItemsLoaded);
-
-            AddStep("right click first panel", () =>
-            {
-                var panel = this.ChildrenOfType<ModPresetPanel>().First();
-                InputManager.MoveMouseTo(panel);
-                InputManager.Click(MouseButton.Right);
-            });
-            AddUntilStep("wait for context menu", () => this.ChildrenOfType<OsuContextMenu>().Any());
-            AddAssert("No Use Current Mods", () => this.ChildrenOfType<DrawableOsuMenuItem>().Count() == 2);
-
-            AddStep("select mods", () => SelectedMods.Value = mods);
-            AddStep("right click second panel", () =>
-            {
-                var panel = this.ChildrenOfType<ModPresetPanel>().ElementAt(1);
-                InputManager.MoveMouseTo(panel);
-                InputManager.Click(MouseButton.Right);
-            });
-
-            AddUntilStep("wait for context menu", () => this.ChildrenOfType<OsuContextMenu>().Any());
-            AddAssert("Have Use Current Mods", () => this.ChildrenOfType<DrawableOsuMenuItem>().Count() == 3);
-            AddStep("Click Use Current Mods", () =>
-            {
-                var editItem = this.ChildrenOfType<DrawableOsuMenuItem>().ElementAt(1);
-                InputManager.MoveMouseTo(editItem);
-                InputManager.Click(MouseButton.Left);
-            });
-            AddAssert("present mod is changed", () =>
-                new HashSet<Mod>(this.ChildrenOfType<ModPresetPanel>().ElementAt(1).Preset.Value.Mods).SetEquals(mods));
-        }
-
         private ICollection<ModPreset> createTestPresets() => new[]
         {
             new ModPreset
diff --git a/osu.Game/Overlays/Mods/ModPresetPanel.cs b/osu.Game/Overlays/Mods/ModPresetPanel.cs
index d01981d18c..6999f2cede 100644
--- a/osu.Game/Overlays/Mods/ModPresetPanel.cs
+++ b/osu.Game/Overlays/Mods/ModPresetPanel.cs
@@ -90,24 +90,11 @@ namespace osu.Game.Overlays.Mods
 
         #region IHasContextMenu
 
-        public MenuItem[] ContextMenuItems
+        public MenuItem[] ContextMenuItems => new MenuItem[]
         {
-            get
-            {
-                var menu = new List<MenuItem>
-                {
-                    new OsuMenuItem(CommonStrings.ButtonsEdit, MenuItemType.Highlighted, this.ShowPopover),
-                    new OsuMenuItem(CommonStrings.ButtonsDelete, MenuItemType.Destructive, () => dialogOverlay?.Push(new DeleteModPresetDialog(Preset))),
-                };
-
-                if (CheckCurrentModCanBeSave())
-                {
-                    menu.Insert(1, new OsuMenuItem("Use Current Mods", MenuItemType.Destructive, () => SaveCurrentMod()));
-                }
-
-                return menu.ToArray();
-            }
-        }
+            new OsuMenuItem(CommonStrings.ButtonsEdit, MenuItemType.Highlighted, this.ShowPopover),
+            new OsuMenuItem(CommonStrings.ButtonsDelete, MenuItemType.Destructive, () => dialogOverlay?.Push(new DeleteModPresetDialog(Preset))),
+        };
 
         #endregion
 

From aa5a026c676c0503f6110c0d4fa610b3669bc9fd Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Wed, 3 May 2023 23:14:24 +0900
Subject: [PATCH 0305/1604] remove local button handle

---
 osu.Game/Overlays/Mods/EditPresetPopover.cs | 27 ++++++---------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Overlays/Mods/EditPresetPopover.cs b/osu.Game/Overlays/Mods/EditPresetPopover.cs
index 0e21260493..77980ea629 100644
--- a/osu.Game/Overlays/Mods/EditPresetPopover.cs
+++ b/osu.Game/Overlays/Mods/EditPresetPopover.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Overlays.Mods
                                 Anchor = Anchor.TopCentre,
                                 Origin = Anchor.TopCentre,
                                 Text = "Use Current Mods",
-                                Action = trySaveCurrentMod
+                                Action = saveCurrentMod
                             },
                             createButton = new ShearedButton
                             {
@@ -123,19 +123,17 @@ namespace osu.Game.Overlays.Mods
             createButton.LighterColour = colours.Orange0;
             createButton.TextColour = colourProvider.Background6;
 
+            useCurrentModButton.DarkerColour = colours.Blue1;
+            useCurrentModButton.LighterColour = colours.Blue0;
+            useCurrentModButton.TextColour = colourProvider.Background6;
+
             selectedMods.BindValueChanged(_ => updateActiveState(), true);
 
             scrollContent.ChildrenEnumerable = preset.Mods.Select(mod => new ModPresetRow(mod));
         }
 
-        private void trySaveCurrentMod()
+        private void saveCurrentMod()
         {
-            if (!checkCanBeSave())
-            {
-                Body.Shake();
-                return;
-            }
-
             saveModAfterClosed = selectedMods.Value.ToList();
             scrollContent.Clear();
             scrollContent.ChildrenEnumerable = saveModAfterClosed.Select(mod => new ModPresetRow(mod));
@@ -144,18 +142,7 @@ namespace osu.Game.Overlays.Mods
 
         private void updateActiveState()
         {
-            if (checkCanBeSave())
-            {
-                useCurrentModButton.DarkerColour = colours.Blue1;
-                useCurrentModButton.LighterColour = colours.Blue0;
-                useCurrentModButton.TextColour = colourProvider.Background6;
-            }
-            else
-            {
-                useCurrentModButton.DarkerColour = colours.Blue3;
-                useCurrentModButton.LighterColour = colours.Blue4;
-                useCurrentModButton.TextColour = colourProvider.Background2;
-            }
+            useCurrentModButton.Enabled.Value = checkCanBeSave();
         }
 
         private bool checkCanBeSave()

From f4b1264cc9859acd275e0f99bf68c2b6cd59306b Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Wed, 3 May 2023 23:22:46 +0900
Subject: [PATCH 0306/1604] use button `Enable` status to ensure preset name is
 not null

---
 osu.Game/Overlays/Mods/AddPresetPopover.cs  | 15 ++++++-------
 osu.Game/Overlays/Mods/EditPresetPopover.cs | 25 ++++++++++-----------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Overlays/Mods/AddPresetPopover.cs b/osu.Game/Overlays/Mods/AddPresetPopover.cs
index 33d72ff383..6fd4231f2c 100644
--- a/osu.Game/Overlays/Mods/AddPresetPopover.cs
+++ b/osu.Game/Overlays/Mods/AddPresetPopover.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Overlays.Mods
                         Anchor = Anchor.TopCentre,
                         Origin = Anchor.TopCentre,
                         Text = ModSelectOverlayStrings.AddPreset,
-                        Action = tryCreatePreset
+                        Action = createPreset
                     }
                 }
             };
@@ -89,16 +89,15 @@ namespace osu.Game.Overlays.Mods
             base.LoadComplete();
 
             ScheduleAfterChildren(() => GetContainingInputManager().ChangeFocus(nameTextBox));
+
+            nameTextBox.Current.BindValueChanged(s =>
+            {
+                createButton.Enabled.Value = !string.IsNullOrWhiteSpace(s.NewValue);
+            }, true);
         }
 
-        private void tryCreatePreset()
+        private void createPreset()
         {
-            if (string.IsNullOrWhiteSpace(nameTextBox.Current.Value))
-            {
-                Body.Shake();
-                return;
-            }
-
             realm.Write(r => r.Add(new ModPreset
             {
                 Name = nameTextBox.Current.Value,
diff --git a/osu.Game/Overlays/Mods/EditPresetPopover.cs b/osu.Game/Overlays/Mods/EditPresetPopover.cs
index 77980ea629..451c1ec712 100644
--- a/osu.Game/Overlays/Mods/EditPresetPopover.cs
+++ b/osu.Game/Overlays/Mods/EditPresetPopover.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Overlays.Mods
         private readonly LabelledTextBox nameTextBox;
         private readonly LabelledTextBox descriptionTextBox;
         private readonly ShearedButton useCurrentModButton;
-        private readonly ShearedButton createButton;
+        private readonly ShearedButton editButton;
         private readonly FillFlowContainer scrollContent;
 
         private readonly ModPreset preset;
@@ -97,12 +97,12 @@ namespace osu.Game.Overlays.Mods
                                 Text = "Use Current Mods",
                                 Action = saveCurrentMod
                             },
-                            createButton = new ShearedButton
+                            editButton = new ShearedButton
                             {
                                 Anchor = Anchor.TopCentre,
                                 Origin = Anchor.TopCentre,
                                 Text = Resources.Localisation.Web.CommonStrings.ButtonsSave,
-                                Action = tryEditPreset
+                                Action = editPreset
                             },
                         }
                     }
@@ -119,9 +119,9 @@ namespace osu.Game.Overlays.Mods
             nameTextBox.Current.Value = preset.Name;
             descriptionTextBox.Current.Value = preset.Description;
 
-            createButton.DarkerColour = colours.Orange1;
-            createButton.LighterColour = colours.Orange0;
-            createButton.TextColour = colourProvider.Background6;
+            editButton.DarkerColour = colours.Orange1;
+            editButton.LighterColour = colours.Orange0;
+            editButton.TextColour = colourProvider.Background6;
 
             useCurrentModButton.DarkerColour = colours.Blue1;
             useCurrentModButton.LighterColour = colours.Blue0;
@@ -130,6 +130,11 @@ namespace osu.Game.Overlays.Mods
             selectedMods.BindValueChanged(_ => updateActiveState(), true);
 
             scrollContent.ChildrenEnumerable = preset.Mods.Select(mod => new ModPresetRow(mod));
+
+            nameTextBox.Current.BindValueChanged(s =>
+            {
+                editButton.Enabled.Value = !string.IsNullOrWhiteSpace(s.NewValue);
+            }, true);
         }
 
         private void saveCurrentMod()
@@ -165,14 +170,8 @@ namespace osu.Game.Overlays.Mods
             ScheduleAfterChildren(() => GetContainingInputManager().ChangeFocus(nameTextBox));
         }
 
-        private void tryEditPreset()
+        private void editPreset()
         {
-            if (string.IsNullOrWhiteSpace(nameTextBox.Current.Value))
-            {
-                Body.Shake();
-                return;
-            }
-
             button.Preset.PerformWrite(s =>
             {
                 s.Name = nameTextBox.Current.Value;

From debbd376bd6e8155612ea8a2b6e2fe1db2a9c884 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Wed, 3 May 2023 23:24:14 +0900
Subject: [PATCH 0307/1604] move `scrollContent` update logic to
 `updateActiveState()`

---
 osu.Game/Overlays/Mods/EditPresetPopover.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Mods/EditPresetPopover.cs b/osu.Game/Overlays/Mods/EditPresetPopover.cs
index 451c1ec712..e96168d8ff 100644
--- a/osu.Game/Overlays/Mods/EditPresetPopover.cs
+++ b/osu.Game/Overlays/Mods/EditPresetPopover.cs
@@ -129,8 +129,6 @@ namespace osu.Game.Overlays.Mods
 
             selectedMods.BindValueChanged(_ => updateActiveState(), true);
 
-            scrollContent.ChildrenEnumerable = preset.Mods.Select(mod => new ModPresetRow(mod));
-
             nameTextBox.Current.BindValueChanged(s =>
             {
                 editButton.Enabled.Value = !string.IsNullOrWhiteSpace(s.NewValue);
@@ -141,12 +139,12 @@ namespace osu.Game.Overlays.Mods
         {
             saveModAfterClosed = selectedMods.Value.ToList();
             scrollContent.Clear();
-            scrollContent.ChildrenEnumerable = saveModAfterClosed.Select(mod => new ModPresetRow(mod));
             updateActiveState();
         }
 
         private void updateActiveState()
         {
+            scrollContent.ChildrenEnumerable = preset.Mods.Select(mod => new ModPresetRow(mod));
             useCurrentModButton.Enabled.Value = checkCanBeSave();
         }
 

From 967e801f9c77cc4b745fd32625c674fd708d25e9 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Wed, 3 May 2023 23:26:58 +0900
Subject: [PATCH 0308/1604] code inspect

---
 osu.Game/Overlays/Mods/AddPresetPopover.cs  | 1 -
 osu.Game/Overlays/Mods/EditPresetPopover.cs | 1 -
 2 files changed, 2 deletions(-)

diff --git a/osu.Game/Overlays/Mods/AddPresetPopover.cs b/osu.Game/Overlays/Mods/AddPresetPopover.cs
index 6fd4231f2c..d9e350e560 100644
--- a/osu.Game/Overlays/Mods/AddPresetPopover.cs
+++ b/osu.Game/Overlays/Mods/AddPresetPopover.cs
@@ -9,7 +9,6 @@ using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Database;
-using osu.Game.Extensions;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
diff --git a/osu.Game/Overlays/Mods/EditPresetPopover.cs b/osu.Game/Overlays/Mods/EditPresetPopover.cs
index e96168d8ff..7f7b9472a7 100644
--- a/osu.Game/Overlays/Mods/EditPresetPopover.cs
+++ b/osu.Game/Overlays/Mods/EditPresetPopover.cs
@@ -8,7 +8,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Extensions;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;

From d1d4b54c640df278987ff8ba8ccad28519e59e44 Mon Sep 17 00:00:00 2001
From: Terochi <mates.cernicky@gmail.com>
Date: Wed, 3 May 2023 18:31:35 +0200
Subject: [PATCH 0309/1604] Simplified

---
 osu.Game/OsuGameBase.cs | 46 +++++++++++++----------------------------
 1 file changed, 14 insertions(+), 32 deletions(-)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index e6d6deabe9..076c1213ad 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -625,40 +625,22 @@ namespace osu.Game
                 return;
             }
 
-            var previouslySelectedCommonMods = new List<Mod>(SelectedMods.Value.Count);
-            var convertedCommonMods = new List<Mod>(SelectedMods.Value.Count);
-
-            foreach (var mod in SelectedMods.Value)
-            {
-                var convertedMod = instance.CreateModFromAcronym(mod.Acronym);
-
-                if (convertedMod == null)
-                    continue;
-
-                previouslySelectedCommonMods.Add(mod);
-
-                convertedMod.CopyCommonSettings(mod);
-                convertedCommonMods.Add(convertedMod);
-            }
-
-            if (!ModUtils.CheckValidForGameplay(convertedCommonMods, out var invalid))
-            {
-                invalid.ForEach(mod =>
-                {
-                    int index = convertedCommonMods.IndexOf(mod);
-                    convertedCommonMods.RemoveAt(index);
-                    previouslySelectedCommonMods.RemoveAt(index);
-                });
-            }
-
-            if (!SelectedMods.Disabled)
-                // Select common mods to play the deselect samples for other mods
-                SelectedMods.Value = previouslySelectedCommonMods;
-
             AvailableMods.Value = dict;
 
-            if (!SelectedMods.Disabled)
-                SelectedMods.Value = convertedCommonMods;
+            if (SelectedMods.Disabled)
+                return;
+
+            var convertedMods = SelectedMods.Value.Select(mod =>
+            {
+                var newMod = instance.CreateModFromAcronym(mod.Acronym);
+                newMod?.CopyCommonSettings(mod);
+                return newMod;
+            }).Where(newMod => newMod != null).ToList();
+
+            if (!ModUtils.CheckValidForGameplay(convertedMods, out var invalid))
+                invalid.ForEach(newMod => convertedMods.Remove(newMod));
+
+            SelectedMods.Value = convertedMods;
 
             void revertRulesetChange() => Ruleset.Value = r.OldValue?.Available == true ? r.OldValue : RulesetStore.AvailableRulesets.First();
         }

From 27fabd99fbc996705e5f700ebdc96f028c035872 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 3 May 2023 19:21:16 +0200
Subject: [PATCH 0310/1604] Rename variables for legibility

Having `typedComponents` and `typeComponents` next to each other is
asking for trouble.
---
 .../Overlays/SkinEditor/SkinEditorChangeHandler.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinEditorChangeHandler.cs b/osu.Game/Overlays/SkinEditor/SkinEditorChangeHandler.cs
index 3dddf639cc..f3c5bc9ce2 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditorChangeHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditorChangeHandler.cs
@@ -61,16 +61,16 @@ namespace osu.Game.Overlays.SkinEditor
             ISerialisableDrawable[] targetComponents = firstTarget.Components.ToArray();
 
             // Store components based on type for later lookup
-            var typedComponents = new Dictionary<Type, Queue<Drawable>>();
+            var componentsPerTypeLookup = new Dictionary<Type, Queue<Drawable>>();
 
             foreach (ISerialisableDrawable component in targetComponents)
             {
                 Type lookup = component.GetType();
 
-                if (!typedComponents.TryGetValue(lookup, out Queue<Drawable>? typeComponents))
-                    typedComponents.Add(lookup, typeComponents = new Queue<Drawable>());
+                if (!componentsPerTypeLookup.TryGetValue(lookup, out Queue<Drawable>? componentsOfSameType))
+                    componentsPerTypeLookup.Add(lookup, componentsOfSameType = new Queue<Drawable>());
 
-                typeComponents.Enqueue((Drawable)component);
+                componentsOfSameType.Enqueue((Drawable)component);
             }
 
             // Remove all components
@@ -81,13 +81,13 @@ namespace osu.Game.Overlays.SkinEditor
             {
                 Type lookup = skinnableInfo.Type;
 
-                if (!typedComponents.TryGetValue(lookup, out Queue<Drawable>? typeComponents))
+                if (!componentsPerTypeLookup.TryGetValue(lookup, out Queue<Drawable>? componentsOfSameType))
                 {
                     firstTarget.Add((ISerialisableDrawable)skinnableInfo.CreateInstance());
                     continue;
                 }
 
-                if (typeComponents.TryDequeue(out Drawable? component))
+                if (componentsOfSameType.TryDequeue(out Drawable? component))
                 {
                     // Re-use unused component
                     component.ApplySerialisedInfo(skinnableInfo);
@@ -101,7 +101,7 @@ namespace osu.Game.Overlays.SkinEditor
                 firstTarget.Add((ISerialisableDrawable)component);
             }
 
-            foreach ((Type _, Queue<Drawable> typeComponents) in typedComponents)
+            foreach ((Type _, Queue<Drawable> typeComponents) in componentsPerTypeLookup)
             {
                 // Dispose extra components
                 foreach (var component in typeComponents)

From 1d4d31e35c8b85eb5104734a25b971ec8c827ad3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 3 May 2023 19:22:52 +0200
Subject: [PATCH 0311/1604] Trim comments

Leaving only the ones that add anything useful and do not restate the
code verbatim.
---
 osu.Game/Overlays/SkinEditor/SkinEditorChangeHandler.cs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinEditorChangeHandler.cs b/osu.Game/Overlays/SkinEditor/SkinEditorChangeHandler.cs
index f3c5bc9ce2..673ba873c4 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditorChangeHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditorChangeHandler.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Overlays.SkinEditor
             SerialisedDrawableInfo[] skinnableInfos = deserializedContent.ToArray();
             ISerialisableDrawable[] targetComponents = firstTarget.Components.ToArray();
 
-            // Store components based on type for later lookup
+            // Store components based on type for later reuse
             var componentsPerTypeLookup = new Dictionary<Type, Queue<Drawable>>();
 
             foreach (ISerialisableDrawable component in targetComponents)
@@ -73,7 +73,6 @@ namespace osu.Game.Overlays.SkinEditor
                 componentsOfSameType.Enqueue((Drawable)component);
             }
 
-            // Remove all components
             for (int i = targetComponents.Length - 1; i >= 0; i--)
                 firstTarget.Remove(targetComponents[i], false);
 
@@ -87,23 +86,22 @@ namespace osu.Game.Overlays.SkinEditor
                     continue;
                 }
 
+                // Wherever possible, attempt to reuse existing component instances.
                 if (componentsOfSameType.TryDequeue(out Drawable? component))
                 {
-                    // Re-use unused component
                     component.ApplySerialisedInfo(skinnableInfo);
                 }
                 else
                 {
-                    // Create new one
                     component = skinnableInfo.CreateInstance();
                 }
 
                 firstTarget.Add((ISerialisableDrawable)component);
             }
 
+            // Dispose components which were not reused.
             foreach ((Type _, Queue<Drawable> typeComponents) in componentsPerTypeLookup)
             {
-                // Dispose extra components
                 foreach (var component in typeComponents)
                     component.Dispose();
             }

From 0a584f065235d3317067b9ed2860a686fe419122 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 May 2023 11:07:09 +0900
Subject: [PATCH 0312/1604] Simplify check logic and improve variable naming

---
 osu.Game/Overlays/Mods/EditPresetPopover.cs | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Overlays/Mods/EditPresetPopover.cs b/osu.Game/Overlays/Mods/EditPresetPopover.cs
index 7f7b9472a7..9015218910 100644
--- a/osu.Game/Overlays/Mods/EditPresetPopover.cs
+++ b/osu.Game/Overlays/Mods/EditPresetPopover.cs
@@ -29,7 +29,8 @@ namespace osu.Game.Overlays.Mods
         private readonly FillFlowContainer scrollContent;
 
         private readonly ModPreset preset;
-        private List<Mod> saveModAfterClosed = new List<Mod>();
+
+        private HashSet<Mod>? newMods;
 
         [Resolved]
         private Bindable<IReadOnlyList<Mod>> selectedMods { get; set; } = null!;
@@ -136,7 +137,7 @@ namespace osu.Game.Overlays.Mods
 
         private void saveCurrentMod()
         {
-            saveModAfterClosed = selectedMods.Value.ToList();
+            newMods = selectedMods.Value.ToHashSet();
             scrollContent.Clear();
             updateActiveState();
         }
@@ -144,18 +145,16 @@ namespace osu.Game.Overlays.Mods
         private void updateActiveState()
         {
             scrollContent.ChildrenEnumerable = preset.Mods.Select(mod => new ModPresetRow(mod));
-            useCurrentModButton.Enabled.Value = checkCanBeSave();
+            useCurrentModButton.Enabled.Value = checkSelectedModsDiffersFromSaved();
         }
 
-        private bool checkCanBeSave()
+        private bool checkSelectedModsDiffersFromSaved()
         {
             if (!selectedMods.Value.Any())
                 return false;
 
-            if (saveModAfterClosed.Any())
-            {
-                return !new HashSet<Mod>(saveModAfterClosed).SetEquals(selectedMods.Value);
-            }
+            if (newMods?.SetEquals(selectedMods.Value) == false)
+                return true;
 
             return button.CheckCurrentModCanBeSave();
         }
@@ -174,10 +173,8 @@ namespace osu.Game.Overlays.Mods
                 s.Name = nameTextBox.Current.Value;
                 s.Description = descriptionTextBox.Current.Value;
 
-                if (saveModAfterClosed.Any())
-                {
-                    s.Mods = saveModAfterClosed;
-                }
+                if (newMods != null)
+                    s.Mods = newMods;
             });
 
             this.HidePopover();

From b7abab6d8aff61e2e79c17f7fd367999f72857de Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 May 2023 11:10:05 +0900
Subject: [PATCH 0313/1604] More variable improvements

---
 osu.Game/Overlays/Mods/EditPresetPopover.cs | 32 ++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Overlays/Mods/EditPresetPopover.cs b/osu.Game/Overlays/Mods/EditPresetPopover.cs
index 9015218910..91beea8e38 100644
--- a/osu.Game/Overlays/Mods/EditPresetPopover.cs
+++ b/osu.Game/Overlays/Mods/EditPresetPopover.cs
@@ -24,8 +24,8 @@ namespace osu.Game.Overlays.Mods
 
         private readonly LabelledTextBox nameTextBox;
         private readonly LabelledTextBox descriptionTextBox;
-        private readonly ShearedButton useCurrentModButton;
-        private readonly ShearedButton editButton;
+        private readonly ShearedButton useCurrentModsButton;
+        private readonly ShearedButton saveButton;
         private readonly FillFlowContainer scrollContent;
 
         private readonly ModPreset preset;
@@ -90,19 +90,19 @@ namespace osu.Game.Overlays.Mods
                         Spacing = new Vector2(7),
                         Children = new Drawable[]
                         {
-                            useCurrentModButton = new ShearedButton
+                            useCurrentModsButton = new ShearedButton
                             {
                                 Anchor = Anchor.TopCentre,
                                 Origin = Anchor.TopCentre,
                                 Text = "Use Current Mods",
-                                Action = saveCurrentMod
+                                Action = useCurrentMods
                             },
-                            editButton = new ShearedButton
+                            saveButton = new ShearedButton
                             {
                                 Anchor = Anchor.TopCentre,
                                 Origin = Anchor.TopCentre,
                                 Text = Resources.Localisation.Web.CommonStrings.ButtonsSave,
-                                Action = editPreset
+                                Action = save
                             },
                         }
                     }
@@ -119,23 +119,23 @@ namespace osu.Game.Overlays.Mods
             nameTextBox.Current.Value = preset.Name;
             descriptionTextBox.Current.Value = preset.Description;
 
-            editButton.DarkerColour = colours.Orange1;
-            editButton.LighterColour = colours.Orange0;
-            editButton.TextColour = colourProvider.Background6;
+            saveButton.DarkerColour = colours.Orange1;
+            saveButton.LighterColour = colours.Orange0;
+            saveButton.TextColour = colourProvider.Background6;
 
-            useCurrentModButton.DarkerColour = colours.Blue1;
-            useCurrentModButton.LighterColour = colours.Blue0;
-            useCurrentModButton.TextColour = colourProvider.Background6;
+            useCurrentModsButton.DarkerColour = colours.Blue1;
+            useCurrentModsButton.LighterColour = colours.Blue0;
+            useCurrentModsButton.TextColour = colourProvider.Background6;
 
             selectedMods.BindValueChanged(_ => updateActiveState(), true);
 
             nameTextBox.Current.BindValueChanged(s =>
             {
-                editButton.Enabled.Value = !string.IsNullOrWhiteSpace(s.NewValue);
+                saveButton.Enabled.Value = !string.IsNullOrWhiteSpace(s.NewValue);
             }, true);
         }
 
-        private void saveCurrentMod()
+        private void useCurrentMods()
         {
             newMods = selectedMods.Value.ToHashSet();
             scrollContent.Clear();
@@ -145,7 +145,7 @@ namespace osu.Game.Overlays.Mods
         private void updateActiveState()
         {
             scrollContent.ChildrenEnumerable = preset.Mods.Select(mod => new ModPresetRow(mod));
-            useCurrentModButton.Enabled.Value = checkSelectedModsDiffersFromSaved();
+            useCurrentModsButton.Enabled.Value = checkSelectedModsDiffersFromSaved();
         }
 
         private bool checkSelectedModsDiffersFromSaved()
@@ -166,7 +166,7 @@ namespace osu.Game.Overlays.Mods
             ScheduleAfterChildren(() => GetContainingInputManager().ChangeFocus(nameTextBox));
         }
 
-        private void editPreset()
+        private void save()
         {
             button.Preset.PerformWrite(s =>
             {

From be995f1359e19de4d9573fe1ad76645400c0949b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 May 2023 11:11:19 +0900
Subject: [PATCH 0314/1604] Add localisation support for new button string

---
 osu.Game/Localisation/ModSelectOverlayStrings.cs | 5 +++++
 osu.Game/Overlays/Mods/EditPresetPopover.cs      | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Localisation/ModSelectOverlayStrings.cs b/osu.Game/Localisation/ModSelectOverlayStrings.cs
index d6a01c4794..f11c52ee20 100644
--- a/osu.Game/Localisation/ModSelectOverlayStrings.cs
+++ b/osu.Game/Localisation/ModSelectOverlayStrings.cs
@@ -34,6 +34,11 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString AddPreset => new TranslatableString(getKey(@"add_preset"), @"Add preset");
 
+        /// <summary>
+        /// "Use current mods"
+        /// </summary>
+        public static LocalisableString UseCurrentMods => new TranslatableString(getKey(@"use_current_mods"), @"Use current mods");
+
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
 }
diff --git a/osu.Game/Overlays/Mods/EditPresetPopover.cs b/osu.Game/Overlays/Mods/EditPresetPopover.cs
index 91beea8e38..b826bdf944 100644
--- a/osu.Game/Overlays/Mods/EditPresetPopover.cs
+++ b/osu.Game/Overlays/Mods/EditPresetPopover.cs
@@ -94,7 +94,7 @@ namespace osu.Game.Overlays.Mods
                             {
                                 Anchor = Anchor.TopCentre,
                                 Origin = Anchor.TopCentre,
-                                Text = "Use Current Mods",
+                                Text = ModSelectOverlayStrings.UseCurrentMods,
                                 Action = useCurrentMods
                             },
                             saveButton = new ShearedButton

From 99d2616c34d51b8e4027543f01b73a8efe499475 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 May 2023 11:14:51 +0900
Subject: [PATCH 0315/1604] Move drawable construction to `load` for simplicity

---
 osu.Game/Overlays/Mods/EditPresetPopover.cs | 58 ++++++++++-----------
 1 file changed, 27 insertions(+), 31 deletions(-)

diff --git a/osu.Game/Overlays/Mods/EditPresetPopover.cs b/osu.Game/Overlays/Mods/EditPresetPopover.cs
index b826bdf944..f02c200654 100644
--- a/osu.Game/Overlays/Mods/EditPresetPopover.cs
+++ b/osu.Game/Overlays/Mods/EditPresetPopover.cs
@@ -20,13 +20,13 @@ namespace osu.Game.Overlays.Mods
 {
     internal partial class EditPresetPopover : OsuPopover
     {
-        private readonly ModPresetPanel button;
+        private readonly ModPresetPanel presetPanel;
 
-        private readonly LabelledTextBox nameTextBox;
-        private readonly LabelledTextBox descriptionTextBox;
-        private readonly ShearedButton useCurrentModsButton;
-        private readonly ShearedButton saveButton;
-        private readonly FillFlowContainer scrollContent;
+        private LabelledTextBox nameTextBox = null!;
+        private LabelledTextBox descriptionTextBox = null!;
+        private ShearedButton useCurrentModsButton = null!;
+        private ShearedButton saveButton = null!;
+        private FillFlowContainer scrollContent = null!;
 
         private readonly ModPreset preset;
 
@@ -41,11 +41,15 @@ namespace osu.Game.Overlays.Mods
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; } = null!;
 
-        public EditPresetPopover(ModPresetPanel modPresetPanel)
+        public EditPresetPopover(ModPresetPanel presetPanel)
         {
-            button = modPresetPanel;
-            preset = button.Preset.Value;
+            this.presetPanel = presetPanel;
+            preset = presetPanel.Preset.Value;
+        }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
             Child = new FillFlowContainer
             {
                 Width = 300,
@@ -59,14 +63,16 @@ namespace osu.Game.Overlays.Mods
                         Anchor = Anchor.TopCentre,
                         Origin = Anchor.TopCentre,
                         Label = CommonStrings.Name,
-                        TabbableContentContainer = this
+                        TabbableContentContainer = this,
+                        Current = { Value = preset.Name },
                     },
                     descriptionTextBox = new LabelledTextBox
                     {
                         Anchor = Anchor.TopCentre,
                         Origin = Anchor.TopCentre,
                         Label = CommonStrings.Description,
-                        TabbableContentContainer = this
+                        TabbableContentContainer = this,
+                        Current = { Value = preset.Description },
                     },
                     new OsuScrollContainer
                     {
@@ -95,40 +101,30 @@ namespace osu.Game.Overlays.Mods
                                 Anchor = Anchor.TopCentre,
                                 Origin = Anchor.TopCentre,
                                 Text = ModSelectOverlayStrings.UseCurrentMods,
-                                Action = useCurrentMods
+                                DarkerColour = colours.Blue1,
+                                LighterColour = colours.Blue0,
+                                TextColour = colourProvider.Background6,
+                                Action = useCurrentMods,
                             },
                             saveButton = new ShearedButton
                             {
                                 Anchor = Anchor.TopCentre,
                                 Origin = Anchor.TopCentre,
                                 Text = Resources.Localisation.Web.CommonStrings.ButtonsSave,
-                                Action = save
+                                DarkerColour = colours.Orange1,
+                                LighterColour = colours.Orange0,
+                                TextColour = colourProvider.Background6,
+                                Action = save,
                             },
                         }
                     }
                 }
             };
-        }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
             Body.BorderThickness = 3;
             Body.BorderColour = colours.Orange1;
 
-            nameTextBox.Current.Value = preset.Name;
-            descriptionTextBox.Current.Value = preset.Description;
-
-            saveButton.DarkerColour = colours.Orange1;
-            saveButton.LighterColour = colours.Orange0;
-            saveButton.TextColour = colourProvider.Background6;
-
-            useCurrentModsButton.DarkerColour = colours.Blue1;
-            useCurrentModsButton.LighterColour = colours.Blue0;
-            useCurrentModsButton.TextColour = colourProvider.Background6;
-
             selectedMods.BindValueChanged(_ => updateActiveState(), true);
-
             nameTextBox.Current.BindValueChanged(s =>
             {
                 saveButton.Enabled.Value = !string.IsNullOrWhiteSpace(s.NewValue);
@@ -156,7 +152,7 @@ namespace osu.Game.Overlays.Mods
             if (newMods?.SetEquals(selectedMods.Value) == false)
                 return true;
 
-            return button.CheckCurrentModCanBeSave();
+            return presetPanel.CheckCurrentModCanBeSave();
         }
 
         protected override void LoadComplete()
@@ -168,7 +164,7 @@ namespace osu.Game.Overlays.Mods
 
         private void save()
         {
-            button.Preset.PerformWrite(s =>
+            presetPanel.Preset.PerformWrite(s =>
             {
                 s.Name = nameTextBox.Current.Value;
                 s.Description = descriptionTextBox.Current.Value;

From b12d139317b55d47046eb0eaaf50756aaf07fb67 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 May 2023 11:16:52 +0900
Subject: [PATCH 0316/1604] Remove dead code

---
 osu.Game/Overlays/Mods/ModPresetPanel.cs | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModPresetPanel.cs b/osu.Game/Overlays/Mods/ModPresetPanel.cs
index 6999f2cede..3f5a764ab1 100644
--- a/osu.Game/Overlays/Mods/ModPresetPanel.cs
+++ b/osu.Game/Overlays/Mods/ModPresetPanel.cs
@@ -98,18 +98,6 @@ namespace osu.Game.Overlays.Mods
 
         #endregion
 
-        public bool SaveCurrentMod()
-        {
-            if (!CheckCurrentModCanBeSave())
-                return false;
-
-            Preset.PerformWrite(s =>
-            {
-                s.Mods = selectedMods.Value.ToArray();
-            });
-            return true;
-        }
-
         public bool CheckCurrentModCanBeSave() => (!Active.Value && selectedMods.Value.Any());
 
         protected override void Dispose(bool isDisposing)

From 49fb5da1a237c30768f753d98d793733750bea5a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 May 2023 11:19:09 +0900
Subject: [PATCH 0317/1604] Stop passing preset panel to popover

---
 osu.Game/Overlays/Mods/EditPresetPopover.cs | 23 ++++++++-------------
 osu.Game/Overlays/Mods/ModPresetPanel.cs    |  4 +---
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Overlays/Mods/EditPresetPopover.cs b/osu.Game/Overlays/Mods/EditPresetPopover.cs
index f02c200654..3f5eca8ad0 100644
--- a/osu.Game/Overlays/Mods/EditPresetPopover.cs
+++ b/osu.Game/Overlays/Mods/EditPresetPopover.cs
@@ -8,6 +8,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
@@ -20,15 +21,13 @@ namespace osu.Game.Overlays.Mods
 {
     internal partial class EditPresetPopover : OsuPopover
     {
-        private readonly ModPresetPanel presetPanel;
-
         private LabelledTextBox nameTextBox = null!;
         private LabelledTextBox descriptionTextBox = null!;
         private ShearedButton useCurrentModsButton = null!;
         private ShearedButton saveButton = null!;
         private FillFlowContainer scrollContent = null!;
 
-        private readonly ModPreset preset;
+        private readonly Live<ModPreset> preset;
 
         private HashSet<Mod>? newMods;
 
@@ -41,10 +40,9 @@ namespace osu.Game.Overlays.Mods
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; } = null!;
 
-        public EditPresetPopover(ModPresetPanel presetPanel)
+        public EditPresetPopover(Live<ModPreset> preset)
         {
-            this.presetPanel = presetPanel;
-            preset = presetPanel.Preset.Value;
+            this.preset = preset;
         }
 
         [BackgroundDependencyLoader]
@@ -64,7 +62,7 @@ namespace osu.Game.Overlays.Mods
                         Origin = Anchor.TopCentre,
                         Label = CommonStrings.Name,
                         TabbableContentContainer = this,
-                        Current = { Value = preset.Name },
+                        Current = { Value = preset.PerformRead(p => p.Name) },
                     },
                     descriptionTextBox = new LabelledTextBox
                     {
@@ -72,7 +70,7 @@ namespace osu.Game.Overlays.Mods
                         Origin = Anchor.TopCentre,
                         Label = CommonStrings.Description,
                         TabbableContentContainer = this,
-                        Current = { Value = preset.Description },
+                        Current = { Value = preset.PerformRead(p => p.Description) },
                     },
                     new OsuScrollContainer
                     {
@@ -140,7 +138,7 @@ namespace osu.Game.Overlays.Mods
 
         private void updateActiveState()
         {
-            scrollContent.ChildrenEnumerable = preset.Mods.Select(mod => new ModPresetRow(mod));
+            scrollContent.ChildrenEnumerable = preset.PerformRead(p => p.Mods.Select(mod => new ModPresetRow(mod)));
             useCurrentModsButton.Enabled.Value = checkSelectedModsDiffersFromSaved();
         }
 
@@ -149,10 +147,7 @@ namespace osu.Game.Overlays.Mods
             if (!selectedMods.Value.Any())
                 return false;
 
-            if (newMods?.SetEquals(selectedMods.Value) == false)
-                return true;
-
-            return presetPanel.CheckCurrentModCanBeSave();
+            return newMods?.SetEquals(selectedMods.Value) == false;
         }
 
         protected override void LoadComplete()
@@ -164,7 +159,7 @@ namespace osu.Game.Overlays.Mods
 
         private void save()
         {
-            presetPanel.Preset.PerformWrite(s =>
+            preset.PerformWrite(s =>
             {
                 s.Name = nameTextBox.Current.Value;
                 s.Description = descriptionTextBox.Current.Value;
diff --git a/osu.Game/Overlays/Mods/ModPresetPanel.cs b/osu.Game/Overlays/Mods/ModPresetPanel.cs
index 3f5a764ab1..8bcb5e4e4e 100644
--- a/osu.Game/Overlays/Mods/ModPresetPanel.cs
+++ b/osu.Game/Overlays/Mods/ModPresetPanel.cs
@@ -98,8 +98,6 @@ namespace osu.Game.Overlays.Mods
 
         #endregion
 
-        public bool CheckCurrentModCanBeSave() => (!Active.Value && selectedMods.Value.Any());
-
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
@@ -107,6 +105,6 @@ namespace osu.Game.Overlays.Mods
             settingChangeTracker?.Dispose();
         }
 
-        public Popover GetPopover() => new EditPresetPopover(this);
+        public Popover GetPopover() => new EditPresetPopover(Preset);
     }
 }

From 26b8c5b852d31b1e0d340d0926821dfcd0910fa5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 May 2023 11:23:51 +0900
Subject: [PATCH 0318/1604] Fix mod list display not updating after clicking
 "use current"

This is not a regression from my changes. It was broken before them.
---
 osu.Game/Overlays/Mods/EditPresetPopover.cs | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Overlays/Mods/EditPresetPopover.cs b/osu.Game/Overlays/Mods/EditPresetPopover.cs
index 3f5eca8ad0..82d0bdb51e 100644
--- a/osu.Game/Overlays/Mods/EditPresetPopover.cs
+++ b/osu.Game/Overlays/Mods/EditPresetPopover.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Overlays.Mods
 
         private readonly Live<ModPreset> preset;
 
-        private HashSet<Mod>? newMods;
+        private HashSet<Mod> saveableMods;
 
         [Resolved]
         private Bindable<IReadOnlyList<Mod>> selectedMods { get; set; } = null!;
@@ -43,6 +43,7 @@ namespace osu.Game.Overlays.Mods
         public EditPresetPopover(Live<ModPreset> preset)
         {
             this.preset = preset;
+            saveableMods = preset.PerformRead(p => p.Mods).ToHashSet();
         }
 
         [BackgroundDependencyLoader]
@@ -122,7 +123,7 @@ namespace osu.Game.Overlays.Mods
             Body.BorderThickness = 3;
             Body.BorderColour = colours.Orange1;
 
-            selectedMods.BindValueChanged(_ => updateActiveState(), true);
+            selectedMods.BindValueChanged(_ => updateState(), true);
             nameTextBox.Current.BindValueChanged(s =>
             {
                 saveButton.Enabled.Value = !string.IsNullOrWhiteSpace(s.NewValue);
@@ -131,14 +132,14 @@ namespace osu.Game.Overlays.Mods
 
         private void useCurrentMods()
         {
-            newMods = selectedMods.Value.ToHashSet();
+            saveableMods = selectedMods.Value.ToHashSet();
             scrollContent.Clear();
-            updateActiveState();
+            updateState();
         }
 
-        private void updateActiveState()
+        private void updateState()
         {
-            scrollContent.ChildrenEnumerable = preset.PerformRead(p => p.Mods.Select(mod => new ModPresetRow(mod)));
+            scrollContent.ChildrenEnumerable = saveableMods.Select(mod => new ModPresetRow(mod));
             useCurrentModsButton.Enabled.Value = checkSelectedModsDiffersFromSaved();
         }
 
@@ -147,7 +148,7 @@ namespace osu.Game.Overlays.Mods
             if (!selectedMods.Value.Any())
                 return false;
 
-            return newMods?.SetEquals(selectedMods.Value) == false;
+            return !saveableMods.SetEquals(selectedMods.Value);
         }
 
         protected override void LoadComplete()
@@ -163,9 +164,7 @@ namespace osu.Game.Overlays.Mods
             {
                 s.Name = nameTextBox.Current.Value;
                 s.Description = descriptionTextBox.Current.Value;
-
-                if (newMods != null)
-                    s.Mods = newMods;
+                s.Mods = saveableMods;
             });
 
             this.HidePopover();

From 0034124d79ee949f00dc5ec7fcd98fe8780d250e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 May 2023 11:25:10 +0900
Subject: [PATCH 0319/1604] Remove unnecessary content clear

---
 osu.Game/Overlays/Mods/EditPresetPopover.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/EditPresetPopover.cs b/osu.Game/Overlays/Mods/EditPresetPopover.cs
index 82d0bdb51e..5220f6a391 100644
--- a/osu.Game/Overlays/Mods/EditPresetPopover.cs
+++ b/osu.Game/Overlays/Mods/EditPresetPopover.cs
@@ -133,7 +133,6 @@ namespace osu.Game.Overlays.Mods
         private void useCurrentMods()
         {
             saveableMods = selectedMods.Value.ToHashSet();
-            scrollContent.Clear();
             updateState();
         }
 

From 95b541ab39169f3f46e534c7652b0246e416bbf2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 May 2023 11:27:18 +0900
Subject: [PATCH 0320/1604] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 3ede0b85da..59bef84bd2 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -11,7 +11,7 @@
     <AndroidManifestMerger>manifestmerger.jar</AndroidManifestMerger>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.418.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.504.0" />
   </ItemGroup>
   <ItemGroup>
     <AndroidManifestOverlay Include="$(MSBuildThisFileDirectory)osu.Android\Properties\AndroidManifestOverlay.xml" />
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 085f78b27b..404fbada95 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,7 +36,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="10.20.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.418.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.504.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.417.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 127994c670..c4df0a2347 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -16,6 +16,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.418.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.504.0" />
   </ItemGroup>
 </Project>

From 2cb6642b0d8f805317f1458078e545c685c0a148 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Thu, 4 May 2023 13:18:25 +0900
Subject: [PATCH 0321/1604] use AddUntilStep or not wait

---
 osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
index 041556a5a6..339d861d3b 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
@@ -645,8 +645,7 @@ namespace osu.Game.Tests.Visual.Online
                 InputManager.Click(MouseButton.Left);
             });
 
-            AddWaitStep("Wait", 3);
-            AddAssert("Overlay closed", () => !this.ChildrenOfType<ReportChatPopover>().Any());
+            AddUntilStep("Overlay closed", () => !this.ChildrenOfType<ReportChatPopover>().Any());
             AddStep("Complete request", () => requestLock.Set());
             AddUntilStep("Request sent", () => request != null);
         }

From 0d2396c5575cd34864e42974b7c99218e4074c2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 4 May 2023 18:15:12 +0200
Subject: [PATCH 0322/1604] Rename method to better indicate directionality

---
 osu.Game.Tests/Mods/ModSettingsTest.cs | 14 +++++++-------
 osu.Game/OsuGameBase.cs                |  2 +-
 osu.Game/Rulesets/Mods/Mod.cs          |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Mods/ModSettingsTest.cs b/osu.Game.Tests/Mods/ModSettingsTest.cs
index b3f6f8da7d..4dcc4511db 100644
--- a/osu.Game.Tests/Mods/ModSettingsTest.cs
+++ b/osu.Game.Tests/Mods/ModSettingsTest.cs
@@ -45,12 +45,12 @@ namespace osu.Game.Tests.Mods
             var modBool = new TestNonMatchingSettingTypeModBool { TestSetting = { Default = false, Value = true } };
             var modInt = new TestNonMatchingSettingTypeModInt { TestSetting = { Value = (int)setting_change / 2 } };
 
-            modDouble.CopyCommonSettings(modBool);
-            modDouble.CopyCommonSettings(modInt);
-            modBool.CopyCommonSettings(modDouble);
-            modBool.CopyCommonSettings(modInt);
-            modInt.CopyCommonSettings(modDouble);
-            modInt.CopyCommonSettings(modBool);
+            modDouble.CopyCommonSettingsFrom(modBool);
+            modDouble.CopyCommonSettingsFrom(modInt);
+            modBool.CopyCommonSettingsFrom(modDouble);
+            modBool.CopyCommonSettingsFrom(modInt);
+            modInt.CopyCommonSettingsFrom(modDouble);
+            modInt.CopyCommonSettingsFrom(modBool);
 
             Assert.That(modDouble.TestSetting.Value, Is.EqualTo(setting_change));
             Assert.That(modBool.TestSetting.Value, Is.EqualTo(!modBool.TestSetting.Default));
@@ -63,7 +63,7 @@ namespace osu.Game.Tests.Mods
             var modBoolTrue = new TestNonMatchingSettingTypeModBool { TestSetting = { Default = true, Value = false } };
             var modBoolFalse = new TestNonMatchingSettingTypeModBool { TestSetting = { Default = false, Value = true } };
 
-            modBoolFalse.CopyCommonSettings(modBoolTrue);
+            modBoolFalse.CopyCommonSettingsFrom(modBoolTrue);
 
             Assert.That(modBoolFalse.TestSetting.Default, Is.EqualTo(false));
             Assert.That(modBoolFalse.TestSetting.Value, Is.EqualTo(modBoolTrue.TestSetting.Value));
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 076c1213ad..c55b6c249f 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -633,7 +633,7 @@ namespace osu.Game
             var convertedMods = SelectedMods.Value.Select(mod =>
             {
                 var newMod = instance.CreateModFromAcronym(mod.Acronym);
-                newMod?.CopyCommonSettings(mod);
+                newMod?.CopyCommonSettingsFrom(mod);
                 return newMod;
             }).Where(newMod => newMod != null).ToList();
 
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 0af8717264..cf5a1c6fcc 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -168,7 +168,7 @@ namespace osu.Game.Rulesets.Mods
         /// </summary>
         /// <remarks>Copied values are unchanged, even if they have different clamping ranges.</remarks>
         /// <param name="source">The mod to extract settings from.</param>
-        public void CopyCommonSettings(Mod source)
+        public void CopyCommonSettingsFrom(Mod source)
         {
             if (source.UsesDefaultConfiguration)
                 return;

From 1ac9d900e1f0ea8b66e5722174fc3f7f960b9e6b Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Thu, 4 May 2023 19:24:37 +0300
Subject: [PATCH 0323/1604] Clear search on `ModSelectOverlay.Hide`

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 9efcd24048..fa39c2b09d 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -112,8 +112,6 @@ namespace osu.Game.Overlays.Mods
         private ShearedSearchTextBox searchTextBox = null!;
         private DifficultyMultiplierDisplay? multiplierDisplay;
 
-        private ModSearchContainer? modSearch;
-
         protected ShearedButton BackButton { get; private set; } = null!;
         protected ShearedToggleButton? CustomisationButton { get; private set; }
 
@@ -215,7 +213,7 @@ namespace osu.Game.Overlays.Mods
                 AutoSizeAxes = Axes.X,
                 Height = ModsEffectDisplay.HEIGHT,
                 Margin = new MarginPadding { Horizontal = 100 },
-                Child = modSearch = new ModSearchContainer()
+                Child = new ModSearchContainer()
             });
 
             FooterContent.Child = footerButtonFlow = new FillFlowContainer<ShearedButton>
@@ -243,6 +241,14 @@ namespace osu.Game.Overlays.Mods
             globalAvailableMods.BindTo(game.AvailableMods);
         }
 
+        public override void Hide()
+        {
+            base.Hide();
+
+            //We want to clear search for next user iteraction with mod overlay
+            searchTextBox.Current.Value = string.Empty;
+        }
+
         private ModSettingChangeTracker? modSettingChangeTracker;
 
         protected override void LoadComplete()

From 26337dbcd8c7ca314cf0a8034ee2a6cdad9058b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 4 May 2023 18:26:45 +0200
Subject: [PATCH 0324/1604] Do not rely on unspecified `Dictionary.Values`
 ordering

---
 osu.Game/Rulesets/Mods/Mod.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index cf5a1c6fcc..db7e7ce8e3 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -119,7 +119,11 @@ namespace osu.Game.Rulesets.Mods
         /// <summary>
         /// All <see cref="IBindable"/> settings within this mod.
         /// </summary>
-        internal IEnumerable<IBindable> SettingsBindables => Settings.Values;
+        /// <remarks>
+        /// The settings are returned in ascending key order as per <see cref="Settings"/>.
+        /// The ordering is intentionally enforced manually, as ordering of <see cref="Dictionary{TKey,TValue}.Values"/> is unspecified.
+        /// </remarks>
+        internal IEnumerable<IBindable> SettingsBindables => Settings.OrderBy(pair => pair.Key).Select(pair => pair.Value);
 
         /// <summary>
         /// Provides mapping of names to <see cref="IBindable"/>s of all settings within this mod.

From 88e77ad390fad33752395905260f97ed95f86def Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 4 May 2023 18:30:41 +0200
Subject: [PATCH 0325/1604] Rename `Settings{-> Map}`

---
 osu.Game/Rulesets/Mods/Mod.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index db7e7ce8e3..cd89b45a5e 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -120,15 +120,15 @@ namespace osu.Game.Rulesets.Mods
         /// All <see cref="IBindable"/> settings within this mod.
         /// </summary>
         /// <remarks>
-        /// The settings are returned in ascending key order as per <see cref="Settings"/>.
+        /// The settings are returned in ascending key order as per <see cref="SettingsMap"/>.
         /// The ordering is intentionally enforced manually, as ordering of <see cref="Dictionary{TKey,TValue}.Values"/> is unspecified.
         /// </remarks>
-        internal IEnumerable<IBindable> SettingsBindables => Settings.OrderBy(pair => pair.Key).Select(pair => pair.Value);
+        internal IEnumerable<IBindable> SettingsBindables => SettingsMap.OrderBy(pair => pair.Key).Select(pair => pair.Value);
 
         /// <summary>
         /// Provides mapping of names to <see cref="IBindable"/>s of all settings within this mod.
         /// </summary>
-        internal IReadOnlyDictionary<string, IBindable> Settings =>
+        internal IReadOnlyDictionary<string, IBindable> SettingsMap =>
             settingsBacking ??= this.GetSettingsSourceProperties()
                                     .Select(p => p.Item2)
                                     .ToDictionary(property => property.Name.ToSnakeCase(), property => (IBindable)property.GetValue(this)!);
@@ -177,9 +177,9 @@ namespace osu.Game.Rulesets.Mods
             if (source.UsesDefaultConfiguration)
                 return;
 
-            foreach (var (name, targetSetting) in Settings)
+            foreach (var (name, targetSetting) in SettingsMap)
             {
-                if (!source.Settings.TryGetValue(name, out IBindable? sourceSetting))
+                if (!source.SettingsMap.TryGetValue(name, out IBindable? sourceSetting))
                     continue;
 
                 if (sourceSetting.IsDefault)

From 1f1342b099752b99de109a2fc6a6fcbaa9b37bbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 4 May 2023 18:33:49 +0200
Subject: [PATCH 0326/1604] Reword xmldoc

---
 osu.Game/Rulesets/Mods/Mod.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index cd89b45a5e..f5ccde01cf 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -167,10 +167,13 @@ namespace osu.Game.Rulesets.Mods
         }
 
         /// <summary>
-        /// When converting mods from one ruleset to the other, this method makes sure
-        /// to also copy the values of all settings sharing same <see cref="MemberInfo.Name"/> between the two instances.
+        /// This method copies the values of all settings from <paramref name="source"/> that share the same names with this mod instance.
+        /// The most frequent use of this is when switching rulesets, in order to preserve values of common settings during the switch.
         /// </summary>
-        /// <remarks>Copied values are unchanged, even if they have different clamping ranges.</remarks>
+        /// <remarks>
+        /// The values are copied directly, without adjusting for possibly different allowed ranges of values.
+        /// If the value of a setting is not valid for this instance due to not falling inside of the allowed range, it will be clamped accordingly.
+        /// </remarks>
         /// <param name="source">The mod to extract settings from.</param>
         public void CopyCommonSettingsFrom(Mod source)
         {

From e43fc23606e4b579fdf46ee54aa3fb144bb85d5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 4 May 2023 18:46:36 +0200
Subject: [PATCH 0327/1604] Fix typos in test

---
 .../Visual/UserInterface/TestSceneModPresetColumn.cs   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
index 0cbbe00311..3efdba8754 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
@@ -262,7 +262,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         }
 
         [Test]
-        public void TestEditPresentName()
+        public void TestEditPresetName()
         {
             ModPresetColumn modPresetColumn = null!;
             string presetName = null!;
@@ -301,7 +301,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                 InputManager.Click(MouseButton.Left);
             });
 
-            AddAssert("present is not changed", () => panel.Preset.Value.Name == presetName);
+            AddAssert("preset is not changed", () => panel.Preset.Value.Name == presetName);
             AddUntilStep("popover is unchanged", () => this.ChildrenOfType<OsuPopover>().FirstOrDefault() == popover);
             AddStep("edit preset name", () => popover.ChildrenOfType<LabelledTextBox>().First().Current.Value = "something new");
             AddStep("attempt preset edit", () =>
@@ -310,7 +310,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                 InputManager.Click(MouseButton.Left);
             });
             AddUntilStep("popover closed", () => !this.ChildrenOfType<OsuPopover>().Any());
-            AddAssert("present is changed", () => panel.Preset.Value.Name != presetName);
+            AddAssert("preset is changed", () => panel.Preset.Value.Name != presetName);
         }
 
         [Test]
@@ -357,7 +357,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                 InputManager.Click(MouseButton.Left);
             });
 
-            AddUntilStep("present mod not changed", () =>
+            AddUntilStep("preset mod not changed", () =>
                 new HashSet<Mod>(this.ChildrenOfType<ModPresetPanel>().First().Preset.Value.Mods).SetEquals(previousMod));
 
             AddStep("select mods", () => SelectedMods.Value = mods);
@@ -388,7 +388,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                 InputManager.Click(MouseButton.Left);
             });
 
-            AddUntilStep("present mod is changed", () =>
+            AddUntilStep("preset mod is changed", () =>
                 new HashSet<Mod>(this.ChildrenOfType<ModPresetPanel>().First().Preset.Value.Mods).SetEquals(mods));
         }
 

From 485b7282dce5a7c220fa534e2f5f9655935270e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 4 May 2023 19:06:07 +0200
Subject: [PATCH 0328/1604] Clarify type check

---
 osu.Game/Rulesets/Mods/Mod.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index f5ccde01cf..787da926ea 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -188,10 +188,13 @@ namespace osu.Game.Rulesets.Mods
                 if (sourceSetting.IsDefault)
                     continue;
 
-                var targetType = targetSetting.GetType();
-                var sourceType = sourceSetting.GetType();
+                var targetBindableType = targetSetting.GetType();
+                var sourceBindableType = sourceSetting.GetType();
 
-                if (!targetType.IsAssignableFrom(sourceType) && !sourceType.IsAssignableFrom(targetType))
+                // if either the target is assignable to the source or the source is assignable to the target,
+                // then we presume that the data types contained in both bindables are compatible and we can proceed with the copy.
+                // this handles cases like `Bindable<int>` and `BindableInt`.
+                if (!targetBindableType.IsAssignableFrom(sourceBindableType) && !sourceBindableType.IsAssignableFrom(targetBindableType))
                     continue;
 
                 // TODO: special case for handling number types

From aa7885ab973a258c350ad26c19bc51d89befdf51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 4 May 2023 19:11:51 +0200
Subject: [PATCH 0329/1604] Use better test step names

---
 .../Visual/UserInterface/TestSceneModSelectOverlay.cs         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index b4b5052f23..f079b65e23 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -399,7 +399,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             changeRuleset(1);
             AddAssert("taiko variant selected", () => SelectedMods.Value.SingleOrDefault() is TaikoModDifficultyAdjust);
 
-            AddAssert("shared settings didn't change", () =>
+            AddAssert("shared settings preserved", () =>
             {
                 var taikoMod = getMod<TaikoModDifficultyAdjust>();
 
@@ -408,7 +408,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                        taikoMod.OverallDifficulty.Value == setting_change;
             });
 
-            AddAssert("non-shared settings unchanged", () =>
+            AddAssert("non-shared settings remain default", () =>
             {
                 var taikoMod = getMod<TaikoModDifficultyAdjust>();
 

From 99e8b2ce70276a34d648960556373917b50d0e46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 4 May 2023 19:12:22 +0200
Subject: [PATCH 0330/1604] Make `getMod()` method generally better

---
 .../Visual/UserInterface/TestSceneModSelectOverlay.cs     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index f079b65e23..9993893a99 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -387,7 +387,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             AddStep("change mod settings", () =>
             {
-                var osuMod = getMod<OsuModDifficultyAdjust>();
+                var osuMod = getSelectedMod<OsuModDifficultyAdjust>();
 
                 osuMod.ExtendedLimits.Value = true;
                 osuMod.CircleSize.Value = setting_change;
@@ -401,7 +401,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             AddAssert("shared settings preserved", () =>
             {
-                var taikoMod = getMod<TaikoModDifficultyAdjust>();
+                var taikoMod = getSelectedMod<TaikoModDifficultyAdjust>();
 
                 return taikoMod.ExtendedLimits.Value &&
                        taikoMod.DrainRate.Value == setting_change &&
@@ -410,7 +410,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             AddAssert("non-shared settings remain default", () =>
             {
-                var taikoMod = getMod<TaikoModDifficultyAdjust>();
+                var taikoMod = getSelectedMod<TaikoModDifficultyAdjust>();
 
                 return taikoMod.ScrollSpeed.IsDefault;
             });
@@ -626,7 +626,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert($"customisation toggle is {(active ? "" : "not ")}active", () => modSelectOverlay.CustomisationButton.AsNonNull().Active.Value == active);
         }
 
-        private T getMod<T>() where T : Mod => (T)SelectedMods.Value.Single();
+        private T getSelectedMod<T>() where T : Mod => SelectedMods.Value.OfType<T>().Single();
 
         private ModPanel getPanelForMod(Type modType)
             => modSelectOverlay.ChildrenOfType<ModPanel>().Single(panel => panel.Mod.GetType() == modType);

From a1106d0a4e0a2522122f945d283f92368714f4f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 4 May 2023 19:14:20 +0200
Subject: [PATCH 0331/1604] Be explicit in test

---
 osu.Game.Tests/Mods/ModSettingsTest.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Mods/ModSettingsTest.cs b/osu.Game.Tests/Mods/ModSettingsTest.cs
index 4dcc4511db..5ec9629dc2 100644
--- a/osu.Game.Tests/Mods/ModSettingsTest.cs
+++ b/osu.Game.Tests/Mods/ModSettingsTest.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Tests.Mods
             modInt.CopyCommonSettingsFrom(modBool);
 
             Assert.That(modDouble.TestSetting.Value, Is.EqualTo(setting_change));
-            Assert.That(modBool.TestSetting.Value, Is.EqualTo(!modBool.TestSetting.Default));
+            Assert.That(modBool.TestSetting.Value, Is.EqualTo(true));
             Assert.That(modInt.TestSetting.Value, Is.EqualTo((int)setting_change / 2));
         }
 

From dcd2abae6d5f7a196fae601854f08a794999c470 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 4 May 2023 20:46:27 +0200
Subject: [PATCH 0332/1604] Add test coverage for mod equality with multiple
 settings

---
 .../Mods/ModSettingsEqualityComparison.cs     | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/osu.Game.Tests/Mods/ModSettingsEqualityComparison.cs b/osu.Game.Tests/Mods/ModSettingsEqualityComparison.cs
index cd6879cf01..a03b29f7bc 100644
--- a/osu.Game.Tests/Mods/ModSettingsEqualityComparison.cs
+++ b/osu.Game.Tests/Mods/ModSettingsEqualityComparison.cs
@@ -49,5 +49,31 @@ namespace osu.Game.Tests.Mods
             Assert.That(mod3, Is.EqualTo(mod2));
             Assert.That(doubleConvertedMod3, Is.EqualTo(doubleConvertedMod2));
         }
+
+        [Test]
+        public void TestModWithMultipleSettings()
+        {
+            var ruleset = new OsuRuleset();
+
+            var mod1 = new OsuModDifficultyAdjust { OverallDifficulty = { Value = 10 }, CircleSize = { Value = 0 } };
+            var mod2 = new OsuModDifficultyAdjust { OverallDifficulty = { Value = 10 }, CircleSize = { Value = 6 } };
+            var mod3 = new OsuModDifficultyAdjust { OverallDifficulty = { Value = 10 }, CircleSize = { Value = 6 } };
+
+            var doubleConvertedMod1 = new APIMod(mod1).ToMod(ruleset);
+            var doubleConvertedMod2 = new APIMod(mod2).ToMod(ruleset);
+            var doubleConvertedMod3 = new APIMod(mod3).ToMod(ruleset);
+
+            Assert.That(mod1, Is.Not.EqualTo(mod2));
+            Assert.That(doubleConvertedMod1, Is.Not.EqualTo(doubleConvertedMod2));
+
+            Assert.That(mod2, Is.EqualTo(mod2));
+            Assert.That(doubleConvertedMod2, Is.EqualTo(doubleConvertedMod2));
+
+            Assert.That(mod2, Is.EqualTo(mod3));
+            Assert.That(doubleConvertedMod2, Is.EqualTo(doubleConvertedMod3));
+
+            Assert.That(mod3, Is.EqualTo(mod2));
+            Assert.That(doubleConvertedMod3, Is.EqualTo(doubleConvertedMod2));
+        }
     }
 }

From 74e7a958bbbba4dc52159d19aabd758e28524cb6 Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Fri, 5 May 2023 05:31:06 +0100
Subject: [PATCH 0333/1604] feat(ArgonKeyCounter): make animation

Currently WIP. Do not consider this final.
---
 osu.Game/Screens/Play/ArgonKeyCounter.cs | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/ArgonKeyCounter.cs b/osu.Game/Screens/Play/ArgonKeyCounter.cs
index 6818b30823..8635783d71 100644
--- a/osu.Game/Screens/Play/ArgonKeyCounter.cs
+++ b/osu.Game/Screens/Play/ArgonKeyCounter.cs
@@ -69,8 +69,19 @@ namespace osu.Game.Screens.Play
         {
             base.LoadComplete();
 
-            IsActive.BindValueChanged(e => inputIndicator.Alpha = e.NewValue ? 1 : 0.5f, true);
             CountPresses.BindValueChanged(e => countText.Text = e.NewValue.ToString(@"#,0"), true);
         }
+
+        protected override void Activate(bool forwardPlayback = true)
+        {
+            base.Activate(forwardPlayback);
+            inputIndicator.FadeIn().MoveToY(0).Then().MoveToY(3, 100, Easing.OutQuart);
+        }
+
+        protected override void Deactivate(bool forwardPlayback = true)
+        {
+            base.Deactivate(forwardPlayback);
+            inputIndicator.MoveToY(0, 200, Easing.OutQuart).FadeTo(0.5f, 200, Easing.OutQuart);
+        }
     }
 }

From 8391e2a538c7ca7777e2c04a9cdf90a9f191abf7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 May 2023 13:58:13 +0900
Subject: [PATCH 0334/1604] Move reporting code out of `DrawableChatUsername`
 into more correct locations

---
 .../Visual/Online/TestSceneChatOverlay.cs     |  2 +-
 osu.Game/Overlays/Chat/ChatLine.cs            | 14 +++++---
 .../Overlays/Chat/DrawableChatUsername.cs     | 34 +++----------------
 osu.Game/Overlays/Chat/ReportChatPopover.cs   | 31 +++++++++++++++--
 4 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
index 339d861d3b..99ce837665 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
@@ -616,7 +616,7 @@ namespace osu.Game.Tests.Visual.Online
                 };
             });
 
-            AddStep("Show report popover", () => this.ChildrenOfType<DrawableChatUsername>().First().ShowPopover());
+            AddStep("Show report popover", () => this.ChildrenOfType<ChatLine>().First().ShowPopover());
 
             AddStep("Set report reason to other", () =>
             {
diff --git a/osu.Game/Overlays/Chat/ChatLine.cs b/osu.Game/Overlays/Chat/ChatLine.cs
index dca34128d1..2f4c175ac4 100644
--- a/osu.Game/Overlays/Chat/ChatLine.cs
+++ b/osu.Game/Overlays/Chat/ChatLine.cs
@@ -1,25 +1,28 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Linq;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.UserInterface;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.Chat;
-using osu.Framework.Graphics.Sprites;
 
 namespace osu.Game.Overlays.Chat
 {
-    public partial class ChatLine : CompositeDrawable
+    public partial class ChatLine : CompositeDrawable, IHasPopover
     {
         private Message message = null!;
 
@@ -92,7 +95,7 @@ namespace osu.Game.Overlays.Chat
                             Font = OsuFont.GetFont(size: FontSize * 0.75f, weight: FontWeight.SemiBold, fixedWidth: true),
                             AlwaysPresent = true,
                         },
-                        drawableUsername = new DrawableChatUsername(message.Sender, message.Id)
+                        drawableUsername = new DrawableChatUsername(message.Sender)
                         {
                             Width = UsernameWidth,
                             FontSize = FontSize,
@@ -100,6 +103,7 @@ namespace osu.Game.Overlays.Chat
                             Origin = Anchor.TopRight,
                             Anchor = Anchor.TopRight,
                             Margin = new MarginPadding { Horizontal = Spacing },
+                            ReportRequested = this.ShowPopover,
                         },
                         drawableContentFlow = new LinkFlowContainer(styleMessageContent)
                         {
@@ -128,6 +132,8 @@ namespace osu.Game.Overlays.Chat
             FinishTransforms(true);
         }
 
+        public Popover GetPopover() => new ReportChatPopover(message);
+
         /// <summary>
         /// Performs a highlight animation on this <see cref="ChatLine"/>.
         /// </summary>
diff --git a/osu.Game/Overlays/Chat/DrawableChatUsername.cs b/osu.Game/Overlays/Chat/DrawableChatUsername.cs
index b3bbc74be7..4b4afc204c 100644
--- a/osu.Game/Overlays/Chat/DrawableChatUsername.cs
+++ b/osu.Game/Overlays/Chat/DrawableChatUsername.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -21,7 +20,6 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Localisation;
 using osu.Game.Online.API;
-using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Chat;
 using osu.Game.Resources.Localisation.Web;
@@ -31,8 +29,10 @@ using ChatStrings = osu.Game.Localisation.ChatStrings;
 
 namespace osu.Game.Overlays.Chat
 {
-    public partial class DrawableChatUsername : OsuClickableContainer, IHasContextMenu, IHasPopover
+    public partial class DrawableChatUsername : OsuClickableContainer, IHasContextMenu
     {
+        public Action? ReportRequested;
+
         public Color4 AccentColour { get; }
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
@@ -73,15 +73,13 @@ namespace osu.Game.Overlays.Chat
         private Bindable<Channel?>? currentChannel { get; set; }
 
         private readonly APIUser user;
-        private readonly long? messageId;
         private readonly OsuSpriteText drawableText;
 
         private readonly Drawable colouredDrawable;
 
-        public DrawableChatUsername(APIUser user, long? messageId)
+        public DrawableChatUsername(APIUser user)
         {
             this.user = user;
-            this.messageId = messageId;
 
             Action = openUserProfile;
 
@@ -174,34 +172,12 @@ namespace osu.Game.Overlays.Chat
                 }
 
                 if (!user.Equals(api.LocalUser.Value))
-                    items.Add(new OsuMenuItem("Report", MenuItemType.Destructive, this.ShowPopover));
+                    items.Add(new OsuMenuItem("Report", MenuItemType.Destructive, ReportRequested));
 
                 return items.ToArray();
             }
         }
 
-        public Popover GetPopover() => new ReportChatPopover(user)
-        {
-            Action = report
-        };
-
-        private void report(ChatReportReason reason, string comments)
-        {
-            var request = new ChatReportRequest(messageId, reason, comments);
-
-            request.Failure += _ => Schedule(() =>
-            {
-                currentChannel?.Value?.AddNewMessages(new ErrorMessage("Report failed to send, please retry"));
-            });
-
-            request.Success += () => Schedule(() =>
-            {
-                currentChannel?.Value?.AddNewMessages(new InfoMessage("Report has been sent"));
-            });
-
-            api.Queue(request);
-        }
-
         private void openUserChannel()
         {
             chatManager?.OpenPrivateChannel(user);
diff --git a/osu.Game/Overlays/Chat/ReportChatPopover.cs b/osu.Game/Overlays/Chat/ReportChatPopover.cs
index de5f3268b8..f02e52eb2e 100644
--- a/osu.Game/Overlays/Chat/ReportChatPopover.cs
+++ b/osu.Game/Overlays/Chat/ReportChatPopover.cs
@@ -1,22 +1,47 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Framework.Allocation;
 using osu.Game.Graphics.UserInterfaceV2;
-using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Online.Chat;
 using osu.Game.Resources.Localisation.Web;
 
 namespace osu.Game.Overlays.Chat
 {
     public partial class ReportChatPopover : ReportPopover<ChatReportReason>
     {
-        public ReportChatPopover(APIUser? user)
-            : base(ReportStrings.UserTitle(user?.Username ?? @"Someone"))
+        [Resolved]
+        private IAPIProvider api { get; set; } = null!;
+
+        [Resolved]
+        private ChannelManager channelManager { get; set; } = null!;
+
+        private readonly Message message;
+
+        public ReportChatPopover(Message message)
+            : base(ReportStrings.UserTitle(message.Sender?.Username ?? @"Someone"))
         {
+            this.message = message;
+            Action = report;
         }
 
         protected override bool CheckCanSubmitEmptyComment(ChatReportReason reason)
         {
             return reason != ChatReportReason.Other;
         }
+
+        private void report(ChatReportReason reason, string comments)
+        {
+            var request = new ChatReportRequest(message.Id, reason, comments);
+
+            request.Success += () => Schedule(() =>
+            {
+                channelManager.CurrentChannel.Value.AddNewMessages(new InfoMessage(UsersStrings.ReportThanks.ToString()));
+            });
+
+            api.Queue(request);
+        }
     }
 }

From 560f71ef5366a673cd0f7e79ba55ef16c4c73610 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 May 2023 14:29:03 +0900
Subject: [PATCH 0335/1604] Adjust `BlurredIcon` expansion ratio to fix glow
 getting cut off at lower resolutions

Closes https://github.com/ppy/osu/issues/23210.

Ballparked the fix to work down to the lowest resolution we support. The
previous number (`2.5f`) was also likely ballparked so the fix seems in
line with expectations.

I don't want to put too much thought into this because the design of
this screen is likely going to change in the mean time anyway.
---
 osu.Game/Screens/Play/Break/BlurredIcon.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/Break/BlurredIcon.cs b/osu.Game/Screens/Play/Break/BlurredIcon.cs
index cd38390324..6ce1c2e686 100644
--- a/osu.Game/Screens/Play/Break/BlurredIcon.cs
+++ b/osu.Game/Screens/Play/Break/BlurredIcon.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Screens.Play.Break
             set
             {
                 icon.Size = value;
-                base.Size = value + BlurSigma * 2.5f;
+                base.Size = value + BlurSigma * 5;
                 ForceRedraw();
             }
             get => base.Size;

From 76b2f0e6dd57f50c956cc38ede5565aa6bda522e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 May 2023 15:15:18 +0900
Subject: [PATCH 0336/1604] Show slider velocity in hit object inspector

---
 osu.Game/Rulesets/Edit/HitObjectInspector.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Rulesets/Edit/HitObjectInspector.cs b/osu.Game/Rulesets/Edit/HitObjectInspector.cs
index 977d00ede2..7eeee7a6e9 100644
--- a/osu.Game/Rulesets/Edit/HitObjectInspector.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectInspector.cs
@@ -98,6 +98,12 @@ namespace osu.Game.Rulesets.Edit
                         addValue($"{distance.Distance:#,0.##}px");
                     }
 
+                    if (selected is IHasSliderVelocity sliderVelocity)
+                    {
+                        addHeader("Slider Velocity");
+                        addValue($"{sliderVelocity.SliderVelocity:#,0.00}x");
+                    }
+
                     if (selected is IHasRepeats repeats)
                     {
                         addHeader("Repeats");

From 54757df51fefc2c8c3a19b7dc340036ceb5b6a29 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Fri, 5 May 2023 09:31:27 +0300
Subject: [PATCH 0337/1604] Fix mod deselect button not working properly when
 search applied

---
 osu.Game/Overlays/Mods/ModColumn.cs        |  6 +++++-
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 10 ----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModColumn.cs b/osu.Game/Overlays/Mods/ModColumn.cs
index df2a7780d3..5da57ee4ed 100644
--- a/osu.Game/Overlays/Mods/ModColumn.cs
+++ b/osu.Game/Overlays/Mods/ModColumn.cs
@@ -206,8 +206,12 @@ namespace osu.Game.Overlays.Mods
         {
             pendingSelectionOperations.Clear();
 
-            foreach (var button in availableMods.Where(b => b.Active.Value && b.MatchingFilter.Value))
+            foreach (var button in availableMods.Where(b => b.Active.Value))
                 pendingSelectionOperations.Enqueue(() => button.Active.Value = false);
+
+            //If column is hidden trigger selection manually
+            if (Alpha == 0f)
+                Update();
         }
 
         /// <summary>
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index fa39c2b09d..d2af305d68 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -206,16 +206,6 @@ namespace osu.Game.Overlays.Mods
                 });
             }
 
-            MainAreaContent.Add(new Container
-            {
-                Anchor = Anchor.TopRight,
-                Origin = Anchor.TopRight,
-                AutoSizeAxes = Axes.X,
-                Height = ModsEffectDisplay.HEIGHT,
-                Margin = new MarginPadding { Horizontal = 100 },
-                Child = new ModSearchContainer()
-            });
-
             FooterContent.Child = footerButtonFlow = new FillFlowContainer<ShearedButton>
             {
                 RelativeSizeAxes = Axes.X,

From ab94b4dce194c85942bfa94d6c1f7bb16073dc93 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Fri, 5 May 2023 09:52:09 +0300
Subject: [PATCH 0338/1604] Update `ModPresetPanel.FilterTerms` to account mod
 names and acronyms

---
 osu.Game/Overlays/Mods/ModPresetPanel.cs | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModPresetPanel.cs b/osu.Game/Overlays/Mods/ModPresetPanel.cs
index 5b6146e106..5bc16abcab 100644
--- a/osu.Game/Overlays/Mods/ModPresetPanel.cs
+++ b/osu.Game/Overlays/Mods/ModPresetPanel.cs
@@ -83,11 +83,20 @@ namespace osu.Game.Overlays.Mods
 
         #region Filtering support
 
-        public override IEnumerable<LocalisableString> FilterTerms => new LocalisableString[]
+        public override IEnumerable<LocalisableString> FilterTerms => getFilterTerms();
+
+        private IEnumerable<LocalisableString> getFilterTerms()
         {
-            Preset.Value.Name,
-            Preset.Value.Description
-        };
+            yield return Preset.Value.Name;
+            yield return Preset.Value.Description;
+
+            foreach (Mod mod in Preset.Value.Mods)
+            {
+                yield return mod.Name;
+                yield return mod.Acronym;
+                yield return mod.Description;
+            }
+        }
 
         #endregion
 

From 4663057060ee71e79aba79bfd99594ba24ebad73 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 May 2023 15:40:34 +0900
Subject: [PATCH 0339/1604] Split out `EditorInspector` implementation for
 reuse

---
 osu.Game/Rulesets/Edit/EditorInspector.cs    | 50 ++++++++++
 osu.Game/Rulesets/Edit/HitObjectInspector.cs | 99 ++++++--------------
 2 files changed, 79 insertions(+), 70 deletions(-)
 create mode 100644 osu.Game/Rulesets/Edit/EditorInspector.cs

diff --git a/osu.Game/Rulesets/Edit/EditorInspector.cs b/osu.Game/Rulesets/Edit/EditorInspector.cs
new file mode 100644
index 0000000000..ed7f305a28
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/EditorInspector.cs
@@ -0,0 +1,50 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Overlays;
+using osu.Game.Screens.Edit;
+
+namespace osu.Game.Rulesets.Edit
+{
+    internal partial class EditorInspector : CompositeDrawable
+    {
+        protected OsuTextFlowContainer InspectorText = null!;
+
+        [Resolved]
+        protected EditorBeatmap EditorBeatmap { get; private set; } = null!;
+
+        [Resolved]
+        private OverlayColourProvider colourProvider { get; set; } = null!;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AutoSizeAxes = Axes.Y;
+            RelativeSizeAxes = Axes.X;
+
+            InternalChild = InspectorText = new OsuTextFlowContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+            };
+        }
+
+        protected void AddHeader(string header) => InspectorText.AddParagraph($"{header}: ", s =>
+        {
+            s.Padding = new MarginPadding { Top = 2 };
+            s.Font = s.Font.With(size: 12);
+            s.Colour = colourProvider.Content2;
+        });
+
+        protected void AddValue(string value) => InspectorText.AddParagraph(value, s =>
+        {
+            s.Font = s.Font.With(weight: FontWeight.SemiBold);
+            s.Colour = colourProvider.Content1;
+        });
+    }
+}
diff --git a/osu.Game/Rulesets/Edit/HitObjectInspector.cs b/osu.Game/Rulesets/Edit/HitObjectInspector.cs
index 7eeee7a6e9..d13190e484 100644
--- a/osu.Game/Rulesets/Edit/HitObjectInspector.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectInspector.cs
@@ -2,43 +2,15 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
-using osu.Framework.Allocation;
 using osu.Framework.Extensions.TypeExtensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Threading;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
-using osu.Game.Overlays;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
-using osu.Game.Screens.Edit;
 
 namespace osu.Game.Rulesets.Edit
 {
-    internal partial class HitObjectInspector : CompositeDrawable
+    internal partial class HitObjectInspector : EditorInspector
     {
-        private OsuTextFlowContainer inspectorText = null!;
-
-        [Resolved]
-        protected EditorBeatmap EditorBeatmap { get; private set; } = null!;
-
-        [Resolved]
-        private OverlayColourProvider colourProvider { get; set; } = null!;
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            AutoSizeAxes = Axes.Y;
-            RelativeSizeAxes = Axes.X;
-
-            InternalChild = inspectorText = new OsuTextFlowContainer
-            {
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y,
-            };
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -53,69 +25,69 @@ namespace osu.Game.Rulesets.Edit
 
         private void updateInspectorText()
         {
-            inspectorText.Clear();
+            InspectorText.Clear();
             rollingTextUpdate?.Cancel();
             rollingTextUpdate = null;
 
             switch (EditorBeatmap.SelectedHitObjects.Count)
             {
                 case 0:
-                    addValue("No selection");
+                    AddValue("No selection");
                     break;
 
                 case 1:
                     var selected = EditorBeatmap.SelectedHitObjects.Single();
 
-                    addHeader("Type");
-                    addValue($"{selected.GetType().ReadableName()}");
+                    AddHeader("Type");
+                    AddValue($"{selected.GetType().ReadableName()}");
 
-                    addHeader("Time");
-                    addValue($"{selected.StartTime:#,0.##}ms");
+                    AddHeader("Time");
+                    AddValue($"{selected.StartTime:#,0.##}ms");
 
                     switch (selected)
                     {
                         case IHasPosition pos:
-                            addHeader("Position");
-                            addValue($"x:{pos.X:#,0.##} y:{pos.Y:#,0.##}");
+                            AddHeader("Position");
+                            AddValue($"x:{pos.X:#,0.##} y:{pos.Y:#,0.##}");
                             break;
 
                         case IHasXPosition x:
-                            addHeader("Position");
+                            AddHeader("Position");
 
-                            addValue($"x:{x.X:#,0.##} ");
+                            AddValue($"x:{x.X:#,0.##} ");
                             break;
 
                         case IHasYPosition y:
-                            addHeader("Position");
+                            AddHeader("Position");
 
-                            addValue($"y:{y.Y:#,0.##}");
+                            AddValue($"y:{y.Y:#,0.##}");
                             break;
                     }
 
                     if (selected is IHasDistance distance)
                     {
-                        addHeader("Distance");
-                        addValue($"{distance.Distance:#,0.##}px");
+                        AddHeader("Distance");
+                        AddValue($"{distance.Distance:#,0.##}px");
                     }
 
                     if (selected is IHasSliderVelocity sliderVelocity)
                     {
-                        addHeader("Slider Velocity");
-                        addValue($"{sliderVelocity.SliderVelocity:#,0.00}x");
+                        AddHeader("Slider Velocity");
+                        AddValue($"{sliderVelocity.SliderVelocity:#,0.00}x");
                     }
 
                     if (selected is IHasRepeats repeats)
                     {
-                        addHeader("Repeats");
-                        addValue($"{repeats.RepeatCount:#,0.##}");
+                        AddHeader("Repeats");
+                        AddValue($"{repeats.RepeatCount:#,0.##}");
                     }
 
                     if (selected is IHasDuration duration)
                     {
-                        addHeader("End Time");
-                        addValue($"{duration.EndTime:#,0.##}ms");
-                        addHeader("Duration");
-                        addValue($"{duration.Duration:#,0.##}ms");
+                        AddHeader("End Time");
+                        AddValue($"{duration.EndTime:#,0.##}ms");
+                        AddHeader("Duration");
+                        AddValue($"{duration.Duration:#,0.##}ms");
                     }
 
                     // I'd hope there's a better way to do this, but I don't want to bind to each and every property above to watch for changes.
@@ -124,29 +96,16 @@ namespace osu.Game.Rulesets.Edit
                     break;
 
                 default:
-                    addHeader("Selected Objects");
-                    addValue($"{EditorBeatmap.SelectedHitObjects.Count:#,0.##}");
+                    AddHeader("Selected Objects");
+                    AddValue($"{EditorBeatmap.SelectedHitObjects.Count:#,0.##}");
 
-                    addHeader("Start Time");
-                    addValue($"{EditorBeatmap.SelectedHitObjects.Min(o => o.StartTime):#,0.##}ms");
+                    AddHeader("Start Time");
+                    AddValue($"{EditorBeatmap.SelectedHitObjects.Min(o => o.StartTime):#,0.##}ms");
 
-                    addHeader("End Time");
-                    addValue($"{EditorBeatmap.SelectedHitObjects.Max(o => o.GetEndTime()):#,0.##}ms");
+                    AddHeader("End Time");
+                    AddValue($"{EditorBeatmap.SelectedHitObjects.Max(o => o.GetEndTime()):#,0.##}ms");
                     break;
             }
-
-            void addHeader(string header) => inspectorText.AddParagraph($"{header}: ", s =>
-            {
-                s.Padding = new MarginPadding { Top = 2 };
-                s.Font = s.Font.With(size: 12);
-                s.Colour = colourProvider.Content2;
-            });
-
-            void addValue(string value) => inspectorText.AddParagraph(value, s =>
-            {
-                s.Font = s.Font.With(weight: FontWeight.SemiBold);
-                s.Colour = colourProvider.Content1;
-            });
         }
     }
 }

From cc70d89bf94269d34b3e32cfc24a66884d26f6dc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 May 2023 15:42:34 +0900
Subject: [PATCH 0340/1604] Move editor inspector classes out of ruleset
 namespace

---
 .../Edit/Compose/Components}/EditorInspector.cs                | 3 +--
 .../Edit/Compose/Components}/HitObjectInspector.cs             | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
 rename osu.Game/{Rulesets/Edit => Screens/Edit/Compose/Components}/EditorInspector.cs (96%)
 rename osu.Game/{Rulesets/Edit => Screens/Edit/Compose/Components}/HitObjectInspector.cs (98%)

diff --git a/osu.Game/Rulesets/Edit/EditorInspector.cs b/osu.Game/Screens/Edit/Compose/Components/EditorInspector.cs
similarity index 96%
rename from osu.Game/Rulesets/Edit/EditorInspector.cs
rename to osu.Game/Screens/Edit/Compose/Components/EditorInspector.cs
index ed7f305a28..442454f97a 100644
--- a/osu.Game/Rulesets/Edit/EditorInspector.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorInspector.cs
@@ -7,9 +7,8 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Overlays;
-using osu.Game.Screens.Edit;
 
-namespace osu.Game.Rulesets.Edit
+namespace osu.Game.Screens.Edit.Compose.Components
 {
     internal partial class EditorInspector : CompositeDrawable
     {
diff --git a/osu.Game/Rulesets/Edit/HitObjectInspector.cs b/osu.Game/Screens/Edit/Compose/Components/HitObjectInspector.cs
similarity index 98%
rename from osu.Game/Rulesets/Edit/HitObjectInspector.cs
rename to osu.Game/Screens/Edit/Compose/Components/HitObjectInspector.cs
index d13190e484..597925e3e2 100644
--- a/osu.Game/Rulesets/Edit/HitObjectInspector.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/HitObjectInspector.cs
@@ -7,7 +7,7 @@ using osu.Framework.Threading;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 
-namespace osu.Game.Rulesets.Edit
+namespace osu.Game.Screens.Edit.Compose.Components
 {
     internal partial class HitObjectInspector : EditorInspector
     {

From b7a287869a5867c6ed5c2388e29ddff36ea94084 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 May 2023 15:54:27 +0900
Subject: [PATCH 0341/1604] Add display of beatmap slider velocity when
 adjusting

---
 .../Timeline/DifficultyPointPiece.cs          | 40 ++++++++++++++++++-
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
index 4741b75641..9192913fa0 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
@@ -95,7 +95,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                                 AutoSizeAxes = Axes.Y,
                                 RelativeSizeAxes = Axes.X,
                                 Text = "Hold shift while dragging the end of an object to adjust velocity while snapping."
-                            }
+                            },
+                            new SliderVelocityInspector(),
                         }
                     }
                 };
@@ -105,7 +106,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 var relevantObjects = (beatmap.SelectedHitObjects.Contains(hitObject) ? beatmap.SelectedHitObjects : hitObject.Yield()).Where(o => o is IHasSliderVelocity).ToArray();
 
                 // even if there are multiple objects selected, we can still display a value if they all have the same value.
-                var selectedPointBindable = relevantObjects.Select(point => ((IHasSliderVelocity)point).SliderVelocity).Distinct().Count() == 1 ? ((IHasSliderVelocity)relevantObjects.First()).SliderVelocityBindable : null;
+                var selectedPointBindable = relevantObjects.Select(point => ((IHasSliderVelocity)point).SliderVelocity).Distinct().Count() == 1
+                    ? ((IHasSliderVelocity)relevantObjects.First()).SliderVelocityBindable
+                    : null;
 
                 if (selectedPointBindable != null)
                 {
@@ -139,4 +142,37 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             }
         }
     }
+
+    internal partial class SliderVelocityInspector : EditorInspector
+    {
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            EditorBeatmap.TransactionBegan += updateInspectorText;
+            EditorBeatmap.TransactionEnded += updateInspectorText;
+            updateInspectorText();
+        }
+
+        private void updateInspectorText()
+        {
+            InspectorText.Clear();
+
+            double[] sliderVelocities = EditorBeatmap.HitObjects.OfType<IHasSliderVelocity>().Select(sv => sv.SliderVelocity).OrderBy(v => v).ToArray();
+
+            if (sliderVelocities.Length < 2)
+                return;
+
+            double? modeSliderVelocity = sliderVelocities.GroupBy(v => v).MaxBy(v => v.Count())?.Key;
+            double? medianSliderVelocity = sliderVelocities[sliderVelocities.Length / 2];
+
+            AddHeader("Beatmap average velocity");
+            AddValue($"{medianSliderVelocity:#,0.00}x");
+
+            AddHeader("Most used velocity");
+            AddValue($"{modeSliderVelocity:#,0.00}x");
+
+            AddHeader("Velocity range");
+            AddValue($"{sliderVelocities.First():#,0.00}x - {sliderVelocities.Last():#,0.00}x");
+        }
+    }
 }

From 3d55a0291f2c1378b0a28e360afd9a6189a4a5cc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 May 2023 15:40:43 +0900
Subject: [PATCH 0342/1604] Prefer block scoped namespaces

---
 .editorconfig       | 2 ++
 osu.sln.DotSettings | 1 +
 2 files changed, 3 insertions(+)

diff --git a/.editorconfig b/.editorconfig
index c0ea55f4c8..67c47000d3 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -191,6 +191,8 @@ csharp_style_prefer_index_operator = false:silent
 csharp_style_prefer_range_operator = false:silent
 csharp_style_prefer_switch_expression = false:none
 
+csharp_style_namespace_declarations = block_scoped:warning
+
 [*.{yaml,yml}]
 insert_final_newline = true
 indent_style = space
diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index 367dfccb71..d7486273fb 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -277,6 +277,7 @@
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/DEFAULT_INTERNAL_MODIFIER/@EntryValue">Explicit</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/LOCAL_FUNCTION_BODY/@EntryValue">ExpressionBody</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/METHOD_OR_OPERATOR_BODY/@EntryValue">BlockBody</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/NAMESPACE_BODY/@EntryValue">BlockScoped</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/OBJECT_CREATION_WHEN_TYPE_EVIDENT/@EntryValue">ExplicitlyTyped</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/USE_HEURISTICS_FOR_BODY_STYLE/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ACCESSOR_DECLARATION_BRACES/@EntryValue">NEXT_LINE</s:String>

From 01581024678c6f4d99a54892cb95cbe7599f0f3c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 May 2023 16:19:09 +0900
Subject: [PATCH 0343/1604] Rename class back to original name so I can read
 the diff

---
 osu.Game.Tests/Database/LegacyModelExporterTest.cs            | 2 +-
 osu.Game/Database/LegacyArchiveExporter.cs                    | 2 +-
 .../Database/{LegacyModelExporter.cs => LegacyExporter.cs}    | 4 ++--
 osu.Game/Database/LegacyScoreExporter.cs                      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename osu.Game/Database/{LegacyModelExporter.cs => LegacyExporter.cs} (98%)

diff --git a/osu.Game.Tests/Database/LegacyModelExporterTest.cs b/osu.Game.Tests/Database/LegacyModelExporterTest.cs
index 27059c3058..1e9cdfd67d 100644
--- a/osu.Game.Tests/Database/LegacyModelExporterTest.cs
+++ b/osu.Game.Tests/Database/LegacyModelExporterTest.cs
@@ -107,7 +107,7 @@ namespace osu.Game.Tests.Database
                 storage.Dispose();
         }
 
-        private class TestLegacyModelExporter : LegacyModelExporter<TestRealmObject>
+        private class TestLegacyModelExporter : LegacyExporter<TestRealmObject>
         {
             public TestLegacyModelExporter(Storage storage)
                 : base(storage)
diff --git a/osu.Game/Database/LegacyArchiveExporter.cs b/osu.Game/Database/LegacyArchiveExporter.cs
index 297139a20e..d37f9a5dca 100644
--- a/osu.Game/Database/LegacyArchiveExporter.cs
+++ b/osu.Game/Database/LegacyArchiveExporter.cs
@@ -17,7 +17,7 @@ using Logger = osu.Framework.Logging.Logger;
 
 namespace osu.Game.Database
 {
-    public abstract class LegacyArchiveExporter<TModel> : LegacyModelExporter<TModel>
+    public abstract class LegacyArchiveExporter<TModel> : LegacyExporter<TModel>
         where TModel : RealmObject, IHasNamedFiles, IHasGuidPrimaryKey
     {
         protected LegacyArchiveExporter(Storage storage)
diff --git a/osu.Game/Database/LegacyModelExporter.cs b/osu.Game/Database/LegacyExporter.cs
similarity index 98%
rename from osu.Game/Database/LegacyModelExporter.cs
rename to osu.Game/Database/LegacyExporter.cs
index 0e4fefae5c..bb2143178b 100644
--- a/osu.Game/Database/LegacyModelExporter.cs
+++ b/osu.Game/Database/LegacyExporter.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Database
     /// <summary>
     /// A class which handles exporting legacy user data of a single type from osu-stable.
     /// </summary>
-    public abstract class LegacyModelExporter<TModel>
+    public abstract class LegacyExporter<TModel>
         where TModel : RealmObject, IHasNamedFiles, IHasGuidPrimaryKey
     {
         /// <summary>
@@ -54,7 +54,7 @@ namespace osu.Game.Database
         /// Create a new exporter for each export, otherwise it will cause confusing notifications.
         /// </summary>
         /// <param name="storage">Storage for storing exported files. Basically it is used to provide export stream</param>
-        protected LegacyModelExporter(Storage storage)
+        protected LegacyExporter(Storage storage)
         {
             exportStorage = storage.GetStorageForDirectory(@"exports");
             UserFileStorage = storage.GetStorageForDirectory(@"files");
diff --git a/osu.Game/Database/LegacyScoreExporter.cs b/osu.Game/Database/LegacyScoreExporter.cs
index e7473c963b..927d36ea03 100644
--- a/osu.Game/Database/LegacyScoreExporter.cs
+++ b/osu.Game/Database/LegacyScoreExporter.cs
@@ -11,7 +11,7 @@ using osu.Game.Scoring;
 
 namespace osu.Game.Database
 {
-    public class LegacyScoreExporter : LegacyModelExporter<ScoreInfo>
+    public class LegacyScoreExporter : LegacyExporter<ScoreInfo>
     {
         public LegacyScoreExporter(Storage storage)
             : base(storage)

From 6a4933a31c0cd861925826dec4d13595399e4fe6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 May 2023 16:30:01 +0900
Subject: [PATCH 0344/1604] Remove need for `TestRealmLive` nonsense

---
 .../Database/LegacyModelExporterTest.cs       | 42 ++++++-------------
 1 file changed, 12 insertions(+), 30 deletions(-)

diff --git a/osu.Game.Tests/Database/LegacyModelExporterTest.cs b/osu.Game.Tests/Database/LegacyModelExporterTest.cs
index 1e9cdfd67d..09f776e8ea 100644
--- a/osu.Game.Tests/Database/LegacyModelExporterTest.cs
+++ b/osu.Game.Tests/Database/LegacyModelExporterTest.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Tests.Database
         [Test]
         public void ExportFileWithNormalNameTest()
         {
-            var item = new TestRealmObject(short_filename);
+            var item = new TestModel(short_filename);
 
             Assert.That(item.Filename.Length, Is.LessThan(TestLegacyModelExporter.MAX_FILENAME_LENGTH));
 
@@ -48,7 +48,7 @@ namespace osu.Game.Tests.Database
         [Test]
         public void ExportFileWithNormalNameMultipleTimesTest()
         {
-            var item = new TestRealmObject(short_filename);
+            var item = new TestModel(short_filename);
 
             Assert.That(item.Filename.Length, Is.LessThan(TestLegacyModelExporter.MAX_FILENAME_LENGTH));
 
@@ -66,7 +66,7 @@ namespace osu.Game.Tests.Database
             int expectedLength = TestLegacyModelExporter.MAX_FILENAME_LENGTH - (legacyExporter.GetExtension().Length);
             string expectedName = long_filename.Remove(expectedLength);
 
-            var item = new TestRealmObject(long_filename);
+            var item = new TestModel(long_filename);
 
             Assert.That(item.Filename.Length, Is.GreaterThan(TestLegacyModelExporter.MAX_FILENAME_LENGTH));
             exportItemAndAssert(item, expectedName);
@@ -78,7 +78,7 @@ namespace osu.Game.Tests.Database
             int expectedLength = TestLegacyModelExporter.MAX_FILENAME_LENGTH - (legacyExporter.GetExtension().Length);
             string expectedName = long_filename.Remove(expectedLength);
 
-            var item = new TestRealmObject(long_filename);
+            var item = new TestModel(long_filename);
 
             Assert.That(item.Filename.Length, Is.GreaterThan(TestLegacyModelExporter.MAX_FILENAME_LENGTH));
 
@@ -90,11 +90,11 @@ namespace osu.Game.Tests.Database
             }
         }
 
-        private void exportItemAndAssert(TestRealmObject item, string expectedName)
+        private void exportItemAndAssert(TestModel item, string expectedName)
         {
             Assert.DoesNotThrow(() =>
             {
-                Task t = Task.Run(() => legacyExporter.ExportAsync(new TestRealmLive(item)));
+                Task t = Task.Run(() => legacyExporter.ExportAsync(new RealmLiveUnmanaged<TestModel>(item)));
                 t.WaitSafely();
             });
             Assert.That(storage.Exists($"exports/{expectedName}{legacyExporter.GetExtension()}"), Is.True);
@@ -107,7 +107,7 @@ namespace osu.Game.Tests.Database
                 storage.Dispose();
         }
 
-        private class TestLegacyModelExporter : LegacyExporter<TestRealmObject>
+        private class TestLegacyModelExporter : LegacyExporter<TestModel>
         {
             public TestLegacyModelExporter(Storage storage)
                 : base(storage)
@@ -116,45 +116,27 @@ namespace osu.Game.Tests.Database
 
             public string GetExtension() => FileExtension;
 
-            protected override void ExportToStream(TestRealmObject model, Stream outputStream, ProgressNotification? notification, CancellationToken cancellationToken = default)
+            protected override void ExportToStream(TestModel model, Stream outputStream, ProgressNotification? notification, CancellationToken cancellationToken = default)
             {
             }
 
             protected override string FileExtension => ".test";
         }
 
-        private class TestRealmObject : RealmObject, IHasNamedFiles, IHasGuidPrimaryKey
+        private class TestModel : RealmObject, IHasNamedFiles, IHasGuidPrimaryKey
         {
-            public Guid ID => throw new NotImplementedException();
+            public Guid ID => Guid.Empty;
+
             public string Filename { get; }
 
             public IEnumerable<INamedFileUsage> Files { get; } = new List<INamedFileUsage>();
 
-            public TestRealmObject(string filename)
+            public TestModel(string filename)
             {
                 Filename = filename;
             }
 
             public override string ToString() => Filename;
         }
-
-        private class TestRealmLive : Live<TestRealmObject>
-        {
-            public override void PerformRead(Action<TestRealmObject> perform) => perform(Value);
-
-            public override TReturn PerformRead<TReturn>(Func<TestRealmObject, TReturn> perform) => perform(Value);
-
-            public override void PerformWrite(Action<TestRealmObject> perform) => throw new NotImplementedException();
-
-            public override bool IsManaged => throw new NotImplementedException();
-
-            public override TestRealmObject Value { get; }
-
-            public TestRealmLive(TestRealmObject model)
-                : base(Guid.Empty)
-            {
-                Value = model;
-            }
-        }
     }
 }

From f2dd457b3de9ae4c2cf66d259de86fa5e0f8ff6a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 May 2023 16:31:48 +0900
Subject: [PATCH 0345/1604] Remove unnecessary local variable

---
 osu.Game.Tests/Database/LegacyModelExporterTest.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Database/LegacyModelExporterTest.cs b/osu.Game.Tests/Database/LegacyModelExporterTest.cs
index 09f776e8ea..2169bc73cd 100644
--- a/osu.Game.Tests/Database/LegacyModelExporterTest.cs
+++ b/osu.Game.Tests/Database/LegacyModelExporterTest.cs
@@ -94,8 +94,7 @@ namespace osu.Game.Tests.Database
         {
             Assert.DoesNotThrow(() =>
             {
-                Task t = Task.Run(() => legacyExporter.ExportAsync(new RealmLiveUnmanaged<TestModel>(item)));
-                t.WaitSafely();
+                Task.Run(() => legacyExporter.ExportAsync(new RealmLiveUnmanaged<TestModel>(item))).WaitSafely();
             });
             Assert.That(storage.Exists($"exports/{expectedName}{legacyExporter.GetExtension()}"), Is.True);
         }

From 4ec98b0578869237d5cd60b7e27779740351ae1c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 May 2023 16:45:45 +0900
Subject: [PATCH 0346/1604] Improve xmldoc and fix silly progress text in
 `LegacyArchiveExporter`

---
 osu.Game/Database/LegacyArchiveExporter.cs | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Database/LegacyArchiveExporter.cs b/osu.Game/Database/LegacyArchiveExporter.cs
index d37f9a5dca..01d00b311d 100644
--- a/osu.Game/Database/LegacyArchiveExporter.cs
+++ b/osu.Game/Database/LegacyArchiveExporter.cs
@@ -17,6 +17,9 @@ using Logger = osu.Framework.Logging.Logger;
 
 namespace osu.Game.Database
 {
+    /// <summary>
+    /// An exporter which handles the common scenario of exporting a model to a zip-based archive, usually with a custom file extension.
+    /// </summary>
     public abstract class LegacyArchiveExporter<TModel> : LegacyExporter<TModel>
         where TModel : RealmObject, IHasNamedFiles, IHasGuidPrimaryKey
     {
@@ -31,17 +34,18 @@ namespace osu.Game.Database
         /// <summary>
         /// Exports an item to Stream as a legacy (.zip based) package.
         /// </summary>
-        /// <param name="model">The model will be exported.</param>
+        /// <param name="model">The model to be exported.</param>
         /// <param name="outputStream">The output stream to export to.</param>
-        /// <param name="notification">The notification will displayed to the user</param>
-        /// <param name="cancellationToken">The Cancellation token that can cancel the exporting.</param>
+        /// <param name="notification">An optional target notification to update with ongoing export progress.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
         private void exportZipArchive(TModel model, Stream outputStream, ProgressNotification? notification, CancellationToken cancellationToken = default)
         {
             try
             {
                 using var writer = new ZipWriter(outputStream, new ZipWriterOptions(CompressionType.Deflate));
 
-                float i = 0;
+                int i = 0;
+                int fileCount = model.Files.Count();
                 bool fileMissing = false;
 
                 foreach (var file in model.Files)
@@ -66,13 +70,12 @@ namespace osu.Game.Database
                         }
                     }
 
-                    i++;
-
                     if (notification != null)
                     {
-                        notification.Progress = i / model.Files.Count();
-                        notification.Text = $"Exporting... ({i}/{model.Files.Count()})";
+                        notification.Progress = (float)(i + 1) / fileCount;
                     }
+
+                    i++;
                 }
             }
             catch (ObjectDisposedException)

From 9cafb20fcbe650580d5d1bea6510319cf61e5a5a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 May 2023 16:50:05 +0900
Subject: [PATCH 0347/1604] Move file missing logging to a better location, and
 log actual filenames to logs

---
 osu.Game/Database/LegacyArchiveExporter.cs | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Database/LegacyArchiveExporter.cs b/osu.Game/Database/LegacyArchiveExporter.cs
index 01d00b311d..f148d6951d 100644
--- a/osu.Game/Database/LegacyArchiveExporter.cs
+++ b/osu.Game/Database/LegacyArchiveExporter.cs
@@ -54,20 +54,14 @@ namespace osu.Game.Database
 
                     using (var stream = UserFileStorage.GetStream(file.File.GetStoragePath()))
                     {
-                        // Sometimes we cannot find the file(probably deleted by the user), so we handle this and post a error.
                         if (stream == null)
                         {
-                            // Only pop up once to prevent spam.
-                            if (!fileMissing)
-                            {
-                                Logger.Log("Some of model files are missing, they will not be included in the archive", LoggingTarget.Database, LogLevel.Error);
-                                fileMissing = true;
-                            }
-                        }
-                        else
-                        {
-                            writer.Write(file.Filename, stream);
+                            Logger.Log($"File {file.Filename} is missing in local storage and will not be included in the export", LoggingTarget.Database);
+                            fileMissing = true;
+                            continue;
                         }
+
+                        writer.Write(file.Filename, stream);
                     }
 
                     if (notification != null)
@@ -77,6 +71,12 @@ namespace osu.Game.Database
 
                     i++;
                 }
+
+                // Only pop up once to prevent spam.
+                if (fileMissing)
+                {
+                    Logger.Log("Some of model files are missing, they will not be included in the archive", LoggingTarget.Database, LogLevel.Error);
+                }
             }
             catch (ObjectDisposedException)
             {

From fc2d2de34c3b20fb012dadde3bf029686f9005b7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 May 2023 16:53:27 +0900
Subject: [PATCH 0348/1604] Fix notification text not including export filename

---
 osu.Game/Database/LegacyExporter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Database/LegacyExporter.cs b/osu.Game/Database/LegacyExporter.cs
index bb2143178b..e5df2a4337 100644
--- a/osu.Game/Database/LegacyExporter.cs
+++ b/osu.Game/Database/LegacyExporter.cs
@@ -112,7 +112,7 @@ namespace osu.Game.Database
             ProgressNotification notification = new ProgressNotification
             {
                 State = ProgressNotificationState.Active,
-                Text = "Exporting...",
+                Text = $"Exporting {itemFilename}...",
             };
             PostNotification?.Invoke(notification);
 

From 4ccfebc02be0c0c1275d8ae76344f11d18be1a79 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 May 2023 21:01:10 +0900
Subject: [PATCH 0349/1604] Simplify `ExportToStreamAsync` implementation

---
 osu.Game/Database/LegacyExporter.cs | 27 ++-------------------------
 1 file changed, 2 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Database/LegacyExporter.cs b/osu.Game/Database/LegacyExporter.cs
index e5df2a4337..bc86420cd2 100644
--- a/osu.Game/Database/LegacyExporter.cs
+++ b/osu.Game/Database/LegacyExporter.cs
@@ -7,7 +7,6 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Extensions;
 using osu.Game.Overlays.Notifications;
@@ -159,30 +158,8 @@ namespace osu.Game.Database
         /// <param name="notification">The notification will displayed to the user</param>
         /// <param name="cancellationToken">The Cancellation token that can cancel the exporting.</param>
         /// <returns>Whether the export was successful</returns>
-        public Task<bool> ExportToStreamAsync(Live<TModel> model, Stream stream, ProgressNotification? notification = null, CancellationToken cancellationToken = default)
-        {
-            return Task.Run(() =>
-            {
-                model.PerformRead(s =>
-                {
-                    ExportToStream(s, stream, notification, cancellationToken);
-                });
-            }, cancellationToken).ContinueWith(t =>
-            {
-                if (cancellationToken.IsCancellationRequested)
-                {
-                    return false;
-                }
-
-                if (t.IsFaulted)
-                {
-                    Logger.Error(t.Exception, "An error occurred while exporting", LoggingTarget.Database);
-                    throw t.Exception!;
-                }
-
-                return true;
-            }, CancellationToken.None);
-        }
+        public Task ExportToStreamAsync(Live<TModel> model, Stream stream, ProgressNotification? notification = null, CancellationToken cancellationToken = default) =>
+            Task.Run(() => { model.PerformRead(s => ExportToStream(s, stream, notification, cancellationToken)); }, cancellationToken);
 
         /// <summary>
         /// Exports model to Stream.

From 2a3e03695cad820002999e420797de7a0faf4cba Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 May 2023 21:04:13 +0900
Subject: [PATCH 0350/1604] Simplify `ExportAsync`, remove weird dedupe logic
 and unnecessary return `success` code

---
 osu.Game/Database/LegacyExporter.cs | 60 ++++++++---------------------
 1 file changed, 15 insertions(+), 45 deletions(-)

diff --git a/osu.Game/Database/LegacyExporter.cs b/osu.Game/Database/LegacyExporter.cs
index bc86420cd2..a8d2fb116c 100644
--- a/osu.Game/Database/LegacyExporter.cs
+++ b/osu.Game/Database/LegacyExporter.cs
@@ -45,9 +45,6 @@ namespace osu.Game.Database
 
         public Action<Notification>? PostNotification { get; set; }
 
-        // Store the model being exporting.
-        private static readonly List<Live<TModel>> exporting_models = new List<Live<TModel>>();
-
         /// <summary>
         /// Construct exporter.
         /// Create a new exporter for each export, otherwise it will cause confusing notifications.
@@ -69,10 +66,8 @@ namespace osu.Game.Database
         /// If specified CancellationToken, then use it. Otherwise use PostNotification's CancellationToken.
         /// </param>
         /// <returns></returns>
-        public Task<bool> ExportAsync(TModel model, RealmAccess realm, CancellationToken cancellationToken = default)
-        {
-            return ExportAsync(model.ToLive(realm), cancellationToken);
-        }
+        public Task ExportAsync(TModel model, RealmAccess realm, CancellationToken cancellationToken = default) =>
+            ExportAsync(model.ToLive(realm), cancellationToken);
 
         /// <summary>
         /// Export the model to default folder.
@@ -83,71 +78,46 @@ namespace osu.Game.Database
         /// If specified CancellationToken, then use it. Otherwise use PostNotification's CancellationToken.
         /// </param>
         /// <returns></returns>
-        public async Task<bool> ExportAsync(Live<TModel> model, CancellationToken cancellationToken = default)
+        public async Task ExportAsync(Live<TModel> model, CancellationToken cancellationToken = default)
         {
-            // check if the model is being exporting already
-            if (!exporting_models.Contains(model))
-            {
-                exporting_models.Add(model);
-            }
-            else
-            {
-                // model is being exported
-                return false;
-            }
-
             string itemFilename = model.PerformRead(s => GetFilename(s).GetValidFilename());
 
             if (itemFilename.Length > MAX_FILENAME_LENGTH - FileExtension.Length)
                 itemFilename = itemFilename.Remove(MAX_FILENAME_LENGTH - FileExtension.Length);
 
-            IEnumerable<string> existingExports =
-                exportStorage
-                    .GetFiles(string.Empty, $"{itemFilename}*{FileExtension}")
-                    .Concat(exportStorage.GetDirectories(string.Empty));
+            IEnumerable<string> existingExports = exportStorage
+                                                  .GetFiles(string.Empty, $"{itemFilename}*{FileExtension}")
+                                                  .Concat(exportStorage.GetDirectories(string.Empty));
+
             string filename = NamingUtils.GetNextBestFilename(existingExports, $"{itemFilename}{FileExtension}");
-            bool success;
 
             ProgressNotification notification = new ProgressNotification
             {
                 State = ProgressNotificationState.Active,
                 Text = $"Exporting {itemFilename}...",
             };
+
             PostNotification?.Invoke(notification);
 
             try
             {
                 using (var stream = exportStorage.CreateFileSafely(filename))
                 {
-                    success = await ExportToStreamAsync(model, stream, notification,
-                        cancellationToken == CancellationToken.None ? notification.CancellationToken : cancellationToken).ConfigureAwait(false);
+                    await ExportToStreamAsync(model, stream, notification, cancellationToken == CancellationToken.None ? notification.CancellationToken : cancellationToken).ConfigureAwait(false);
                 }
             }
             catch
             {
                 notification.State = ProgressNotificationState.Cancelled;
+
+                // cleanup if export is failed or canceled.
+                exportStorage.Delete(filename);
                 throw;
             }
-            finally
-            {
-                // Determines whether to export repeatedly, so he must be removed from the list at the end whether there is a error.
-                exporting_models.Remove(model);
-            }
 
-            // cleanup if export is failed or canceled.
-            if (!success)
-            {
-                notification.State = ProgressNotificationState.Cancelled;
-                exportStorage.Delete(filename);
-            }
-            else
-            {
-                notification.CompletionText = $"Exported {itemFilename}! Click to view.";
-                notification.CompletionClickAction = () => exportStorage.PresentFileExternally(filename);
-                notification.State = ProgressNotificationState.Completed;
-            }
-
-            return success;
+            notification.CompletionText = $"Exported {itemFilename}! Click to view.";
+            notification.CompletionClickAction = () => exportStorage.PresentFileExternally(filename);
+            notification.State = ProgressNotificationState.Completed;
         }
 
         /// <summary>

From 5d78561aa36fb6dd2cbbdec343b7fcbb63c10683 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 May 2023 21:05:57 +0900
Subject: [PATCH 0351/1604] Remove weird catch logic

---
 osu.Game/Database/LegacyArchiveExporter.cs | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/osu.Game/Database/LegacyArchiveExporter.cs b/osu.Game/Database/LegacyArchiveExporter.cs
index f148d6951d..306ac5f6a4 100644
--- a/osu.Game/Database/LegacyArchiveExporter.cs
+++ b/osu.Game/Database/LegacyArchiveExporter.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
 using System.IO;
 using System.Linq;
 using System.Threading;
@@ -40,10 +39,8 @@ namespace osu.Game.Database
         /// <param name="cancellationToken">The cancellation token.</param>
         private void exportZipArchive(TModel model, Stream outputStream, ProgressNotification? notification, CancellationToken cancellationToken = default)
         {
-            try
+            using (var writer = new ZipWriter(outputStream, new ZipWriterOptions(CompressionType.Deflate)))
             {
-                using var writer = new ZipWriter(outputStream, new ZipWriterOptions(CompressionType.Deflate));
-
                 int i = 0;
                 int fileCount = model.Files.Count();
                 bool fileMissing = false;
@@ -78,14 +75,6 @@ namespace osu.Game.Database
                     Logger.Log("Some of model files are missing, they will not be included in the archive", LoggingTarget.Database, LogLevel.Error);
                 }
             }
-            catch (ObjectDisposedException)
-            {
-                // outputStream may close before writing when request cancel.
-                if (cancellationToken.IsCancellationRequested)
-                    return;
-
-                throw;
-            }
         }
     }
 }

From 747f912af5d49ffe56cd1a1cca75b0b42d86bf06 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 May 2023 21:08:01 +0900
Subject: [PATCH 0352/1604] Fix incorrect cancellation logic

---
 osu.Game/Database/LegacyExporter.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Database/LegacyExporter.cs b/osu.Game/Database/LegacyExporter.cs
index a8d2fb116c..906e2083ff 100644
--- a/osu.Game/Database/LegacyExporter.cs
+++ b/osu.Game/Database/LegacyExporter.cs
@@ -99,11 +99,13 @@ namespace osu.Game.Database
 
             PostNotification?.Invoke(notification);
 
+            using var linkedSource = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, notification.CancellationToken);
+
             try
             {
                 using (var stream = exportStorage.CreateFileSafely(filename))
                 {
-                    await ExportToStreamAsync(model, stream, notification, cancellationToken == CancellationToken.None ? notification.CancellationToken : cancellationToken).ConfigureAwait(false);
+                    await ExportToStreamAsync(model, stream, notification, linkedSource.Token).ConfigureAwait(false);
                 }
             }
             catch

From 490df8073ca1f0950f7f22dda30317ac1ae82003 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 May 2023 21:15:26 +0900
Subject: [PATCH 0353/1604] Fix one incorrect namespace syntax file

---
 .../Objects/Types/IHasSliderVelocity.cs       | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.cs b/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.cs
index c0ac5036ee..80fd8dd8dc 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.cs
@@ -3,17 +3,18 @@
 
 using osu.Framework.Bindables;
 
-namespace osu.Game.Rulesets.Objects.Types;
-
-/// <summary>
-/// A HitObject that has a slider velocity multiplier.
-/// </summary>
-public interface IHasSliderVelocity
+namespace osu.Game.Rulesets.Objects.Types
 {
     /// <summary>
-    /// The slider velocity multiplier.
+    /// A HitObject that has a slider velocity multiplier.
     /// </summary>
-    double SliderVelocity { get; set; }
+    public interface IHasSliderVelocity
+    {
+        /// <summary>
+        /// The slider velocity multiplier.
+        /// </summary>
+        double SliderVelocity { get; set; }
 
-    BindableNumber<double> SliderVelocityBindable { get; }
+        BindableNumber<double> SliderVelocityBindable { get; }
+    }
 }

From 4393e53b4310cc30d9301095cdbcfe3cd2dc7fcb Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Fri, 5 May 2023 21:28:43 +0900
Subject: [PATCH 0354/1604] ExportToStream should be public

---
 osu.Game.Tests/Database/LegacyModelExporterTest.cs | 2 +-
 osu.Game/Database/LegacyArchiveExporter.cs         | 2 +-
 osu.Game/Database/LegacyExporter.cs                | 2 +-
 osu.Game/Database/LegacyScoreExporter.cs           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Database/LegacyModelExporterTest.cs b/osu.Game.Tests/Database/LegacyModelExporterTest.cs
index 2169bc73cd..0c4b0cc9c4 100644
--- a/osu.Game.Tests/Database/LegacyModelExporterTest.cs
+++ b/osu.Game.Tests/Database/LegacyModelExporterTest.cs
@@ -115,7 +115,7 @@ namespace osu.Game.Tests.Database
 
             public string GetExtension() => FileExtension;
 
-            protected override void ExportToStream(TestModel model, Stream outputStream, ProgressNotification? notification, CancellationToken cancellationToken = default)
+            public override void ExportToStream(TestModel model, Stream outputStream, ProgressNotification? notification, CancellationToken cancellationToken = default)
             {
             }
 
diff --git a/osu.Game/Database/LegacyArchiveExporter.cs b/osu.Game/Database/LegacyArchiveExporter.cs
index 306ac5f6a4..1afa19a162 100644
--- a/osu.Game/Database/LegacyArchiveExporter.cs
+++ b/osu.Game/Database/LegacyArchiveExporter.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Database
         {
         }
 
-        protected override void ExportToStream(TModel model, Stream outputStream, ProgressNotification? notification, CancellationToken cancellationToken = default)
+        public override void ExportToStream(TModel model, Stream outputStream, ProgressNotification? notification, CancellationToken cancellationToken = default)
             => exportZipArchive(model, outputStream, notification, cancellationToken);
 
         /// <summary>
diff --git a/osu.Game/Database/LegacyExporter.cs b/osu.Game/Database/LegacyExporter.cs
index 906e2083ff..3b24ab4f4a 100644
--- a/osu.Game/Database/LegacyExporter.cs
+++ b/osu.Game/Database/LegacyExporter.cs
@@ -140,6 +140,6 @@ namespace osu.Game.Database
         /// <param name="outputStream">The output stream to export to.</param>
         /// <param name="notification">The notification will displayed to the user</param>
         /// <param name="cancellationToken">The Cancellation token that can cancel the exporting.</param>
-        protected abstract void ExportToStream(TModel model, Stream outputStream, ProgressNotification? notification, CancellationToken cancellationToken = default);
+        public abstract void ExportToStream(TModel model, Stream outputStream, ProgressNotification? notification, CancellationToken cancellationToken = default);
     }
 }
diff --git a/osu.Game/Database/LegacyScoreExporter.cs b/osu.Game/Database/LegacyScoreExporter.cs
index 927d36ea03..fe5d1e8b47 100644
--- a/osu.Game/Database/LegacyScoreExporter.cs
+++ b/osu.Game/Database/LegacyScoreExporter.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Database
 
         protected override string FileExtension => ".osr";
 
-        protected override void ExportToStream(ScoreInfo model, Stream stream, ProgressNotification? notification, CancellationToken cancellationToken = default)
+        public override void ExportToStream(ScoreInfo model, Stream stream, ProgressNotification? notification, CancellationToken cancellationToken = default)
         {
             var file = model.Files.SingleOrDefault();
             if (file == null)

From 71864fbb932b980931033d2e8808d90a569d2a7c Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Fri, 5 May 2023 21:29:06 +0900
Subject: [PATCH 0355/1604] remove meanless comment

---
 osu.Game/Database/LegacyArchiveExporter.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Database/LegacyArchiveExporter.cs b/osu.Game/Database/LegacyArchiveExporter.cs
index 1afa19a162..19ccc13a29 100644
--- a/osu.Game/Database/LegacyArchiveExporter.cs
+++ b/osu.Game/Database/LegacyArchiveExporter.cs
@@ -69,7 +69,6 @@ namespace osu.Game.Database
                     i++;
                 }
 
-                // Only pop up once to prevent spam.
                 if (fileMissing)
                 {
                     Logger.Log("Some of model files are missing, they will not be included in the archive", LoggingTarget.Database, LogLevel.Error);

From f536238554873f27cd8424e0a3547032b3c1e737 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 5 May 2023 20:30:50 +0200
Subject: [PATCH 0356/1604] Use shorter copy

---
 .../Edit/Compose/Components/Timeline/DifficultyPointPiece.cs    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
index 9192913fa0..e737d6b0ce 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
@@ -165,7 +165,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             double? modeSliderVelocity = sliderVelocities.GroupBy(v => v).MaxBy(v => v.Count())?.Key;
             double? medianSliderVelocity = sliderVelocities[sliderVelocities.Length / 2];
 
-            AddHeader("Beatmap average velocity");
+            AddHeader("Average velocity");
             AddValue($"{medianSliderVelocity:#,0.00}x");
 
             AddHeader("Most used velocity");

From e808a47811d0027f82037cbc5d58b0c7117cffba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 5 May 2023 20:33:27 +0200
Subject: [PATCH 0357/1604] Fix delegate leak

---
 .../Compose/Components/Timeline/DifficultyPointPiece.cs   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
index e737d6b0ce..13a1c30cfe 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
@@ -174,5 +174,13 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             AddHeader("Velocity range");
             AddValue($"{sliderVelocities.First():#,0.00}x - {sliderVelocities.Last():#,0.00}x");
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            EditorBeatmap.TransactionBegan -= updateInspectorText;
+            EditorBeatmap.TransactionEnded -= updateInspectorText;
+        }
     }
 }

From 7422b5285ce8e9631111c20ab9a1baf40d81152a Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Fri, 5 May 2023 22:41:30 +0300
Subject: [PATCH 0358/1604] Fix wrong filtering in testing

---
 .../UserInterface/TestSceneModColumn.cs       |  2 +-
 .../TestSceneModSelectOverlay.cs              | 12 ++++----
 osu.Game/Overlays/Mods/ModColumn.cs           |  3 +-
 osu.Game/Overlays/Mods/ModPanel.cs            | 30 +++++++++++++++++--
 osu.Game/Overlays/Mods/ModState.cs            |  5 ++++
 osu.Game/Overlays/Mods/SelectAllModsButton.cs |  2 +-
 6 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs
index ec6084aa8e..2ae95a3a09 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs
@@ -291,7 +291,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         private void setFilter(Func<Mod, bool>? filter)
         {
             foreach (var modState in this.ChildrenOfType<ModColumn>().Single().AvailableMods)
-                modState.MatchingFilter.Value = filter?.Invoke(modState.Mod) == false;
+                modState.MatchingFilter.Value = filter?.Invoke(modState.Mod) ?? true;
         }
 
         private partial class TestModColumn : ModColumn
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 9c6ec653e9..006a6abbc2 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -431,15 +431,15 @@ namespace osu.Game.Tests.Visual.UserInterface
             createScreen();
             changeRuleset(0);
 
-            AddAssert("double time visible", () => modSelectOverlay.ChildrenOfType<ModPanel>().Where(panel => panel.Mod is OsuModDoubleTime).Any(panel => panel.MatchingFilter));
+            AddAssert("double time visible", () => modSelectOverlay.ChildrenOfType<ModPanel>().Where(panel => panel.Mod is OsuModDoubleTime).Any(panel => panel.IsValid));
 
             AddStep("make double time invalid", () => modSelectOverlay.IsValidMod = m => !(m is OsuModDoubleTime));
-            AddUntilStep("double time not visible", () => modSelectOverlay.ChildrenOfType<ModPanel>().Where(panel => panel.Mod is OsuModDoubleTime).All(panel => !panel.MatchingFilter));
-            AddAssert("nightcore still visible", () => modSelectOverlay.ChildrenOfType<ModPanel>().Where(panel => panel.Mod is OsuModNightcore).Any(panel => panel.MatchingFilter));
+            AddUntilStep("double time not visible", () => modSelectOverlay.ChildrenOfType<ModPanel>().Where(panel => panel.Mod is OsuModDoubleTime).All(panel => !panel.IsValid));
+            AddAssert("nightcore still visible", () => modSelectOverlay.ChildrenOfType<ModPanel>().Where(panel => panel.Mod is OsuModNightcore).Any(panel => panel.IsValid));
 
             AddStep("make double time valid again", () => modSelectOverlay.IsValidMod = _ => true);
-            AddUntilStep("double time visible", () => modSelectOverlay.ChildrenOfType<ModPanel>().Where(panel => panel.Mod is OsuModDoubleTime).Any(panel => panel.MatchingFilter));
-            AddAssert("nightcore still visible", () => modSelectOverlay.ChildrenOfType<ModPanel>().Where(b => b.Mod is OsuModNightcore).Any(panel => panel.MatchingFilter));
+            AddUntilStep("double time visible", () => modSelectOverlay.ChildrenOfType<ModPanel>().Where(panel => panel.Mod is OsuModDoubleTime).Any(panel => panel.IsValid));
+            AddAssert("nightcore still visible", () => modSelectOverlay.ChildrenOfType<ModPanel>().Where(b => b.Mod is OsuModNightcore).Any(panel => panel.IsValid));
         }
 
         [Test]
@@ -465,7 +465,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("set ruleset", () => Ruleset.Value = testRuleset.RulesetInfo);
             waitForColumnLoad();
 
-            AddAssert("unimplemented mod panel is filtered", () => !getPanelForMod(typeof(TestUnimplementedMod)).MatchingFilter);
+            AddAssert("unimplemented mod panel is filtered", () => !getPanelForMod(typeof(TestUnimplementedMod)).IsValid);
         }
 
         [Test]
diff --git a/osu.Game/Overlays/Mods/ModColumn.cs b/osu.Game/Overlays/Mods/ModColumn.cs
index 5da57ee4ed..c8822d78fd 100644
--- a/osu.Game/Overlays/Mods/ModColumn.cs
+++ b/osu.Game/Overlays/Mods/ModColumn.cs
@@ -47,6 +47,7 @@ namespace osu.Game.Overlays.Mods
                 {
                     mod.Active.BindValueChanged(_ => updateState());
                     mod.MatchingFilter.BindValueChanged(_ => updateState());
+                    mod.ValidForSelection.BindValueChanged(_ => updateState());
                 }
 
                 updateState();
@@ -145,7 +146,7 @@ namespace osu.Game.Overlays.Mods
 
         private void updateState()
         {
-            Alpha = availableMods.All(mod => !mod.MatchingFilter.Value) ? 0 : 1;
+            Alpha = availableMods.All(mod => !mod.MatchingFilter.Value || !mod.ValidForSelection.Value) ? 0 : 1;
 
             if (toggleAllCheckbox != null && !SelectionAnimationRunning)
             {
diff --git a/osu.Game/Overlays/Mods/ModPanel.cs b/osu.Game/Overlays/Mods/ModPanel.cs
index a5ff52dfd2..cd94226d8f 100644
--- a/osu.Game/Overlays/Mods/ModPanel.cs
+++ b/osu.Game/Overlays/Mods/ModPanel.cs
@@ -56,7 +56,8 @@ namespace osu.Game.Overlays.Mods
         {
             base.LoadComplete();
 
-            canBeShown.BindTo(modState.ValidForSelection);
+            modState.ValidForSelection.BindValueChanged(_ => updateFilterState());
+            modState.MatchingFilter.BindValueChanged(_ => updateFilterState(), true);
         }
 
         protected override void Select()
@@ -71,6 +72,23 @@ namespace osu.Game.Overlays.Mods
             Active.Value = false;
         }
 
+        /// <summary>
+        /// Determine if <see cref="ModPanel"/> is valid and can be shown
+        /// </summary>
+        public bool IsValid => modState.IsValid;
+
+        public bool ValidForSelection
+        {
+            get => modState.ValidForSelection.Value;
+            set
+            {
+                if (modState.ValidForSelection.Value == value)
+                    return;
+
+                modState.ValidForSelection.Value = value;
+            }
+        }
+
         #region Filtering support
 
         public override IEnumerable<LocalisableString> FilterTerms => new[]
@@ -89,13 +107,21 @@ namespace osu.Game.Overlays.Mods
                     return;
 
                 modState.MatchingFilter.Value = value;
-                this.FadeTo(value ? 1 : 0);
             }
         }
 
+        /// <summary>
+        /// This property is always <see langword="true"/> because it affects search result
+        /// </summary>
         private readonly BindableBool canBeShown = new BindableBool(true);
+
         IBindable<bool> IConditionalFilterable.CanBeShown => canBeShown;
 
+        private void updateFilterState()
+        {
+            this.FadeTo(IsValid ? 1 : 0);
+        }
+
         #endregion
     }
 }
diff --git a/osu.Game/Overlays/Mods/ModState.cs b/osu.Game/Overlays/Mods/ModState.cs
index 35b264fe71..be770ec937 100644
--- a/osu.Game/Overlays/Mods/ModState.cs
+++ b/osu.Game/Overlays/Mods/ModState.cs
@@ -38,6 +38,11 @@ namespace osu.Game.Overlays.Mods
         /// </summary>
         public BindableBool ValidForSelection { get; } = new BindableBool(true);
 
+        /// <summary>
+        /// Determine if <see cref="Mod"/> is valid and can be shown
+        /// </summary>
+        public bool IsValid => MatchingFilter.Value && ValidForSelection.Value;
+
         /// <summary>
         /// Whether the mod is matching the current filter, i.e. it is available for user selection.
         /// </summary>
diff --git a/osu.Game/Overlays/Mods/SelectAllModsButton.cs b/osu.Game/Overlays/Mods/SelectAllModsButton.cs
index 212563de7d..dad4f7b629 100644
--- a/osu.Game/Overlays/Mods/SelectAllModsButton.cs
+++ b/osu.Game/Overlays/Mods/SelectAllModsButton.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Overlays.Mods
         {
             Enabled.Value = availableMods.Value
                                          .SelectMany(pair => pair.Value)
-                                         .Any(modState => !modState.Active.Value && !modState.MatchingFilter.Value);
+                                         .Any(modState => !modState.Active.Value && modState.IsValid);
         }
 
         public bool OnPressed(KeyBindingPressEvent<PlatformAction> e)

From a226caff560afc897e3c596e08a0fcfa74b6a3a0 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Sat, 6 May 2023 11:09:44 +0300
Subject: [PATCH 0359/1604] Fix testing

---
 .../TestSceneMultiplayerMatchSubScreen.cs          |  2 +-
 .../Visual/UserInterface/TestSceneModColumn.cs     | 14 +++++++-------
 .../Overlays/Mods/Input/ClassicModHotkeyHandler.cs |  2 +-
 .../Mods/Input/SequentialModHotkeyHandler.cs       |  2 +-
 osu.Game/Overlays/Mods/ModColumn.cs                |  8 ++++----
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
index 8fd16fb723..40acea475b 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
@@ -203,7 +203,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddUntilStep("mod select contains only double time mod",
                 () => this.ChildrenOfType<RoomSubScreen>().Single().UserModsSelectOverlay
                           .ChildrenOfType<ModPanel>()
-                          .SingleOrDefault(panel => panel.MatchingFilter)?.Mod is OsuModDoubleTime);
+                          .SingleOrDefault(panel => panel.IsValid)?.Mod is OsuModDoubleTime);
         }
 
         [Test]
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs
index 2ae95a3a09..fc1db3c644 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs
@@ -106,26 +106,26 @@ namespace osu.Game.Tests.Visual.UserInterface
             });
 
             AddStep("set filter", () => setFilter(mod => mod.Name.Contains("Wind", StringComparison.CurrentCultureIgnoreCase)));
-            AddUntilStep("two panels visible", () => column.ChildrenOfType<ModPanel>().Count(panel => panel.MatchingFilter) == 2);
+            AddUntilStep("two panels visible", () => column.ChildrenOfType<ModPanel>().Count(panel => panel.IsValid) == 2);
 
             clickToggle();
             AddUntilStep("wait for animation", () => !column.SelectionAnimationRunning);
-            AddAssert("only visible items selected", () => column.ChildrenOfType<ModPanel>().Where(panel => panel.Active.Value).All(panel => panel.MatchingFilter));
+            AddAssert("only visible items selected", () => column.ChildrenOfType<ModPanel>().Where(panel => panel.Active.Value).All(panel => panel.IsValid));
 
             AddStep("unset filter", () => setFilter(null));
-            AddUntilStep("all panels visible", () => column.ChildrenOfType<ModPanel>().All(panel => panel.MatchingFilter));
+            AddUntilStep("all panels visible", () => column.ChildrenOfType<ModPanel>().All(panel => panel.IsValid));
             AddAssert("checkbox not selected", () => !column.ChildrenOfType<OsuCheckbox>().Single().Current.Value);
 
             AddStep("set filter", () => setFilter(mod => mod.Name.Contains("Wind", StringComparison.CurrentCultureIgnoreCase)));
-            AddUntilStep("two panels visible", () => column.ChildrenOfType<ModPanel>().Count(panel => panel.MatchingFilter) == 2);
+            AddUntilStep("two panels visible", () => column.ChildrenOfType<ModPanel>().Count(panel => panel.IsValid) == 2);
             AddAssert("checkbox selected", () => column.ChildrenOfType<OsuCheckbox>().Single().Current.Value);
 
             AddStep("filter out everything", () => setFilter(_ => false));
-            AddUntilStep("no panels visible", () => column.ChildrenOfType<ModPanel>().All(panel => !panel.MatchingFilter));
+            AddUntilStep("no panels visible", () => column.ChildrenOfType<ModPanel>().All(panel => !panel.IsValid));
             AddUntilStep("checkbox hidden", () => !column.ChildrenOfType<OsuCheckbox>().Single().IsPresent);
 
             AddStep("inset filter", () => setFilter(null));
-            AddUntilStep("all panels visible", () => column.ChildrenOfType<ModPanel>().All(panel => panel.MatchingFilter));
+            AddUntilStep("all panels visible", () => column.ChildrenOfType<ModPanel>().All(panel => panel.IsValid));
             AddUntilStep("checkbox visible", () => column.ChildrenOfType<OsuCheckbox>().Single().IsPresent);
 
             void clickToggle() => AddStep("click toggle", () =>
@@ -291,7 +291,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         private void setFilter(Func<Mod, bool>? filter)
         {
             foreach (var modState in this.ChildrenOfType<ModColumn>().Single().AvailableMods)
-                modState.MatchingFilter.Value = filter?.Invoke(modState.Mod) ?? true;
+                modState.ValidForSelection.Value = filter?.Invoke(modState.Mod) ?? true;
         }
 
         private partial class TestModColumn : ModColumn
diff --git a/osu.Game/Overlays/Mods/Input/ClassicModHotkeyHandler.cs b/osu.Game/Overlays/Mods/Input/ClassicModHotkeyHandler.cs
index 566e741880..343f7242f1 100644
--- a/osu.Game/Overlays/Mods/Input/ClassicModHotkeyHandler.cs
+++ b/osu.Game/Overlays/Mods/Input/ClassicModHotkeyHandler.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Overlays.Mods.Input
             if (!mod_type_lookup.TryGetValue(e.Key, out var typesToMatch))
                 return false;
 
-            var matchingMods = availableMods.Where(modState => matches(modState, typesToMatch) && modState.MatchingFilter.Value).ToArray();
+            var matchingMods = availableMods.Where(modState => matches(modState, typesToMatch) && modState.IsValid).ToArray();
 
             if (matchingMods.Length == 0)
                 return false;
diff --git a/osu.Game/Overlays/Mods/Input/SequentialModHotkeyHandler.cs b/osu.Game/Overlays/Mods/Input/SequentialModHotkeyHandler.cs
index b4ec8ad4c8..cbfa96307d 100644
--- a/osu.Game/Overlays/Mods/Input/SequentialModHotkeyHandler.cs
+++ b/osu.Game/Overlays/Mods/Input/SequentialModHotkeyHandler.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Overlays.Mods.Input
             if (index < 0)
                 return false;
 
-            var modState = availableMods.Where(modState => modState.MatchingFilter.Value).ElementAtOrDefault(index);
+            var modState = availableMods.Where(modState => modState.IsValid).ElementAtOrDefault(index);
             if (modState == null)
                 return false;
 
diff --git a/osu.Game/Overlays/Mods/ModColumn.cs b/osu.Game/Overlays/Mods/ModColumn.cs
index c8822d78fd..b53e621759 100644
--- a/osu.Game/Overlays/Mods/ModColumn.cs
+++ b/osu.Game/Overlays/Mods/ModColumn.cs
@@ -146,12 +146,12 @@ namespace osu.Game.Overlays.Mods
 
         private void updateState()
         {
-            Alpha = availableMods.All(mod => !mod.MatchingFilter.Value || !mod.ValidForSelection.Value) ? 0 : 1;
+            Alpha = availableMods.All(mod => !mod.IsValid) ? 0 : 1;
 
             if (toggleAllCheckbox != null && !SelectionAnimationRunning)
             {
-                toggleAllCheckbox.Alpha = availableMods.Any(panel => panel.MatchingFilter.Value) ? 1 : 0;
-                toggleAllCheckbox.Current.Value = availableMods.Where(panel => panel.MatchingFilter.Value).All(panel => panel.Active.Value);
+                toggleAllCheckbox.Alpha = availableMods.Any(panel => panel.IsValid) ? 1 : 0;
+                toggleAllCheckbox.Current.Value = availableMods.Where(panel => panel.IsValid).All(panel => panel.Active.Value);
             }
         }
 
@@ -196,7 +196,7 @@ namespace osu.Game.Overlays.Mods
         {
             pendingSelectionOperations.Clear();
 
-            foreach (var button in availableMods.Where(b => !b.Active.Value && b.MatchingFilter.Value))
+            foreach (var button in availableMods.Where(b => !b.Active.Value && b.IsValid))
                 pendingSelectionOperations.Enqueue(() => button.Active.Value = true);
         }
 

From cbb9f0100e2dad808ae7309d74b8f3bb701aa5d1 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Sat, 6 May 2023 11:27:06 +0300
Subject: [PATCH 0360/1604] Update `PopIn` and `PopOut` filtering. Expose
 `SearchTerm`

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index d2af305d68..cb8eddca62 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -64,6 +64,21 @@ namespace osu.Game.Overlays.Mods
             }
         }
 
+        /// <summary>
+        /// Search term applied on mod overlay
+        /// </summary>
+        public string SearchTerm
+        {
+            get => searchTextBox.Current.Value;
+            set
+            {
+                if (searchTextBox.Current.Value == value)
+                    return;
+
+                searchTextBox.Current.Value = value;
+            }
+        }
+
         /// <summary>
         /// Whether the total score multiplier calculated from the current selected set of mods should be shown.
         /// </summary>
@@ -494,7 +509,7 @@ namespace osu.Game.Overlays.Mods
             {
                 var column = columnFlow[i].Column;
 
-                bool allFiltered = column is ModColumn modColumn && modColumn.AvailableMods.All(modState => !modState.MatchingFilter.Value);
+                bool allFiltered = column is ModColumn modColumn && modColumn.AvailableMods.All(modState => !modState.IsValid);
 
                 double delay = allFiltered ? 0 : nonFilteredColumnCount * 30;
                 double duration = allFiltered ? 0 : fade_in_duration;
@@ -556,7 +571,7 @@ namespace osu.Game.Overlays.Mods
 
                 if (column is ModColumn modColumn)
                 {
-                    allFiltered = modColumn.AvailableMods.All(modState => !modState.MatchingFilter.Value);
+                    allFiltered = modColumn.AvailableMods.All(modState => !modState.IsValid);
                     modColumn.FlushPendingSelections();
                 }
 

From 5aca3a78dac91fb940d3ccdf82e077db374f708a Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Sat, 6 May 2023 12:21:32 +0300
Subject: [PATCH 0361/1604] Add basic tests for external search

---
 .../UserInterface/TestSceneModColumn.cs       | 43 ++++++++++++
 .../TestSceneModSelectOverlay.cs              | 65 +++++++++++++++++--
 2 files changed, 101 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs
index fc1db3c644..394a38fe5d 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs
@@ -288,6 +288,49 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("no change", () => this.ChildrenOfType<ModPanel>().Count(panel => panel.Active.Value) == 2);
         }
 
+        [Test]
+        public void TestApplySearchTerms()
+        {
+            Mod hidden = getExampleModsFor(ModType.DifficultyIncrease).Where(modState => modState.Mod is ModHidden).Select(modState => modState.Mod).Single();
+
+            ModColumn column = null!;
+            AddStep("create content", () => Child = new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Padding = new MarginPadding(30),
+                Child = column = new ModColumn(ModType.DifficultyIncrease, false)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    AvailableMods = getExampleModsFor(ModType.DifficultyIncrease)
+                }
+            });
+
+            applySearchAndAssert(hidden.Name);
+
+            clearSearch();
+
+            applySearchAndAssert(hidden.Acronym);
+
+            clearSearch();
+
+            applySearchAndAssert(hidden.Description.ToString());
+
+            void applySearchAndAssert(string searchTerm)
+            {
+                AddStep("search by mod name", () => column.SearchTerm = searchTerm);
+
+                AddAssert("only hidden is visible", () => column.ChildrenOfType<ModPanel>().Where(panel => panel.IsValid).All(panel => panel.Mod is ModHidden));
+            }
+
+            void clearSearch()
+            {
+                AddStep("clear search", () => column.SearchTerm = string.Empty);
+
+                AddAssert("all mods are visible", () => column.ChildrenOfType<ModPanel>().All(panel => panel.IsValid));
+            }
+        }
+
         private void setFilter(Func<Mod, bool>? filter)
         {
             foreach (var modState in this.ChildrenOfType<ModColumn>().Single().AvailableMods)
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 006a6abbc2..e8a835a330 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -521,8 +521,11 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("mod select hidden", () => modSelectOverlay.State.Value == Visibility.Hidden);
         }
 
+        /// <summary>
+        /// Internal search applies from code by setting <see cref="ModSelectOverlay.IsValidMod"/>
+        /// </summary>
         [Test]
-        public void TestColumnHiding()
+        public void TestColumnHidingOnInternalSearch()
         {
             AddStep("create screen", () => Child = modSelectOverlay = new TestModSelectOverlay
             {
@@ -551,6 +554,56 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddUntilStep("3 columns visible", () => this.ChildrenOfType<ModColumn>().Count(col => col.IsPresent) == 3);
         }
 
+        /// <summary>
+        /// External search applies by user by entering search term into search bar
+        /// </summary>
+        [Test]
+        public void TestColumnHidingOnExternalSearch()
+        {
+            AddStep("create screen", () => Child = modSelectOverlay = new TestModSelectOverlay
+            {
+                RelativeSizeAxes = Axes.Both,
+                State = { Value = Visibility.Visible },
+                SelectedMods = { BindTarget = SelectedMods }
+            });
+            waitForColumnLoad();
+            changeRuleset(0);
+
+            AddAssert("all columns visible", () => this.ChildrenOfType<ModColumn>().All(col => col.IsPresent));
+
+            AddStep("set search", () => modSelectOverlay.SearchTerm = "HD");
+            AddAssert("one column visible", () => this.ChildrenOfType<ModColumn>().Count(col => col.IsPresent) == 1);
+
+            AddStep("filter out everything", () => modSelectOverlay.SearchTerm = "Some long search term with no matches");
+            AddAssert("no columns visible", () => this.ChildrenOfType<ModColumn>().All(col => !col.IsPresent));
+
+            AddStep("clear search bar", () => modSelectOverlay.SearchTerm = "");
+            AddAssert("all columns visible", () => this.ChildrenOfType<ModColumn>().All(col => col.IsPresent));
+        }
+
+        [Test]
+        public void TestHidingOverlayClearsSearch()
+        {
+            AddStep("create screen", () => Child = modSelectOverlay = new TestModSelectOverlay
+            {
+                RelativeSizeAxes = Axes.Both,
+                State = { Value = Visibility.Visible },
+                SelectedMods = { BindTarget = SelectedMods }
+            });
+            waitForColumnLoad();
+            changeRuleset(0);
+
+            AddAssert("all columns visible", () => this.ChildrenOfType<ModColumn>().All(col => col.IsPresent));
+
+            AddStep("set search", () => modSelectOverlay.SearchTerm = "fail");
+            AddAssert("one column visible", () => this.ChildrenOfType<ModColumn>().Count(col => col.IsPresent) == 2);
+
+            AddStep("hide", () => modSelectOverlay.Hide());
+            AddStep("show", () => modSelectOverlay.Show());
+
+            AddAssert("all columns visible", () => this.ChildrenOfType<ModColumn>().All(col => col.IsPresent));
+        }
+
         [Test]
         public void TestColumnHidingOnRulesetChange()
         {
@@ -605,12 +658,10 @@ namespace osu.Game.Tests.Visual.UserInterface
         {
             public override string ShortName => "unimplemented";
 
-            public override IEnumerable<Mod> GetModsFor(ModType type)
-            {
-                if (type == ModType.Conversion) return base.GetModsFor(type).Concat(new[] { new TestUnimplementedMod() });
-
-                return base.GetModsFor(type);
-            }
+            public override IEnumerable<Mod> GetModsFor(ModType type) =>
+                type == ModType.Conversion
+                    ? base.GetModsFor(type).Concat(new[] { new TestUnimplementedMod() })
+                    : base.GetModsFor(type);
         }
     }
 }

From 7d1e73e36dcf67a5052395aa84f9c241d2d6696b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 4 May 2023 21:24:31 +0200
Subject: [PATCH 0362/1604] Add workflow for automated osu-web mod definition
 updates

---
 .../workflows/update-web-mod-definitions.yml  | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 .github/workflows/update-web-mod-definitions.yml

diff --git a/.github/workflows/update-web-mod-definitions.yml b/.github/workflows/update-web-mod-definitions.yml
new file mode 100644
index 0000000000..32d3d37ffe
--- /dev/null
+++ b/.github/workflows/update-web-mod-definitions.yml
@@ -0,0 +1,53 @@
+name: Update osu-web mod definitions
+on:
+  push:
+    tags:
+      - '*'
+
+permissions:
+  contents: read # to fetch code (actions/checkout)
+
+jobs:
+  update-mod-definitions:
+    name: Update osu-web mod definitions
+    runs-on: ubuntu-latest
+    steps:
+    - name: Install .NET 6.0.x
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: "6.0.x"
+
+    - name: Checkout ppy/osu
+      uses: actions/checkout@v3
+      with:
+        path: osu
+
+    - name: Checkout ppy/osu-tools
+      uses: actions/checkout@v3
+      with:
+        repository: ppy/osu-tools
+        path: osu-tools
+
+    - name: Checkout ppy/osu-web
+      uses: actions/checkout@v3
+      with:
+        repository: ppy/osu-web
+        path: osu-web
+
+    - name: Setup local game checkout for tools
+      run: ./UseLocalOsu.sh
+      working-directory: ./osu-tools
+
+    - name: Regenerate mod definitions
+      run: dotnet run --project PerformanceCalculator -- mods > ../osu-web/database/mods.json
+      working-directory: ./osu-tools
+
+    - name: Create pull request with changes
+      uses: peter-evans/create-pull-request@v5
+      with:
+        title: Update mod definitions
+        body: "This PR has been auto-generated to update the mod definitions to match ppy/osu@${{ github.ref_name }}."
+        branch: update-mod-definitions
+        commit-message: Update mod definitions
+        path: osu-web
+        token: ${{ secrets.OSU_WEB_PULL_REQUEST_PAT }}

From 52e5835be6e8ae544ec9917d67409a2493b04c20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 6 May 2023 14:52:33 +0200
Subject: [PATCH 0363/1604] Document and retouch `ReportPopover`

---
 .../Graphics/UserInterfaceV2/ReportPopover.cs | 32 +++++++++++++------
 osu.Game/Overlays/Chat/ReportChatPopover.cs   |  5 +--
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Graphics/UserInterfaceV2/ReportPopover.cs b/osu.Game/Graphics/UserInterfaceV2/ReportPopover.cs
index a5c60bb9e6..393cdef76d 100644
--- a/osu.Game/Graphics/UserInterfaceV2/ReportPopover.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/ReportPopover.cs
@@ -16,17 +16,29 @@ using osuTK;
 
 namespace osu.Game.Graphics.UserInterfaceV2
 {
-    public abstract partial class ReportPopover<T> : OsuPopover
-        where T : struct, Enum
+    /// <summary>
+    /// A generic popover for sending an online report about something.
+    /// </summary>
+    /// <typeparam name="TReportReason">An enumeration type with all valid reasons for the report.</typeparam>
+    public abstract partial class ReportPopover<TReportReason> : OsuPopover
+        where TReportReason : struct, Enum
     {
-        public Action<T, string>? Action;
+        /// <summary>
+        /// The action to run when the report is finalised.
+        /// The arguments to this action are: the reason for the report, and an optional additional comment.
+        /// </summary>
+        public Action<TReportReason, string>? Action;
 
-        private OsuEnumDropdown<T> reasonDropdown = null!;
+        private OsuEnumDropdown<TReportReason> reasonDropdown = null!;
         private OsuTextBox commentsTextBox = null!;
         private RoundedButton submitButton = null!;
 
         private readonly LocalisableString header;
 
+        /// <summary>
+        /// Creates a new <see cref="ReportPopover{TReportReason}"/>.
+        /// </summary>
+        /// <param name="headerString">The text to display in the header of the popover.</param>
         protected ReportPopover(LocalisableString headerString)
         {
             header = headerString;
@@ -68,7 +80,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
                     {
                         RelativeSizeAxes = Axes.X,
                         Height = 40,
-                        Child = reasonDropdown = new OsuEnumDropdown<T>
+                        Child = reasonDropdown = new OsuEnumDropdown<TReportReason>
                         {
                             RelativeSizeAxes = Axes.X
                         }
@@ -110,12 +122,12 @@ namespace osu.Game.Graphics.UserInterfaceV2
 
         private void updateStatus()
         {
-            submitButton.Enabled.Value = !string.IsNullOrWhiteSpace(commentsTextBox.Current.Value) || CheckCanSubmitEmptyComment(reasonDropdown.Current.Value);
+            submitButton.Enabled.Value = !string.IsNullOrWhiteSpace(commentsTextBox.Current.Value) || IsCommentRequired(reasonDropdown.Current.Value);
         }
 
-        protected virtual bool CheckCanSubmitEmptyComment(T reason)
-        {
-            return false;
-        }
+        /// <summary>
+        /// Determines whether an additional comment is required for submitting the report with the supplied <paramref name="reason"/>.
+        /// </summary>
+        protected virtual bool IsCommentRequired(TReportReason reason) => false;
     }
 }
diff --git a/osu.Game/Overlays/Chat/ReportChatPopover.cs b/osu.Game/Overlays/Chat/ReportChatPopover.cs
index f02e52eb2e..625f44505b 100644
--- a/osu.Game/Overlays/Chat/ReportChatPopover.cs
+++ b/osu.Game/Overlays/Chat/ReportChatPopover.cs
@@ -27,10 +27,7 @@ namespace osu.Game.Overlays.Chat
             Action = report;
         }
 
-        protected override bool CheckCanSubmitEmptyComment(ChatReportReason reason)
-        {
-            return reason != ChatReportReason.Other;
-        }
+        protected override bool IsCommentRequired(ChatReportReason reason) => reason != ChatReportReason.Other;
 
         private void report(ChatReportReason reason, string comments)
         {

From 6b4050ea5253bd70c1a4c2d691d7c49d2c53fbab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 6 May 2023 15:01:57 +0200
Subject: [PATCH 0364/1604] Remove invalid report reason (and add osu-web
 references)

---
 osu.Game/Overlays/Chat/ChatReportReason.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Chat/ChatReportReason.cs b/osu.Game/Overlays/Chat/ChatReportReason.cs
index 55593d29ad..5fda11b61e 100644
--- a/osu.Game/Overlays/Chat/ChatReportReason.cs
+++ b/osu.Game/Overlays/Chat/ChatReportReason.cs
@@ -7,6 +7,11 @@ using osu.Game.Resources.Localisation.Web;
 
 namespace osu.Game.Overlays.Chat
 {
+    /// <remarks>
+    /// References:
+    /// https://github.com/ppy/osu-web/blob/0a41b13acf5f47bb0d2b08bab42a9646b7ab5821/app/Models/UserReport.php#L50
+    /// https://github.com/ppy/osu-web/blob/0a41b13acf5f47bb0d2b08bab42a9646b7ab5821/app/Models/UserReport.php#L39
+    /// </remarks>
     public enum ChatReportReason
     {
         [Description("Insulting People")]
@@ -17,10 +22,6 @@ namespace osu.Game.Overlays.Chat
         [LocalisableDescription(typeof(UsersStrings), nameof(UsersStrings.ReportOptionsSpam))]
         Spam,
 
-        [Description("Cheating")]
-        [LocalisableDescription(typeof(UsersStrings), nameof(UsersStrings.ReportOptionsCheating))]
-        FoulPlay,
-
         [Description("Unwanted Content")]
         [LocalisableDescription(typeof(UsersStrings), nameof(UsersStrings.ReportOptionsUnwantedContent))]
         UnwantedContent,

From fba3c587cfd11278247840de290463dbc19e1201 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 6 May 2023 15:26:29 +0200
Subject: [PATCH 0365/1604] Add test coverage for info message failing to
 display

---
 osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
index 99ce837665..55e6b54af7 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
@@ -648,6 +648,7 @@ namespace osu.Game.Tests.Visual.Online
             AddUntilStep("Overlay closed", () => !this.ChildrenOfType<ReportChatPopover>().Any());
             AddStep("Complete request", () => requestLock.Set());
             AddUntilStep("Request sent", () => request != null);
+            AddUntilStep("Info message displayed", () => channelManager.CurrentChannel.Value.Messages.Last(), () => Is.InstanceOf(typeof(InfoMessage)));
         }
 
         private void joinTestChannel(int i)

From 1da5e69d5a6aeb573d0d538e84257ecbf6752455 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 6 May 2023 15:27:27 +0200
Subject: [PATCH 0366/1604] Fix API success callback scheduling to dead
 drawable

---
 osu.Game/Overlays/Chat/ReportChatPopover.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Chat/ReportChatPopover.cs b/osu.Game/Overlays/Chat/ReportChatPopover.cs
index 625f44505b..999c76ca10 100644
--- a/osu.Game/Overlays/Chat/ReportChatPopover.cs
+++ b/osu.Game/Overlays/Chat/ReportChatPopover.cs
@@ -33,10 +33,7 @@ namespace osu.Game.Overlays.Chat
         {
             var request = new ChatReportRequest(message.Id, reason, comments);
 
-            request.Success += () => Schedule(() =>
-            {
-                channelManager.CurrentChannel.Value.AddNewMessages(new InfoMessage(UsersStrings.ReportThanks.ToString()));
-            });
+            request.Success += () => channelManager.CurrentChannel.Value.AddNewMessages(new InfoMessage(UsersStrings.ReportThanks.ToString()));
 
             api.Queue(request);
         }

From 3942281d13a4a23b3d8efbd2aed96e155831753d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 6 May 2023 15:34:55 +0200
Subject: [PATCH 0367/1604] Fix back-to-front logic

---
 osu.Game/Graphics/UserInterfaceV2/ReportPopover.cs | 4 ++--
 osu.Game/Overlays/Chat/ReportChatPopover.cs        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Graphics/UserInterfaceV2/ReportPopover.cs b/osu.Game/Graphics/UserInterfaceV2/ReportPopover.cs
index 393cdef76d..7b3c32d60d 100644
--- a/osu.Game/Graphics/UserInterfaceV2/ReportPopover.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/ReportPopover.cs
@@ -122,12 +122,12 @@ namespace osu.Game.Graphics.UserInterfaceV2
 
         private void updateStatus()
         {
-            submitButton.Enabled.Value = !string.IsNullOrWhiteSpace(commentsTextBox.Current.Value) || IsCommentRequired(reasonDropdown.Current.Value);
+            submitButton.Enabled.Value = !string.IsNullOrWhiteSpace(commentsTextBox.Current.Value) || !IsCommentRequired(reasonDropdown.Current.Value);
         }
 
         /// <summary>
         /// Determines whether an additional comment is required for submitting the report with the supplied <paramref name="reason"/>.
         /// </summary>
-        protected virtual bool IsCommentRequired(TReportReason reason) => false;
+        protected virtual bool IsCommentRequired(TReportReason reason) => true;
     }
 }
diff --git a/osu.Game/Overlays/Chat/ReportChatPopover.cs b/osu.Game/Overlays/Chat/ReportChatPopover.cs
index 999c76ca10..265a17c799 100644
--- a/osu.Game/Overlays/Chat/ReportChatPopover.cs
+++ b/osu.Game/Overlays/Chat/ReportChatPopover.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Overlays.Chat
             Action = report;
         }
 
-        protected override bool IsCommentRequired(ChatReportReason reason) => reason != ChatReportReason.Other;
+        protected override bool IsCommentRequired(ChatReportReason reason) => reason == ChatReportReason.Other;
 
         private void report(ChatReportReason reason, string comments)
         {

From e75ff33d629dfe4f8e368026ec55010637097479 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 6 May 2023 23:10:09 +0900
Subject: [PATCH 0368/1604] Remove redundant xmldoc and reword some remaining

---
 osu.Game/Database/LegacyExporter.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/osu.Game/Database/LegacyExporter.cs b/osu.Game/Database/LegacyExporter.cs
index 3b24ab4f4a..468370809a 100644
--- a/osu.Game/Database/LegacyExporter.cs
+++ b/osu.Game/Database/LegacyExporter.cs
@@ -16,7 +16,7 @@ using Realms;
 namespace osu.Game.Database
 {
     /// <summary>
-    /// A class which handles exporting legacy user data of a single type from osu-stable.
+    /// Handles exporting models to files for sharing / consumption outside the game.
     /// </summary>
     public abstract class LegacyExporter<TModel>
         where TModel : RealmObject, IHasNamedFiles, IHasGuidPrimaryKey
@@ -45,11 +45,6 @@ namespace osu.Game.Database
 
         public Action<Notification>? PostNotification { get; set; }
 
-        /// <summary>
-        /// Construct exporter.
-        /// Create a new exporter for each export, otherwise it will cause confusing notifications.
-        /// </summary>
-        /// <param name="storage">Storage for storing exported files. Basically it is used to provide export stream</param>
         protected LegacyExporter(Storage storage)
         {
             exportStorage = storage.GetStorageForDirectory(@"exports");

From 0d095c4bb703304b2df127db32de69ef3c69bef1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 6 May 2023 23:10:18 +0900
Subject: [PATCH 0369/1604] Remove non-`Live` pathway

---
 osu.Game/Beatmaps/BeatmapManager.cs |  2 +-
 osu.Game/Database/LegacyExporter.cs | 13 -------------
 osu.Game/Scoring/ScoreManager.cs    |  2 +-
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index e87e71ae33..61b234d88a 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -400,7 +400,7 @@ namespace osu.Game.Beatmaps
         public Task<Live<BeatmapSetInfo>?> ImportAsUpdate(ProgressNotification notification, ImportTask importTask, BeatmapSetInfo original) =>
             beatmapImporter.ImportAsUpdate(notification, importTask, original);
 
-        public Task Export(BeatmapSetInfo beatmap) => beatmapExporter.ExportAsync(beatmap, Realm);
+        public Task Export(BeatmapSetInfo beatmap) => beatmapExporter.ExportAsync(beatmap.ToLive(Realm));
 
         private void updateHashAndMarkDirty(BeatmapSetInfo setInfo)
         {
diff --git a/osu.Game/Database/LegacyExporter.cs b/osu.Game/Database/LegacyExporter.cs
index 468370809a..bd38e38888 100644
--- a/osu.Game/Database/LegacyExporter.cs
+++ b/osu.Game/Database/LegacyExporter.cs
@@ -51,19 +51,6 @@ namespace osu.Game.Database
             UserFileStorage = storage.GetStorageForDirectory(@"files");
         }
 
-        /// <summary>
-        /// Export the model to default folder.
-        /// </summary>
-        /// <param name="model">The model should export.</param>
-        /// <param name="realm">Realm that convert model to Live.</param>
-        /// <param name="cancellationToken">
-        /// The Cancellation token that can cancel the exporting.
-        /// If specified CancellationToken, then use it. Otherwise use PostNotification's CancellationToken.
-        /// </param>
-        /// <returns></returns>
-        public Task ExportAsync(TModel model, RealmAccess realm, CancellationToken cancellationToken = default) =>
-            ExportAsync(model.ToLive(realm), cancellationToken);
-
         /// <summary>
         /// Export the model to default folder.
         /// </summary>
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 5e432b6a96..3e6d09b74a 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -193,7 +193,7 @@ namespace osu.Game.Scoring
 
         public Task<IEnumerable<Live<ScoreInfo>>> Import(ProgressNotification notification, ImportTask[] tasks, ImportParameters parameters = default) => scoreImporter.Import(notification, tasks);
 
-        public Task Export(ScoreInfo score) => scoreExporter.ExportAsync(score, Realm);
+        public Task Export(ScoreInfo score) => scoreExporter.ExportAsync(score.ToLive(Realm));
 
         public Task<Live<ScoreInfo>> ImportAsUpdate(ProgressNotification notification, ImportTask task, ScoreInfo original) => scoreImporter.ImportAsUpdate(notification, task, original);
 

From 38ebce8ee978738fbc1ccf1f57f07ad8b8c00d12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 6 May 2023 16:21:48 +0200
Subject: [PATCH 0370/1604] Update framework again

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 59bef84bd2..e9ecbaa10b 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -11,7 +11,7 @@
     <AndroidManifestMerger>manifestmerger.jar</AndroidManifestMerger>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.504.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.506.0" />
   </ItemGroup>
   <ItemGroup>
     <AndroidManifestOverlay Include="$(MSBuildThisFileDirectory)osu.Android\Properties\AndroidManifestOverlay.xml" />
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 404fbada95..7ab9810ab5 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,7 +36,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="10.20.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.504.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.506.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.417.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index c4df0a2347..bfa0dc63bb 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -16,6 +16,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.504.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.506.0" />
   </ItemGroup>
 </Project>

From 808a44ac0c33377aae9b37ab64bd27d3049cb22b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 6 May 2023 16:23:00 +0200
Subject: [PATCH 0371/1604] Resolve code quality inspection

---
 osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs b/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
index e951197643..555610a3b6 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Rulesets.Osu.UI
 
             localCursorContainer?.Expire();
             localCursorContainer = null;
-            GameplayCursor?.ActiveCursor?.Show();
+            GameplayCursor?.ActiveCursor.Show();
         }
 
         protected override bool OnHover(HoverEvent e) => true;

From d2591368a6f21496fb4a00d326d0aac737f6a6d9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 6 May 2023 23:53:35 +0900
Subject: [PATCH 0372/1604] More xmldoc fixes

---
 osu.Game/Database/LegacyArchiveExporter.cs |  9 +----
 osu.Game/Database/LegacyExporter.cs        | 38 ++++++++++------------
 2 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/osu.Game/Database/LegacyArchiveExporter.cs b/osu.Game/Database/LegacyArchiveExporter.cs
index 19ccc13a29..d18c6b1497 100644
--- a/osu.Game/Database/LegacyArchiveExporter.cs
+++ b/osu.Game/Database/LegacyArchiveExporter.cs
@@ -17,7 +17,7 @@ using Logger = osu.Framework.Logging.Logger;
 namespace osu.Game.Database
 {
     /// <summary>
-    /// An exporter which handles the common scenario of exporting a model to a zip-based archive, usually with a custom file extension.
+    /// Handles the common scenario of exporting a model to a zip-based archive, usually with a custom file extension.
     /// </summary>
     public abstract class LegacyArchiveExporter<TModel> : LegacyExporter<TModel>
         where TModel : RealmObject, IHasNamedFiles, IHasGuidPrimaryKey
@@ -30,13 +30,6 @@ namespace osu.Game.Database
         public override void ExportToStream(TModel model, Stream outputStream, ProgressNotification? notification, CancellationToken cancellationToken = default)
             => exportZipArchive(model, outputStream, notification, cancellationToken);
 
-        /// <summary>
-        /// Exports an item to Stream as a legacy (.zip based) package.
-        /// </summary>
-        /// <param name="model">The model to be exported.</param>
-        /// <param name="outputStream">The output stream to export to.</param>
-        /// <param name="notification">An optional target notification to update with ongoing export progress.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
         private void exportZipArchive(TModel model, Stream outputStream, ProgressNotification? notification, CancellationToken cancellationToken = default)
         {
             using (var writer = new ZipWriter(outputStream, new ZipWriterOptions(CompressionType.Deflate)))
diff --git a/osu.Game/Database/LegacyExporter.cs b/osu.Game/Database/LegacyExporter.cs
index bd38e38888..c86873ea3f 100644
--- a/osu.Game/Database/LegacyExporter.cs
+++ b/osu.Game/Database/LegacyExporter.cs
@@ -52,14 +52,11 @@ namespace osu.Game.Database
         }
 
         /// <summary>
-        /// Export the model to default folder.
+        /// Exports a model to the default export location.
+        /// This will create a notification tracking the progress of the export, visible to the user.
         /// </summary>
-        /// <param name="model">The model should export.</param>
-        /// <param name="cancellationToken">
-        /// The Cancellation token that can cancel the exporting.
-        /// If specified CancellationToken, then use it. Otherwise use PostNotification's CancellationToken.
-        /// </param>
-        /// <returns></returns>
+        /// <param name="model">The model to export.</param>
+        /// <param name="cancellationToken">A cancellation token.</param>
         public async Task ExportAsync(Live<TModel> model, CancellationToken cancellationToken = default)
         {
             string itemFilename = model.PerformRead(s => GetFilename(s).GetValidFilename());
@@ -105,23 +102,22 @@ namespace osu.Game.Database
         }
 
         /// <summary>
-        /// Export model to stream.
-        /// </summary>
-        /// <param name="model">The model which have <see cref="IHasGuidPrimaryKey"/>.</param>
-        /// <param name="stream">The stream to export.</param>
-        /// <param name="notification">The notification will displayed to the user</param>
-        /// <param name="cancellationToken">The Cancellation token that can cancel the exporting.</param>
-        /// <returns>Whether the export was successful</returns>
-        public Task ExportToStreamAsync(Live<TModel> model, Stream stream, ProgressNotification? notification = null, CancellationToken cancellationToken = default) =>
-            Task.Run(() => { model.PerformRead(s => ExportToStream(s, stream, notification, cancellationToken)); }, cancellationToken);
-
-        /// <summary>
-        /// Exports model to Stream.
+        /// Exports a model to a provided stream.
         /// </summary>
         /// <param name="model">The model to export.</param>
         /// <param name="outputStream">The output stream to export to.</param>
-        /// <param name="notification">The notification will displayed to the user</param>
-        /// <param name="cancellationToken">The Cancellation token that can cancel the exporting.</param>
+        /// <param name="notification">An optional notification to be updated with export progress.</param>
+        /// <param name="cancellationToken">A cancellation token.</param>
+        public Task ExportToStreamAsync(Live<TModel> model, Stream outputStream, ProgressNotification? notification = null, CancellationToken cancellationToken = default) =>
+            Task.Run(() => { model.PerformRead(s => ExportToStream(s, outputStream, notification, cancellationToken)); }, cancellationToken);
+
+        /// <summary>
+        /// Exports a model to a provided stream.
+        /// </summary>
+        /// <param name="model">The model to export.</param>
+        /// <param name="outputStream">The output stream to export to.</param>
+        /// <param name="notification">An optional notification to be updated with export progress.</param>
+        /// <param name="cancellationToken">A cancellation token.</param>
         public abstract void ExportToStream(TModel model, Stream outputStream, ProgressNotification? notification, CancellationToken cancellationToken = default);
     }
 }

From 64d7e0d8966fe1e1f922d5d20d4cc12119c4914f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 7 May 2023 00:24:30 +0900
Subject: [PATCH 0373/1604] Rename `outputStream` variable to match base class

---
 osu.Game/Database/LegacyScoreExporter.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Database/LegacyScoreExporter.cs b/osu.Game/Database/LegacyScoreExporter.cs
index fe5d1e8b47..f0514d5350 100644
--- a/osu.Game/Database/LegacyScoreExporter.cs
+++ b/osu.Game/Database/LegacyScoreExporter.cs
@@ -28,14 +28,14 @@ namespace osu.Game.Database
 
         protected override string FileExtension => ".osr";
 
-        public override void ExportToStream(ScoreInfo model, Stream stream, ProgressNotification? notification, CancellationToken cancellationToken = default)
+        public override void ExportToStream(ScoreInfo model, Stream outputStream, ProgressNotification? notification, CancellationToken cancellationToken = default)
         {
             var file = model.Files.SingleOrDefault();
             if (file == null)
                 return;
 
             using (var inputStream = UserFileStorage.GetStream(file.File.GetStoragePath()))
-                inputStream.CopyTo(stream);
+                inputStream.CopyTo(outputStream);
         }
     }
 }

From 5e64d25b2a977bc0edb6538aa8929763050c2fda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 6 May 2023 19:26:51 +0200
Subject: [PATCH 0374/1604] Make `UserFileStorage` `readonly` again

---
 osu.Game/Database/LegacyExporter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Database/LegacyExporter.cs b/osu.Game/Database/LegacyExporter.cs
index c86873ea3f..d1feb5f0cc 100644
--- a/osu.Game/Database/LegacyExporter.cs
+++ b/osu.Game/Database/LegacyExporter.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Database
         /// </summary>
         protected abstract string FileExtension { get; }
 
-        protected Storage UserFileStorage;
+        protected readonly Storage UserFileStorage;
         private readonly Storage exportStorage;
         protected virtual string GetFilename(TModel item) => item.GetDisplayString();
 

From e0823ffd036b15fd202eb8169ab6c673d54b4951 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 6 May 2023 19:29:08 +0200
Subject: [PATCH 0375/1604] Move lower and xmldoc `GetFilename(TModel)`

---
 osu.Game/Database/LegacyExporter.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Database/LegacyExporter.cs b/osu.Game/Database/LegacyExporter.cs
index d1feb5f0cc..f9164e34cd 100644
--- a/osu.Game/Database/LegacyExporter.cs
+++ b/osu.Game/Database/LegacyExporter.cs
@@ -41,7 +41,6 @@ namespace osu.Game.Database
 
         protected readonly Storage UserFileStorage;
         private readonly Storage exportStorage;
-        protected virtual string GetFilename(TModel item) => item.GetDisplayString();
 
         public Action<Notification>? PostNotification { get; set; }
 
@@ -51,6 +50,16 @@ namespace osu.Game.Database
             UserFileStorage = storage.GetStorageForDirectory(@"files");
         }
 
+        /// <summary>
+        /// Returns the baseline name of the file to which the <paramref name="item"/> will be exported.
+        /// </summary>
+        /// <remarks>
+        /// The name of the file will be run through <see cref="ModelExtensions.GetValidFilename"/> to eliminate characters
+        /// which are not permitted by various filesystems.
+        /// </remarks>
+        /// <param name="item">The item being exported.</param>
+        protected virtual string GetFilename(TModel item) => item.GetDisplayString();
+
         /// <summary>
         /// Exports a model to the default export location.
         /// This will create a notification tracking the progress of the export, visible to the user.

From 3afe198d1dfa840d97830271c17dc94e8165c2c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 6 May 2023 19:34:22 +0200
Subject: [PATCH 0376/1604] Remove weird single-use private method

---
 osu.Game/Database/LegacyArchiveExporter.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Database/LegacyArchiveExporter.cs b/osu.Game/Database/LegacyArchiveExporter.cs
index d18c6b1497..4d5a1a767c 100644
--- a/osu.Game/Database/LegacyArchiveExporter.cs
+++ b/osu.Game/Database/LegacyArchiveExporter.cs
@@ -28,9 +28,6 @@ namespace osu.Game.Database
         }
 
         public override void ExportToStream(TModel model, Stream outputStream, ProgressNotification? notification, CancellationToken cancellationToken = default)
-            => exportZipArchive(model, outputStream, notification, cancellationToken);
-
-        private void exportZipArchive(TModel model, Stream outputStream, ProgressNotification? notification, CancellationToken cancellationToken = default)
         {
             using (var writer = new ZipWriter(outputStream, new ZipWriterOptions(CompressionType.Deflate)))
             {

From a56a5d563c6c4d80b6fca50a21c8d1468f57c0de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 6 May 2023 19:38:05 +0200
Subject: [PATCH 0377/1604] Unify error message wording

---
 osu.Game/Database/LegacyArchiveExporter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Database/LegacyArchiveExporter.cs b/osu.Game/Database/LegacyArchiveExporter.cs
index 4d5a1a767c..4ba6025e6a 100644
--- a/osu.Game/Database/LegacyArchiveExporter.cs
+++ b/osu.Game/Database/LegacyArchiveExporter.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Database
 
                 if (fileMissing)
                 {
-                    Logger.Log("Some of model files are missing, they will not be included in the archive", LoggingTarget.Database, LogLevel.Error);
+                    Logger.Log("Some files are missing in local storage and will not be included in the export", LoggingTarget.Database, LogLevel.Error);
                 }
             }
         }

From bb17b684b00da1a0f00e36d4c0e62098cba27f85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 6 May 2023 19:38:41 +0200
Subject: [PATCH 0378/1604] Rename flag

---
 osu.Game/Database/LegacyArchiveExporter.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Database/LegacyArchiveExporter.cs b/osu.Game/Database/LegacyArchiveExporter.cs
index 4ba6025e6a..feddf602b9 100644
--- a/osu.Game/Database/LegacyArchiveExporter.cs
+++ b/osu.Game/Database/LegacyArchiveExporter.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Database
             {
                 int i = 0;
                 int fileCount = model.Files.Count();
-                bool fileMissing = false;
+                bool anyFileMissing = false;
 
                 foreach (var file in model.Files)
                 {
@@ -44,7 +44,7 @@ namespace osu.Game.Database
                         if (stream == null)
                         {
                             Logger.Log($"File {file.Filename} is missing in local storage and will not be included in the export", LoggingTarget.Database);
-                            fileMissing = true;
+                            anyFileMissing = true;
                             continue;
                         }
 
@@ -59,7 +59,7 @@ namespace osu.Game.Database
                     i++;
                 }
 
-                if (fileMissing)
+                if (anyFileMissing)
                 {
                     Logger.Log("Some files are missing in local storage and will not be included in the export", LoggingTarget.Database, LogLevel.Error);
                 }

From 3f63fd7f4d1f8ee6d87258bb309879e6f540cf8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 6 May 2023 19:39:52 +0200
Subject: [PATCH 0379/1604] Reorder increment to make progress update less
 weird

---
 osu.Game/Database/LegacyArchiveExporter.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Database/LegacyArchiveExporter.cs b/osu.Game/Database/LegacyArchiveExporter.cs
index feddf602b9..7689ffc13d 100644
--- a/osu.Game/Database/LegacyArchiveExporter.cs
+++ b/osu.Game/Database/LegacyArchiveExporter.cs
@@ -51,12 +51,12 @@ namespace osu.Game.Database
                         writer.Write(file.Filename, stream);
                     }
 
+                    i++;
+
                     if (notification != null)
                     {
-                        notification.Progress = (float)(i + 1) / fileCount;
+                        notification.Progress = (float)i / fileCount;
                     }
-
-                    i++;
                 }
 
                 if (anyFileMissing)

From 510484011c836cfd90c38c385fcaf8f4399a758c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 6 May 2023 19:42:28 +0200
Subject: [PATCH 0380/1604] Mark exporter extensions as untranslatable

---
 osu.Game/Database/LegacyBeatmapExporter.cs | 2 +-
 osu.Game/Database/LegacyScoreExporter.cs   | 2 +-
 osu.Game/Database/LegacySkinExporter.cs    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Database/LegacyBeatmapExporter.cs b/osu.Game/Database/LegacyBeatmapExporter.cs
index e89d3da8c7..4ee8c0636e 100644
--- a/osu.Game/Database/LegacyBeatmapExporter.cs
+++ b/osu.Game/Database/LegacyBeatmapExporter.cs
@@ -13,6 +13,6 @@ namespace osu.Game.Database
         {
         }
 
-        protected override string FileExtension => ".osz";
+        protected override string FileExtension => @".osz";
     }
 }
diff --git a/osu.Game/Database/LegacyScoreExporter.cs b/osu.Game/Database/LegacyScoreExporter.cs
index f0514d5350..690070af85 100644
--- a/osu.Game/Database/LegacyScoreExporter.cs
+++ b/osu.Game/Database/LegacyScoreExporter.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Database
             return filename;
         }
 
-        protected override string FileExtension => ".osr";
+        protected override string FileExtension => @".osr";
 
         public override void ExportToStream(ScoreInfo model, Stream outputStream, ProgressNotification? notification, CancellationToken cancellationToken = default)
         {
diff --git a/osu.Game/Database/LegacySkinExporter.cs b/osu.Game/Database/LegacySkinExporter.cs
index 4775a54c13..14a3907916 100644
--- a/osu.Game/Database/LegacySkinExporter.cs
+++ b/osu.Game/Database/LegacySkinExporter.cs
@@ -13,6 +13,6 @@ namespace osu.Game.Database
         {
         }
 
-        protected override string FileExtension => ".osk";
+        protected override string FileExtension => @".osk";
     }
 }

From e9d7cd7a795c85846895a0a98c295841f4ee00eb Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Sat, 6 May 2023 19:08:30 +0100
Subject: [PATCH 0381/1604] feat(ArgonKeyCounter): flash key name

---
 osu.Game/Screens/Play/ArgonKeyCounter.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/ArgonKeyCounter.cs b/osu.Game/Screens/Play/ArgonKeyCounter.cs
index 8635783d71..53305901ee 100644
--- a/osu.Game/Screens/Play/ArgonKeyCounter.cs
+++ b/osu.Game/Screens/Play/ArgonKeyCounter.cs
@@ -14,6 +14,7 @@ namespace osu.Game.Screens.Play
     public partial class ArgonKeyCounter : KeyCounter
     {
         private Circle inputIndicator = null!;
+        private OsuSpriteText keyNameText = null!;
         private OsuSpriteText countText = null!;
 
         // These values were taken from Figma
@@ -42,7 +43,7 @@ namespace osu.Game.Screens.Play
                     Height = line_height * scale_factor,
                     Alpha = 0.5f
                 },
-                new OsuSpriteText
+                keyNameText = new OsuSpriteText
                 {
                     Anchor = Anchor.BottomLeft,
                     Origin = Anchor.BottomLeft,
@@ -75,6 +76,7 @@ namespace osu.Game.Screens.Play
         protected override void Activate(bool forwardPlayback = true)
         {
             base.Activate(forwardPlayback);
+            keyNameText.FlashColour(Colour4.White, 200);
             inputIndicator.FadeIn().MoveToY(0).Then().MoveToY(3, 100, Easing.OutQuart);
         }
 

From 4d235105d14d0b1ed91fedae09c6eaea6bdf13bf Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Sun, 7 May 2023 15:14:49 +0300
Subject: [PATCH 0382/1604] Convert `ModSearchContainer` to block-scoped
 namespace

---
 osu.Game/Overlays/Mods/ModSearchContainer.cs | 27 ++++++++++----------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSearchContainer.cs b/osu.Game/Overlays/Mods/ModSearchContainer.cs
index 29cc7d8132..f9bf11d1f1 100644
--- a/osu.Game/Overlays/Mods/ModSearchContainer.cs
+++ b/osu.Game/Overlays/Mods/ModSearchContainer.cs
@@ -3,23 +3,24 @@
 
 using osu.Framework.Graphics.Containers;
 
-namespace osu.Game.Overlays.Mods;
-
-public partial class ModSearchContainer : SearchContainer
+namespace osu.Game.Overlays.Mods
 {
-    /// <summary>
-    /// A string that should match the <see cref="IFilterable"/> children
-    /// </summary>
-    public string ForcedSearchTerm
+    public partial class ModSearchContainer : SearchContainer
     {
-        get => SearchTerm;
-        set
+        /// <summary>
+        /// A string that should match the <see cref="IFilterable"/> children
+        /// </summary>
+        public string ForcedSearchTerm
         {
-            if (value == SearchTerm)
-                return;
+            get => SearchTerm;
+            set
+            {
+                if (value == SearchTerm)
+                    return;
 
-            SearchTerm = value;
-            Update();
+                SearchTerm = value;
+                Update();
+            }
         }
     }
 }

From 60bad35145ac63e0d357d801c4a6fcf2a56a5812 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Sun, 7 May 2023 15:34:01 +0300
Subject: [PATCH 0383/1604] Remove weird update usage when 'deselect all'
 pressed

---
 osu.Game/Overlays/Mods/ModColumn.cs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModColumn.cs b/osu.Game/Overlays/Mods/ModColumn.cs
index b53e621759..71d964c618 100644
--- a/osu.Game/Overlays/Mods/ModColumn.cs
+++ b/osu.Game/Overlays/Mods/ModColumn.cs
@@ -208,11 +208,12 @@ namespace osu.Game.Overlays.Mods
             pendingSelectionOperations.Clear();
 
             foreach (var button in availableMods.Where(b => b.Active.Value))
-                pendingSelectionOperations.Enqueue(() => button.Active.Value = false);
-
-            //If column is hidden trigger selection manually
-            if (Alpha == 0f)
-                Update();
+            {
+                if (Alpha == 0f)
+                    button.Active.Value = false; //If column is hidden change state manually without any animation
+                else
+                    pendingSelectionOperations.Enqueue(() => button.Active.Value = false);
+            }
         }
 
         /// <summary>

From 4c3af6ecfed1f17dcf3f60193247c3394a4f152c Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Sun, 7 May 2023 15:50:21 +0300
Subject: [PATCH 0384/1604] Add test coverage for deselect all with filtered
 mods selected

---
 .../TestSceneModSelectOverlay.cs              | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index e8a835a330..8e4f437f44 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -502,6 +502,31 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("deselect all button disabled", () => !this.ChildrenOfType<DeselectAllModsButton>().Single().Enabled.Value);
         }
 
+        [Test]
+        public void TestDeselectAllViaButton_WithSearchApplied()
+        {
+            createScreen();
+            changeRuleset(0);
+
+            AddAssert("deselect all button disabled", () => !this.ChildrenOfType<DeselectAllModsButton>().Single().Enabled.Value);
+
+            AddStep("select DT + HD + RD", () => SelectedMods.Value = new Mod[] { new OsuModDoubleTime(), new OsuModHidden(), new OsuModRandom() });
+            AddAssert("DT + HD + RD selected", () => modSelectOverlay.ChildrenOfType<ModPanel>().Count(panel => panel.Active.Value) == 3);
+            AddAssert("deselect all button enabled", () => this.ChildrenOfType<DeselectAllModsButton>().Single().Enabled.Value);
+
+            AddStep("apply search", () => modSelectOverlay.SearchTerm = "Easy");
+            AddAssert("DT + HD + RD are hidden and selected", () => modSelectOverlay.ChildrenOfType<ModPanel>().Count(panel => !panel.IsValid && panel.Active.Value) == 3);
+            AddAssert("deselect all button enabled", () => this.ChildrenOfType<DeselectAllModsButton>().Single().Enabled.Value);
+
+            AddStep("click deselect all button", () =>
+            {
+                InputManager.MoveMouseTo(this.ChildrenOfType<DeselectAllModsButton>().Single());
+                InputManager.Click(MouseButton.Left);
+            });
+            AddUntilStep("all mods deselected", () => !SelectedMods.Value.Any());
+            AddAssert("deselect all button disabled", () => !this.ChildrenOfType<DeselectAllModsButton>().Single().Enabled.Value);
+        }
+
         [Test]
         public void TestCloseViaBackButton()
         {

From 8514b2758a69d344e59941427572c6b4d41db9a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 7 May 2023 21:07:38 +0200
Subject: [PATCH 0385/1604] Fix rapid back button test failure

---
 osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index 0d081e8138..193cec8907 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -700,7 +700,7 @@ namespace osu.Game.Tests.Visual.Navigation
             AddStep("press escape twice rapidly", () =>
             {
                 InputManager.Key(Key.Escape);
-                InputManager.Key(Key.Escape);
+                Schedule(InputManager.Key, Key.Escape);
             });
 
             pushEscape();

From 85d0c56cd28d8a299e570b891f3f208b7832674c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 May 2023 13:00:45 +0900
Subject: [PATCH 0386/1604] Fix incorrect special style description text

Closes https://github.com/ppy/osu/issues/23428.
---
 osu.Game.Rulesets.Mania/Edit/Setup/ManiaSetupSection.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/Setup/ManiaSetupSection.cs b/osu.Game.Rulesets.Mania/Edit/Setup/ManiaSetupSection.cs
index 508733ad14..98635c10a3 100644
--- a/osu.Game.Rulesets.Mania/Edit/Setup/ManiaSetupSection.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Setup/ManiaSetupSection.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Mania.Edit.Setup
                 specialStyle = new LabelledSwitchButton
                 {
                     Label = "Use special (N+1) style",
-                    Description = "Changes one column to act as a classic \"scratch\" or \"special\" column, which can be moved around by the user's skin (to the left/right/centre). Generally used in 5k (4+1) or 8key (7+1) configurations.",
+                    Description = "Changes one column to act as a classic \"scratch\" or \"special\" column, which can be moved around by the user's skin (to the left/right/centre). Generally used in 6k (5+1) or 8k (7+1) configurations.",
                     Current = { Value = Beatmap.BeatmapInfo.SpecialStyle }
                 }
             };

From f7d44c3013f3bb11d6e2aa5476950e1d4036f3ac Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 7 May 2023 12:32:38 +0900
Subject: [PATCH 0387/1604] Rename `SliderMultiplier` to `BaseSliderVelocity`

---
 .../Editor/TestSceneJuiceStreamPlacementBlueprint.cs |  2 +-
 .../Editor/TestSceneJuiceStreamSelectionBlueprint.cs |  2 +-
 .../TestSceneAutoJuiceStream.cs                      |  2 +-
 .../TestSceneJuiceStream.cs                          |  2 +-
 osu.Game.Rulesets.Catch/Objects/JuiceStream.cs       |  4 ++--
 .../Legacy/DistanceObjectPatternGenerator.cs         |  2 +-
 osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs   |  2 +-
 .../Editor/TestSceneOsuDistanceSnapGrid.cs           |  2 +-
 .../Editor/TestSceneSliderStreamConversion.cs        |  2 +-
 osu.Game.Rulesets.Osu/Objects/Slider.cs              |  2 +-
 .../Editor/TestSceneTaikoEditorSaving.cs             |  4 ++--
 .../Beatmaps/TaikoBeatmapConverter.cs                |  6 +++---
 .../Mods/TaikoModDifficultyAdjust.cs                 |  2 +-
 osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs         |  2 +-
 osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs     |  2 +-
 osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs          |  2 +-
 .../Beatmaps/Formats/LegacyBeatmapDecoderTest.cs     |  2 +-
 .../Beatmaps/Formats/OsuJsonDecoderTest.cs           |  2 +-
 .../TestSceneHitObjectComposerDistanceSnapping.cs    | 12 ++++++------
 .../Visual/Editing/TestSceneDistanceSnapGrid.cs      |  2 +-
 .../Gameplay/TestSceneDrawableScrollingRuleset.cs    |  4 ++--
 .../Gameplay/TestSceneGameplaySampleTriggerSource.cs |  2 +-
 osu.Game/Beatmaps/BeatmapDifficulty.cs               |  8 ++++----
 osu.Game/Beatmaps/BeatmapImporter.cs                 |  2 +-
 osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs    |  2 +-
 osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs    |  4 ++--
 osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs          |  7 ++++---
 osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs |  2 +-
 osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs    |  2 +-
 .../UI/Scrolling/DrawableScrollingRuleset.cs         |  6 +++---
 30 files changed, 49 insertions(+), 48 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamPlacementBlueprint.cs b/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamPlacementBlueprint.cs
index 2426f8c886..e729a09a18 100644
--- a/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamPlacementBlueprint.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Catch.Tests.Editor
         {
             var playable = base.GetPlayableBeatmap();
             playable.Difficulty.SliderTickRate = 5;
-            playable.Difficulty.SliderMultiplier = velocity_factor * 10;
+            playable.Difficulty.BaseSliderVelocity = velocity_factor * 10;
             return playable;
         }
 
diff --git a/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamSelectionBlueprint.cs b/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamSelectionBlueprint.cs
index beba5811fe..634e1f5cbb 100644
--- a/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamSelectionBlueprint.cs
@@ -210,7 +210,7 @@ namespace osu.Game.Rulesets.Catch.Tests.Editor
                 X = x,
                 Path = sliderPath,
             };
-            EditorBeatmap.Difficulty.SliderMultiplier = velocity;
+            EditorBeatmap.Difficulty.BaseSliderVelocity = velocity;
             EditorBeatmap.Add(hitObject);
             EditorBeatmap.Update(hitObject);
             Assert.That(hitObject.Velocity, Is.EqualTo(velocity));
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
index 40dc7d2403..d1f3f06971 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             {
                 BeatmapInfo = new BeatmapInfo
                 {
-                    Difficulty = new BeatmapDifficulty { CircleSize = 6, SliderMultiplier = 3 },
+                    Difficulty = new BeatmapDifficulty { CircleSize = 6, BaseSliderVelocity = 3 },
                     Ruleset = ruleset
                 }
             };
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs
index c91f07891c..71cb8964c3 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             BeatmapInfo = new BeatmapInfo
             {
-                Difficulty = new BeatmapDifficulty { CircleSize = 5, SliderMultiplier = 2 },
+                Difficulty = new BeatmapDifficulty { CircleSize = 5, BaseSliderVelocity = 2 },
                 Ruleset = ruleset
             },
             HitObjects = new List<HitObject>
diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
index 169e99c90c..301ecd6d66 100644
--- a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
@@ -64,8 +64,8 @@ namespace osu.Game.Rulesets.Catch.Objects
 
             TimingControlPoint timingPoint = controlPointInfo.TimingPointAt(StartTime);
 
-            velocityFactor = base_scoring_distance * difficulty.SliderMultiplier / timingPoint.BeatLength;
-            tickDistanceFactor = base_scoring_distance * difficulty.SliderMultiplier / difficulty.SliderTickRate;
+            velocityFactor = base_scoring_distance * difficulty.BaseSliderVelocity / timingPoint.BeatLength;
+            tickDistanceFactor = base_scoring_distance * difficulty.BaseSliderVelocity / difficulty.SliderTickRate;
         }
 
         protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
index 91b7be6e8f..ab6f5e8269 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             StartTime = (int)Math.Round(hitObject.StartTime);
 
             // This matches stable's calculation.
-            EndTime = (int)Math.Floor(StartTime + distanceData.Distance * beatLength * SpanCount * 0.01 / beatmap.Difficulty.SliderMultiplier);
+            EndTime = (int)Math.Floor(StartTime + distanceData.Distance * beatLength * SpanCount * 0.01 / beatmap.Difficulty.BaseSliderVelocity);
 
             SegmentDuration = (EndTime - StartTime) / SpanCount;
         }
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index af8758fb5e..cb38551a43 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -92,7 +92,7 @@ namespace osu.Game.Rulesets.Mania.UI
             {
                 // Mania doesn't care about global velocity
                 p.Velocity = 1;
-                p.BaseBeatLength *= Beatmap.Difficulty.SliderMultiplier;
+                p.BaseBeatLength *= Beatmap.Difficulty.BaseSliderVelocity;
 
                 // For non-mania beatmap, speed changes should only happen through timing points
                 if (!isForCurrentRuleset)
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs
index 7579e8077b..b79d4efe1b 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs
@@ -80,7 +80,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         [SetUp]
         public void Setup() => Schedule(() =>
         {
-            editorBeatmap.Difficulty.SliderMultiplier = 1;
+            editorBeatmap.Difficulty.BaseSliderVelocity = 1;
             editorBeatmap.ControlPointInfo.Clear();
             editorBeatmap.ControlPointInfo.Add(0, new TimingControlPoint { BeatLength = beat_length });
             snapProvider.DistanceSpacingMultiplier.Value = 1;
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderStreamConversion.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderStreamConversion.cs
index a162d9a491..938e093489 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderStreamConversion.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderStreamConversion.cs
@@ -162,7 +162,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             AddStep("change to these specific circumstances", () =>
             {
-                EditorBeatmap.Difficulty.SliderMultiplier = 1;
+                EditorBeatmap.Difficulty.BaseSliderVelocity = 1;
                 var timingPoint = EditorBeatmap.ControlPointInfo.TimingPointAt(slider.StartTime);
                 timingPoint.BeatLength = 352.941176470588;
                 slider.Path.ControlPoints[^1].Position = new Vector2(-110, 16);
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 4189f8ba1e..b86351e7cd 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -167,7 +167,7 @@ namespace osu.Game.Rulesets.Osu.Objects
 
             TimingControlPoint timingPoint = controlPointInfo.TimingPointAt(StartTime);
 
-            double scoringDistance = BASE_SCORING_DISTANCE * difficulty.SliderMultiplier * SliderVelocity;
+            double scoringDistance = BASE_SCORING_DISTANCE * difficulty.BaseSliderVelocity * SliderVelocity;
 
             Velocity = scoringDistance / timingPoint.BeatLength;
             TickDistance = GenerateTicks ? (scoringDistance / difficulty.SliderTickRate * TickDistanceMultiplier) : double.PositiveInfinity;
diff --git a/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoEditorSaving.cs b/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoEditorSaving.cs
index 93b26624de..d79ca28c8f 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoEditorSaving.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoEditorSaving.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Editor
         [Test]
         public void TestTaikoSliderMultiplier()
         {
-            AddStep("Set slider multiplier", () => EditorBeatmap.Difficulty.SliderMultiplier = 2);
+            AddStep("Set slider multiplier", () => EditorBeatmap.Difficulty.BaseSliderVelocity = 2);
 
             SaveEditor();
 
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Editor
                 // therefore, ensure that we have that difficulty type by calling .CopyFrom(), which is a no-op if the type is already correct.
                 var taikoDifficulty = new TaikoBeatmapConverter.TaikoMultiplierAppliedDifficulty();
                 taikoDifficulty.CopyFrom(EditorBeatmap.Difficulty);
-                return Precision.AlmostEquals(taikoDifficulty.SliderMultiplier, 2);
+                return Precision.AlmostEquals(taikoDifficulty.BaseSliderVelocity, 2);
             }
         }
     }
diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index e298e313df..932211695a 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -189,7 +189,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
             else
                 beatLength = timingPoint.BeatLength;
 
-            double sliderScoringPointDistance = osu_base_scoring_distance * beatmap.Difficulty.SliderMultiplier / beatmap.Difficulty.SliderTickRate;
+            double sliderScoringPointDistance = osu_base_scoring_distance * beatmap.Difficulty.BaseSliderVelocity / beatmap.Difficulty.SliderTickRate;
 
             // The velocity and duration of the taiko hit object - calculated as the velocity of a drum roll.
             double taikoVelocity = sliderScoringPointDistance * beatmap.Difficulty.SliderTickRate;
@@ -239,14 +239,14 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
             {
                 base.CopyTo(other);
                 if (!(other is TaikoMultiplierAppliedDifficulty))
-                    other.SliderMultiplier /= LegacyBeatmapEncoder.LEGACY_TAIKO_VELOCITY_MULTIPLIER;
+                    other.BaseSliderVelocity /= LegacyBeatmapEncoder.LEGACY_TAIKO_VELOCITY_MULTIPLIER;
             }
 
             public override void CopyFrom(IBeatmapDifficultyInfo other)
             {
                 base.CopyFrom(other);
                 if (!(other is TaikoMultiplierAppliedDifficulty))
-                    SliderMultiplier *= LegacyBeatmapEncoder.LEGACY_TAIKO_VELOCITY_MULTIPLIER;
+                    BaseSliderVelocity *= LegacyBeatmapEncoder.LEGACY_TAIKO_VELOCITY_MULTIPLIER;
             }
 
             #endregion
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModDifficultyAdjust.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModDifficultyAdjust.cs
index 99a064d35f..fe9c1f5815 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModDifficultyAdjust.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
         {
             base.ApplySettings(difficulty);
 
-            if (ScrollSpeed.Value != null) difficulty.SliderMultiplier *= ScrollSpeed.Value.Value;
+            if (ScrollSpeed.Value != null) difficulty.BaseSliderVelocity *= ScrollSpeed.Value.Value;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs
index 009f2854f8..5aeb5a87d7 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
         public override void ApplyToDifficulty(BeatmapDifficulty difficulty)
         {
             base.ApplyToDifficulty(difficulty);
-            difficulty.SliderMultiplier *= slider_multiplier;
+            difficulty.BaseSliderVelocity *= slider_multiplier;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs
index ba41175461..0f68750535 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
         public override void ApplyToDifficulty(BeatmapDifficulty difficulty)
         {
             base.ApplyToDifficulty(difficulty);
-            difficulty.SliderMultiplier *= slider_multiplier;
+            difficulty.BaseSliderVelocity *= slider_multiplier;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
index b4a12fd314..014fec9319 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Rulesets.Taiko.Objects
 
             TimingControlPoint timingPoint = controlPointInfo.TimingPointAt(StartTime);
 
-            double scoringDistance = base_distance * difficulty.SliderMultiplier * SliderVelocity;
+            double scoringDistance = base_distance * difficulty.BaseSliderVelocity * SliderVelocity;
             Velocity = scoringDistance / timingPoint.BeatLength;
 
             tickSpacing = timingPoint.BeatLength / TickRate;
diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
index 2c4f193327..98ad6fc18d 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -136,7 +136,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.AreEqual(4, difficulty.CircleSize);
                 Assert.AreEqual(8, difficulty.OverallDifficulty);
                 Assert.AreEqual(9, difficulty.ApproachRate);
-                Assert.AreEqual(1.8, difficulty.SliderMultiplier);
+                Assert.AreEqual(1.8, difficulty.BaseSliderVelocity);
                 Assert.AreEqual(2, difficulty.SliderTickRate);
             }
         }
diff --git a/osu.Game.Tests/Beatmaps/Formats/OsuJsonDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/OsuJsonDecoderTest.cs
index 3764467047..11c5f2a2fc 100644
--- a/osu.Game.Tests/Beatmaps/Formats/OsuJsonDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/OsuJsonDecoderTest.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
             Assert.AreEqual(4, difficulty.CircleSize);
             Assert.AreEqual(8, difficulty.OverallDifficulty);
             Assert.AreEqual(9, difficulty.ApproachRate);
-            Assert.AreEqual(1.8, difficulty.SliderMultiplier);
+            Assert.AreEqual(1.8, difficulty.BaseSliderVelocity);
             Assert.AreEqual(2, difficulty.SliderTickRate);
         }
 
diff --git a/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs b/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
index 6399507aa0..ffbe16260b 100644
--- a/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
+++ b/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Tests.Editing
 
             BeatDivisor.Value = 1;
 
-            composer.EditorBeatmap.Difficulty.SliderMultiplier = 1;
+            composer.EditorBeatmap.Difficulty.BaseSliderVelocity = 1;
             composer.EditorBeatmap.ControlPointInfo.Clear();
             composer.EditorBeatmap.ControlPointInfo.Add(0, new TimingControlPoint { BeatLength = 1000 });
         });
@@ -66,7 +66,7 @@ namespace osu.Game.Tests.Editing
         [TestCase(2)]
         public void TestSliderMultiplier(float multiplier)
         {
-            AddStep($"set slider multiplier = {multiplier}", () => composer.EditorBeatmap.Difficulty.SliderMultiplier = multiplier);
+            AddStep($"set slider multiplier = {multiplier}", () => composer.EditorBeatmap.Difficulty.BaseSliderVelocity = multiplier);
 
             assertSnapDistance(100 * multiplier, null, true);
         }
@@ -128,7 +128,7 @@ namespace osu.Game.Tests.Editing
             assertDurationToDistance(500, 50);
             assertDurationToDistance(1000, 100);
 
-            AddStep("set slider multiplier = 2", () => composer.EditorBeatmap.Difficulty.SliderMultiplier = 2);
+            AddStep("set slider multiplier = 2", () => composer.EditorBeatmap.Difficulty.BaseSliderVelocity = 2);
 
             assertDurationToDistance(500, 100);
             assertDurationToDistance(1000, 200);
@@ -149,7 +149,7 @@ namespace osu.Game.Tests.Editing
             assertDistanceToDuration(50, 500);
             assertDistanceToDuration(100, 1000);
 
-            AddStep("set slider multiplier = 2", () => composer.EditorBeatmap.Difficulty.SliderMultiplier = 2);
+            AddStep("set slider multiplier = 2", () => composer.EditorBeatmap.Difficulty.BaseSliderVelocity = 2);
 
             assertDistanceToDuration(100, 500);
             assertDistanceToDuration(200, 1000);
@@ -174,7 +174,7 @@ namespace osu.Game.Tests.Editing
             assertSnappedDuration(200, 2000);
             assertSnappedDuration(250, 3000);
 
-            AddStep("set slider multiplier = 2", () => composer.EditorBeatmap.Difficulty.SliderMultiplier = 2);
+            AddStep("set slider multiplier = 2", () => composer.EditorBeatmap.Difficulty.BaseSliderVelocity = 2);
 
             assertSnappedDuration(0, 0);
             assertSnappedDuration(50, 0);
@@ -206,7 +206,7 @@ namespace osu.Game.Tests.Editing
             assertSnappedDistance(200, 200);
             assertSnappedDistance(250, 200);
 
-            AddStep("set slider multiplier = 2", () => composer.EditorBeatmap.Difficulty.SliderMultiplier = 2);
+            AddStep("set slider multiplier = 2", () => composer.EditorBeatmap.Difficulty.BaseSliderVelocity = 2);
 
             assertSnappedDistance(50, 0);
             assertSnappedDistance(100, 0);
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs b/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs
index 21b925a257..a99bd72e40 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Tests.Visual.Editing
                 }
             });
             editorBeatmap.ControlPointInfo.Add(0, new TimingControlPoint { BeatLength = beat_length });
-            editorBeatmap.Difficulty.SliderMultiplier = 1;
+            editorBeatmap.Difficulty.BaseSliderVelocity = 1;
         }
 
         [SetUp]
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
index 287b7d43b4..735af9493c 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
@@ -184,7 +184,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             var beatmap = createBeatmap();
             beatmap.ControlPointInfo.Add(0, new TimingControlPoint { BeatLength = time_range });
-            beatmap.Difficulty.SliderMultiplier = 2;
+            beatmap.Difficulty.BaseSliderVelocity = 2;
 
             createTest(beatmap, d => d.RelativeScaleBeatLengthsOverride = true);
             AddStep("adjust time range", () => drawableRuleset.TimeRange.Value = 5000);
@@ -198,7 +198,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             var beatmap = createBeatmap();
             beatmap.ControlPointInfo.Add(0, new TimingControlPoint { BeatLength = time_range });
-            beatmap.Difficulty.SliderMultiplier = 2;
+            beatmap.Difficulty.BaseSliderVelocity = 2;
 
             createTest(beatmap);
             AddStep("adjust time range", () => drawableRuleset.TimeRange.Value = 2000);
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs
index 114c554d28..28cc890fce 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
                 BeatmapInfo = new BeatmapInfo
                 {
-                    Difficulty = new BeatmapDifficulty { CircleSize = 6, SliderMultiplier = 3 },
+                    Difficulty = new BeatmapDifficulty { CircleSize = 6, BaseSliderVelocity = 3 },
                     Ruleset = ruleset
                 },
                 ControlPointInfo = controlPointInfo
diff --git a/osu.Game/Beatmaps/BeatmapDifficulty.cs b/osu.Game/Beatmaps/BeatmapDifficulty.cs
index f4bc5e7b77..cbea30f3b0 100644
--- a/osu.Game/Beatmaps/BeatmapDifficulty.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficulty.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Beatmaps
     public class BeatmapDifficulty : EmbeddedObject, IBeatmapDifficultyInfo
     {
         /// <summary>
-        /// The default value used for all difficulty settings except <see cref="SliderMultiplier"/> and <see cref="SliderTickRate"/>.
+        /// The default value used for all difficulty settings except <see cref="BaseSliderVelocity"/> and <see cref="SliderTickRate"/>.
         /// </summary>
         public const float DEFAULT_DIFFICULTY = 5;
 
@@ -20,7 +20,7 @@ namespace osu.Game.Beatmaps
         public float OverallDifficulty { get; set; } = IBeatmapDifficultyInfo.DEFAULT_DIFFICULTY;
         public float ApproachRate { get; set; } = IBeatmapDifficultyInfo.DEFAULT_DIFFICULTY;
 
-        public double SliderMultiplier { get; set; } = 1;
+        public double BaseSliderVelocity { get; set; } = 1;
         public double SliderTickRate { get; set; } = 1;
 
         public BeatmapDifficulty()
@@ -44,7 +44,7 @@ namespace osu.Game.Beatmaps
             difficulty.CircleSize = CircleSize;
             difficulty.OverallDifficulty = OverallDifficulty;
 
-            difficulty.SliderMultiplier = SliderMultiplier;
+            difficulty.BaseSliderVelocity = BaseSliderVelocity;
             difficulty.SliderTickRate = SliderTickRate;
         }
 
@@ -55,7 +55,7 @@ namespace osu.Game.Beatmaps
             CircleSize = other.CircleSize;
             OverallDifficulty = other.OverallDifficulty;
 
-            SliderMultiplier = other.SliderMultiplier;
+            BaseSliderVelocity = other.BaseSliderVelocity;
             SliderTickRate = other.SliderTickRate;
         }
     }
diff --git a/osu.Game/Beatmaps/BeatmapImporter.cs b/osu.Game/Beatmaps/BeatmapImporter.cs
index 4731a70753..e96e38d249 100644
--- a/osu.Game/Beatmaps/BeatmapImporter.cs
+++ b/osu.Game/Beatmaps/BeatmapImporter.cs
@@ -353,7 +353,7 @@ namespace osu.Game.Beatmaps
                         CircleSize = decodedDifficulty.CircleSize,
                         OverallDifficulty = decodedDifficulty.OverallDifficulty,
                         ApproachRate = decodedDifficulty.ApproachRate,
-                        SliderMultiplier = decodedDifficulty.SliderMultiplier,
+                        BaseSliderVelocity = decodedDifficulty.BaseSliderVelocity,
                         SliderTickRate = decodedDifficulty.SliderTickRate,
                     };
 
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index 5e98025c9a..891e627435 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -384,7 +384,7 @@ namespace osu.Game.Beatmaps.Formats
                     break;
 
                 case @"SliderMultiplier":
-                    difficulty.SliderMultiplier = Parsing.ParseDouble(pair.Value);
+                    difficulty.BaseSliderVelocity = Parsing.ParseDouble(pair.Value);
                     break;
 
                 case @"SliderTickRate":
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 7fbcca9adb..fffead3a6c 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -155,8 +155,8 @@ namespace osu.Game.Beatmaps.Formats
 
             // Taiko adjusts the slider multiplier (see: LEGACY_TAIKO_VELOCITY_MULTIPLIER)
             writer.WriteLine(onlineRulesetID == 1
-                ? FormattableString.Invariant($"SliderMultiplier: {beatmap.Difficulty.SliderMultiplier / LEGACY_TAIKO_VELOCITY_MULTIPLIER}")
-                : FormattableString.Invariant($"SliderMultiplier: {beatmap.Difficulty.SliderMultiplier}"));
+                ? FormattableString.Invariant($"SliderMultiplier: {beatmap.Difficulty.BaseSliderVelocity / LEGACY_TAIKO_VELOCITY_MULTIPLIER}")
+                : FormattableString.Invariant($"SliderMultiplier: {beatmap.Difficulty.BaseSliderVelocity}"));
 
             writer.WriteLine(FormattableString.Invariant($"SliderTickRate: {beatmap.Difficulty.SliderTickRate}"));
         }
diff --git a/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs b/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs
index dad9bbbd0b..bc2ee23da7 100644
--- a/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs
+++ b/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Beatmaps
     public interface IBeatmapDifficultyInfo
     {
         /// <summary>
-        /// The default value used for all difficulty settings except <see cref="SliderMultiplier"/> and <see cref="SliderTickRate"/>.
+        /// The default value used for all difficulty settings except <see cref="BaseSliderVelocity"/> and <see cref="SliderTickRate"/>.
         /// </summary>
         const float DEFAULT_DIFFICULTY = 5;
 
@@ -34,9 +34,10 @@ namespace osu.Game.Beatmaps
         float ApproachRate { get; }
 
         /// <summary>
-        /// The slider multiplier of the associated beatmap.
+        /// The base slider velocity of the associated beatmap.
+        /// This was known as "SliderMultiplier" in the .osu format and stable editor.
         /// </summary>
-        double SliderMultiplier { get; }
+        double BaseSliderVelocity { get; }
 
         /// <summary>
         /// The slider tick rate of the associated beatmap.
diff --git a/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs b/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
index a8972775de..4adbb356da 100644
--- a/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
@@ -240,7 +240,7 @@ namespace osu.Game.Rulesets.Edit
 
         public virtual float GetBeatSnapDistanceAt(HitObject referenceObject, bool useReferenceSliderVelocity = true)
         {
-            return (float)(100 * (useReferenceSliderVelocity && referenceObject is IHasSliderVelocity hasSliderVelocity ? hasSliderVelocity.SliderVelocity : 1) * EditorBeatmap.Difficulty.SliderMultiplier * 1
+            return (float)(100 * (useReferenceSliderVelocity && referenceObject is IHasSliderVelocity hasSliderVelocity ? hasSliderVelocity.SliderVelocity : 1) * EditorBeatmap.Difficulty.BaseSliderVelocity * 1
                            / BeatSnapProvider.BeatDivisor);
         }
 
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
index 7ddd372dc9..bdcf539033 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
 
             TimingControlPoint timingPoint = controlPointInfo.TimingPointAt(StartTime);
 
-            double scoringDistance = base_scoring_distance * difficulty.SliderMultiplier * SliderVelocity;
+            double scoringDistance = base_scoring_distance * difficulty.BaseSliderVelocity * SliderVelocity;
 
             Velocity = scoringDistance / timingPoint.BeatLength;
         }
diff --git a/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs b/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
index 4c7564b791..da1110506a 100644
--- a/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
@@ -123,7 +123,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
                 // The slider multiplier is post-multiplied to determine the final velocity, but for relative scale beat lengths
                 // the multiplier should not affect the effective timing point (the longest in the beatmap), so it is factored out here
-                baseBeatLength /= Beatmap.Difficulty.SliderMultiplier;
+                baseBeatLength /= Beatmap.Difficulty.BaseSliderVelocity;
             }
 
             // Merge sequences of timing and difficulty control points to create the aggregate "multiplier" control point
@@ -150,7 +150,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
                 return new MultiplierControlPoint(c.Time)
                 {
-                    Velocity = Beatmap.Difficulty.SliderMultiplier,
+                    Velocity = Beatmap.Difficulty.BaseSliderVelocity,
                     BaseBeatLength = baseBeatLength,
                     TimingPoint = lastTimingPoint,
                     EffectPoint = lastEffectPoint
@@ -167,7 +167,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
             ControlPoints.AddRange(timingChanges);
 
             if (ControlPoints.Count == 0)
-                ControlPoints.Add(new MultiplierControlPoint { Velocity = Beatmap.Difficulty.SliderMultiplier });
+                ControlPoints.Add(new MultiplierControlPoint { Velocity = Beatmap.Difficulty.BaseSliderVelocity });
         }
 
         protected override void LoadComplete()

From b109ee74a631a32df7195b077cd237e70ead1530 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 7 May 2023 13:20:57 +0900
Subject: [PATCH 0388/1604] Add "base velocity" adjustment to difficulty setup
 screen

---
 osu.Game/Localisation/EditorSetupStrings.cs      | 10 ++++++++++
 osu.Game/Screens/Edit/Setup/DifficultySection.cs | 15 +++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/osu.Game/Localisation/EditorSetupStrings.cs b/osu.Game/Localisation/EditorSetupStrings.cs
index 4ddacf2c5b..caea3dd130 100644
--- a/osu.Game/Localisation/EditorSetupStrings.cs
+++ b/osu.Game/Localisation/EditorSetupStrings.cs
@@ -126,6 +126,16 @@ namespace osu.Game.Localisation
         public static LocalisableString OverallDifficultyDescription =>
             new TranslatableString(getKey(@"overall_difficulty_description"), @"The harshness of hit windows and difficulty of special objects (ie. spinners)");
 
+        /// <summary>
+        /// "Base Velocity"
+        /// </summary>
+        public static LocalisableString BaseVelocity => new TranslatableString(getKey(@"base_velocity"), @"Base Velocity");
+
+        /// <summary>
+        /// "The base velocity of the beatmap, affecting things like slider velocity and scroll speed in some rulesets."
+        /// </summary>
+        public static LocalisableString BaseVelocityDescription => new TranslatableString(getKey(@"base_velocity_description"), @"The base velocity of the beatmap, affecting things like slider velocity and scroll speed in some rulesets.");
+
         /// <summary>
         /// "Metadata"
         /// </summary>
diff --git a/osu.Game/Screens/Edit/Setup/DifficultySection.cs b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
index 7026bde681..7c4b0e72d7 100644
--- a/osu.Game/Screens/Edit/Setup/DifficultySection.cs
+++ b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
@@ -19,6 +19,7 @@ namespace osu.Game.Screens.Edit.Setup
         private LabelledSliderBar<float> healthDrainSlider = null!;
         private LabelledSliderBar<float> approachRateSlider = null!;
         private LabelledSliderBar<float> overallDifficultySlider = null!;
+        private LabelledSliderBar<double> baseVelocitySlider = null!;
 
         public override LocalisableString Title => EditorSetupStrings.DifficultyHeader;
 
@@ -79,6 +80,19 @@ namespace osu.Game.Screens.Edit.Setup
                         Precision = 0.1f,
                     }
                 },
+                baseVelocitySlider = new LabelledSliderBar<double>
+                {
+                    Label = EditorSetupStrings.BaseVelocity,
+                    FixedLabelWidth = LABEL_WIDTH,
+                    Description = EditorSetupStrings.BaseVelocityDescription,
+                    Current = new BindableDouble(Beatmap.Difficulty.BaseSliderVelocity)
+                    {
+                        Default = 1,
+                        MinValue = 0.01,
+                        MaxValue = 10,
+                        Precision = 0.1f,
+                    }
+                },
             };
 
             foreach (var item in Children.OfType<LabelledSliderBar<float>>())
@@ -93,6 +107,7 @@ namespace osu.Game.Screens.Edit.Setup
             Beatmap.Difficulty.DrainRate = healthDrainSlider.Current.Value;
             Beatmap.Difficulty.ApproachRate = approachRateSlider.Current.Value;
             Beatmap.Difficulty.OverallDifficulty = overallDifficultySlider.Current.Value;
+            Beatmap.Difficulty.BaseSliderVelocity = baseVelocitySlider.Current.Value;
 
             Beatmap.UpdateAllHitObjects();
             Beatmap.SaveState();

From 31de4de72031afdfa1e02ed201a5bbcacf9d8333 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 7 May 2023 13:21:39 +0900
Subject: [PATCH 0389/1604] Remove median/mode slider velocity display

The intention was to give an idea of what the most common velocity of
the beatmap is, but in hindsight, because the "base" velocity is being
set elsewhere this doesn't make sense. It will/should be 1.0x.

Showing this range is still valuable, though.
---
 .../Timeline/DifficultyPointPiece.cs           | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
index 13a1c30cfe..545e54254a 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
@@ -159,20 +159,12 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             double[] sliderVelocities = EditorBeatmap.HitObjects.OfType<IHasSliderVelocity>().Select(sv => sv.SliderVelocity).OrderBy(v => v).ToArray();
 
-            if (sliderVelocities.Length < 2)
-                return;
+            if (sliderVelocities.First() != sliderVelocities.Last())
+            {
+                AddHeader("Used velocity range");
+                AddValue($"{sliderVelocities.First():#,0.00}x - {sliderVelocities.Last():#,0.00}x");
+            }
 
-            double? modeSliderVelocity = sliderVelocities.GroupBy(v => v).MaxBy(v => v.Count())?.Key;
-            double? medianSliderVelocity = sliderVelocities[sliderVelocities.Length / 2];
-
-            AddHeader("Average velocity");
-            AddValue($"{medianSliderVelocity:#,0.00}x");
-
-            AddHeader("Most used velocity");
-            AddValue($"{modeSliderVelocity:#,0.00}x");
-
-            AddHeader("Velocity range");
-            AddValue($"{sliderVelocities.First():#,0.00}x - {sliderVelocities.Last():#,0.00}x");
         }
 
         protected override void Dispose(bool isDisposing)

From d9dd35c0202d10694721737c16675e4db236c45f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 7 May 2023 13:22:48 +0900
Subject: [PATCH 0390/1604] Show base velocity in slider adjustment popover

---
 .../Edit/Compose/Components/Timeline/DifficultyPointPiece.cs    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
index 545e54254a..a02a3be430 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
@@ -165,6 +165,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 AddValue($"{sliderVelocities.First():#,0.00}x - {sliderVelocities.Last():#,0.00}x");
             }
 
+            AddHeader("Beatmap base velocity");
+            AddValue($"{EditorBeatmap.Difficulty.BaseSliderVelocity:#,0.00}x");
         }
 
         protected override void Dispose(bool isDisposing)

From 451af9d1b5b04e58cf034f65a2480366c3b9a34b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 May 2023 13:23:13 +0900
Subject: [PATCH 0391/1604] Fix beatmap values not being updated due to a
 varying data type

---
 osu.Game/Screens/Edit/Setup/DifficultySection.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Setup/DifficultySection.cs b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
index 7c4b0e72d7..66bb8a9b84 100644
--- a/osu.Game/Screens/Edit/Setup/DifficultySection.cs
+++ b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
@@ -96,10 +96,13 @@ namespace osu.Game.Screens.Edit.Setup
             };
 
             foreach (var item in Children.OfType<LabelledSliderBar<float>>())
-                item.Current.ValueChanged += onValueChanged;
+                item.Current.ValueChanged += _ => updateValues();
+
+            foreach (var item in Children.OfType<LabelledSliderBar<double>>())
+                item.Current.ValueChanged += _ => updateValues();
         }
 
-        private void onValueChanged(ValueChangedEvent<float> args)
+        private void updateValues()
         {
             // for now, update these on commit rather than making BeatmapMetadata bindables.
             // after switching database engines we can reconsider if switching to bindables is a good direction.

From a91edd68d976df038c654feea6c1714d03ac11bc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 May 2023 13:42:25 +0900
Subject: [PATCH 0392/1604] Show post-multiplied velocity in main hit object
 inspector

---
 osu.Game/Screens/Edit/Compose/Components/HitObjectInspector.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/HitObjectInspector.cs b/osu.Game/Screens/Edit/Compose/Components/HitObjectInspector.cs
index 597925e3e2..60b9010aa8 100644
--- a/osu.Game/Screens/Edit/Compose/Components/HitObjectInspector.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/HitObjectInspector.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                     if (selected is IHasSliderVelocity sliderVelocity)
                     {
                         AddHeader("Slider Velocity");
-                        AddValue($"{sliderVelocity.SliderVelocity:#,0.00}x");
+                        AddValue($"{sliderVelocity.SliderVelocity:#,0.00}x ({sliderVelocity.SliderVelocity * EditorBeatmap.Difficulty.BaseSliderVelocity:#,0.00}x)");
                     }
 
                     if (selected is IHasRepeats repeats)

From a6cb1f90e4c9ab1b2e06bda043321f2795a56b8e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 May 2023 13:43:21 +0900
Subject: [PATCH 0393/1604] Change difficulty popover inspector display (yet
 again)

I think this makes the most sense of the iterations I've tested so far, albeit maybe being a touch too verbose.
---
 .../Timeline/DifficultyPointPiece.cs          | 32 +++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
index a02a3be430..ac37101060 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
@@ -96,7 +96,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                                 RelativeSizeAxes = Axes.X,
                                 Text = "Hold shift while dragging the end of an object to adjust velocity while snapping."
                             },
-                            new SliderVelocityInspector(),
+                            new SliderVelocityInspector(sliderVelocitySlider.Current),
                         }
                     }
                 };
@@ -145,28 +145,48 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
     internal partial class SliderVelocityInspector : EditorInspector
     {
+        private readonly Bindable<double?> current;
+
+        public SliderVelocityInspector(Bindable<double?> current)
+        {
+            this.current = current;
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
             EditorBeatmap.TransactionBegan += updateInspectorText;
             EditorBeatmap.TransactionEnded += updateInspectorText;
+            EditorBeatmap.BeatmapReprocessed += updateInspectorText;
+            current.ValueChanged += _ => updateInspectorText();
+
             updateInspectorText();
         }
 
         private void updateInspectorText()
         {
+            double beatmapVelocity = EditorBeatmap.Difficulty.BaseSliderVelocity;
+
             InspectorText.Clear();
 
             double[] sliderVelocities = EditorBeatmap.HitObjects.OfType<IHasSliderVelocity>().Select(sv => sv.SliderVelocity).OrderBy(v => v).ToArray();
 
+            AddHeader("Base velocity (from beatmap setup)");
+            AddValue($"{beatmapVelocity:#,0.00}x");
+
+            AddHeader("Final velocity");
+            AddValue($"{beatmapVelocity * current.Value:#,0.00}x");
+
             if (sliderVelocities.First() != sliderVelocities.Last())
             {
-                AddHeader("Used velocity range");
-                AddValue($"{sliderVelocities.First():#,0.00}x - {sliderVelocities.Last():#,0.00}x");
-            }
+                AddHeader("Beatmap velocity range");
 
-            AddHeader("Beatmap base velocity");
-            AddValue($"{EditorBeatmap.Difficulty.BaseSliderVelocity:#,0.00}x");
+                string range = $"{sliderVelocities.First():#,0.00}x - {sliderVelocities.Last():#,0.00}x";
+                if (beatmapVelocity != 1)
+                    range += $" ({beatmapVelocity * sliderVelocities.First():#,0.00}x - {beatmapVelocity * sliderVelocities.Last():#,0.00}x)";
+
+                AddValue(range);
+            }
         }
 
         protected override void Dispose(bool isDisposing)

From 8c44d528e9f640d56a4834cb81d99cbf81bc630a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 May 2023 13:51:52 +0900
Subject: [PATCH 0394/1604] Use min/max values from stable

---
 osu.Game/Screens/Edit/Setup/DifficultySection.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Setup/DifficultySection.cs b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
index 66bb8a9b84..6c7e96f91d 100644
--- a/osu.Game/Screens/Edit/Setup/DifficultySection.cs
+++ b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
@@ -88,9 +88,9 @@ namespace osu.Game.Screens.Edit.Setup
                     Current = new BindableDouble(Beatmap.Difficulty.BaseSliderVelocity)
                     {
                         Default = 1,
-                        MinValue = 0.01,
-                        MaxValue = 10,
-                        Precision = 0.1f,
+                        MinValue = 0.4,
+                        MaxValue = 3.6,
+                        Precision = 0.01f,
                     }
                 },
             };

From f0020381377f77f58d5374007aebbe16e70e8776 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 May 2023 15:29:04 +0900
Subject: [PATCH 0395/1604] Add test coverage of failing wiki return to page
 scenario

---
 .../Visual/Online/TestSceneWikiOverlay.cs     | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneWikiOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneWikiOverlay.cs
index b0e4303ca4..310e34262e 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneWikiOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneWikiOverlay.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Linq;
 using System.Net;
@@ -20,7 +18,7 @@ namespace osu.Game.Tests.Visual.Online
     {
         private DummyAPIAccess dummyAPI => (DummyAPIAccess)API;
 
-        private WikiOverlay wiki;
+        private WikiOverlay wiki = null!;
 
         [SetUp]
         public void SetUp() => Schedule(() => Child = wiki = new WikiOverlay());
@@ -73,7 +71,23 @@ namespace osu.Game.Tests.Visual.Online
             AddUntilStep("Error message correct", () => wiki.ChildrenOfType<SpriteText>().Any(text => text.Text == "\"This_page_will_error_out\"."));
         }
 
-        private void setUpWikiResponse(APIWikiPage r, string redirectionPath = null)
+        [Test]
+        public void TestReturnAfterErrorPage()
+        {
+            setUpWikiResponse(responseArticlePage);
+
+            AddStep("Show article page", () => wiki.ShowPage("Article_styling_criteria/Formatting"));
+            AddUntilStep("Wait for non-error page", () => wiki.CurrentPath == "Article_styling_criteria/Formatting");
+
+            AddStep("Show nonexistent page", () => wiki.ShowPage("This_page_will_error_out"));
+            AddUntilStep("Wait for error page", () => wiki.CurrentPath == "error");
+
+            AddStep("Show article page", () => wiki.ShowPage("Article_styling_criteria/Formatting"));
+            AddUntilStep("Wait for non-error page", () => wiki.CurrentPath == "Article_styling_criteria/Formatting");
+            AddUntilStep("Error message not displayed", () => wiki.ChildrenOfType<SpriteText>().All(text => text.Text != "\"This_page_will_error_out\"."));
+        }
+
+        private void setUpWikiResponse(APIWikiPage r, string? redirectionPath = null)
             => AddStep("set up response", () =>
             {
                 dummyAPI.HandleRequest = request =>

From 715b735131d8c1c1b3073222175ebe8753fc51ee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 May 2023 15:20:17 +0900
Subject: [PATCH 0396/1604] Fix "Return to main page" link not working on wiki
 after error

---
 osu.Game/Overlays/WikiOverlay.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Overlays/WikiOverlay.cs b/osu.Game/Overlays/WikiOverlay.cs
index 2444aa4fa2..c816eca776 100644
--- a/osu.Game/Overlays/WikiOverlay.cs
+++ b/osu.Game/Overlays/WikiOverlay.cs
@@ -157,7 +157,9 @@ namespace osu.Game.Overlays
 
         private void onFail(string originalPath)
         {
+            wikiData.Value = null;
             path.Value = "error";
+
             LoadDisplay(articlePage = new WikiArticlePage($@"{api.WebsiteRootUrl}/wiki/",
                 $"Something went wrong when trying to fetch page \"{originalPath}\".\n\n[Return to the main page](Main_Page)."));
         }

From 9160711470035a7fbe6fd8227debe1934c943742 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 May 2023 15:32:00 +0900
Subject: [PATCH 0397/1604] Change "Show main page" test steps to actually load
 the main page

---
 osu.Game.Tests/Visual/Online/TestSceneWikiOverlay.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneWikiOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneWikiOverlay.cs
index 310e34262e..79c7e3a22e 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneWikiOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneWikiOverlay.cs
@@ -27,13 +27,13 @@ namespace osu.Game.Tests.Visual.Online
         public void TestMainPage()
         {
             setUpWikiResponse(responseMainPage);
-            AddStep("Show main page", () => wiki.Show());
+            AddStep("Show main page", () => wiki.ShowPage());
         }
 
         [Test]
         public void TestCancellationDoesntShowError()
         {
-            AddStep("Show main page", () => wiki.Show());
+            AddStep("Show main page", () => wiki.ShowPage());
             AddStep("Show another page", () => wiki.ShowPage("Article_styling_criteria/Formatting"));
 
             AddUntilStep("Current path is not error", () => wiki.CurrentPath != "error");

From 814f0b3fedf27661b721aecb17c1a9fbb7c5f000 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 May 2023 15:43:11 +0900
Subject: [PATCH 0398/1604] Add back early return in `OnReleased` for safety

---
 osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index 20daab2447..e5a6aa1049 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -329,6 +329,10 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             if (HoldStartTime == null)
                 return;
 
+            // do not run any of this logic when rewinding, as it inverts order of presses/releases.
+            if (Time.Elapsed < 0)
+                return;
+
             Tail.UpdateResult();
             endHold();
 

From 1b7dd32eb1f006393fb73969f215a4b2421619c8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 May 2023 16:55:29 +0900
Subject: [PATCH 0399/1604] Apply nullability in related classes and remove
 unused variable

---
 .../TestSceneHoldNoteInput.cs                        | 12 ++++--------
 .../UI/Scrolling/Algorithms/IScrollAlgorithm.cs      |  2 --
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index 42e2099e3f..ce6a118d9b 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
@@ -40,7 +38,7 @@ namespace osu.Game.Rulesets.Mania.Tests
         private const double time_tail = 4000;
         private const double time_after_tail = 5250;
 
-        private List<JudgementResult> judgementResults;
+        private List<JudgementResult> judgementResults = new List<JudgementResult>();
 
         /// <summary>
         ///     -----[           ]-----
@@ -521,9 +519,9 @@ namespace osu.Game.Rulesets.Mania.Tests
         private void assertLastTickJudgement(HitResult result)
             => AddAssert($"last tick judged as {result}", () => judgementResults.Last(j => j.HitObject is HoldNoteTick).Type, () => Is.EqualTo(result));
 
-        private ScoreAccessibleReplayPlayer currentPlayer;
+        private ScoreAccessibleReplayPlayer currentPlayer = null!;
 
-        private void performTest(List<ReplayFrame> frames, Beatmap<ManiaHitObject> beatmap = null)
+        private void performTest(List<ReplayFrame> frames, Beatmap<ManiaHitObject>? beatmap = null)
         {
             if (beatmap == null)
             {
@@ -569,15 +567,13 @@ namespace osu.Game.Rulesets.Mania.Tests
             AddUntilStep("Beatmap at 0", () => Beatmap.Value.Track.CurrentTime == 0);
             AddUntilStep("Wait until player is loaded", () => currentPlayer.IsCurrentScreen());
 
-            AddUntilStep("Wait for completion", () => currentPlayer.ScoreProcessor?.HasCompleted.Value == true);
+            AddUntilStep("Wait for completion", () => currentPlayer.ScoreProcessor.HasCompleted.Value);
         }
 
         private partial class ScoreAccessibleReplayPlayer : ReplayPlayer
         {
             public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;
 
-            public new GameplayClockContainer GameplayClockContainer => base.GameplayClockContainer;
-
             protected override bool PauseOnFocusLost => false;
 
             public ScoreAccessibleReplayPlayer(Score score)
diff --git a/osu.Game/Rulesets/UI/Scrolling/Algorithms/IScrollAlgorithm.cs b/osu.Game/Rulesets/UI/Scrolling/Algorithms/IScrollAlgorithm.cs
index f78509f919..437e5a5e38 100644
--- a/osu.Game/Rulesets/UI/Scrolling/Algorithms/IScrollAlgorithm.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/Algorithms/IScrollAlgorithm.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Rulesets.UI.Scrolling.Algorithms
 {
     public interface IScrollAlgorithm

From d6ce56e6b1d7eec37ea19a32d5034f467fb96226 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 May 2023 16:55:48 +0900
Subject: [PATCH 0400/1604] Fix `GetMostCommonBeatLength` returning zero in
 case of not timing points

---
 osu.Game/Beatmaps/Beatmap.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/Beatmap.cs b/osu.Game/Beatmaps/Beatmap.cs
index 416d655cc3..4f81b26c3e 100644
--- a/osu.Game/Beatmaps/Beatmap.cs
+++ b/osu.Game/Beatmaps/Beatmap.cs
@@ -107,9 +107,12 @@ namespace osu.Game.Beatmaps
                                 // Aggregate durations into a set of (beatLength, duration) tuples for each beat length
                                 .GroupBy(t => Math.Round(t.beatLength * 1000) / 1000)
                                 .Select(g => (beatLength: g.Key, duration: g.Sum(t => t.duration)))
-                                // Get the most common one, or 0 as a suitable default
+                                // Get the most common one, or 0 as a suitable default (see handling below)
                                 .OrderByDescending(i => i.duration).FirstOrDefault();
 
+            if (mostCommon.beatLength == 0)
+                return TimingControlPoint.DEFAULT_BEAT_LENGTH;
+
             return mostCommon.beatLength;
         }
 

From bcabe967141d8a55b42b4e3da42546c8f2520749 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 May 2023 17:49:41 +0900
Subject: [PATCH 0401/1604] Add extra tests of hold note input in more standard
 scenarios

---
 .../TestSceneHoldNoteInput.cs                 | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index ce6a118d9b..77db1b0bd8 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -59,6 +59,44 @@ namespace osu.Game.Rulesets.Mania.Tests
             assertNoteJudgement(HitResult.IgnoreMiss);
         }
 
+        /// <summary>
+        ///     -----[           ]-----
+        ///          x           o
+        /// </summary>
+        [Test]
+        public void TestCorrectInput()
+        {
+            performTest(new List<ReplayFrame>
+            {
+                new ManiaReplayFrame(time_head, ManiaAction.Key1),
+                new ManiaReplayFrame(time_tail),
+            });
+
+            assertHeadJudgement(HitResult.Perfect);
+            assertTickJudgement(HitResult.LargeTickHit);
+            assertTailJudgement(HitResult.Perfect);
+            assertNoteJudgement(HitResult.IgnoreHit);
+        }
+
+        /// <summary>
+        ///     -----[           ]-----
+        ///          x                   o
+        /// </summary>
+        [Test]
+        public void TestLateRelease()
+        {
+            performTest(new List<ReplayFrame>
+            {
+                new ManiaReplayFrame(time_head, ManiaAction.Key1),
+                new ManiaReplayFrame(time_after_tail),
+            });
+
+            assertHeadJudgement(HitResult.Perfect);
+            assertTickJudgement(HitResult.LargeTickHit);
+            assertTailJudgement(HitResult.Miss);
+            assertNoteJudgement(HitResult.IgnoreMiss);
+        }
+
         /// <summary>
         ///     -----[           ]-----
         ///  x                           o

From d2380bd8401491d13d70bf0122ce1df341f8620e Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 8 May 2023 18:12:56 +0900
Subject: [PATCH 0402/1604] Remove usages of [ExcludeFromDynamicCompile]

---
 osu.Game/Beatmaps/BeatmapDifficulty.cs                | 2 --
 osu.Game/Beatmaps/BeatmapImporter.cs                  | 2 --
 osu.Game/Beatmaps/BeatmapInfo.cs                      | 2 --
 osu.Game/Beatmaps/BeatmapManager.cs                   | 2 --
 osu.Game/Beatmaps/BeatmapMetadata.cs                  | 2 --
 osu.Game/Beatmaps/BeatmapSetInfo.cs                   | 2 --
 osu.Game/Beatmaps/BeatmapUpdaterMetadataLookup.cs     | 2 --
 osu.Game/Beatmaps/WorkingBeatmap.cs                   | 2 --
 osu.Game/Beatmaps/WorkingBeatmapCache.cs              | 2 --
 osu.Game/Configuration/DevelopmentOsuConfigManager.cs | 2 --
 osu.Game/Configuration/OsuConfigManager.cs            | 2 --
 osu.Game/Database/RealmFileStore.cs                   | 2 --
 osu.Game/Models/RealmFile.cs                          | 2 --
 osu.Game/Models/RealmNamedFileUsage.cs                | 2 --
 osu.Game/Overlays/Settings/SettingsSubsection.cs      | 2 --
 osu.Game/Rulesets/Mods/Mod.cs                         | 2 --
 osu.Game/Rulesets/Ruleset.cs                          | 2 --
 osu.Game/Rulesets/RulesetInfo.cs                      | 2 --
 osu.Game/Scoring/ScoreInfo.cs                         | 2 --
 osu.Game/Skinning/SkinInfo.cs                         | 2 --
 osu.Game/Skinning/SkinManager.cs                      | 2 --
 osu.Game/Tests/Visual/OsuTestScene.cs                 | 1 -
 22 files changed, 43 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapDifficulty.cs b/osu.Game/Beatmaps/BeatmapDifficulty.cs
index f4bc5e7b77..217f3b89a4 100644
--- a/osu.Game/Beatmaps/BeatmapDifficulty.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficulty.cs
@@ -1,12 +1,10 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Framework.Testing;
 using Realms;
 
 namespace osu.Game.Beatmaps
 {
-    [ExcludeFromDynamicCompile]
     [MapTo("BeatmapDifficulty")]
     public class BeatmapDifficulty : EmbeddedObject, IBeatmapDifficultyInfo
     {
diff --git a/osu.Game/Beatmaps/BeatmapImporter.cs b/osu.Game/Beatmaps/BeatmapImporter.cs
index 4731a70753..7d367ef77d 100644
--- a/osu.Game/Beatmaps/BeatmapImporter.cs
+++ b/osu.Game/Beatmaps/BeatmapImporter.cs
@@ -12,7 +12,6 @@ using osu.Framework.Extensions;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
-using osu.Framework.Testing;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.Collections;
 using osu.Game.Database;
@@ -28,7 +27,6 @@ namespace osu.Game.Beatmaps
     /// <summary>
     /// Handles the storage and retrieval of Beatmaps/WorkingBeatmaps.
     /// </summary>
-    [ExcludeFromDynamicCompile]
     public class BeatmapImporter : RealmArchiveModelImporter<BeatmapSetInfo>
     {
         public override IEnumerable<string> HandledExtensions => new[] { ".osz" };
diff --git a/osu.Game/Beatmaps/BeatmapInfo.cs b/osu.Game/Beatmaps/BeatmapInfo.cs
index 63e878b80d..393feff087 100644
--- a/osu.Game/Beatmaps/BeatmapInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapInfo.cs
@@ -6,7 +6,6 @@ using System.Diagnostics;
 using System.Linq;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
-using osu.Framework.Testing;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Collections;
 using osu.Game.Database;
@@ -27,7 +26,6 @@ namespace osu.Game.Beatmaps
     /// <remarks>
     /// There are some legacy fields in this model which are not persisted to realm. These are isolated in a code region within the class and should eventually be migrated to `Beatmap`.
     /// </remarks>
-    [ExcludeFromDynamicCompile]
     [Serializable]
     [MapTo("Beatmap")]
     public class BeatmapInfo : RealmObject, IHasGuidPrimaryKey, IBeatmapInfo, IEquatable<BeatmapInfo>
diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 61b234d88a..305dc01844 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -15,7 +15,6 @@ using osu.Framework.Audio.Track;
 using osu.Framework.Extensions;
 using osu.Framework.IO.Stores;
 using osu.Framework.Platform;
-using osu.Framework.Testing;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.Database;
 using osu.Game.Extensions;
@@ -33,7 +32,6 @@ namespace osu.Game.Beatmaps
     /// <summary>
     /// Handles general operations related to global beatmap management.
     /// </summary>
-    [ExcludeFromDynamicCompile]
     public class BeatmapManager : ModelManager<BeatmapSetInfo>, IModelImporter<BeatmapSetInfo>, IWorkingBeatmapCache
     {
         public ITrackStore BeatmapTrackStore { get; }
diff --git a/osu.Game/Beatmaps/BeatmapMetadata.cs b/osu.Game/Beatmaps/BeatmapMetadata.cs
index f645d914b1..811dc54e16 100644
--- a/osu.Game/Beatmaps/BeatmapMetadata.cs
+++ b/osu.Game/Beatmaps/BeatmapMetadata.cs
@@ -4,7 +4,6 @@
 using System;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
-using osu.Framework.Testing;
 using osu.Game.Models;
 using osu.Game.Users;
 using osu.Game.Utils;
@@ -23,7 +22,6 @@ namespace osu.Game.Beatmaps
     ///
     /// Note that difficulty name is not stored in this metadata but in <see cref="BeatmapInfo"/>.
     /// </remarks>
-    [ExcludeFromDynamicCompile]
     [Serializable]
     [MapTo("BeatmapMetadata")]
     public class BeatmapMetadata : RealmObject, IBeatmapMetadataInfo, IDeepCloneable<BeatmapMetadata>
diff --git a/osu.Game/Beatmaps/BeatmapSetInfo.cs b/osu.Game/Beatmaps/BeatmapSetInfo.cs
index b90dfdba05..59e413d935 100644
--- a/osu.Game/Beatmaps/BeatmapSetInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapSetInfo.cs
@@ -6,7 +6,6 @@ using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
-using osu.Framework.Testing;
 using osu.Game.Database;
 using osu.Game.Extensions;
 using osu.Game.Models;
@@ -17,7 +16,6 @@ namespace osu.Game.Beatmaps
     /// <summary>
     /// A realm model containing metadata for a beatmap set (containing multiple <see cref="BeatmapInfo"/>s).
     /// </summary>
-    [ExcludeFromDynamicCompile]
     [MapTo("BeatmapSet")]
     public class BeatmapSetInfo : RealmObject, IHasGuidPrimaryKey, IHasRealmFiles, ISoftDelete, IEquatable<BeatmapSetInfo>, IBeatmapSetInfo
     {
diff --git a/osu.Game/Beatmaps/BeatmapUpdaterMetadataLookup.cs b/osu.Game/Beatmaps/BeatmapUpdaterMetadataLookup.cs
index 71d40b1a48..fac91c23f5 100644
--- a/osu.Game/Beatmaps/BeatmapUpdaterMetadataLookup.cs
+++ b/osu.Game/Beatmaps/BeatmapUpdaterMetadataLookup.cs
@@ -13,7 +13,6 @@ using osu.Framework.Development;
 using osu.Framework.IO.Network;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
-using osu.Framework.Testing;
 using osu.Game.Database;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
@@ -30,7 +29,6 @@ namespace osu.Game.Beatmaps
     /// On creating the component, a copy of a database containing metadata for a large subset of beatmaps (stored to <see cref="cache_database_name"/>) will be downloaded if not already present locally.
     /// This will always be checked before doing a second online query to get required metadata.
     /// </remarks>
-    [ExcludeFromDynamicCompile]
     public class BeatmapUpdaterMetadataLookup : IDisposable
     {
         private readonly IAPIProvider api;
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index ab790617bb..59a71fd80c 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -16,7 +16,6 @@ using osu.Framework.Audio.Track;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Logging;
-using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
@@ -25,7 +24,6 @@ using osu.Game.Storyboards;
 
 namespace osu.Game.Beatmaps
 {
-    [ExcludeFromDynamicCompile]
     public abstract class WorkingBeatmap : IWorkingBeatmap
     {
         public readonly BeatmapInfo BeatmapInfo;
diff --git a/osu.Game/Beatmaps/WorkingBeatmapCache.cs b/osu.Game/Beatmaps/WorkingBeatmapCache.cs
index 76a31a6f78..ef843909d8 100644
--- a/osu.Game/Beatmaps/WorkingBeatmapCache.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmapCache.cs
@@ -17,7 +17,6 @@ using osu.Framework.Lists;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Framework.Statistics;
-using osu.Framework.Testing;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.Database;
 using osu.Game.IO;
@@ -121,7 +120,6 @@ namespace osu.Game.Beatmaps
 
         #endregion
 
-        [ExcludeFromDynamicCompile]
         private class BeatmapManagerWorkingBeatmap : WorkingBeatmap
         {
             [NotNull]
diff --git a/osu.Game/Configuration/DevelopmentOsuConfigManager.cs b/osu.Game/Configuration/DevelopmentOsuConfigManager.cs
index dda30c1d00..33329002a9 100644
--- a/osu.Game/Configuration/DevelopmentOsuConfigManager.cs
+++ b/osu.Game/Configuration/DevelopmentOsuConfigManager.cs
@@ -4,11 +4,9 @@
 #nullable disable
 
 using osu.Framework.Platform;
-using osu.Framework.Testing;
 
 namespace osu.Game.Configuration
 {
-    [ExcludeFromDynamicCompile]
     public class DevelopmentOsuConfigManager : OsuConfigManager
     {
         protected override string Filename => base.Filename.Replace(".ini", ".dev.ini");
diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 1e7d3cf84f..365ad37f4c 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -12,7 +12,6 @@ using osu.Framework.Extensions;
 using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Localisation;
 using osu.Framework.Platform;
-using osu.Framework.Testing;
 using osu.Game.Beatmaps.Drawables.Cards;
 using osu.Game.Input;
 using osu.Game.Input.Bindings;
@@ -26,7 +25,6 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Configuration
 {
-    [ExcludeFromDynamicCompile]
     public class OsuConfigManager : IniConfigManager<OsuSetting>, IGameplaySettings
     {
         public OsuConfigManager(Storage storage)
diff --git a/osu.Game/Database/RealmFileStore.cs b/osu.Game/Database/RealmFileStore.cs
index f75d3be725..1da64d5be8 100644
--- a/osu.Game/Database/RealmFileStore.cs
+++ b/osu.Game/Database/RealmFileStore.cs
@@ -8,7 +8,6 @@ using osu.Framework.Extensions;
 using osu.Framework.IO.Stores;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
-using osu.Framework.Testing;
 using osu.Game.Extensions;
 using osu.Game.IO;
 using osu.Game.Models;
@@ -19,7 +18,6 @@ namespace osu.Game.Database
     /// <summary>
     /// Handles the storing of files to the file system (and database) backing.
     /// </summary>
-    [ExcludeFromDynamicCompile]
     public class RealmFileStore
     {
         private readonly RealmAccess realm;
diff --git a/osu.Game/Models/RealmFile.cs b/osu.Game/Models/RealmFile.cs
index f96b717937..2faa3f0ca6 100644
--- a/osu.Game/Models/RealmFile.cs
+++ b/osu.Game/Models/RealmFile.cs
@@ -1,13 +1,11 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Framework.Testing;
 using osu.Game.IO;
 using Realms;
 
 namespace osu.Game.Models
 {
-    [ExcludeFromDynamicCompile]
     [MapTo("File")]
     public class RealmFile : RealmObject, IFileInfo
     {
diff --git a/osu.Game/Models/RealmNamedFileUsage.cs b/osu.Game/Models/RealmNamedFileUsage.cs
index c4310c4edb..c8e2c6f6d0 100644
--- a/osu.Game/Models/RealmNamedFileUsage.cs
+++ b/osu.Game/Models/RealmNamedFileUsage.cs
@@ -3,14 +3,12 @@
 
 using System;
 using JetBrains.Annotations;
-using osu.Framework.Testing;
 using osu.Game.Database;
 using osu.Game.IO;
 using Realms;
 
 namespace osu.Game.Models
 {
-    [ExcludeFromDynamicCompile]
     public class RealmNamedFileUsage : EmbeddedObject, INamedFile, INamedFileUsage
     {
         public RealmFile File { get; set; } = null!;
diff --git a/osu.Game/Overlays/Settings/SettingsSubsection.cs b/osu.Game/Overlays/Settings/SettingsSubsection.cs
index 784f20a6e8..eda18abaef 100644
--- a/osu.Game/Overlays/Settings/SettingsSubsection.cs
+++ b/osu.Game/Overlays/Settings/SettingsSubsection.cs
@@ -10,12 +10,10 @@ using osu.Game.Graphics.Sprites;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Localisation;
-using osu.Framework.Testing;
 using osu.Game.Graphics;
 
 namespace osu.Game.Overlays.Settings
 {
-    [ExcludeFromDynamicCompile]
     public abstract partial class SettingsSubsection : FillFlowContainer, IFilterable
     {
         protected override Container<Drawable> Content => FlowContent;
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 787da926ea..f9812d6c00 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -10,7 +10,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
-using osu.Framework.Testing;
 using osu.Game.Configuration;
 using osu.Game.Extensions;
 using osu.Game.Rulesets.UI;
@@ -21,7 +20,6 @@ namespace osu.Game.Rulesets.Mods
     /// <summary>
     /// The base class for gameplay modifiers.
     /// </summary>
-    [ExcludeFromDynamicCompile]
     public abstract class Mod : IMod, IEquatable<Mod>, IDeepCloneable<Mod>
     {
         [JsonIgnore]
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index fcf7a78090..a77068eb14 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -12,7 +12,6 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Bindings;
 using osu.Framework.IO.Stores;
 using osu.Framework.Localisation;
-using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Legacy;
 using osu.Game.Configuration;
@@ -34,7 +33,6 @@ using osu.Game.Users;
 
 namespace osu.Game.Rulesets
 {
-    [ExcludeFromDynamicCompile]
     public abstract class Ruleset
     {
         public RulesetInfo RulesetInfo { get; }
diff --git a/osu.Game/Rulesets/RulesetInfo.cs b/osu.Game/Rulesets/RulesetInfo.cs
index 6a4e0f0b48..56f073f74c 100644
--- a/osu.Game/Rulesets/RulesetInfo.cs
+++ b/osu.Game/Rulesets/RulesetInfo.cs
@@ -3,13 +3,11 @@
 
 using System;
 using JetBrains.Annotations;
-using osu.Framework.Testing;
 using osu.Game.Rulesets.Difficulty;
 using Realms;
 
 namespace osu.Game.Rulesets
 {
-    [ExcludeFromDynamicCompile]
     [MapTo("Ruleset")]
     public class RulesetInfo : RealmObject, IEquatable<RulesetInfo>, IComparable<RulesetInfo>, IRulesetInfo
     {
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 02c7acf350..e084c45de0 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -7,7 +7,6 @@ using System.Linq;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
 using osu.Framework.Localisation;
-using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
 using osu.Game.Models;
@@ -25,7 +24,6 @@ namespace osu.Game.Scoring
     /// <summary>
     /// A realm model containing metadata for a single score.
     /// </summary>
-    [ExcludeFromDynamicCompile]
     [MapTo("Score")]
     public class ScoreInfo : RealmObject, IHasGuidPrimaryKey, IHasRealmFiles, ISoftDelete, IEquatable<ScoreInfo>, IScoreInfo
     {
diff --git a/osu.Game/Skinning/SkinInfo.cs b/osu.Game/Skinning/SkinInfo.cs
index 9ad91f8725..c2b80b7ead 100644
--- a/osu.Game/Skinning/SkinInfo.cs
+++ b/osu.Game/Skinning/SkinInfo.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
-using osu.Framework.Testing;
 using osu.Game.Database;
 using osu.Game.IO;
 using osu.Game.Models;
@@ -13,7 +12,6 @@ using Realms;
 
 namespace osu.Game.Skinning
 {
-    [ExcludeFromDynamicCompile]
     [MapTo("Skin")]
     [JsonObject(MemberSerialization.OptIn)]
     public class SkinInfo : RealmObject, IHasRealmFiles, IEquatable<SkinInfo>, IHasGuidPrimaryKey, ISoftDelete, IHasNamedFiles
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 45536e04eb..51605c6045 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -18,7 +18,6 @@ using osu.Framework.Graphics.Rendering;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
 using osu.Framework.Platform;
-using osu.Framework.Testing;
 using osu.Framework.Threading;
 using osu.Framework.Utils;
 using osu.Game.Audio;
@@ -36,7 +35,6 @@ namespace osu.Game.Skinning
     /// This is also exposed and cached as <see cref="ISkinSource"/> to allow for any component to potentially have skinning support.
     /// For gameplay components, see <see cref="RulesetSkinProvidingContainer"/> which adds extra legacy and toggle logic that may affect the lookup process.
     /// </remarks>
-    [ExcludeFromDynamicCompile]
     public class SkinManager : ModelManager<SkinInfo>, ISkinSource, IStorageResourceProvider, IModelImporter<SkinInfo>
     {
         /// <summary>
diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index 46c7c3a57c..0ec5a4c5c2 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -36,7 +36,6 @@ using osu.Game.Tests.Rulesets;
 
 namespace osu.Game.Tests.Visual
 {
-    [ExcludeFromDynamicCompile]
     public abstract partial class OsuTestScene : TestScene
     {
         [Cached]

From 27c10cbdb7082e219400873ae72de33029e131bf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 May 2023 18:14:07 +0900
Subject: [PATCH 0403/1604] Remove clamping of `sizingContainer` in
 `DrawableHoldNote` to fix head note alignment

---
 .../Objects/Drawables/DrawableHoldNote.cs                    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index 372ef1e164..09976827fe 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -3,7 +3,6 @@
 
 #nullable disable
 
-using System;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -246,8 +245,8 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             if (Head.IsHit && releaseTime == null && DrawHeight > 0)
             {
                 // How far past the hit target this hold note is. Always a positive value.
-                float yOffset = Math.Max(0, Direction.Value == ScrollingDirection.Up ? -Y : Y);
-                sizingContainer.Height = Math.Clamp(1 - yOffset / DrawHeight, 0, 1);
+                float yOffset = Direction.Value == ScrollingDirection.Up ? -Y : Y;
+                sizingContainer.Height = 1 - yOffset / DrawHeight;
             }
         }
 

From 64498e95a46915843625de96156c9e6ec6e0c0aa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 May 2023 18:56:29 +0900
Subject: [PATCH 0404/1604] Add an `IAnimationTimeReference` to
 `DrawableHitObject` to synchronise all animations

---
 .../Rulesets/Objects/Drawables/DrawableHitObject.cs  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 79fc778287..07c0d1f8a1 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -30,7 +30,7 @@ using osuTK.Graphics;
 namespace osu.Game.Rulesets.Objects.Drawables
 {
     [Cached(typeof(DrawableHitObject))]
-    public abstract partial class DrawableHitObject : PoolableDrawableWithLifetime<HitObjectLifetimeEntry>
+    public abstract partial class DrawableHitObject : PoolableDrawableWithLifetime<HitObjectLifetimeEntry>, IAnimationTimeReference
     {
         /// <summary>
         /// Invoked after this <see cref="DrawableHitObject"/>'s applied <see cref="HitObject"/> has had its defaults applied.
@@ -425,11 +425,13 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
             LifetimeEnd = double.MaxValue;
 
-            double transformTime = HitObject.StartTime - InitialLifetimeOffset;
-
             clearExistingStateTransforms();
 
-            using (BeginAbsoluteSequence(transformTime))
+            double initialTransformsTime = HitObject.StartTime - InitialLifetimeOffset;
+
+            AnimationStartTime.Value = initialTransformsTime;
+
+            using (BeginAbsoluteSequence(initialTransformsTime))
                 UpdateInitialTransforms();
 
             using (BeginAbsoluteSequence(StateUpdateTime))
@@ -721,6 +723,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
             if (CurrentSkin != null)
                 CurrentSkin.SourceChanged -= skinSourceChanged;
         }
+
+        public Bindable<double> AnimationStartTime { get; } = new BindableDouble();
     }
 
     public abstract partial class DrawableHitObject<TObject> : DrawableHitObject

From 1ff17309484e02aceb14efa3ba2fea8ebce67b88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 8 May 2023 22:35:41 +0200
Subject: [PATCH 0405/1604] Remove no-longer-correct remark

---
 osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index 9ffd338d7c..ce34addeff 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -247,7 +247,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             // 2. The head note will move along with the new "head position" in the container.
             if (Head.IsHit && releaseTime == null && DrawHeight > 0)
             {
-                // How far past the hit target this hold note is. Always a positive value.
+                // How far past the hit target this hold note is.
                 float yOffset = Direction.Value == ScrollingDirection.Up ? -Y : Y;
                 sizingContainer.Height = 1 - yOffset / DrawHeight;
             }

From 0a47ffcbdd4bacdba6a0ab1739e7eaaeaedef35f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 9 May 2023 07:03:13 +0200
Subject: [PATCH 0406/1604] Match generally used casing

Co-authored-by: Joseph Madamba <madamba.joehu@outlook.com>
---
 osu.Game.Rulesets.Mania/Edit/Setup/ManiaSetupSection.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/Setup/ManiaSetupSection.cs b/osu.Game.Rulesets.Mania/Edit/Setup/ManiaSetupSection.cs
index 98635c10a3..d5a9a311bc 100644
--- a/osu.Game.Rulesets.Mania/Edit/Setup/ManiaSetupSection.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Setup/ManiaSetupSection.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Mania.Edit.Setup
                 specialStyle = new LabelledSwitchButton
                 {
                     Label = "Use special (N+1) style",
-                    Description = "Changes one column to act as a classic \"scratch\" or \"special\" column, which can be moved around by the user's skin (to the left/right/centre). Generally used in 6k (5+1) or 8k (7+1) configurations.",
+                    Description = "Changes one column to act as a classic \"scratch\" or \"special\" column, which can be moved around by the user's skin (to the left/right/centre). Generally used in 6K (5+1) or 8K (7+1) configurations.",
                     Current = { Value = Beatmap.BeatmapInfo.SpecialStyle }
                 }
             };

From 944da06c108b9240190c297b5825365e10ccf49b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 May 2023 16:58:19 +0900
Subject: [PATCH 0407/1604] Rename slider multiplier variable back for now

---
 .../Editor/TestSceneJuiceStreamPlacementBlueprint.cs |  2 +-
 .../Editor/TestSceneJuiceStreamSelectionBlueprint.cs |  2 +-
 .../TestSceneAutoJuiceStream.cs                      |  2 +-
 .../TestSceneJuiceStream.cs                          |  2 +-
 osu.Game.Rulesets.Catch/Objects/JuiceStream.cs       |  4 ++--
 .../Legacy/DistanceObjectPatternGenerator.cs         |  2 +-
 osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs   |  2 +-
 .../Editor/TestSceneOsuDistanceSnapGrid.cs           |  2 +-
 .../Editor/TestSceneSliderStreamConversion.cs        |  2 +-
 osu.Game.Rulesets.Osu/Objects/Slider.cs              |  2 +-
 .../Editor/TestSceneTaikoEditorSaving.cs             |  4 ++--
 .../Beatmaps/TaikoBeatmapConverter.cs                |  6 +++---
 .../Mods/TaikoModDifficultyAdjust.cs                 |  2 +-
 osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs         |  2 +-
 osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs     |  2 +-
 osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs          |  2 +-
 .../Beatmaps/Formats/LegacyBeatmapDecoderTest.cs     |  2 +-
 .../Beatmaps/Formats/OsuJsonDecoderTest.cs           |  2 +-
 .../TestSceneHitObjectComposerDistanceSnapping.cs    | 12 ++++++------
 .../Visual/Editing/TestSceneDistanceSnapGrid.cs      |  2 +-
 .../Gameplay/TestSceneDrawableScrollingRuleset.cs    |  4 ++--
 .../Gameplay/TestSceneGameplaySampleTriggerSource.cs |  2 +-
 osu.Game/Beatmaps/BeatmapDifficulty.cs               |  8 ++++----
 osu.Game/Beatmaps/BeatmapImporter.cs                 |  2 +-
 osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs    |  2 +-
 osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs    |  4 ++--
 osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs          |  4 ++--
 osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs |  2 +-
 osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs    |  2 +-
 .../UI/Scrolling/DrawableScrollingRuleset.cs         |  6 +++---
 .../Edit/Compose/Components/HitObjectInspector.cs    |  2 +-
 .../Components/Timeline/DifficultyPointPiece.cs      |  2 +-
 osu.Game/Screens/Edit/Setup/DifficultySection.cs     |  4 ++--
 33 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamPlacementBlueprint.cs b/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamPlacementBlueprint.cs
index e729a09a18..2426f8c886 100644
--- a/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamPlacementBlueprint.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Catch.Tests.Editor
         {
             var playable = base.GetPlayableBeatmap();
             playable.Difficulty.SliderTickRate = 5;
-            playable.Difficulty.BaseSliderVelocity = velocity_factor * 10;
+            playable.Difficulty.SliderMultiplier = velocity_factor * 10;
             return playable;
         }
 
diff --git a/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamSelectionBlueprint.cs b/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamSelectionBlueprint.cs
index 634e1f5cbb..beba5811fe 100644
--- a/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamSelectionBlueprint.cs
@@ -210,7 +210,7 @@ namespace osu.Game.Rulesets.Catch.Tests.Editor
                 X = x,
                 Path = sliderPath,
             };
-            EditorBeatmap.Difficulty.BaseSliderVelocity = velocity;
+            EditorBeatmap.Difficulty.SliderMultiplier = velocity;
             EditorBeatmap.Add(hitObject);
             EditorBeatmap.Update(hitObject);
             Assert.That(hitObject.Velocity, Is.EqualTo(velocity));
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
index d1f3f06971..40dc7d2403 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             {
                 BeatmapInfo = new BeatmapInfo
                 {
-                    Difficulty = new BeatmapDifficulty { CircleSize = 6, BaseSliderVelocity = 3 },
+                    Difficulty = new BeatmapDifficulty { CircleSize = 6, SliderMultiplier = 3 },
                     Ruleset = ruleset
                 }
             };
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs
index 71cb8964c3..c91f07891c 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             BeatmapInfo = new BeatmapInfo
             {
-                Difficulty = new BeatmapDifficulty { CircleSize = 5, BaseSliderVelocity = 2 },
+                Difficulty = new BeatmapDifficulty { CircleSize = 5, SliderMultiplier = 2 },
                 Ruleset = ruleset
             },
             HitObjects = new List<HitObject>
diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
index 301ecd6d66..169e99c90c 100644
--- a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
@@ -64,8 +64,8 @@ namespace osu.Game.Rulesets.Catch.Objects
 
             TimingControlPoint timingPoint = controlPointInfo.TimingPointAt(StartTime);
 
-            velocityFactor = base_scoring_distance * difficulty.BaseSliderVelocity / timingPoint.BeatLength;
-            tickDistanceFactor = base_scoring_distance * difficulty.BaseSliderVelocity / difficulty.SliderTickRate;
+            velocityFactor = base_scoring_distance * difficulty.SliderMultiplier / timingPoint.BeatLength;
+            tickDistanceFactor = base_scoring_distance * difficulty.SliderMultiplier / difficulty.SliderTickRate;
         }
 
         protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
index ab6f5e8269..91b7be6e8f 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             StartTime = (int)Math.Round(hitObject.StartTime);
 
             // This matches stable's calculation.
-            EndTime = (int)Math.Floor(StartTime + distanceData.Distance * beatLength * SpanCount * 0.01 / beatmap.Difficulty.BaseSliderVelocity);
+            EndTime = (int)Math.Floor(StartTime + distanceData.Distance * beatLength * SpanCount * 0.01 / beatmap.Difficulty.SliderMultiplier);
 
             SegmentDuration = (EndTime - StartTime) / SpanCount;
         }
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index cb38551a43..af8758fb5e 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -92,7 +92,7 @@ namespace osu.Game.Rulesets.Mania.UI
             {
                 // Mania doesn't care about global velocity
                 p.Velocity = 1;
-                p.BaseBeatLength *= Beatmap.Difficulty.BaseSliderVelocity;
+                p.BaseBeatLength *= Beatmap.Difficulty.SliderMultiplier;
 
                 // For non-mania beatmap, speed changes should only happen through timing points
                 if (!isForCurrentRuleset)
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs
index b79d4efe1b..7579e8077b 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs
@@ -80,7 +80,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         [SetUp]
         public void Setup() => Schedule(() =>
         {
-            editorBeatmap.Difficulty.BaseSliderVelocity = 1;
+            editorBeatmap.Difficulty.SliderMultiplier = 1;
             editorBeatmap.ControlPointInfo.Clear();
             editorBeatmap.ControlPointInfo.Add(0, new TimingControlPoint { BeatLength = beat_length });
             snapProvider.DistanceSpacingMultiplier.Value = 1;
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderStreamConversion.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderStreamConversion.cs
index 938e093489..a162d9a491 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderStreamConversion.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderStreamConversion.cs
@@ -162,7 +162,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             AddStep("change to these specific circumstances", () =>
             {
-                EditorBeatmap.Difficulty.BaseSliderVelocity = 1;
+                EditorBeatmap.Difficulty.SliderMultiplier = 1;
                 var timingPoint = EditorBeatmap.ControlPointInfo.TimingPointAt(slider.StartTime);
                 timingPoint.BeatLength = 352.941176470588;
                 slider.Path.ControlPoints[^1].Position = new Vector2(-110, 16);
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index b86351e7cd..4189f8ba1e 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -167,7 +167,7 @@ namespace osu.Game.Rulesets.Osu.Objects
 
             TimingControlPoint timingPoint = controlPointInfo.TimingPointAt(StartTime);
 
-            double scoringDistance = BASE_SCORING_DISTANCE * difficulty.BaseSliderVelocity * SliderVelocity;
+            double scoringDistance = BASE_SCORING_DISTANCE * difficulty.SliderMultiplier * SliderVelocity;
 
             Velocity = scoringDistance / timingPoint.BeatLength;
             TickDistance = GenerateTicks ? (scoringDistance / difficulty.SliderTickRate * TickDistanceMultiplier) : double.PositiveInfinity;
diff --git a/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoEditorSaving.cs b/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoEditorSaving.cs
index d79ca28c8f..93b26624de 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoEditorSaving.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoEditorSaving.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Editor
         [Test]
         public void TestTaikoSliderMultiplier()
         {
-            AddStep("Set slider multiplier", () => EditorBeatmap.Difficulty.BaseSliderVelocity = 2);
+            AddStep("Set slider multiplier", () => EditorBeatmap.Difficulty.SliderMultiplier = 2);
 
             SaveEditor();
 
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Editor
                 // therefore, ensure that we have that difficulty type by calling .CopyFrom(), which is a no-op if the type is already correct.
                 var taikoDifficulty = new TaikoBeatmapConverter.TaikoMultiplierAppliedDifficulty();
                 taikoDifficulty.CopyFrom(EditorBeatmap.Difficulty);
-                return Precision.AlmostEquals(taikoDifficulty.BaseSliderVelocity, 2);
+                return Precision.AlmostEquals(taikoDifficulty.SliderMultiplier, 2);
             }
         }
     }
diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index 932211695a..e298e313df 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -189,7 +189,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
             else
                 beatLength = timingPoint.BeatLength;
 
-            double sliderScoringPointDistance = osu_base_scoring_distance * beatmap.Difficulty.BaseSliderVelocity / beatmap.Difficulty.SliderTickRate;
+            double sliderScoringPointDistance = osu_base_scoring_distance * beatmap.Difficulty.SliderMultiplier / beatmap.Difficulty.SliderTickRate;
 
             // The velocity and duration of the taiko hit object - calculated as the velocity of a drum roll.
             double taikoVelocity = sliderScoringPointDistance * beatmap.Difficulty.SliderTickRate;
@@ -239,14 +239,14 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
             {
                 base.CopyTo(other);
                 if (!(other is TaikoMultiplierAppliedDifficulty))
-                    other.BaseSliderVelocity /= LegacyBeatmapEncoder.LEGACY_TAIKO_VELOCITY_MULTIPLIER;
+                    other.SliderMultiplier /= LegacyBeatmapEncoder.LEGACY_TAIKO_VELOCITY_MULTIPLIER;
             }
 
             public override void CopyFrom(IBeatmapDifficultyInfo other)
             {
                 base.CopyFrom(other);
                 if (!(other is TaikoMultiplierAppliedDifficulty))
-                    BaseSliderVelocity *= LegacyBeatmapEncoder.LEGACY_TAIKO_VELOCITY_MULTIPLIER;
+                    SliderMultiplier *= LegacyBeatmapEncoder.LEGACY_TAIKO_VELOCITY_MULTIPLIER;
             }
 
             #endregion
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModDifficultyAdjust.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModDifficultyAdjust.cs
index fe9c1f5815..99a064d35f 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModDifficultyAdjust.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
         {
             base.ApplySettings(difficulty);
 
-            if (ScrollSpeed.Value != null) difficulty.BaseSliderVelocity *= ScrollSpeed.Value.Value;
+            if (ScrollSpeed.Value != null) difficulty.SliderMultiplier *= ScrollSpeed.Value.Value;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs
index 5aeb5a87d7..009f2854f8 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
         public override void ApplyToDifficulty(BeatmapDifficulty difficulty)
         {
             base.ApplyToDifficulty(difficulty);
-            difficulty.BaseSliderVelocity *= slider_multiplier;
+            difficulty.SliderMultiplier *= slider_multiplier;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs
index 0f68750535..ba41175461 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
         public override void ApplyToDifficulty(BeatmapDifficulty difficulty)
         {
             base.ApplyToDifficulty(difficulty);
-            difficulty.BaseSliderVelocity *= slider_multiplier;
+            difficulty.SliderMultiplier *= slider_multiplier;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
index 014fec9319..b4a12fd314 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Rulesets.Taiko.Objects
 
             TimingControlPoint timingPoint = controlPointInfo.TimingPointAt(StartTime);
 
-            double scoringDistance = base_distance * difficulty.BaseSliderVelocity * SliderVelocity;
+            double scoringDistance = base_distance * difficulty.SliderMultiplier * SliderVelocity;
             Velocity = scoringDistance / timingPoint.BeatLength;
 
             tickSpacing = timingPoint.BeatLength / TickRate;
diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
index 98ad6fc18d..2c4f193327 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -136,7 +136,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.AreEqual(4, difficulty.CircleSize);
                 Assert.AreEqual(8, difficulty.OverallDifficulty);
                 Assert.AreEqual(9, difficulty.ApproachRate);
-                Assert.AreEqual(1.8, difficulty.BaseSliderVelocity);
+                Assert.AreEqual(1.8, difficulty.SliderMultiplier);
                 Assert.AreEqual(2, difficulty.SliderTickRate);
             }
         }
diff --git a/osu.Game.Tests/Beatmaps/Formats/OsuJsonDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/OsuJsonDecoderTest.cs
index 11c5f2a2fc..3764467047 100644
--- a/osu.Game.Tests/Beatmaps/Formats/OsuJsonDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/OsuJsonDecoderTest.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
             Assert.AreEqual(4, difficulty.CircleSize);
             Assert.AreEqual(8, difficulty.OverallDifficulty);
             Assert.AreEqual(9, difficulty.ApproachRate);
-            Assert.AreEqual(1.8, difficulty.BaseSliderVelocity);
+            Assert.AreEqual(1.8, difficulty.SliderMultiplier);
             Assert.AreEqual(2, difficulty.SliderTickRate);
         }
 
diff --git a/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs b/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
index ffbe16260b..6399507aa0 100644
--- a/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
+++ b/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Tests.Editing
 
             BeatDivisor.Value = 1;
 
-            composer.EditorBeatmap.Difficulty.BaseSliderVelocity = 1;
+            composer.EditorBeatmap.Difficulty.SliderMultiplier = 1;
             composer.EditorBeatmap.ControlPointInfo.Clear();
             composer.EditorBeatmap.ControlPointInfo.Add(0, new TimingControlPoint { BeatLength = 1000 });
         });
@@ -66,7 +66,7 @@ namespace osu.Game.Tests.Editing
         [TestCase(2)]
         public void TestSliderMultiplier(float multiplier)
         {
-            AddStep($"set slider multiplier = {multiplier}", () => composer.EditorBeatmap.Difficulty.BaseSliderVelocity = multiplier);
+            AddStep($"set slider multiplier = {multiplier}", () => composer.EditorBeatmap.Difficulty.SliderMultiplier = multiplier);
 
             assertSnapDistance(100 * multiplier, null, true);
         }
@@ -128,7 +128,7 @@ namespace osu.Game.Tests.Editing
             assertDurationToDistance(500, 50);
             assertDurationToDistance(1000, 100);
 
-            AddStep("set slider multiplier = 2", () => composer.EditorBeatmap.Difficulty.BaseSliderVelocity = 2);
+            AddStep("set slider multiplier = 2", () => composer.EditorBeatmap.Difficulty.SliderMultiplier = 2);
 
             assertDurationToDistance(500, 100);
             assertDurationToDistance(1000, 200);
@@ -149,7 +149,7 @@ namespace osu.Game.Tests.Editing
             assertDistanceToDuration(50, 500);
             assertDistanceToDuration(100, 1000);
 
-            AddStep("set slider multiplier = 2", () => composer.EditorBeatmap.Difficulty.BaseSliderVelocity = 2);
+            AddStep("set slider multiplier = 2", () => composer.EditorBeatmap.Difficulty.SliderMultiplier = 2);
 
             assertDistanceToDuration(100, 500);
             assertDistanceToDuration(200, 1000);
@@ -174,7 +174,7 @@ namespace osu.Game.Tests.Editing
             assertSnappedDuration(200, 2000);
             assertSnappedDuration(250, 3000);
 
-            AddStep("set slider multiplier = 2", () => composer.EditorBeatmap.Difficulty.BaseSliderVelocity = 2);
+            AddStep("set slider multiplier = 2", () => composer.EditorBeatmap.Difficulty.SliderMultiplier = 2);
 
             assertSnappedDuration(0, 0);
             assertSnappedDuration(50, 0);
@@ -206,7 +206,7 @@ namespace osu.Game.Tests.Editing
             assertSnappedDistance(200, 200);
             assertSnappedDistance(250, 200);
 
-            AddStep("set slider multiplier = 2", () => composer.EditorBeatmap.Difficulty.BaseSliderVelocity = 2);
+            AddStep("set slider multiplier = 2", () => composer.EditorBeatmap.Difficulty.SliderMultiplier = 2);
 
             assertSnappedDistance(50, 0);
             assertSnappedDistance(100, 0);
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs b/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs
index a99bd72e40..21b925a257 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Tests.Visual.Editing
                 }
             });
             editorBeatmap.ControlPointInfo.Add(0, new TimingControlPoint { BeatLength = beat_length });
-            editorBeatmap.Difficulty.BaseSliderVelocity = 1;
+            editorBeatmap.Difficulty.SliderMultiplier = 1;
         }
 
         [SetUp]
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
index 735af9493c..287b7d43b4 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
@@ -184,7 +184,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             var beatmap = createBeatmap();
             beatmap.ControlPointInfo.Add(0, new TimingControlPoint { BeatLength = time_range });
-            beatmap.Difficulty.BaseSliderVelocity = 2;
+            beatmap.Difficulty.SliderMultiplier = 2;
 
             createTest(beatmap, d => d.RelativeScaleBeatLengthsOverride = true);
             AddStep("adjust time range", () => drawableRuleset.TimeRange.Value = 5000);
@@ -198,7 +198,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             var beatmap = createBeatmap();
             beatmap.ControlPointInfo.Add(0, new TimingControlPoint { BeatLength = time_range });
-            beatmap.Difficulty.BaseSliderVelocity = 2;
+            beatmap.Difficulty.SliderMultiplier = 2;
 
             createTest(beatmap);
             AddStep("adjust time range", () => drawableRuleset.TimeRange.Value = 2000);
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs
index 28cc890fce..114c554d28 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
                 BeatmapInfo = new BeatmapInfo
                 {
-                    Difficulty = new BeatmapDifficulty { CircleSize = 6, BaseSliderVelocity = 3 },
+                    Difficulty = new BeatmapDifficulty { CircleSize = 6, SliderMultiplier = 3 },
                     Ruleset = ruleset
                 },
                 ControlPointInfo = controlPointInfo
diff --git a/osu.Game/Beatmaps/BeatmapDifficulty.cs b/osu.Game/Beatmaps/BeatmapDifficulty.cs
index cbea30f3b0..f4bc5e7b77 100644
--- a/osu.Game/Beatmaps/BeatmapDifficulty.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficulty.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Beatmaps
     public class BeatmapDifficulty : EmbeddedObject, IBeatmapDifficultyInfo
     {
         /// <summary>
-        /// The default value used for all difficulty settings except <see cref="BaseSliderVelocity"/> and <see cref="SliderTickRate"/>.
+        /// The default value used for all difficulty settings except <see cref="SliderMultiplier"/> and <see cref="SliderTickRate"/>.
         /// </summary>
         public const float DEFAULT_DIFFICULTY = 5;
 
@@ -20,7 +20,7 @@ namespace osu.Game.Beatmaps
         public float OverallDifficulty { get; set; } = IBeatmapDifficultyInfo.DEFAULT_DIFFICULTY;
         public float ApproachRate { get; set; } = IBeatmapDifficultyInfo.DEFAULT_DIFFICULTY;
 
-        public double BaseSliderVelocity { get; set; } = 1;
+        public double SliderMultiplier { get; set; } = 1;
         public double SliderTickRate { get; set; } = 1;
 
         public BeatmapDifficulty()
@@ -44,7 +44,7 @@ namespace osu.Game.Beatmaps
             difficulty.CircleSize = CircleSize;
             difficulty.OverallDifficulty = OverallDifficulty;
 
-            difficulty.BaseSliderVelocity = BaseSliderVelocity;
+            difficulty.SliderMultiplier = SliderMultiplier;
             difficulty.SliderTickRate = SliderTickRate;
         }
 
@@ -55,7 +55,7 @@ namespace osu.Game.Beatmaps
             CircleSize = other.CircleSize;
             OverallDifficulty = other.OverallDifficulty;
 
-            BaseSliderVelocity = other.BaseSliderVelocity;
+            SliderMultiplier = other.SliderMultiplier;
             SliderTickRate = other.SliderTickRate;
         }
     }
diff --git a/osu.Game/Beatmaps/BeatmapImporter.cs b/osu.Game/Beatmaps/BeatmapImporter.cs
index e96e38d249..4731a70753 100644
--- a/osu.Game/Beatmaps/BeatmapImporter.cs
+++ b/osu.Game/Beatmaps/BeatmapImporter.cs
@@ -353,7 +353,7 @@ namespace osu.Game.Beatmaps
                         CircleSize = decodedDifficulty.CircleSize,
                         OverallDifficulty = decodedDifficulty.OverallDifficulty,
                         ApproachRate = decodedDifficulty.ApproachRate,
-                        BaseSliderVelocity = decodedDifficulty.BaseSliderVelocity,
+                        SliderMultiplier = decodedDifficulty.SliderMultiplier,
                         SliderTickRate = decodedDifficulty.SliderTickRate,
                     };
 
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index 891e627435..5e98025c9a 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -384,7 +384,7 @@ namespace osu.Game.Beatmaps.Formats
                     break;
 
                 case @"SliderMultiplier":
-                    difficulty.BaseSliderVelocity = Parsing.ParseDouble(pair.Value);
+                    difficulty.SliderMultiplier = Parsing.ParseDouble(pair.Value);
                     break;
 
                 case @"SliderTickRate":
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index fffead3a6c..7fbcca9adb 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -155,8 +155,8 @@ namespace osu.Game.Beatmaps.Formats
 
             // Taiko adjusts the slider multiplier (see: LEGACY_TAIKO_VELOCITY_MULTIPLIER)
             writer.WriteLine(onlineRulesetID == 1
-                ? FormattableString.Invariant($"SliderMultiplier: {beatmap.Difficulty.BaseSliderVelocity / LEGACY_TAIKO_VELOCITY_MULTIPLIER}")
-                : FormattableString.Invariant($"SliderMultiplier: {beatmap.Difficulty.BaseSliderVelocity}"));
+                ? FormattableString.Invariant($"SliderMultiplier: {beatmap.Difficulty.SliderMultiplier / LEGACY_TAIKO_VELOCITY_MULTIPLIER}")
+                : FormattableString.Invariant($"SliderMultiplier: {beatmap.Difficulty.SliderMultiplier}"));
 
             writer.WriteLine(FormattableString.Invariant($"SliderTickRate: {beatmap.Difficulty.SliderTickRate}"));
         }
diff --git a/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs b/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs
index bc2ee23da7..78234a9dd9 100644
--- a/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs
+++ b/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Beatmaps
     public interface IBeatmapDifficultyInfo
     {
         /// <summary>
-        /// The default value used for all difficulty settings except <see cref="BaseSliderVelocity"/> and <see cref="SliderTickRate"/>.
+        /// The default value used for all difficulty settings except <see cref="SliderMultiplier"/> and <see cref="SliderTickRate"/>.
         /// </summary>
         const float DEFAULT_DIFFICULTY = 5;
 
@@ -37,7 +37,7 @@ namespace osu.Game.Beatmaps
         /// The base slider velocity of the associated beatmap.
         /// This was known as "SliderMultiplier" in the .osu format and stable editor.
         /// </summary>
-        double BaseSliderVelocity { get; }
+        double SliderMultiplier { get; }
 
         /// <summary>
         /// The slider tick rate of the associated beatmap.
diff --git a/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs b/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
index 4adbb356da..a8972775de 100644
--- a/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
@@ -240,7 +240,7 @@ namespace osu.Game.Rulesets.Edit
 
         public virtual float GetBeatSnapDistanceAt(HitObject referenceObject, bool useReferenceSliderVelocity = true)
         {
-            return (float)(100 * (useReferenceSliderVelocity && referenceObject is IHasSliderVelocity hasSliderVelocity ? hasSliderVelocity.SliderVelocity : 1) * EditorBeatmap.Difficulty.BaseSliderVelocity * 1
+            return (float)(100 * (useReferenceSliderVelocity && referenceObject is IHasSliderVelocity hasSliderVelocity ? hasSliderVelocity.SliderVelocity : 1) * EditorBeatmap.Difficulty.SliderMultiplier * 1
                            / BeatSnapProvider.BeatDivisor);
         }
 
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
index bdcf539033..7ddd372dc9 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
 
             TimingControlPoint timingPoint = controlPointInfo.TimingPointAt(StartTime);
 
-            double scoringDistance = base_scoring_distance * difficulty.BaseSliderVelocity * SliderVelocity;
+            double scoringDistance = base_scoring_distance * difficulty.SliderMultiplier * SliderVelocity;
 
             Velocity = scoringDistance / timingPoint.BeatLength;
         }
diff --git a/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs b/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
index da1110506a..4c7564b791 100644
--- a/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
@@ -123,7 +123,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
                 // The slider multiplier is post-multiplied to determine the final velocity, but for relative scale beat lengths
                 // the multiplier should not affect the effective timing point (the longest in the beatmap), so it is factored out here
-                baseBeatLength /= Beatmap.Difficulty.BaseSliderVelocity;
+                baseBeatLength /= Beatmap.Difficulty.SliderMultiplier;
             }
 
             // Merge sequences of timing and difficulty control points to create the aggregate "multiplier" control point
@@ -150,7 +150,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
                 return new MultiplierControlPoint(c.Time)
                 {
-                    Velocity = Beatmap.Difficulty.BaseSliderVelocity,
+                    Velocity = Beatmap.Difficulty.SliderMultiplier,
                     BaseBeatLength = baseBeatLength,
                     TimingPoint = lastTimingPoint,
                     EffectPoint = lastEffectPoint
@@ -167,7 +167,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
             ControlPoints.AddRange(timingChanges);
 
             if (ControlPoints.Count == 0)
-                ControlPoints.Add(new MultiplierControlPoint { Velocity = Beatmap.Difficulty.BaseSliderVelocity });
+                ControlPoints.Add(new MultiplierControlPoint { Velocity = Beatmap.Difficulty.SliderMultiplier });
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Screens/Edit/Compose/Components/HitObjectInspector.cs b/osu.Game/Screens/Edit/Compose/Components/HitObjectInspector.cs
index 60b9010aa8..7beaf7d086 100644
--- a/osu.Game/Screens/Edit/Compose/Components/HitObjectInspector.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/HitObjectInspector.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                     if (selected is IHasSliderVelocity sliderVelocity)
                     {
                         AddHeader("Slider Velocity");
-                        AddValue($"{sliderVelocity.SliderVelocity:#,0.00}x ({sliderVelocity.SliderVelocity * EditorBeatmap.Difficulty.BaseSliderVelocity:#,0.00}x)");
+                        AddValue($"{sliderVelocity.SliderVelocity:#,0.00}x ({sliderVelocity.SliderVelocity * EditorBeatmap.Difficulty.SliderMultiplier:#,0.00}x)");
                     }
 
                     if (selected is IHasRepeats repeats)
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
index ac37101060..76ad3e5b6a 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
@@ -165,7 +165,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private void updateInspectorText()
         {
-            double beatmapVelocity = EditorBeatmap.Difficulty.BaseSliderVelocity;
+            double beatmapVelocity = EditorBeatmap.Difficulty.SliderMultiplier;
 
             InspectorText.Clear();
 
diff --git a/osu.Game/Screens/Edit/Setup/DifficultySection.cs b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
index 6c7e96f91d..3a3fe7f747 100644
--- a/osu.Game/Screens/Edit/Setup/DifficultySection.cs
+++ b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
@@ -85,7 +85,7 @@ namespace osu.Game.Screens.Edit.Setup
                     Label = EditorSetupStrings.BaseVelocity,
                     FixedLabelWidth = LABEL_WIDTH,
                     Description = EditorSetupStrings.BaseVelocityDescription,
-                    Current = new BindableDouble(Beatmap.Difficulty.BaseSliderVelocity)
+                    Current = new BindableDouble(Beatmap.Difficulty.SliderMultiplier)
                     {
                         Default = 1,
                         MinValue = 0.4,
@@ -110,7 +110,7 @@ namespace osu.Game.Screens.Edit.Setup
             Beatmap.Difficulty.DrainRate = healthDrainSlider.Current.Value;
             Beatmap.Difficulty.ApproachRate = approachRateSlider.Current.Value;
             Beatmap.Difficulty.OverallDifficulty = overallDifficultySlider.Current.Value;
-            Beatmap.Difficulty.BaseSliderVelocity = baseVelocitySlider.Current.Value;
+            Beatmap.Difficulty.SliderMultiplier = baseVelocitySlider.Current.Value;
 
             Beatmap.UpdateAllHitObjects();
             Beatmap.SaveState();

From 2085833a842c023ddb26e85e6fd54a2375867119 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 May 2023 17:08:03 +0900
Subject: [PATCH 0408/1604] Fix missing delegate unsubscribe

---
 .../Edit/Compose/Components/Timeline/DifficultyPointPiece.cs     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
index 76ad3e5b6a..173a665d5c 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
@@ -195,6 +195,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             EditorBeatmap.TransactionBegan -= updateInspectorText;
             EditorBeatmap.TransactionEnded -= updateInspectorText;
+            EditorBeatmap.BeatmapReprocessed -= updateInspectorText;
         }
     }
 }

From 5afe57033ddc19da134009b4967409022b2f8dea Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smgi@Dans-MacBook-Pro.local>
Date: Tue, 9 May 2023 19:30:54 +0900
Subject: [PATCH 0409/1604] Add parent hitobject to strong hits

---
 osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs              | 7 ++++++-
 osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs          | 6 +++++-
 osu.Game.Rulesets.Taiko/Objects/Hit.cs                   | 6 +++++-
 osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs | 7 +++++++
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
index b4a12fd314..80553a1033 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
@@ -109,12 +109,17 @@ namespace osu.Game.Rulesets.Taiko.Objects
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
 
-        protected override StrongNestedHitObject CreateStrongNestedHit(double startTime) => new StrongNestedHit { StartTime = startTime };
+        protected override StrongNestedHitObject CreateStrongNestedHit(double startTime) => new StrongNestedHit(this) { StartTime = startTime };
 
         public class StrongNestedHit : StrongNestedHitObject
         {
             // The strong hit of the drum roll doesn't actually provide any score.
             public override Judgement CreateJudgement() => new IgnoreJudgement();
+
+            public StrongNestedHit(TaikoHitObject parent)
+                : base(parent)
+            {
+            }
         }
 
         #region LegacyBeatmapEncoder
diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
index 6bcb8674e6..56dbe3ce38 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
@@ -33,10 +33,14 @@ namespace osu.Game.Rulesets.Taiko.Objects
 
         public override double MaximumJudgementOffset => HitWindow;
 
-        protected override StrongNestedHitObject CreateStrongNestedHit(double startTime) => new StrongNestedHit { StartTime = startTime };
+        protected override StrongNestedHitObject CreateStrongNestedHit(double startTime) => new StrongNestedHit(this) { StartTime = startTime };
 
         public class StrongNestedHit : StrongNestedHitObject
         {
+            public StrongNestedHit(TaikoHitObject parent)
+                : base(parent)
+            {
+            }
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Hit.cs b/osu.Game.Rulesets.Taiko/Objects/Hit.cs
index 787079bfee..6a3c8467e9 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Hit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Hit.cs
@@ -72,10 +72,14 @@ namespace osu.Game.Rulesets.Taiko.Objects
             }
         }
 
-        protected override StrongNestedHitObject CreateStrongNestedHit(double startTime) => new StrongNestedHit { StartTime = startTime };
+        protected override StrongNestedHitObject CreateStrongNestedHit(double startTime) => new StrongNestedHit(this) { StartTime = startTime };
 
         public class StrongNestedHit : StrongNestedHitObject
         {
+            public StrongNestedHit(TaikoHitObject parent)
+                : base(parent)
+            {
+            }
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs
index 628c41d878..316115f44d 100644
--- a/osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs
@@ -15,6 +15,13 @@ namespace osu.Game.Rulesets.Taiko.Objects
     /// </summary>
     public abstract class StrongNestedHitObject : TaikoHitObject
     {
+        public readonly TaikoHitObject Parent;
+
+        protected StrongNestedHitObject(TaikoHitObject parent)
+        {
+            Parent = parent;
+        }
+
         public override Judgement CreateJudgement() => new TaikoStrongJudgement();
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;

From 3c3c812ed6dfca27d7ffa2db07703c93d57d52b9 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smgi@Dans-MacBook-Pro.local>
Date: Tue, 9 May 2023 19:33:33 +0900
Subject: [PATCH 0410/1604] Initial implementation of ScoreV2

---
 osu.Game.Rulesets.Catch/CatchRuleset.cs       |   2 +-
 .../Scoring/CatchScoreProcessor.cs            |  78 +++-
 osu.Game.Rulesets.Mania/ManiaRuleset.cs       |   2 +-
 .../Scoring/ManiaScoreProcessor.cs            |  49 ++-
 osu.Game.Rulesets.Osu/OsuRuleset.cs           |   2 +-
 .../Scoring/OsuScoreProcessor.cs              |  37 +-
 .../Scoring/TaikoScoreProcessor.cs            |  58 ++-
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs       |   2 +-
 .../Spectator/SpectatorScoreProcessor.cs      |   3 +-
 .../PerformanceBreakdownCalculator.cs         |   4 +-
 .../Rulesets/Mods/ModAccuracyChallenge.cs     |   4 +-
 osu.Game/Rulesets/Ruleset.cs                  |  21 +-
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs   | 392 ++++--------------
 osu.Game/Scoring/ScoreManager.cs              |   4 +-
 .../OnlinePlay/Playlists/PlaylistsPlayer.cs   |   3 +-
 15 files changed, 300 insertions(+), 361 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index 8a0b8250d5..e2255fa6f7 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Catch
     {
         public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod>? mods = null) => new DrawableCatchRuleset(this, beatmap, mods);
 
-        public override ScoreProcessor CreateScoreProcessor() => new CatchScoreProcessor();
+        public override ScoreProcessor CreateScoreProcessor() => new CatchScoreProcessor(this);
 
         public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => new CatchBeatmapConverter(beatmap, this);
 
diff --git a/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs b/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
index b6a42407da..bf5c3a91d6 100644
--- a/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
@@ -1,17 +1,87 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
+using osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Catch.Scoring
 {
     public partial class CatchScoreProcessor : ScoreProcessor
     {
-        public CatchScoreProcessor()
-            : base(new CatchRuleset())
+        private const int combo_cap = 200;
+        private const double combo_base = 4;
+
+        protected override double ClassicScoreMultiplier => 28;
+
+        private double tinyDropletScale;
+
+        private int maximumTinyDroplets;
+        private int hitTinyDroplets;
+
+        public CatchScoreProcessor(Ruleset ruleset)
+            : base(ruleset)
         {
         }
 
-        protected override double ClassicScoreMultiplier => 28;
+        protected override double ComputeTotalScore()
+        {
+            double fruitHitsRatio = maximumTinyDroplets == 0 ? 0 : (double)hitTinyDroplets / maximumTinyDroplets;
+
+            const int tiny_droplets_portion = 400000;
+
+            return
+                (int)Math.Round
+                ((
+                    ((1000000 - tiny_droplets_portion) + tiny_droplets_portion * (1 - tinyDropletScale)) * ComboPortion / MaxComboPortion +
+                    tiny_droplets_portion * tinyDropletScale * fruitHitsRatio +
+                    BonusPortion
+                ) * ScoreMultiplier);
+        }
+
+        protected override void AddScoreChange(JudgementResult result)
+        {
+            var change = computeScoreChange(result);
+            ComboPortion += change.combo;
+            BonusPortion += change.bonus;
+            hitTinyDroplets += change.tinyDropletHits;
+        }
+
+        protected override void RemoveScoreChange(JudgementResult result)
+        {
+            var change = computeScoreChange(result);
+            ComboPortion -= change.combo;
+            BonusPortion -= change.bonus;
+            hitTinyDroplets -= change.tinyDropletHits;
+        }
+
+        private (double combo, double bonus, int tinyDropletHits) computeScoreChange(JudgementResult result)
+        {
+            if (result.HitObject is TinyDroplet)
+                return (0, 0, 1);
+
+            if (result.Type.IsBonus())
+                return (0, Judgement.ToNumericResult(result.Type), 0);
+
+            return (Judgement.ToNumericResult(result.Type) * Math.Min(Math.Max(0.5, Math.Log(result.ComboAtJudgement, combo_base)), Math.Log(combo_cap, combo_base)), 0, 0);
+        }
+
+        protected override void Reset(bool storeResults)
+        {
+            base.Reset(storeResults);
+
+            if (storeResults)
+            {
+                maximumTinyDroplets = hitTinyDroplets;
+
+                if (maximumTinyDroplets + MaxBasicJudgements == 0)
+                    tinyDropletScale = 0;
+                else
+                    tinyDropletScale = (double)maximumTinyDroplets / (maximumTinyDroplets + MaxBasicJudgements);
+            }
+
+            hitTinyDroplets = 0;
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index d324682989..c6065c9b96 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Rulesets.Mania
 
         public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod>? mods = null) => new DrawableManiaRuleset(this, beatmap, mods);
 
-        public override ScoreProcessor CreateScoreProcessor() => new ManiaScoreProcessor();
+        public override ScoreProcessor CreateScoreProcessor() => new ManiaScoreProcessor(this);
 
         public override HealthProcessor CreateHealthProcessor(double drainStartTime) => new ManiaHealthProcessor(drainStartTime);
 
diff --git a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
index f724972a29..7d188c6786 100644
--- a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
+++ b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
@@ -1,23 +1,54 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
+using System;
+using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mania.Scoring
 {
-    internal partial class ManiaScoreProcessor : ScoreProcessor
+    public partial class ManiaScoreProcessor : ScoreProcessor
     {
-        public ManiaScoreProcessor()
-            : base(new ManiaRuleset())
+        private const double combo_base = 4;
+
+        protected override double ClassicScoreMultiplier => 16;
+
+        public ManiaScoreProcessor(Ruleset ruleset)
+            : base(ruleset)
         {
         }
 
-        protected override double DefaultAccuracyPortion => 0.99;
+        protected override double ComputeTotalScore()
+        {
+            return
+                (int)Math.Round
+                ((
+                    200000 * ComboPortion / MaxComboPortion +
+                    800000 * Math.Pow(Accuracy.Value, 2 + 2 * Accuracy.Value) * ((double)CurrentBasicJudgements / MaxBasicJudgements) +
+                    BonusPortion
+                ) * ScoreMultiplier);
+        }
 
-        protected override double DefaultComboPortion => 0.01;
+        protected override void AddScoreChange(JudgementResult result)
+        {
+            var change = computeScoreChange(result);
+            ComboPortion += change.combo;
+            BonusPortion += change.bonus;
+        }
 
-        protected override double ClassicScoreMultiplier => 16;
+        protected override void RemoveScoreChange(JudgementResult result)
+        {
+            var change = computeScoreChange(result);
+            ComboPortion -= change.combo;
+            BonusPortion -= change.bonus;
+        }
+
+        private (double combo, double bonus) computeScoreChange(JudgementResult result)
+        {
+            if (result.Type.IsBonus())
+                return (0, Judgement.ToNumericResult(result.Type));
+
+            return (Judgement.ToNumericResult(result.Type) * Math.Min(Math.Max(0.5, Math.Log(result.ComboAtJudgement, combo_base)), Math.Log(400, combo_base)), 0);
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 922594a93a..497d405436 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Rulesets.Osu
     {
         public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod>? mods = null) => new DrawableOsuRuleset(this, beatmap, mods);
 
-        public override ScoreProcessor CreateScoreProcessor() => new OsuScoreProcessor();
+        public override ScoreProcessor CreateScoreProcessor() => new OsuScoreProcessor(this);
 
         public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => new OsuBeatmapConverter(beatmap, this);
 
diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
index 50d4eb6258..5f5997b0c1 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
@@ -1,38 +1,29 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
-using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Osu.Judgements;
-using osu.Game.Rulesets.Osu.Objects;
+using System;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Scoring
 {
     public partial class OsuScoreProcessor : ScoreProcessor
     {
-        public OsuScoreProcessor()
-            : base(new OsuRuleset())
+        protected override double ClassicScoreMultiplier => 36;
+
+        public OsuScoreProcessor(Ruleset ruleset)
+            : base(ruleset)
         {
         }
 
-        protected override double ClassicScoreMultiplier => 36;
-
-        protected override HitEvent CreateHitEvent(JudgementResult result)
-            => base.CreateHitEvent(result).With((result as OsuHitCircleJudgementResult)?.CursorPositionAtHit);
-
-        protected override JudgementResult CreateResult(HitObject hitObject, Judgement judgement)
+        protected override double ComputeTotalScore()
         {
-            switch (hitObject)
-            {
-                case HitCircle:
-                    return new OsuHitCircleJudgementResult(hitObject, judgement);
-
-                default:
-                    return new OsuJudgementResult(hitObject, judgement);
-            }
+            return
+                (int)Math.Round
+                ((
+                    700000 * ComboPortion / MaxComboPortion +
+                    300000 * Math.Pow(Accuracy.Value, 10) * ((double)CurrentBasicJudgements / MaxBasicJudgements) +
+                    BonusPortion
+                ) * ScoreMultiplier);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs b/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
index 4b60ee3ccb..caf0a799a2 100644
--- a/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
+++ b/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
@@ -1,23 +1,63 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
+using System;
+using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Taiko.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Scoring
 {
-    internal partial class TaikoScoreProcessor : ScoreProcessor
+    public partial class TaikoScoreProcessor : ScoreProcessor
     {
-        public TaikoScoreProcessor()
-            : base(new TaikoRuleset())
+        private const double combo_base = 4;
+
+        protected override double ClassicScoreMultiplier => 22;
+
+        public TaikoScoreProcessor(Ruleset ruleset)
+            : base(ruleset)
         {
         }
 
-        protected override double DefaultAccuracyPortion => 0.75;
+        protected override double ComputeTotalScore()
+        {
+            return
+                (int)Math.Round
+                ((
+                    250000 * ComboPortion / MaxComboPortion +
+                    750000 * Math.Pow(Accuracy.Value, 3.6) * ((double)CurrentBasicJudgements / MaxBasicJudgements) +
+                    BonusPortion
+                ) * ScoreMultiplier);
+        }
 
-        protected override double DefaultComboPortion => 0.25;
+        protected override void AddScoreChange(JudgementResult result)
+        {
+            var change = computeScoreChange(result);
+            BonusPortion += change.bonus;
+            ComboPortion += change.combo;
+        }
 
-        protected override double ClassicScoreMultiplier => 22;
+        protected override void RemoveScoreChange(JudgementResult result)
+        {
+            var change = computeScoreChange(result);
+            BonusPortion -= change.bonus;
+            ComboPortion -= change.combo;
+        }
+
+        private (double combo, double bonus) computeScoreChange(JudgementResult result)
+        {
+            double hitValue = Judgement.ToNumericResult(result.Type);
+
+            if (result.HitObject is StrongNestedHitObject strong)
+            {
+                double strongBonus = strong.Parent is DrumRollTick ? 3 : 7;
+                hitValue *= strongBonus;
+            }
+
+            if (result.Type.IsBonus())
+                return (0, hitValue);
+
+            return (hitValue * Math.Min(Math.Max(0.5, Math.Log(result.ComboAtJudgement, combo_base)), Math.Log(400, combo_base)), 0);
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index a35fdb890d..599d0dc33c 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Taiko
     {
         public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod>? mods = null) => new DrawableTaikoRuleset(this, beatmap, mods);
 
-        public override ScoreProcessor CreateScoreProcessor() => new TaikoScoreProcessor();
+        public override ScoreProcessor CreateScoreProcessor() => new TaikoScoreProcessor(this);
 
         public override HealthProcessor CreateHealthProcessor(double drainStartTime) => new TaikoHealthProcessor();
 
diff --git a/osu.Game/Online/Spectator/SpectatorScoreProcessor.cs b/osu.Game/Online/Spectator/SpectatorScoreProcessor.cs
index 1c505ea107..cb23164c00 100644
--- a/osu.Game/Online/Spectator/SpectatorScoreProcessor.cs
+++ b/osu.Game/Online/Spectator/SpectatorScoreProcessor.cs
@@ -157,7 +157,8 @@ namespace osu.Game.Online.Spectator
             Accuracy.Value = frame.Header.Accuracy;
             Combo.Value = frame.Header.Combo;
 
-            TotalScore.Value = scoreProcessor.ComputeScore(Mode.Value, scoreInfo);
+            // Todo:
+            // TotalScore.Value = scoreProcessor.ComputeScore(Mode.Value, scoreInfo);
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Rulesets/Difficulty/PerformanceBreakdownCalculator.cs b/osu.Game/Rulesets/Difficulty/PerformanceBreakdownCalculator.cs
index 4f802a22a1..03bd0f7509 100644
--- a/osu.Game/Rulesets/Difficulty/PerformanceBreakdownCalculator.cs
+++ b/osu.Game/Rulesets/Difficulty/PerformanceBreakdownCalculator.cs
@@ -66,7 +66,9 @@ namespace osu.Game.Rulesets.Difficulty
                 // calculate total score
                 ScoreProcessor scoreProcessor = ruleset.CreateScoreProcessor();
                 scoreProcessor.Mods.Value = perfectPlay.Mods;
-                perfectPlay.TotalScore = scoreProcessor.ComputeScore(ScoringMode.Standardised, perfectPlay);
+
+                // Todo:
+                // perfectPlay.TotalScore = scoreProcessor.ComputeScore(ScoringMode.Standardised, perfectPlay);
 
                 // compute rank achieved
                 // default to SS, then adjust the rank with mods
diff --git a/osu.Game/Rulesets/Mods/ModAccuracyChallenge.cs b/osu.Game/Rulesets/Mods/ModAccuracyChallenge.cs
index d4223a80c2..13b8ad5d84 100644
--- a/osu.Game/Rulesets/Mods/ModAccuracyChallenge.cs
+++ b/osu.Game/Rulesets/Mods/ModAccuracyChallenge.cs
@@ -65,7 +65,9 @@ namespace osu.Game.Rulesets.Mods
             scoreProcessor.PopulateScore(score);
             score.Statistics[result.Type]++;
 
-            return scoreProcessor.ComputeAccuracy(score);
+            // Todo:
+            return 0;
+            // return scoreProcessor.ComputeAccuracy(score);
         }
     }
 }
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index a77068eb14..2e7a58b96c 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -232,7 +232,7 @@ namespace osu.Game.Rulesets
         /// Creates a <see cref="ScoreProcessor"/> for this <see cref="Ruleset"/>.
         /// </summary>
         /// <returns>The score processor.</returns>
-        public virtual ScoreProcessor CreateScoreProcessor() => new ScoreProcessor(this);
+        public virtual ScoreProcessor CreateScoreProcessor() => new DefaultScoreProcessor(this);
 
         /// <summary>
         /// Creates a <see cref="HealthProcessor"/> for this <see cref="Ruleset"/>.
@@ -381,4 +381,23 @@ namespace osu.Game.Rulesets
         /// </summary>
         public virtual RulesetSetupSection? CreateEditorSetupSection() => null;
     }
+
+    public partial class DefaultScoreProcessor : ScoreProcessor
+    {
+        public DefaultScoreProcessor(Ruleset ruleset)
+            : base(ruleset)
+        {
+        }
+
+        protected override double ComputeTotalScore()
+        {
+            return
+                (int)Math.Round
+                ((
+                    700000 * ComboPortion / MaxComboPortion +
+                    300000 * Math.Pow(Accuracy.Value, 10) * ((double)CurrentBasicJudgements / MaxBasicJudgements) +
+                    BonusPortion
+                ) * ScoreMultiplier);
+        }
+    }
 }
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 96f6922224..8373ebd50c 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -4,11 +4,9 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Diagnostics.Contracts;
 using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Localisation;
-using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Extensions;
 using osu.Game.Localisation;
@@ -20,8 +18,10 @@ using osu.Game.Scoring;
 
 namespace osu.Game.Rulesets.Scoring
 {
-    public partial class ScoreProcessor : JudgementProcessor
+    public abstract partial class ScoreProcessor : JudgementProcessor
     {
+        protected const double MAX_SCORE = 1000000;
+
         private const double accuracy_cutoff_x = 1;
         private const double accuracy_cutoff_s = 0.95;
         private const double accuracy_cutoff_a = 0.9;
@@ -29,8 +29,6 @@ namespace osu.Game.Rulesets.Scoring
         private const double accuracy_cutoff_c = 0.7;
         private const double accuracy_cutoff_d = 0;
 
-        private const double max_score = 1000000;
-
         /// <summary>
         /// Invoked when this <see cref="ScoreProcessor"/> was reset from a replay frame.
         /// </summary>
@@ -89,16 +87,6 @@ namespace osu.Game.Rulesets.Scoring
         /// </summary>
         public IReadOnlyList<HitEvent> HitEvents => hitEvents;
 
-        /// <summary>
-        /// The default portion of <see cref="max_score"/> awarded for hitting <see cref="HitObject"/>s accurately. Defaults to 30%.
-        /// </summary>
-        protected virtual double DefaultAccuracyPortion => 0.3;
-
-        /// <summary>
-        /// The default portion of <see cref="max_score"/> awarded for achieving a high combo. Default to 70%.
-        /// </summary>
-        protected virtual double DefaultComboPortion => 0.7;
-
         /// <summary>
         /// An arbitrary multiplier to scale scores in the <see cref="ScoringMode.Classic"/> scoring mode.
         /// </summary>
@@ -109,8 +97,45 @@ namespace osu.Game.Rulesets.Scoring
         /// </summary>
         public readonly Ruleset Ruleset;
 
-        private readonly double accuracyPortion;
-        private readonly double comboPortion;
+        /// <summary>
+        /// The sum of all basic judgements at the current time.
+        /// </summary>
+        private double currentBasicScore;
+
+        /// <summary>
+        /// The maximum sum of basic judgements at the current time.
+        /// </summary>
+        private double currentMaxBasicScore;
+
+        /// <summary>
+        /// The total count of basic judgements in the beatmap.
+        /// </summary>
+        protected int MaxBasicJudgements { get; private set; }
+
+        /// <summary>
+        /// The current count of basic judgements by the player.
+        /// </summary>
+        protected int CurrentBasicJudgements { get; private set; }
+
+        /// <summary>
+        /// The current combo score.
+        /// </summary>
+        protected double ComboPortion { get; set; }
+
+        /// <summary>
+        /// The maximum achievable combo score.
+        /// </summary>
+        protected double MaxComboPortion { get; private set; }
+
+        /// <summary>
+        /// The current bonus score.
+        /// </summary>
+        protected double BonusPortion { get; set; }
+
+        /// <summary>
+        /// The total score multiplier.
+        /// </summary>
+        protected double ScoreMultiplier { get; private set; } = 1;
 
         public Dictionary<HitResult, int> MaximumStatistics
         {
@@ -123,27 +148,6 @@ namespace osu.Game.Rulesets.Scoring
             }
         }
 
-        private ScoringValues maximumScoringValues;
-
-        /// <summary>
-        /// Scoring values for the current play assuming all perfect hits.
-        /// </summary>
-        /// <remarks>
-        /// This is only used to determine the accuracy with respect to the current point in time for an ongoing play session.
-        /// </remarks>
-        private ScoringValues currentMaximumScoringValues;
-
-        /// <summary>
-        /// Scoring values for the current play.
-        /// </summary>
-        private ScoringValues currentScoringValues;
-
-        /// <summary>
-        /// The maximum <see cref="HitResult"/> of a basic (non-tick and non-bonus) hitobject.
-        /// Only populated via <see cref="ComputeScore(osu.Game.Rulesets.Scoring.ScoringMode,osu.Game.Scoring.ScoreInfo)"/> or <see cref="ResetFromReplayFrame"/>.
-        /// </summary>
-        private HitResult? maxBasicResult;
-
         private bool beatmapApplied;
 
         private readonly Dictionary<HitResult, int> scoreResultCounts = new Dictionary<HitResult, int>();
@@ -152,18 +156,10 @@ namespace osu.Game.Rulesets.Scoring
         private readonly List<HitEvent> hitEvents = new List<HitEvent>();
         private HitObject? lastHitObject;
 
-        private double scoreMultiplier = 1;
-
-        public ScoreProcessor(Ruleset ruleset)
+        protected ScoreProcessor(Ruleset ruleset)
         {
             Ruleset = ruleset;
 
-            accuracyPortion = DefaultAccuracyPortion;
-            comboPortion = DefaultComboPortion;
-
-            if (!Precision.AlmostEquals(1.0, accuracyPortion + comboPortion))
-                throw new InvalidOperationException($"{nameof(DefaultAccuracyPortion)} + {nameof(DefaultComboPortion)} must equal 1.");
-
             Combo.ValueChanged += combo => HighestCombo.Value = Math.Max(HighestCombo.Value, combo.NewValue);
             Accuracy.ValueChanged += accuracy =>
             {
@@ -175,10 +171,10 @@ namespace osu.Game.Rulesets.Scoring
             Mode.ValueChanged += _ => updateScore();
             Mods.ValueChanged += mods =>
             {
-                scoreMultiplier = 1;
+                ScoreMultiplier = 1;
 
                 foreach (var m in mods.NewValue)
-                    scoreMultiplier *= m.ScoreMultiplier;
+                    ScoreMultiplier *= m.ScoreMultiplier;
 
                 updateScore();
             };
@@ -200,10 +196,6 @@ namespace osu.Game.Rulesets.Scoring
 
             scoreResultCounts[result.Type] = scoreResultCounts.GetValueOrDefault(result.Type) + 1;
 
-            // Always update the maximum scoring values.
-            applyResult(result.Judgement.MaxResult, ref currentMaximumScoringValues);
-            currentMaximumScoringValues.MaxCombo += result.Judgement.MaxResult.IncreasesCombo() ? 1 : 0;
-
             if (!result.Type.IsScorable())
                 return;
 
@@ -212,8 +204,13 @@ namespace osu.Game.Rulesets.Scoring
             else if (result.Type.BreaksCombo())
                 Combo.Value = 0;
 
-            applyResult(result.Type, ref currentScoringValues);
-            currentScoringValues.MaxCombo = HighestCombo.Value;
+            if (result.Type.IsBasic())
+                CurrentBasicJudgements++;
+
+            currentMaxBasicScore += Judgement.ToNumericResult(result.Judgement.MaxResult);
+            currentBasicScore += Judgement.ToNumericResult(result.Type);
+
+            AddScoreChange(result);
 
             hitEvents.Add(CreateHitEvent(result));
             lastHitObject = result.HitObject;
@@ -221,20 +218,6 @@ namespace osu.Game.Rulesets.Scoring
             updateScore();
         }
 
-        private static void applyResult(HitResult result, ref ScoringValues scoringValues)
-        {
-            if (!result.IsScorable())
-                return;
-
-            if (result.IsBonus())
-                scoringValues.BonusScore += result.IsHit() ? Judgement.ToNumericResult(result) : 0;
-            else
-                scoringValues.BaseScore += result.IsHit() ? Judgement.ToNumericResult(result) : 0;
-
-            if (result.IsBasic())
-                scoringValues.CountBasicHitObjects++;
-        }
-
         /// <summary>
         /// Creates the <see cref="HitEvent"/> that describes a <see cref="JudgementResult"/>.
         /// </summary>
@@ -253,15 +236,16 @@ namespace osu.Game.Rulesets.Scoring
 
             scoreResultCounts[result.Type] = scoreResultCounts.GetValueOrDefault(result.Type) - 1;
 
-            // Always update the maximum scoring values.
-            revertResult(result.Judgement.MaxResult, ref currentMaximumScoringValues);
-            currentMaximumScoringValues.MaxCombo -= result.Judgement.MaxResult.IncreasesCombo() ? 1 : 0;
-
             if (!result.Type.IsScorable())
                 return;
 
-            revertResult(result.Type, ref currentScoringValues);
-            currentScoringValues.MaxCombo = HighestCombo.Value;
+            if (result.Type.IsBasic())
+                CurrentBasicJudgements--;
+
+            currentMaxBasicScore -= Judgement.ToNumericResult(result.Judgement.MaxResult);
+            currentBasicScore -= Judgement.ToNumericResult(result.Type);
+
+            RemoveScoreChange(result);
 
             Debug.Assert(hitEvents.Count > 0);
             lastHitObject = hitEvents[^1].LastHitObject;
@@ -270,111 +254,31 @@ namespace osu.Game.Rulesets.Scoring
             updateScore();
         }
 
-        private static void revertResult(HitResult result, ref ScoringValues scoringValues)
+        protected virtual void AddScoreChange(JudgementResult result)
         {
-            if (!result.IsScorable())
-                return;
-
-            if (result.IsBonus())
-                scoringValues.BonusScore -= result.IsHit() ? Judgement.ToNumericResult(result) : 0;
+            if (result.Type.IsBonus())
+                BonusPortion += Judgement.ToNumericResult(result.Type);
             else
-                scoringValues.BaseScore -= result.IsHit() ? Judgement.ToNumericResult(result) : 0;
+                ComboPortion += Judgement.ToNumericResult(result.Type) * (1 + result.ComboAtJudgement / 10d);
+        }
 
-            if (result.IsBasic())
-                scoringValues.CountBasicHitObjects--;
+        protected virtual void RemoveScoreChange(JudgementResult result)
+        {
+            if (result.Type.IsBonus())
+                BonusPortion -= Judgement.ToNumericResult(result.Type);
+            else
+                ComboPortion -= Judgement.ToNumericResult(result.Type) * (1 + result.ComboAtJudgement / 10d);
         }
 
         private void updateScore()
         {
-            Accuracy.Value = currentMaximumScoringValues.BaseScore > 0 ? (double)currentScoringValues.BaseScore / currentMaximumScoringValues.BaseScore : 1;
-            MinimumAccuracy.Value = maximumScoringValues.BaseScore > 0 ? (double)currentScoringValues.BaseScore / maximumScoringValues.BaseScore : 0;
-            MaximumAccuracy.Value = maximumScoringValues.BaseScore > 0
-                ? (double)(currentScoringValues.BaseScore + (maximumScoringValues.BaseScore - currentMaximumScoringValues.BaseScore)) / maximumScoringValues.BaseScore
-                : 1;
-            TotalScore.Value = computeScore(Mode.Value, currentScoringValues, maximumScoringValues);
+            Accuracy.Value = currentMaxBasicScore > 0 ? currentBasicScore / currentMaxBasicScore : 1;
+
+            // Todo: Classic/Standardised
+            TotalScore.Value = (long)Math.Round(ComputeTotalScore());
         }
 
-        /// <summary>
-        /// Computes the accuracy of a given <see cref="ScoreInfo"/>.
-        /// </summary>
-        /// <param name="scoreInfo">The <see cref="ScoreInfo"/> to compute the total score of.</param>
-        /// <returns>The score's accuracy.</returns>
-        [Pure]
-        public double ComputeAccuracy(ScoreInfo scoreInfo)
-        {
-            if (!Ruleset.RulesetInfo.Equals(scoreInfo.Ruleset))
-                throw new ArgumentException($"Unexpected score ruleset. Expected \"{Ruleset.RulesetInfo.ShortName}\" but was \"{scoreInfo.Ruleset.ShortName}\".");
-
-            // We only extract scoring values from the score's statistics. This is because accuracy is always relative to the point of pass or fail rather than relative to the whole beatmap.
-            extractScoringValues(scoreInfo.Statistics, out var current, out var maximum);
-
-            return maximum.BaseScore > 0 ? (double)current.BaseScore / maximum.BaseScore : 1;
-        }
-
-        /// <summary>
-        /// Computes the total score of a given <see cref="ScoreInfo"/>.
-        /// </summary>
-        /// <remarks>
-        /// Does not require <see cref="JudgementProcessor.ApplyBeatmap"/> to have been called before use.
-        /// </remarks>
-        /// <param name="mode">The <see cref="ScoringMode"/> to represent the score as.</param>
-        /// <param name="scoreInfo">The <see cref="ScoreInfo"/> to compute the total score of.</param>
-        /// <returns>The total score in the given <see cref="ScoringMode"/>.</returns>
-        [Pure]
-        public long ComputeScore(ScoringMode mode, ScoreInfo scoreInfo)
-        {
-            if (!Ruleset.RulesetInfo.Equals(scoreInfo.Ruleset))
-                throw new ArgumentException($"Unexpected score ruleset. Expected \"{Ruleset.RulesetInfo.ShortName}\" but was \"{scoreInfo.Ruleset.ShortName}\".");
-
-            extractScoringValues(scoreInfo, out var current, out var maximum);
-
-            return computeScore(mode, current, maximum);
-        }
-
-        /// <summary>
-        /// Computes the total score from scoring values.
-        /// </summary>
-        /// <param name="mode">The <see cref="ScoringMode"/> to represent the score as.</param>
-        /// <param name="current">The current scoring values.</param>
-        /// <param name="maximum">The maximum scoring values.</param>
-        /// <returns>The total score computed from the given scoring values.</returns>
-        [Pure]
-        private long computeScore(ScoringMode mode, ScoringValues current, ScoringValues maximum)
-        {
-            double accuracyRatio = maximum.BaseScore > 0 ? (double)current.BaseScore / maximum.BaseScore : 1;
-            double comboRatio = maximum.MaxCombo > 0 ? (double)current.MaxCombo / maximum.MaxCombo : 1;
-            return ComputeScore(mode, accuracyRatio, comboRatio, current.BonusScore, maximum.CountBasicHitObjects);
-        }
-
-        /// <summary>
-        /// Computes the total score from individual scoring components.
-        /// </summary>
-        /// <param name="mode">The <see cref="ScoringMode"/> to represent the score as.</param>
-        /// <param name="accuracyRatio">The accuracy percentage achieved by the player.</param>
-        /// <param name="comboRatio">The portion of the max combo achieved by the player.</param>
-        /// <param name="bonusScore">The total bonus score.</param>
-        /// <param name="totalBasicHitObjects">The total number of basic (non-tick and non-bonus) hitobjects in the beatmap.</param>
-        /// <returns>The total score computed from the given scoring component ratios.</returns>
-        [Pure]
-        public long ComputeScore(ScoringMode mode, double accuracyRatio, double comboRatio, long bonusScore, int totalBasicHitObjects)
-        {
-            double accuracyScore = accuracyPortion * accuracyRatio;
-            double comboScore = comboPortion * comboRatio;
-            double rawScore = (max_score * (accuracyScore + comboScore) + bonusScore) * scoreMultiplier;
-
-            switch (mode)
-            {
-                default:
-                case ScoringMode.Standardised:
-                    return (long)Math.Round(rawScore);
-
-                case ScoringMode.Classic:
-                    // This gives a similar feeling to osu!stable scoring (ScoreV1) while keeping classic scoring as only a constant multiple of standardised scoring.
-                    // The invariant is important to ensure that scores don't get re-ordered on leaderboards between the two scoring modes.
-                    double scaledRawScore = rawScore / max_score;
-                    return (long)Math.Round(Math.Pow(scaledRawScore * Math.Max(1, totalBasicHitObjects), 2) * ClassicScoreMultiplier);
-            }
-        }
+        protected abstract double ComputeTotalScore();
 
         /// <summary>
         /// Resets this ScoreProcessor to a default state.
@@ -389,7 +293,8 @@ namespace osu.Game.Rulesets.Scoring
 
             if (storeResults)
             {
-                maximumScoringValues = currentScoringValues;
+                MaxComboPortion = ComboPortion;
+                MaxBasicJudgements = CurrentBasicJudgements;
 
                 maximumResultCounts.Clear();
                 maximumResultCounts.AddRange(scoreResultCounts);
@@ -397,8 +302,11 @@ namespace osu.Game.Rulesets.Scoring
 
             scoreResultCounts.Clear();
 
-            currentScoringValues = default;
-            currentMaximumScoringValues = default;
+            currentBasicScore = 0;
+            currentMaxBasicScore = 0;
+            CurrentBasicJudgements = 0;
+            ComboPortion = 0;
+            BonusPortion = 0;
 
             TotalScore.Value = 0;
             Accuracy.Value = 1;
@@ -406,6 +314,9 @@ namespace osu.Game.Rulesets.Scoring
             Rank.Disabled = false;
             Rank.Value = ScoreRank.X;
             HighestCombo.Value = 0;
+
+            currentBasicScore = 0;
+            currentMaxBasicScore = 0;
         }
 
         /// <summary>
@@ -428,7 +339,7 @@ namespace osu.Game.Rulesets.Scoring
                 score.MaximumStatistics[result] = maximumResultCounts.GetValueOrDefault(result);
 
             // Populate total score after everything else.
-            score.TotalScore = ComputeScore(ScoringMode.Standardised, score);
+            score.TotalScore = TotalScore.Value;
         }
 
         /// <summary>
@@ -452,12 +363,6 @@ namespace osu.Game.Rulesets.Scoring
             if (frame.Header == null)
                 return;
 
-            extractScoringValues(frame.Header.Statistics, out var current, out var maximum);
-            currentScoringValues.BaseScore = current.BaseScore;
-            currentScoringValues.MaxCombo = frame.Header.MaxCombo;
-            currentMaximumScoringValues.BaseScore = maximum.BaseScore;
-            currentMaximumScoringValues.MaxCombo = maximum.MaxCombo;
-
             Combo.Value = frame.Header.Combo;
             HighestCombo.Value = frame.Header.MaxCombo;
 
@@ -469,105 +374,6 @@ namespace osu.Game.Rulesets.Scoring
             OnResetFromReplayFrame?.Invoke();
         }
 
-        #region ScoringValue extraction
-
-        /// <summary>
-        /// Applies a best-effort extraction of hit statistics into <see cref="ScoringValues"/>.
-        /// </summary>
-        /// <remarks>
-        /// This method is useful in a variety of situations, with a few drawbacks that need to be considered:
-        /// <list type="bullet">
-        ///     <item>The maximum <see cref="ScoringValues.BonusScore"/> will always be 0.</item>
-        ///     <item>The current and maximum <see cref="ScoringValues.CountBasicHitObjects"/> will always be the same value.</item>
-        /// </list>
-        /// Consumers are expected to more accurately fill in the above values through external means.
-        /// <para>
-        /// <b>Ensure</b> to fill in the maximum <see cref="ScoringValues.CountBasicHitObjects"/> for use in
-        /// <see cref="computeScore(osu.Game.Rulesets.Scoring.ScoringMode,ScoringValues,ScoringValues)"/>.
-        /// </para>
-        /// </remarks>
-        /// <param name="scoreInfo">The score to extract scoring values from.</param>
-        /// <param name="current">The "current" scoring values, representing the hit statistics as they appear.</param>
-        /// <param name="maximum">The "maximum" scoring values, representing the hit statistics as if the maximum hit result was attained each time.</param>
-        [Pure]
-        private void extractScoringValues(ScoreInfo scoreInfo, out ScoringValues current, out ScoringValues maximum)
-        {
-            extractScoringValues(scoreInfo.Statistics, out current, out maximum);
-            current.MaxCombo = scoreInfo.MaxCombo;
-
-            if (scoreInfo.MaximumStatistics.Count > 0)
-                extractScoringValues(scoreInfo.MaximumStatistics, out _, out maximum);
-        }
-
-        /// <summary>
-        /// Applies a best-effort extraction of hit statistics into <see cref="ScoringValues"/>.
-        /// </summary>
-        /// <remarks>
-        /// This method is useful in a variety of situations, with a few drawbacks that need to be considered:
-        /// <list type="bullet">
-        ///     <item>The current <see cref="ScoringValues.MaxCombo"/> will always be 0.</item>
-        ///     <item>The maximum <see cref="ScoringValues.BonusScore"/> will always be 0.</item>
-        ///     <item>The current and maximum <see cref="ScoringValues.CountBasicHitObjects"/> will always be the same value.</item>
-        /// </list>
-        /// Consumers are expected to more accurately fill in the above values (especially the current <see cref="ScoringValues.MaxCombo"/>) via external means (e.g. <see cref="ScoreInfo"/>).
-        /// </remarks>
-        /// <param name="statistics">The hit statistics to extract scoring values from.</param>
-        /// <param name="current">The "current" scoring values, representing the hit statistics as they appear.</param>
-        /// <param name="maximum">The "maximum" scoring values, representing the hit statistics as if the maximum hit result was attained each time.</param>
-        [Pure]
-        private void extractScoringValues(IReadOnlyDictionary<HitResult, int> statistics, out ScoringValues current, out ScoringValues maximum)
-        {
-            current = default;
-            maximum = default;
-
-            foreach ((HitResult result, int count) in statistics)
-            {
-                if (!result.IsScorable())
-                    continue;
-
-                if (result.IsBonus())
-                    current.BonusScore += count * Judgement.ToNumericResult(result);
-
-                if (result.AffectsAccuracy())
-                {
-                    // The maximum result of this judgement if it wasn't a miss.
-                    // E.g. For a GOOD judgement, the max result is either GREAT/PERFECT depending on which one the ruleset uses (osu!: GREAT, osu!mania: PERFECT).
-                    HitResult maxResult;
-
-                    switch (result)
-                    {
-                        case HitResult.LargeTickHit:
-                        case HitResult.LargeTickMiss:
-                            maxResult = HitResult.LargeTickHit;
-                            break;
-
-                        case HitResult.SmallTickHit:
-                        case HitResult.SmallTickMiss:
-                            maxResult = HitResult.SmallTickHit;
-                            break;
-
-                        default:
-                            maxResult = maxBasicResult ??= Ruleset.GetHitResults().MaxBy(kvp => Judgement.ToNumericResult(kvp.result)).result;
-                            break;
-                    }
-
-                    current.BaseScore += count * Judgement.ToNumericResult(result);
-                    maximum.BaseScore += count * Judgement.ToNumericResult(maxResult);
-                }
-
-                if (result.AffectsCombo())
-                    maximum.MaxCombo += count;
-
-                if (result.IsBasic())
-                {
-                    current.CountBasicHitObjects += count;
-                    maximum.CountBasicHitObjects += count;
-                }
-            }
-        }
-
-        #endregion
-
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
@@ -629,32 +435,6 @@ namespace osu.Game.Rulesets.Scoring
         }
 
         #endregion
-
-        /// <summary>
-        /// Stores the required scoring data that fulfils the minimum requirements for a <see cref="ScoreProcessor"/> to calculate score.
-        /// </summary>
-        private struct ScoringValues
-        {
-            /// <summary>
-            /// The sum of all "basic" <see cref="HitObject"/> scoring values. See: <see cref="HitResultExtensions.IsBasic"/> and <see cref="Judgement.ToNumericResult"/>.
-            /// </summary>
-            public long BaseScore;
-
-            /// <summary>
-            /// The sum of all "bonus" <see cref="HitObject"/> scoring values. See: <see cref="HitResultExtensions.IsBonus"/> and <see cref="Judgement.ToNumericResult"/>.
-            /// </summary>
-            public long BonusScore;
-
-            /// <summary>
-            /// The highest achieved combo.
-            /// </summary>
-            public int MaxCombo;
-
-            /// <summary>
-            /// The count of "basic" <see cref="HitObject"/>s. See: <see cref="HitResultExtensions.IsBasic"/>.
-            /// </summary>
-            public int CountBasicHitObjects;
-        }
     }
 
     public enum ScoringMode
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 3e6d09b74a..3779156fda 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -115,7 +115,9 @@ namespace osu.Game.Scoring
             var scoreProcessor = ruleset.CreateScoreProcessor();
             scoreProcessor.Mods.Value = score.Mods;
 
-            return scoreProcessor.ComputeScore(mode, score);
+            // Todo:
+            return 0;
+            // return scoreProcessor.ComputeScore(mode, score);
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
index 0c25a32259..7b77785c7a 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
@@ -67,7 +67,8 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         {
             await base.PrepareScoreForResultsAsync(score).ConfigureAwait(false);
 
-            Score.ScoreInfo.TotalScore = ScoreProcessor.ComputeScore(ScoringMode.Standardised, Score.ScoreInfo);
+            // Todo:
+            // Score.ScoreInfo.TotalScore = ScoreProcessor.ComputeScore(ScoringMode.Standardised, Score.ScoreInfo);
         }
 
         protected override void Dispose(bool isDisposing)

From a7b623f52af08fd05d89366f169fe75031fa14c3 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smgi@Dans-MacBook-Pro.local>
Date: Tue, 9 May 2023 20:00:14 +0900
Subject: [PATCH 0411/1604] Reimplement classic scoring mode

---
 .../Scoring/CatchScoreProcessor.cs               | 12 +++++-------
 .../Scoring/ManiaScoreProcessor.cs               | 12 +++++-------
 .../Scoring/OsuScoreProcessor.cs                 | 12 +++++-------
 .../Scoring/TaikoScoreProcessor.cs               | 12 +++++-------
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs      | 16 ++++++++++++++--
 osu.Game/Scoring/ScoreManager.cs                 |  8 +++-----
 6 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs b/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
index bf5c3a91d6..9c5359ebeb 100644
--- a/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
@@ -31,13 +31,11 @@ namespace osu.Game.Rulesets.Catch.Scoring
 
             const int tiny_droplets_portion = 400000;
 
-            return
-                (int)Math.Round
-                ((
-                    ((1000000 - tiny_droplets_portion) + tiny_droplets_portion * (1 - tinyDropletScale)) * ComboPortion / MaxComboPortion +
-                    tiny_droplets_portion * tinyDropletScale * fruitHitsRatio +
-                    BonusPortion
-                ) * ScoreMultiplier);
+            return (
+                ((1000000 - tiny_droplets_portion) + tiny_droplets_portion * (1 - tinyDropletScale)) * ComboPortion / MaxComboPortion +
+                tiny_droplets_portion * tinyDropletScale * fruitHitsRatio +
+                BonusPortion
+            ) * ScoreMultiplier;
         }
 
         protected override void AddScoreChange(JudgementResult result)
diff --git a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
index 7d188c6786..19f8a4a639 100644
--- a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
+++ b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
@@ -20,13 +20,11 @@ namespace osu.Game.Rulesets.Mania.Scoring
 
         protected override double ComputeTotalScore()
         {
-            return
-                (int)Math.Round
-                ((
-                    200000 * ComboPortion / MaxComboPortion +
-                    800000 * Math.Pow(Accuracy.Value, 2 + 2 * Accuracy.Value) * ((double)CurrentBasicJudgements / MaxBasicJudgements) +
-                    BonusPortion
-                ) * ScoreMultiplier);
+            return (
+                200000 * ComboPortion / MaxComboPortion +
+                800000 * Math.Pow(Accuracy.Value, 2 + 2 * Accuracy.Value) * ((double)CurrentBasicJudgements / MaxBasicJudgements) +
+                BonusPortion
+            ) * ScoreMultiplier;
         }
 
         protected override void AddScoreChange(JudgementResult result)
diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
index 5f5997b0c1..f8cbf1a641 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
@@ -17,13 +17,11 @@ namespace osu.Game.Rulesets.Osu.Scoring
 
         protected override double ComputeTotalScore()
         {
-            return
-                (int)Math.Round
-                ((
-                    700000 * ComboPortion / MaxComboPortion +
-                    300000 * Math.Pow(Accuracy.Value, 10) * ((double)CurrentBasicJudgements / MaxBasicJudgements) +
-                    BonusPortion
-                ) * ScoreMultiplier);
+            return (
+                700000 * ComboPortion / MaxComboPortion +
+                300000 * Math.Pow(Accuracy.Value, 10) * ((double)CurrentBasicJudgements / MaxBasicJudgements) +
+                BonusPortion
+            ) * ScoreMultiplier;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs b/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
index caf0a799a2..71eb0b1602 100644
--- a/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
+++ b/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
@@ -21,13 +21,11 @@ namespace osu.Game.Rulesets.Taiko.Scoring
 
         protected override double ComputeTotalScore()
         {
-            return
-                (int)Math.Round
-                ((
-                    250000 * ComboPortion / MaxComboPortion +
-                    750000 * Math.Pow(Accuracy.Value, 3.6) * ((double)CurrentBasicJudgements / MaxBasicJudgements) +
-                    BonusPortion
-                ) * ScoreMultiplier);
+            return (
+                250000 * ComboPortion / MaxComboPortion +
+                750000 * Math.Pow(Accuracy.Value, 3.6) * ((double)CurrentBasicJudgements / MaxBasicJudgements) +
+                BonusPortion
+            ) * ScoreMultiplier;
         }
 
         protected override void AddScoreChange(JudgementResult result)
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 8373ebd50c..9172034ff6 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -274,8 +274,20 @@ namespace osu.Game.Rulesets.Scoring
         {
             Accuracy.Value = currentMaxBasicScore > 0 ? currentBasicScore / currentMaxBasicScore : 1;
 
-            // Todo: Classic/Standardised
-            TotalScore.Value = (long)Math.Round(ComputeTotalScore());
+            double standardisedScore = ComputeTotalScore();
+
+            if (Mode.Value == ScoringMode.Standardised)
+                TotalScore.Value = (long)Math.Round(standardisedScore);
+            else
+                TotalScore.Value = ConvertToClassic(standardisedScore);
+        }
+
+        public long ConvertToClassic(double standardised)
+        {
+            // This gives a similar feeling to osu!stable scoring (ScoreV1) while keeping classic scoring as only a constant multiple of standardised scoring.
+            // The invariant is important to ensure that scores don't get re-ordered on leaderboards between the two scoring modes.
+            double scaledRawScore = standardised / MAX_SCORE;
+            return (long)Math.Round(Math.Pow(scaledRawScore * Math.Max(1, MaxBasicJudgements), 2) * ClassicScoreMultiplier);
         }
 
         protected abstract double ComputeTotalScore();
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 3779156fda..0674947f30 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -107,17 +107,15 @@ namespace osu.Game.Scoring
         /// <returns>The total score.</returns>
         public long GetTotalScore([NotNull] ScoreInfo score, ScoringMode mode = ScoringMode.Standardised)
         {
-            // TODO: This is required for playlist aggregate scores. They should likely not be getting here in the first place.
-            if (string.IsNullOrEmpty(score.BeatmapInfo.MD5Hash))
+            if (mode == ScoringMode.Standardised)
                 return score.TotalScore;
 
             var ruleset = score.Ruleset.CreateInstance();
             var scoreProcessor = ruleset.CreateScoreProcessor();
             scoreProcessor.Mods.Value = score.Mods;
 
-            // Todo:
-            return 0;
-            // return scoreProcessor.ComputeScore(mode, score);
+            // Todo: This loses precision because we're dealing with pre-rounded total scores.
+            return scoreProcessor.ConvertToClassic(score.TotalScore);
         }
 
         /// <summary>

From ca5e8b290f30006c93116e7d1ef47fbdb663fc00 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 May 2023 14:05:59 +0900
Subject: [PATCH 0412/1604] Add clamping to `SliderMultiplier` and
 `SliderTickRate` at parsing time

---
 osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index 5e98025c9a..49594ca969 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -384,11 +384,11 @@ namespace osu.Game.Beatmaps.Formats
                     break;
 
                 case @"SliderMultiplier":
-                    difficulty.SliderMultiplier = Parsing.ParseDouble(pair.Value);
+                    difficulty.SliderMultiplier = Math.Clamp(Parsing.ParseDouble(pair.Value), 0.4, 3.6);
                     break;
 
                 case @"SliderTickRate":
-                    difficulty.SliderTickRate = Parsing.ParseDouble(pair.Value);
+                    difficulty.SliderTickRate = Math.Clamp(Parsing.ParseDouble(pair.Value), 0.5, 8);
                     break;
             }
         }

From bdf8a78b4245dc008e8661820ea3cbcff42b97e8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 May 2023 14:14:54 +0900
Subject: [PATCH 0413/1604] Add the ability to adjust the beatmap tick rate in
 the editor

---
 osu.Game/Localisation/EditorSetupStrings.cs   | 31 ++++++++++---------
 .../Screens/Edit/Setup/DifficultySection.cs   | 15 +++++++++
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Localisation/EditorSetupStrings.cs b/osu.Game/Localisation/EditorSetupStrings.cs
index caea3dd130..401411365b 100644
--- a/osu.Game/Localisation/EditorSetupStrings.cs
+++ b/osu.Game/Localisation/EditorSetupStrings.cs
@@ -42,8 +42,7 @@ namespace osu.Game.Localisation
         /// <summary>
         /// "If enabled, an &quot;Are you ready? 3, 2, 1, GO!&quot; countdown will be inserted at the beginning of the beatmap, assuming there is enough time to do so."
         /// </summary>
-        public static LocalisableString CountdownDescription => new TranslatableString(getKey(@"countdown_description"),
-            @"If enabled, an ""Are you ready? 3, 2, 1, GO!"" countdown will be inserted at the beginning of the beatmap, assuming there is enough time to do so.");
+        public static LocalisableString CountdownDescription => new TranslatableString(getKey(@"countdown_description"), @"If enabled, an ""Are you ready? 3, 2, 1, GO!"" countdown will be inserted at the beginning of the beatmap, assuming there is enough time to do so.");
 
         /// <summary>
         /// "Countdown speed"
@@ -53,8 +52,7 @@ namespace osu.Game.Localisation
         /// <summary>
         /// "If the countdown sounds off-time, use this to make it appear one or more beats early."
         /// </summary>
-        public static LocalisableString CountdownOffsetDescription =>
-            new TranslatableString(getKey(@"countdown_offset_description"), @"If the countdown sounds off-time, use this to make it appear one or more beats early.");
+        public static LocalisableString CountdownOffsetDescription => new TranslatableString(getKey(@"countdown_offset_description"), @"If the countdown sounds off-time, use this to make it appear one or more beats early.");
 
         /// <summary>
         /// "Countdown offset"
@@ -69,8 +67,7 @@ namespace osu.Game.Localisation
         /// <summary>
         /// "Allows storyboards to use the full screen space, rather than be confined to a 4:3 area."
         /// </summary>
-        public static LocalisableString WidescreenSupportDescription =>
-            new TranslatableString(getKey(@"widescreen_support_description"), @"Allows storyboards to use the full screen space, rather than be confined to a 4:3 area.");
+        public static LocalisableString WidescreenSupportDescription => new TranslatableString(getKey(@"widescreen_support_description"), @"Allows storyboards to use the full screen space, rather than be confined to a 4:3 area.");
 
         /// <summary>
         /// "Epilepsy warning"
@@ -80,8 +77,7 @@ namespace osu.Game.Localisation
         /// <summary>
         /// "Recommended if the storyboard or video contain scenes with rapidly flashing colours."
         /// </summary>
-        public static LocalisableString EpilepsyWarningDescription =>
-            new TranslatableString(getKey(@"epilepsy_warning_description"), @"Recommended if the storyboard or video contain scenes with rapidly flashing colours.");
+        public static LocalisableString EpilepsyWarningDescription => new TranslatableString(getKey(@"epilepsy_warning_description"), @"Recommended if the storyboard or video contain scenes with rapidly flashing colours.");
 
         /// <summary>
         /// "Letterbox during breaks"
@@ -91,8 +87,7 @@ namespace osu.Game.Localisation
         /// <summary>
         /// "Adds horizontal letterboxing to give a cinematic look during breaks."
         /// </summary>
-        public static LocalisableString LetterboxDuringBreaksDescription =>
-            new TranslatableString(getKey(@"letterbox_during_breaks_description"), @"Adds horizontal letterboxing to give a cinematic look during breaks.");
+        public static LocalisableString LetterboxDuringBreaksDescription => new TranslatableString(getKey(@"letterbox_during_breaks_description"), @"Adds horizontal letterboxing to give a cinematic look during breaks.");
 
         /// <summary>
         /// "Samples match playback rate"
@@ -102,8 +97,7 @@ namespace osu.Game.Localisation
         /// <summary>
         /// "When enabled, all samples will speed up or slow down when rate-changing mods are enabled."
         /// </summary>
-        public static LocalisableString SamplesMatchPlaybackRateDescription => new TranslatableString(getKey(@"samples_match_playback_rate_description"),
-            @"When enabled, all samples will speed up or slow down when rate-changing mods are enabled.");
+        public static LocalisableString SamplesMatchPlaybackRateDescription => new TranslatableString(getKey(@"samples_match_playback_rate_description"), @"When enabled, all samples will speed up or slow down when rate-changing mods are enabled.");
 
         /// <summary>
         /// "The size of all hit objects"
@@ -123,8 +117,17 @@ namespace osu.Game.Localisation
         /// <summary>
         /// "The harshness of hit windows and difficulty of special objects (ie. spinners)"
         /// </summary>
-        public static LocalisableString OverallDifficultyDescription =>
-            new TranslatableString(getKey(@"overall_difficulty_description"), @"The harshness of hit windows and difficulty of special objects (ie. spinners)");
+        public static LocalisableString OverallDifficultyDescription => new TranslatableString(getKey(@"overall_difficulty_description"), @"The harshness of hit windows and difficulty of special objects (ie. spinners)");
+
+        /// <summary>
+        /// "Tick Rate"
+        /// </summary>
+        public static LocalisableString TickRate => new TranslatableString(getKey(@"tick_rate"), @"Tick Rate");
+
+        /// <summary>
+        /// "Determines how many &quot;ticks&quot; are generated within long hit objects. A tick rate of 1 will generate ticks on each beat, 2 would be twice per beat, etc."
+        /// </summary>
+        public static LocalisableString TickRateDescription => new TranslatableString(getKey(@"tick_rate_description"), @"Determines how many ""ticks"" are generated within long hit objects. A tick rate of 1 will generate ticks on each beat, 2 would be twice per beat, etc.");
 
         /// <summary>
         /// "Base Velocity"
diff --git a/osu.Game/Screens/Edit/Setup/DifficultySection.cs b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
index 3a3fe7f747..4c062b0cb7 100644
--- a/osu.Game/Screens/Edit/Setup/DifficultySection.cs
+++ b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
@@ -20,6 +20,7 @@ namespace osu.Game.Screens.Edit.Setup
         private LabelledSliderBar<float> approachRateSlider = null!;
         private LabelledSliderBar<float> overallDifficultySlider = null!;
         private LabelledSliderBar<double> baseVelocitySlider = null!;
+        private LabelledSliderBar<double> tickRateSlider = null!;
 
         public override LocalisableString Title => EditorSetupStrings.DifficultyHeader;
 
@@ -93,6 +94,19 @@ namespace osu.Game.Screens.Edit.Setup
                         Precision = 0.01f,
                     }
                 },
+                tickRateSlider = new LabelledSliderBar<double>
+                {
+                    Label = EditorSetupStrings.TickRate,
+                    FixedLabelWidth = LABEL_WIDTH,
+                    Description = EditorSetupStrings.TickRateDescription,
+                    Current = new BindableDouble(Beatmap.Difficulty.SliderTickRate)
+                    {
+                        Default = 1,
+                        MinValue = 1,
+                        MaxValue = 4,
+                        Precision = 1,
+                    }
+                },
             };
 
             foreach (var item in Children.OfType<LabelledSliderBar<float>>())
@@ -111,6 +125,7 @@ namespace osu.Game.Screens.Edit.Setup
             Beatmap.Difficulty.ApproachRate = approachRateSlider.Current.Value;
             Beatmap.Difficulty.OverallDifficulty = overallDifficultySlider.Current.Value;
             Beatmap.Difficulty.SliderMultiplier = baseVelocitySlider.Current.Value;
+            Beatmap.Difficulty.SliderTickRate = tickRateSlider.Current.Value;
 
             Beatmap.UpdateAllHitObjects();
             Beatmap.SaveState();

From 2467813d8199473f2b37041fb005065c312dd7d2 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Tue, 9 May 2023 16:14:42 +0300
Subject: [PATCH 0414/1604] Block `deselect all` short key when using the
 search box

---
 .../TestSceneModSelectOverlay.cs              | 20 +++++++++++++++++++
 .../UserInterface/ShearedSearchTextBox.cs     |  2 ++
 .../Overlays/Mods/DeselectAllModsButton.cs    |  8 +++++---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    | 20 +++++++++++--------
 4 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 8e4f437f44..d1cbe7d91c 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -481,6 +481,26 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddUntilStep("all mods deselected", () => !SelectedMods.Value.Any());
         }
 
+        [Test]
+        public void TestDeselectAllViaKey_WithSearchApplied()
+        {
+            createScreen();
+            changeRuleset(0);
+
+            AddStep("select DT + HD", () => SelectedMods.Value = new Mod[] { new OsuModDoubleTime(), new OsuModHidden() });
+            AddStep("focus on search", () => modSelectOverlay.SearchTextBox.TakeFocus());
+            AddStep("apply search", () => modSelectOverlay.SearchTerm = "Easy");
+            AddAssert("DT + HD selected and hidden", () => modSelectOverlay.ChildrenOfType<ModPanel>().Count(panel => !panel.IsValid && panel.Active.Value) == 2);
+
+            AddStep("press backspace", () => InputManager.Key(Key.BackSpace));
+            AddAssert("DT + HD still selected", () => modSelectOverlay.ChildrenOfType<ModPanel>().Count(panel => panel.Active.Value) == 2);
+            AddAssert("search term changed", () => modSelectOverlay.SearchTerm == "Eas");
+
+            AddStep("kill focus", () => modSelectOverlay.SearchTextBox.KillFocus());
+            AddStep("press backspace", () => InputManager.Key(Key.BackSpace));
+            AddUntilStep("all mods deselected", () => !SelectedMods.Value.Any());
+        }
+
         [Test]
         public void TestDeselectAllViaButton()
         {
diff --git a/osu.Game/Graphics/UserInterface/ShearedSearchTextBox.cs b/osu.Game/Graphics/UserInterface/ShearedSearchTextBox.cs
index 7bd083f9d5..a6954fafb1 100644
--- a/osu.Game/Graphics/UserInterface/ShearedSearchTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/ShearedSearchTextBox.cs
@@ -37,6 +37,8 @@ namespace osu.Game.Graphics.UserInterface
             set => textBox.HoldFocus = value;
         }
 
+        public new bool HasFocus => textBox.HasFocus;
+
         public void TakeFocus() => textBox.TakeFocus();
 
         public void KillFocus() => textBox.KillFocus();
diff --git a/osu.Game/Overlays/Mods/DeselectAllModsButton.cs b/osu.Game/Overlays/Mods/DeselectAllModsButton.cs
index 3e5a3b12d1..d4d196508f 100644
--- a/osu.Game/Overlays/Mods/DeselectAllModsButton.cs
+++ b/osu.Game/Overlays/Mods/DeselectAllModsButton.cs
@@ -18,6 +18,7 @@ namespace osu.Game.Overlays.Mods
     public partial class DeselectAllModsButton : ShearedButton, IKeyBindingHandler<GlobalAction>
     {
         private readonly Bindable<IReadOnlyList<Mod>> selectedMods = new Bindable<IReadOnlyList<Mod>>();
+        private readonly ShearedSearchTextBox searchTextBox;
 
         public DeselectAllModsButton(ModSelectOverlay modSelectOverlay)
             : base(ModSelectOverlay.BUTTON_WIDTH)
@@ -25,6 +26,8 @@ namespace osu.Game.Overlays.Mods
             Text = CommonStrings.DeselectAll;
             Action = modSelectOverlay.DeselectAll;
 
+            searchTextBox = modSelectOverlay.SearchTextBox;
+
             selectedMods.BindTo(modSelectOverlay.SelectedMods);
         }
 
@@ -40,9 +43,8 @@ namespace osu.Game.Overlays.Mods
             Enabled.Value = selectedMods.Value.Any();
         }
 
-        public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
-        {
-            if (e.Repeat || e.Action != GlobalAction.DeselectAllMods)
+        public bool OnPressed(KeyBindingPressEvent<GlobalAction> e) {
+            if (e.Repeat || e.Action != GlobalAction.DeselectAllMods || searchTextBox.HasFocus)
                 return false;
 
             TriggerClick();
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index cb8eddca62..fdc948bcbf 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -69,16 +69,21 @@ namespace osu.Game.Overlays.Mods
         /// </summary>
         public string SearchTerm
         {
-            get => searchTextBox.Current.Value;
+            get => SearchTextBox.Current.Value;
             set
             {
-                if (searchTextBox.Current.Value == value)
+                if (SearchTextBox.Current.Value == value)
                     return;
 
-                searchTextBox.Current.Value = value;
+                SearchTextBox.Current.Value = value;
             }
         }
 
+        /// <summary>
+        /// Search box applied on mod overlay
+        /// </summary>
+        public ShearedSearchTextBox SearchTextBox { get; private set; } = null!;
+
         /// <summary>
         /// Whether the total score multiplier calculated from the current selected set of mods should be shown.
         /// </summary>
@@ -124,7 +129,6 @@ namespace osu.Game.Overlays.Mods
         private FillFlowContainer<ShearedButton> footerButtonFlow = null!;
 
         private Container aboveColumnsContent = null!;
-        private ShearedSearchTextBox searchTextBox = null!;
         private DifficultyMultiplierDisplay? multiplierDisplay;
 
         protected ShearedButton BackButton { get; private set; } = null!;
@@ -168,7 +172,7 @@ namespace osu.Game.Overlays.Mods
                     RelativeSizeAxes = Axes.X,
                     Height = ModsEffectDisplay.HEIGHT,
                     Padding = new MarginPadding { Horizontal = 100 },
-                    Child = searchTextBox = new ShearedSearchTextBox
+                    Child = SearchTextBox = new ShearedSearchTextBox
                     {
                         HoldFocus = false,
                         Width = 300
@@ -250,8 +254,8 @@ namespace osu.Game.Overlays.Mods
         {
             base.Hide();
 
-            //We want to clear search for next user iteraction with mod overlay
-            searchTextBox.Current.Value = string.Empty;
+            //We want to clear search for next user interaction with mod overlay
+            SearchTextBox.Current.Value = string.Empty;
         }
 
         private ModSettingChangeTracker? modSettingChangeTracker;
@@ -287,7 +291,7 @@ namespace osu.Game.Overlays.Mods
 
             customisationVisible.BindValueChanged(_ => updateCustomisationVisualState(), true);
 
-            searchTextBox.Current.BindValueChanged(query =>
+            SearchTextBox.Current.BindValueChanged(query =>
             {
                 foreach (var column in columnFlow.Columns)
                     column.SearchTerm = query.NewValue;

From 84efddcbc7cb09db82ccb58d2a57bd80c1b9c1fd Mon Sep 17 00:00:00 2001
From: timiimit <timi.korda@gmail.com>
Date: Tue, 9 May 2023 15:53:36 +0200
Subject: [PATCH 0415/1604] Fix default progress graph flipping with a hack

---
 osu.Game/Screens/Play/SquareGraph.cs | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/SquareGraph.cs b/osu.Game/Screens/Play/SquareGraph.cs
index 57b7c84e89..8636f08b00 100644
--- a/osu.Game/Screens/Play/SquareGraph.cs
+++ b/osu.Game/Screens/Play/SquareGraph.cs
@@ -75,18 +75,28 @@ namespace osu.Game.Screens.Play
 
         private Vector2 previousDrawSize;
 
+        private Vector2 previousParentScale;
+
         protected override void Update()
         {
             base.Update();
 
-            if (graphNeedsUpdate || (values != null && DrawSize != previousDrawSize))
+            bool hasFlipped = previousParentScale != Parent.Scale;
+            if (graphNeedsUpdate || (values != null && DrawSize != previousDrawSize) || hasFlipped)
             {
-                columns?.FadeOut(500, Easing.OutQuint).Expire();
-
                 scheduledCreate?.Cancel();
-                scheduledCreate = Scheduler.AddDelayed(RecreateGraph, 500);
+
+                if (!hasFlipped)
+                {
+                    scheduledCreate = Scheduler.AddDelayed(RecreateGraph, 500);
+                }
+                else
+                {
+                    RecreateGraph();
+                }
 
                 previousDrawSize = DrawSize;
+                previousParentScale = Parent.Scale;
                 graphNeedsUpdate = false;
             }
         }

From ad80e2ff5119322dfadaadfa57622bd6aca5afbe Mon Sep 17 00:00:00 2001
From: timiimit <timi.korda@gmail.com>
Date: Tue, 9 May 2023 17:15:54 +0200
Subject: [PATCH 0416/1604] More robust implementation

---
 osu.Game/Screens/Play/SquareGraph.cs | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/SquareGraph.cs b/osu.Game/Screens/Play/SquareGraph.cs
index 8636f08b00..a498917504 100644
--- a/osu.Game/Screens/Play/SquareGraph.cs
+++ b/osu.Game/Screens/Play/SquareGraph.cs
@@ -81,20 +81,31 @@ namespace osu.Game.Screens.Play
         {
             base.Update();
 
-            bool hasFlipped = previousParentScale != Parent.Scale;
-            if (graphNeedsUpdate || (values != null && DrawSize != previousDrawSize) || hasFlipped)
+            bool extraUpdateConditions =
+                DrawSize != previousDrawSize ||
+                previousParentScale != Parent.Scale;
+
+            if (graphNeedsUpdate || (values != null && extraUpdateConditions))
             {
-                scheduledCreate?.Cancel();
+                bool hasFlipped =
+                    previousParentScale.X == -Parent.Scale.X ||
+                    previousParentScale.Y == -Parent.Scale.Y;
 
                 if (!hasFlipped)
                 {
-                    scheduledCreate = Scheduler.AddDelayed(RecreateGraph, 500);
+                    columns?.FadeOut(500, Easing.OutQuint).Expire();
                 }
                 else
                 {
-                    RecreateGraph();
+                    if (columns != null)
+                    {
+                        columns.Alpha = 0.0f;
+                    }
                 }
 
+                scheduledCreate?.Cancel();
+                scheduledCreate = Scheduler.AddDelayed(RecreateGraph, 500);
+
                 previousDrawSize = DrawSize;
                 previousParentScale = Parent.Scale;
                 graphNeedsUpdate = false;

From 745341ca6b4b5c1ed40b362a2fece9af58a7af86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 9 May 2023 21:55:53 +0200
Subject: [PATCH 0417/1604] Fix iOS build workflow failing

A new version of `Microsoft.iOS.Sdk` was released on
2023-05-09T17:28:41.7300000. This version requires Xcode 14.3, which is
not currently available on `macos-latest` runners (which currently alias
to `macos-12`).

To fix, migrate to `macos-13`, which is currently in beta, and
explicitly use Xcode 14.3 (because even on the `macos-13` image, Xcode
14.3 is not yet the default).
---
 .github/workflows/ci.yml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e60e0a39ae..a8167ec4db 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -121,12 +121,24 @@ jobs:
 
   build-only-ios:
     name: Build only (iOS)
-    runs-on: macos-latest
+    # `macos-13` is required, because Xcode 14.3 is required (see below).
+    # TODO: can be changed to `macos-latest` once `macos-13` becomes latest (currently in beta)
+    runs-on: macos-13
     timeout-minutes: 60
     steps:
       - name: Checkout
         uses: actions/checkout@v3
 
+      # newest Microsoft.iOS.Sdk versions require Xcode 14.3.
+      # 14.3 is currently not the default Xcode version (https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md#xcode),
+      # so set it manually.
+      # TODO: remove when 14.3 becomes the default Xcode version.
+      - name: Set Xcode version
+        shell: bash
+        run: |
+          sudo xcode-select -s "/Applications/Xcode_14.3.app"
+          echo "MD_APPLE_SDK_ROOT=/Applications/Xcode_14.3.app" >> $GITHUB_ENV
+
       - name: Install .NET 6.0.x
         uses: actions/setup-dotnet@v3
         with:

From 4aa241daeab7d12eb8a32f1bb1da78ed5749a5c8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 10 May 2023 15:19:43 +0900
Subject: [PATCH 0418/1604] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index e9ecbaa10b..ff76e17184 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -11,7 +11,7 @@
     <AndroidManifestMerger>manifestmerger.jar</AndroidManifestMerger>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.506.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.510.0" />
   </ItemGroup>
   <ItemGroup>
     <AndroidManifestOverlay Include="$(MSBuildThisFileDirectory)osu.Android\Properties\AndroidManifestOverlay.xml" />
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 7ab9810ab5..93f22a31d8 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,7 +36,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="10.20.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.506.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.510.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.417.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index bfa0dc63bb..c5477f765e 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -16,6 +16,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.506.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.510.0" />
   </ItemGroup>
 </Project>

From 3fc19553b4435211370cfd2655ed35992ae95aa7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 10 May 2023 15:19:46 +0900
Subject: [PATCH 0419/1604] Update resources

---
 osu.Game/osu.Game.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 93f22a31d8..4315f44e07 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -37,7 +37,7 @@
     </PackageReference>
     <PackageReference Include="Realm" Version="10.20.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2023.510.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.417.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.510.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />

From ca688507304721a799c85a40900c1624976954c7 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Wed, 10 May 2023 19:43:58 +0300
Subject: [PATCH 0420/1604] fix formatting

---
 osu.Game/Overlays/Mods/DeselectAllModsButton.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/DeselectAllModsButton.cs b/osu.Game/Overlays/Mods/DeselectAllModsButton.cs
index d4d196508f..bdb37e3ead 100644
--- a/osu.Game/Overlays/Mods/DeselectAllModsButton.cs
+++ b/osu.Game/Overlays/Mods/DeselectAllModsButton.cs
@@ -43,7 +43,8 @@ namespace osu.Game.Overlays.Mods
             Enabled.Value = selectedMods.Value.Any();
         }
 
-        public bool OnPressed(KeyBindingPressEvent<GlobalAction> e) {
+        public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
+        {
             if (e.Repeat || e.Action != GlobalAction.DeselectAllMods || searchTextBox.HasFocus)
                 return false;
 

From c1a85658b728614be2f25fbca7d8dda1916865f3 Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Thu, 11 May 2023 14:58:17 +0100
Subject: [PATCH 0421/1604] feat(settings): add "import" as keywords for first
 run setup

---
 osu.Game/Overlays/Settings/Sections/GeneralSection.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/GeneralSection.cs b/osu.Game/Overlays/Settings/Sections/GeneralSection.cs
index c5274d6223..b12541b261 100644
--- a/osu.Game/Overlays/Settings/Sections/GeneralSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/GeneralSection.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Overlays.Settings.Sections
                 new SettingsButton
                 {
                     Text = GeneralSettingsStrings.RunSetupWizard,
-                    Keywords = new[] { @"first run", @"initial", @"getting started" },
+                    Keywords = new[] { @"first run", @"initial", @"getting started", @"import" },
                     TooltipText = FirstRunSetupOverlayStrings.FirstRunSetupDescription,
                     Action = () => firstRunSetupOverlay?.Show(),
                 },

From 2d45d602a538532245f9fe4287700e27493e962b Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Thu, 11 May 2023 15:03:42 +0100
Subject: [PATCH 0422/1604] feat(settings): more keyword for first run setup

---
 osu.Game/Overlays/Settings/Sections/GeneralSection.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/GeneralSection.cs b/osu.Game/Overlays/Settings/Sections/GeneralSection.cs
index b12541b261..f4a79d65e6 100644
--- a/osu.Game/Overlays/Settings/Sections/GeneralSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/GeneralSection.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Overlays.Settings.Sections
                 new SettingsButton
                 {
                     Text = GeneralSettingsStrings.RunSetupWizard,
-                    Keywords = new[] { @"first run", @"initial", @"getting started", @"import" },
+                    Keywords = new[] { @"first run", @"initial", @"getting started", @"import", @"tutorial", @"recommended beatmaps" },
                     TooltipText = FirstRunSetupOverlayStrings.FirstRunSetupDescription,
                     Action = () => firstRunSetupOverlay?.Show(),
                 },

From 4732c8a06c73c8e8e63673f6bbf21c7dd45c1b92 Mon Sep 17 00:00:00 2001
From: alix <me@alix.sh>
Date: Thu, 11 May 2023 13:46:07 -0400
Subject: [PATCH 0423/1604] fix angle sharpness slider value from not always
 scaling by 0.5

---
 osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
index 307d731fd4..b8ce667398 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         {
             MinValue = 1,
             MaxValue = 10,
-            Precision = 0.1f
+            Precision = 0.5f
         };
 
         private static readonly float playfield_diagonal = OsuPlayfield.BASE_SIZE.LengthFast;

From 3bce7ac58931806ddaa81191b04e744ffbdef680 Mon Sep 17 00:00:00 2001
From: js1086 <js1086@student.le.ac.uk>
Date: Thu, 11 May 2023 19:07:22 +0100
Subject: [PATCH 0424/1604] Copy SliderVelocity to strict tracking sliders

---
 osu.Game.Rulesets.Osu/Mods/OsuModStrictTracking.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModStrictTracking.cs b/osu.Game.Rulesets.Osu/Mods/OsuModStrictTracking.cs
index 7e4ffc7408..72031b4958 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModStrictTracking.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModStrictTracking.cs
@@ -98,6 +98,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                 ComboOffset = original.ComboOffset;
                 LegacyLastTickOffset = original.LegacyLastTickOffset;
                 TickDistanceMultiplier = original.TickDistanceMultiplier;
+                SliderVelocity = original.SliderVelocity;
             }
 
             protected override void CreateNestedHitObjects(CancellationToken cancellationToken)

From a4954e64acb288a3a3ca1d6213ef63f68d812a64 Mon Sep 17 00:00:00 2001
From: alix <me@alix.sh>
Date: Thu, 11 May 2023 23:45:41 -0400
Subject: [PATCH 0425/1604] fix precision from making mouse input also go 0.5

---
 osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
index b8ce667398..89767b29c1 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
@@ -22,18 +22,27 @@ namespace osu.Game.Rulesets.Osu.Mods
     /// <summary>
     /// Mod that randomises the positions of the <see cref="HitObject"/>s
     /// </summary>
+
+    public partial class AngleSharpnessSlider : SettingsSlider<float>
+    {
+        public AngleSharpnessSlider()
+        {
+            KeyboardStep = 0.5f;
+        }
+    }
+
     public class OsuModRandom : ModRandom, IApplicableToBeatmap
     {
         public override LocalisableString Description => "It never gets boring!";
 
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(OsuModTargetPractice)).ToArray();
 
-        [SettingSource("Angle sharpness", "How sharp angles should be", SettingControlType = typeof(SettingsSlider<float>))]
+        [SettingSource("Angle sharpness", "How sharp angles should be", SettingControlType = typeof(AngleSharpnessSlider))]
         public BindableFloat AngleSharpness { get; } = new BindableFloat(7)
         {
             MinValue = 1,
             MaxValue = 10,
-            Precision = 0.5f
+            Precision = 0.1f
         };
 
         private static readonly float playfield_diagonal = OsuPlayfield.BASE_SIZE.LengthFast;

From e50cab9e81196405011654019cd003a795018789 Mon Sep 17 00:00:00 2001
From: alix <me@alix.sh>
Date: Thu, 11 May 2023 23:48:31 -0400
Subject: [PATCH 0426/1604] move class to the bottom of the file

---
 osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
index 89767b29c1..3d19a4d6eb 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
@@ -22,15 +22,6 @@ namespace osu.Game.Rulesets.Osu.Mods
     /// <summary>
     /// Mod that randomises the positions of the <see cref="HitObject"/>s
     /// </summary>
-
-    public partial class AngleSharpnessSlider : SettingsSlider<float>
-    {
-        public AngleSharpnessSlider()
-        {
-            KeyboardStep = 0.5f;
-        }
-    }
-
     public class OsuModRandom : ModRandom, IApplicableToBeatmap
     {
         public override LocalisableString Description => "It never gets boring!";
@@ -170,5 +161,13 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             return previousObjectStartedCombo && random.NextDouble() < 0.6f;
         }
+
+        public partial class AngleSharpnessSlider : SettingsSlider<float>
+        {
+        public AngleSharpnessSlider()
+            {
+            KeyboardStep = 0.5f;
+            }
+        }
     }
 }

From 53ab780796fdb4a83366e84e5c00b58be3ac1cb1 Mon Sep 17 00:00:00 2001
From: alix <me@alix.sh>
Date: Thu, 11 May 2023 23:50:45 -0400
Subject: [PATCH 0427/1604] fix indents

---
 osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
index 3d19a4d6eb..61fb9189bc 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
@@ -164,9 +164,9 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public partial class AngleSharpnessSlider : SettingsSlider<float>
         {
-        public AngleSharpnessSlider()
+            public AngleSharpnessSlider()
             {
-            KeyboardStep = 0.5f;
+                KeyboardStep = 0.5f;
             }
         }
     }

From b3a5e4d3052d4d97d4a97779f561359bf92c3217 Mon Sep 17 00:00:00 2001
From: alix <me@alix.sh>
Date: Fri, 12 May 2023 00:29:00 -0400
Subject: [PATCH 0428/1604] nest class outside of OsuModRandom

---
 osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
index 61fb9189bc..6affeb24d8 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
@@ -161,13 +161,13 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             return previousObjectStartedCombo && random.NextDouble() < 0.6f;
         }
+    }
 
-        public partial class AngleSharpnessSlider : SettingsSlider<float>
+    public partial class AngleSharpnessSlider : SettingsSlider<float>
+    {
+        public AngleSharpnessSlider()
         {
-            public AngleSharpnessSlider()
-            {
-                KeyboardStep = 0.5f;
-            }
+            KeyboardStep = 0.5f;
         }
     }
 }

From c0f869e685970af218ef68640cabe755f2f93db5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 May 2023 14:57:54 +0900
Subject: [PATCH 0429/1604] Fix some tablet settings being hidden when
 searching using "area" keyword

As discussed in https://github.com/ppy/osu/discussions/23504.
---
 osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index 951cf3802f..4c9320c2a6 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -3,6 +3,8 @@
 
 #nullable disable
 
+using System.Collections.Generic;
+using System.Linq;
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -23,6 +25,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 {
     public partial class TabletSettings : SettingsSubsection
     {
+        public override IEnumerable<LocalisableString> FilterTerms => base.FilterTerms.Concat(new LocalisableString[] { "area" });
+
         public TabletAreaSelection AreaSelection { get; private set; }
 
         private readonly ITabletHandler tabletHandler;

From f443cfb93e41c4c33e3f51bccd1583b382b5dd3a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 May 2023 16:00:40 +0900
Subject: [PATCH 0430/1604] Move blueprint validity conditions to allow more
 correct external usage of `EndPlacement`

Until now, these were haphazardly enforce inline in blueprint
implementations. The only thing stopping complete breakage is that
`EndPlacement` wasn't called (too much) from outside the blueprint,
leaving them responsible for their own placement.

By moving this conditional out of the provided paramters to
`EndPlacement`, it allows more flexible usage of that method externally.
Coming in a future PR.
---
 .../Blueprints/BananaShowerPlacementBlueprint.cs    |  4 +++-
 .../Blueprints/JuiceStreamPlacementBlueprint.cs     |  4 +++-
 .../Edit/Blueprints/HoldNotePlacementBlueprint.cs   |  4 +++-
 .../Blueprints/Sliders/SliderPlacementBlueprint.cs  |  4 +++-
 .../Edit/Blueprints/TaikoSpanPlacementBlueprint.cs  |  4 +++-
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs        | 13 +++++++++++--
 6 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Edit/Blueprints/BananaShowerPlacementBlueprint.cs b/osu.Game.Rulesets.Catch/Edit/Blueprints/BananaShowerPlacementBlueprint.cs
index 5f22ef5c12..1e63d32c41 100644
--- a/osu.Game.Rulesets.Catch/Edit/Blueprints/BananaShowerPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Catch/Edit/Blueprints/BananaShowerPlacementBlueprint.cs
@@ -17,6 +17,8 @@ namespace osu.Game.Rulesets.Catch.Edit.Blueprints
         private double placementStartTime;
         private double placementEndTime;
 
+        protected override bool IsValidForPlacement => HitObject.Duration > 0;
+
         public BananaShowerPlacementBlueprint()
         {
             InternalChild = outline = new TimeSpanOutline();
@@ -49,7 +51,7 @@ namespace osu.Game.Rulesets.Catch.Edit.Blueprints
                 case PlacementState.Active:
                     if (e.Button != MouseButton.Right) break;
 
-                    EndPlacement(HitObject.Duration > 0);
+                    EndPlacement(true);
                     return true;
             }
 
diff --git a/osu.Game.Rulesets.Catch/Edit/Blueprints/JuiceStreamPlacementBlueprint.cs b/osu.Game.Rulesets.Catch/Edit/Blueprints/JuiceStreamPlacementBlueprint.cs
index 03ec674abb..9e50b5a80f 100644
--- a/osu.Game.Rulesets.Catch/Edit/Blueprints/JuiceStreamPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Catch/Edit/Blueprints/JuiceStreamPlacementBlueprint.cs
@@ -24,6 +24,8 @@ namespace osu.Game.Rulesets.Catch.Edit.Blueprints
 
         private InputManager inputManager = null!;
 
+        protected override bool IsValidForPlacement => HitObject.Duration > 0;
+
         public JuiceStreamPlacementBlueprint()
         {
             InternalChildren = new Drawable[]
@@ -70,7 +72,7 @@ namespace osu.Game.Rulesets.Catch.Edit.Blueprints
                             return true;
 
                         case MouseButton.Right:
-                            EndPlacement(HitObject.Duration > 0);
+                            EndPlacement(true);
                             return true;
                     }
 
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
index 21beee0769..381af8be7f 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
@@ -25,6 +25,8 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         [Resolved]
         private IScrollingInfo scrollingInfo { get; set; }
 
+        protected override bool IsValidForPlacement => HitObject.Duration > 0;
+
         public HoldNotePlacementBlueprint()
             : base(new HoldNote())
         {
@@ -75,7 +77,7 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
                 return;
 
             base.OnMouseUp(e);
-            EndPlacement(HitObject.Duration > 0);
+            EndPlacement(true);
         }
 
         private double originalStartTime;
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 50514865e1..28ceb80627 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -41,6 +41,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         [Resolved(CanBeNull = true)]
         private IDistanceSnapProvider snapProvider { get; set; }
 
+        protected override bool IsValidForPlacement => HitObject.Path.HasValidLength;
+
         public SliderPlacementBlueprint()
             : base(new Slider())
         {
@@ -150,7 +152,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         private void endCurve()
         {
             updateSlider();
-            EndPlacement(HitObject.Path.HasValidLength);
+            EndPlacement(true);
         }
 
         protected override void Update()
diff --git a/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSpanPlacementBlueprint.cs b/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSpanPlacementBlueprint.cs
index fcf2573d64..bc4129c982 100644
--- a/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSpanPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSpanPlacementBlueprint.cs
@@ -25,6 +25,8 @@ namespace osu.Game.Rulesets.Taiko.Edit.Blueprints
 
         private readonly IHasDuration spanPlacementObject;
 
+        protected override bool IsValidForPlacement => spanPlacementObject.Duration > 0;
+
         public TaikoSpanPlacementBlueprint(HitObject hitObject)
             : base(hitObject)
         {
@@ -73,7 +75,7 @@ namespace osu.Game.Rulesets.Taiko.Edit.Blueprints
                 return;
 
             base.OnMouseUp(e);
-            EndPlacement(spanPlacementObject.Duration > 0);
+            EndPlacement(true);
         }
 
         public override void UpdateTimeAndPosition(SnapResult result)
diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index bdcb334738..253d59751d 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -47,6 +47,15 @@ namespace osu.Game.Rulesets.Edit
         [Resolved]
         private IPlacementHandler placementHandler { get; set; }
 
+        /// <summary>
+        /// Whether this blueprint is currently in a state that can be committed.
+        /// </summary>
+        /// <remarks>
+        /// Override this with any preconditions that should be double-checked on committing.
+        /// If <c>false</c> is returned and a commit is attempted, the blueprint will be destroyed instead.
+        /// </remarks>
+        protected virtual bool IsValidForPlacement => true;
+
         protected PlacementBlueprint(HitObject hitObject)
         {
             HitObject = hitObject;
@@ -88,7 +97,7 @@ namespace osu.Game.Rulesets.Edit
         /// Signals that the placement of <see cref="HitObject"/> has finished.
         /// This will destroy this <see cref="PlacementBlueprint"/>, and add the HitObject.StartTime to the <see cref="Beatmap"/>.
         /// </summary>
-        /// <param name="commit">Whether the object should be committed.</param>
+        /// <param name="commit">Whether the object should be committed. Note that a commit may fail if <see cref="IsValidForPlacement"/> is <c>false</c>.</param>
         public void EndPlacement(bool commit)
         {
             switch (PlacementActive)
@@ -102,7 +111,7 @@ namespace osu.Game.Rulesets.Edit
                     break;
             }
 
-            placementHandler.EndPlacement(HitObject, commit);
+            placementHandler.EndPlacement(HitObject, IsValidForPlacement && commit);
             PlacementActive = PlacementState.Finished;
         }
 

From 70e248b92790da42e5d74d4f966407af2c2e5e0e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 May 2023 15:48:53 +0900
Subject: [PATCH 0431/1604] Force placement of in-progress object when changing
 tools in the editor

---
 .../Components/ComposeBlueprintContainer.cs       | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 453e4b9130..07fb450628 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -317,12 +317,16 @@ namespace osu.Game.Screens.Edit.Compose.Components
             }
         }
 
+        private void commitIfPlacementActive()
+        {
+            CurrentPlacement?.EndPlacement(CurrentPlacement.PlacementActive == PlacementBlueprint.PlacementState.Active);
+            removePlacement();
+        }
+
         private void removePlacement()
         {
-            if (CurrentPlacement == null) return;
-
-            CurrentPlacement.EndPlacement(false);
-            CurrentPlacement.Expire();
+            CurrentPlacement?.EndPlacement(false);
+            CurrentPlacement?.Expire();
             CurrentPlacement = null;
         }
 
@@ -342,7 +346,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
                 currentTool = value;
 
-                refreshTool();
+                // As per stable editor, when changing tools, we should forcefully commit any pending placement.
+                commitIfPlacementActive();
             }
         }
     }

From 0c1959ef2ff93e2e743a6a1a32b74e18c4028d5d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 May 2023 15:50:33 +0900
Subject: [PATCH 0432/1604] Allow commiting / undoing placement of blueprints
 using back / select bindings

---
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs | 28 +++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index 253d59751d..12c0ea1807 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -9,10 +9,12 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Input.Bindings;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Compose;
@@ -24,7 +26,7 @@ namespace osu.Game.Rulesets.Edit
     /// <summary>
     /// A blueprint which governs the creation of a new <see cref="HitObject"/> to actualisation.
     /// </summary>
-    public abstract partial class PlacementBlueprint : CompositeDrawable
+    public abstract partial class PlacementBlueprint : CompositeDrawable, IKeyBindingHandler<GlobalAction>
     {
         /// <summary>
         /// Whether the <see cref="HitObject"/> is currently mid-placement, but has not necessarily finished being placed.
@@ -115,6 +117,30 @@ namespace osu.Game.Rulesets.Edit
             PlacementActive = PlacementState.Finished;
         }
 
+        public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
+        {
+            if (PlacementActive == PlacementState.Waiting)
+                return false;
+
+            switch (e.Action)
+            {
+                case GlobalAction.Select:
+                    EndPlacement(true);
+                    return true;
+
+                case GlobalAction.Back:
+                    EndPlacement(false);
+                    return true;
+
+                default:
+                    return false;
+            }
+        }
+
+        public void OnReleased(KeyBindingReleaseEvent<GlobalAction> e)
+        {
+        }
+
         /// <summary>
         /// Updates the time and position of this <see cref="PlacementBlueprint"/> based on the provided snap information.
         /// </summary>

From 6180d0d620bcf6f49ec8e22168d23c5a7d7bb465 Mon Sep 17 00:00:00 2001
From: timiimit <timi.korda@gmail.com>
Date: Fri, 12 May 2023 15:00:46 +0200
Subject: [PATCH 0433/1604] Remove cached frame buffer

---
 osu.Game/Screens/Play/SquareGraph.cs | 26 +++-----------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

diff --git a/osu.Game/Screens/Play/SquareGraph.cs b/osu.Game/Screens/Play/SquareGraph.cs
index 57b7c84e89..26283858a6 100644
--- a/osu.Game/Screens/Play/SquareGraph.cs
+++ b/osu.Game/Screens/Play/SquareGraph.cs
@@ -51,7 +51,8 @@ namespace osu.Game.Screens.Play
                 if (value == values) return;
 
                 values = value;
-                graphNeedsUpdate = true;
+                scheduledCreate?.Cancel();
+                scheduledCreate = Scheduler.AddDelayed(RecreateGraph, 500);
             }
         }
 
@@ -70,27 +71,6 @@ namespace osu.Game.Screens.Play
         }
 
         private ScheduledDelegate scheduledCreate;
-
-        private bool graphNeedsUpdate;
-
-        private Vector2 previousDrawSize;
-
-        protected override void Update()
-        {
-            base.Update();
-
-            if (graphNeedsUpdate || (values != null && DrawSize != previousDrawSize))
-            {
-                columns?.FadeOut(500, Easing.OutQuint).Expire();
-
-                scheduledCreate?.Cancel();
-                scheduledCreate = Scheduler.AddDelayed(RecreateGraph, 500);
-
-                previousDrawSize = DrawSize;
-                graphNeedsUpdate = false;
-            }
-        }
-
         private CancellationTokenSource cts;
 
         /// <summary>
@@ -98,7 +78,7 @@ namespace osu.Game.Screens.Play
         /// </summary>
         protected virtual void RecreateGraph()
         {
-            var newColumns = new BufferedContainer<Column>(cachedFrameBuffer: true)
+            var newColumns = new BufferedContainer<Column>
             {
                 RedrawOnScale = false,
                 RelativeSizeAxes = Axes.Both,

From 159cacf9c7299dfa72cf091bb31dc99030879d4b Mon Sep 17 00:00:00 2001
From: timiimit <timi.korda@gmail.com>
Date: Sat, 13 May 2023 01:27:28 +0200
Subject: [PATCH 0434/1604] Fix logic in recalculateValues()

---
 osu.Game/Screens/Play/SquareGraph.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/SquareGraph.cs b/osu.Game/Screens/Play/SquareGraph.cs
index 26283858a6..d521bb5448 100644
--- a/osu.Game/Screens/Play/SquareGraph.cs
+++ b/osu.Game/Screens/Play/SquareGraph.cs
@@ -139,18 +139,19 @@ namespace osu.Game.Screens.Play
             if (values == null)
             {
                 for (float i = 0; i < ColumnCount; i++)
+                {
                     newValues.Add(0);
-
-                return;
             }
-
+            }
+            else
+            {
             int max = values.Max();
-
             float step = values.Length / (float)ColumnCount;
 
             for (float i = 0; i < values.Length; i += step)
             {
                 newValues.Add((float)values[(int)i] / max);
+                }
             }
 
             calculatedValues = newValues.ToArray();

From 21d7c62f303c2064dd99ae305d19c409f87cd4c6 Mon Sep 17 00:00:00 2001
From: timiimit <timi.korda@gmail.com>
Date: Sat, 13 May 2023 01:29:11 +0200
Subject: [PATCH 0435/1604] Add optimized UpdateGraph

---
 osu.Game/Screens/Play/SquareGraph.cs | 122 +++++++++++++++++++--------
 1 file changed, 88 insertions(+), 34 deletions(-)

diff --git a/osu.Game/Screens/Play/SquareGraph.cs b/osu.Game/Screens/Play/SquareGraph.cs
index d521bb5448..dd964b8908 100644
--- a/osu.Game/Screens/Play/SquareGraph.cs
+++ b/osu.Game/Screens/Play/SquareGraph.cs
@@ -16,6 +16,7 @@ using osuTK.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Allocation;
 using osu.Framework.Threading;
+using osu.Framework.Layout;
 
 namespace osu.Game.Screens.Play
 {
@@ -23,6 +24,8 @@ namespace osu.Game.Screens.Play
     {
         private BufferedContainer<Column> columns;
 
+        private readonly LayoutValue layout = new LayoutValue(Invalidation.DrawSize | Invalidation.DrawInfo);
+
         public int ColumnCount => columns?.Children.Count ?? 0;
 
         private int progress;
@@ -51,11 +54,13 @@ namespace osu.Game.Screens.Play
                 if (value == values) return;
 
                 values = value;
-                scheduledCreate?.Cancel();
-                scheduledCreate = Scheduler.AddDelayed(RecreateGraph, 500);
+                haveValuesChanged = true;
+                layout.Invalidate();
             }
         }
 
+        bool haveValuesChanged;
+
         private Color4 fillColour;
 
         public Color4 FillColour
@@ -70,43 +75,93 @@ namespace osu.Game.Screens.Play
             }
         }
 
-        private ScheduledDelegate scheduledCreate;
-        private CancellationTokenSource cts;
-
-        /// <summary>
-        /// Recreates the entire graph.
-        /// </summary>
-        protected virtual void RecreateGraph()
+        public SquareGraph()
         {
-            var newColumns = new BufferedContainer<Column>
+            AddLayout(layout);
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Child = columns = new BufferedContainer<Column>(cachedFrameBuffer: true)
             {
                 RedrawOnScale = false,
-                RelativeSizeAxes = Axes.Both,
+                RelativeSizeAxes = Axes.Both
             };
+        }
 
-            for (float x = 0; x < DrawWidth; x += Column.WIDTH)
+
+        // private Vector2 parentScale;
+
+        protected override void Update()
+        {
+            base.Update();
+            
+            if (!layout.IsValid)
             {
-                newColumns.Add(new Column(DrawHeight)
+                UpdateGraph();
+                layout.Validate();
+            }
+        }
+
+        /// <summary>
+        /// Updates the graph by either adding or removing columns based on DrawWidth.
+        /// Does nothing if correct number of columns already exists and/or if <see cref="SquareGraph.values"/> haven't changed.
+        /// </summary>
+        protected virtual void UpdateGraph()
+        {
+            int targetColumnCount = values == null ? 0 : (int)(DrawWidth / Column.WIDTH);
+
+            // early exit the most frequent case
+            if (!haveValuesChanged && targetColumnCount == ColumnCount)
+            {
+                columns.ForceRedraw();
+                return;
+            }
+
+            ensureColumnCount(targetColumnCount);
+
+            // fill graph data
+            recalculateValues();
+            redrawFilled();
+            redrawProgress();
+
+            haveValuesChanged = false;
+        }
+
+        private void ensureColumnCount(int targetColumnCount)
+        {
+            // remove excess columns
+            while (targetColumnCount < ColumnCount)
+            {
+                columns.Remove(columns.Children[ColumnCount - 1], true);
+            }
+
+            // update height of existing columns
+            foreach (var column in columns)
+            {
+                column.Height = DrawHeight;
+            }
+
+            // add missing columns
+            float x = ColumnCount * Column.WIDTH;
+            while (targetColumnCount > ColumnCount)
+            {
+                var column = new Column()
                 {
+                    Height = DrawHeight,
                     LitColour = fillColour,
                     Anchor = Anchor.BottomLeft,
                     Origin = Anchor.BottomLeft,
                     Position = new Vector2(x, 0),
                     State = ColumnState.Dimmed,
-                });
+                };
+
+                LoadComponentAsync(column);
+                columns.Add(column);
+
+                x += Column.WIDTH;
             }
-
-            cts?.Cancel();
-
-            LoadComponentAsync(newColumns, c =>
-            {
-                Child = columns = c;
-                columns.FadeInFromZero(500, Easing.OutQuint);
-
-                recalculateValues();
-                redrawFilled();
-                redrawProgress();
-            }, (cts = new CancellationTokenSource()).Token);
         }
 
         /// <summary>
@@ -141,16 +196,16 @@ namespace osu.Game.Screens.Play
                 for (float i = 0; i < ColumnCount; i++)
                 {
                     newValues.Add(0);
-            }
+                }
             }
             else
             {
-            int max = values.Max();
-            float step = values.Length / (float)ColumnCount;
+                int max = values.Max();
+                float step = values.Length / (float)ColumnCount;
 
-            for (float i = 0; i < values.Length; i += step)
-            {
-                newValues.Add((float)values[(int)i] / max);
+                for (float i = 0; i < values.Length; i += step)
+                {
+                    newValues.Add((float)values[(int)i] / max);
                 }
             }
 
@@ -203,10 +258,9 @@ namespace osu.Game.Screens.Play
                 }
             }
 
-            public Column(float height)
+            public Column()
             {
                 Width = WIDTH;
-                Height = height;
             }
 
             [BackgroundDependencyLoader]

From 04f7def798e365660a8e6e721c6309ba469f6a98 Mon Sep 17 00:00:00 2001
From: timiimit <timi.korda@gmail.com>
Date: Sat, 13 May 2023 01:31:12 +0200
Subject: [PATCH 0436/1604] Remove useless comment

---
 osu.Game/Screens/Play/SquareGraph.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Screens/Play/SquareGraph.cs b/osu.Game/Screens/Play/SquareGraph.cs
index dd964b8908..7e8a8952cc 100644
--- a/osu.Game/Screens/Play/SquareGraph.cs
+++ b/osu.Game/Screens/Play/SquareGraph.cs
@@ -90,9 +90,6 @@ namespace osu.Game.Screens.Play
             };
         }
 
-
-        // private Vector2 parentScale;
-
         protected override void Update()
         {
             base.Update();

From d39d552660d79ea2652c15e9201f2d65034e6d10 Mon Sep 17 00:00:00 2001
From: timiimit <timi.korda@gmail.com>
Date: Sat, 13 May 2023 01:35:48 +0200
Subject: [PATCH 0437/1604] Update test

---
 .../Visual/Gameplay/TestSceneDefaultSongProgressGraph.cs  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneDefaultSongProgressGraph.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneDefaultSongProgressGraph.cs
index 66671a506f..4e57a255be 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneDefaultSongProgressGraph.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneDefaultSongProgressGraph.cs
@@ -63,10 +63,12 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             public int CreationCount { get; private set; }
 
-            protected override void RecreateGraph()
+            protected override void UpdateGraph()
             {
-                base.RecreateGraph();
-                CreationCount++;
+                base.UpdateGraph();
+
+                if (base.ColumnCount > 0)
+                    CreationCount++;
             }
         }
     }

From 8cc0c5ad1ca7b27c13651a48f5ab5ebe9c673cc5 Mon Sep 17 00:00:00 2001
From: timiimit <timi.korda@gmail.com>
Date: Sat, 13 May 2023 01:39:01 +0200
Subject: [PATCH 0438/1604] Fix code style

---
 osu.Game/Screens/Play/SquareGraph.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/SquareGraph.cs b/osu.Game/Screens/Play/SquareGraph.cs
index 7e8a8952cc..5ea17a7518 100644
--- a/osu.Game/Screens/Play/SquareGraph.cs
+++ b/osu.Game/Screens/Play/SquareGraph.cs
@@ -6,7 +6,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
 using osu.Framework;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -15,7 +14,6 @@ using osuTK;
 using osuTK.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Allocation;
-using osu.Framework.Threading;
 using osu.Framework.Layout;
 
 namespace osu.Game.Screens.Play
@@ -59,7 +57,7 @@ namespace osu.Game.Screens.Play
             }
         }
 
-        bool haveValuesChanged;
+        private bool haveValuesChanged;
 
         private Color4 fillColour;
 
@@ -93,7 +91,7 @@ namespace osu.Game.Screens.Play
         protected override void Update()
         {
             base.Update();
-            
+
             if (!layout.IsValid)
             {
                 UpdateGraph();

From 80b6e014f16747173aa4240aebb709fda1187b82 Mon Sep 17 00:00:00 2001
From: timiimit <timi.korda@gmail.com>
Date: Sat, 13 May 2023 01:47:44 +0200
Subject: [PATCH 0439/1604] More code style

---
 .../Visual/Gameplay/TestSceneDefaultSongProgressGraph.cs       | 2 +-
 osu.Game/Screens/Play/SquareGraph.cs                           | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneDefaultSongProgressGraph.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneDefaultSongProgressGraph.cs
index 4e57a255be..8d0c26996c 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneDefaultSongProgressGraph.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneDefaultSongProgressGraph.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
                 base.UpdateGraph();
 
-                if (base.ColumnCount > 0)
+                if (ColumnCount > 0)
                     CreationCount++;
             }
         }
diff --git a/osu.Game/Screens/Play/SquareGraph.cs b/osu.Game/Screens/Play/SquareGraph.cs
index 5ea17a7518..27c6cae2fc 100644
--- a/osu.Game/Screens/Play/SquareGraph.cs
+++ b/osu.Game/Screens/Play/SquareGraph.cs
@@ -140,9 +140,10 @@ namespace osu.Game.Screens.Play
 
             // add missing columns
             float x = ColumnCount * Column.WIDTH;
+
             while (targetColumnCount > ColumnCount)
             {
-                var column = new Column()
+                var column = new Column
                 {
                     Height = DrawHeight,
                     LitColour = fillColour,

From e5884016ab7ad72fda9be0878afec14bb8363b29 Mon Sep 17 00:00:00 2001
From: John <johntbiddle@gmail.com>
Date: Fri, 12 May 2023 19:07:25 -0700
Subject: [PATCH 0440/1604] Initial commit for the snap colour mod. Implements
 basic functionality.

---
 .../Mods/OsuModSnapColour.cs                  | 42 +++++++++++++++++++
 osu.Game.Rulesets.Osu/OsuRuleset.cs           |  1 +
 osu.Game/Rulesets/Mods/ModSnapColour.cs       | 19 +++++++++
 3 files changed, 62 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu/Mods/OsuModSnapColour.cs
 create mode 100644 osu.Game/Rulesets/Mods/ModSnapColour.cs

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModSnapColour.cs b/osu.Game.Rulesets.Osu/Mods/OsuModSnapColour.cs
new file mode 100644
index 0000000000..87a2598695
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModSnapColour.cs
@@ -0,0 +1,42 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+#nullable disable
+
+using osu.Framework.Allocation;
+using osu.Framework.Extensions.ObjectExtensions;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Screens.Edit;
+
+namespace osu.Game.Rulesets.Osu.Mods
+{
+    /// <summary>
+    /// Mod that colours <see cref="HitObject"/>s based on the musical division they are on
+    /// </summary>
+    public class OsuModSnapColour : ModSnapColour, IApplicableToBeatmap, IApplicableToDrawableHitObject
+    {
+        [Resolved]
+        private OsuColour colours { get; set; } = new OsuColour();
+
+        [Resolved(canBeNull: true)]
+        private IBeatmap currentBeatmap { get; set; }
+
+        public void ApplyToBeatmap(IBeatmap beatmap)
+        {
+            //Store a reference to the current beatmap to look up the beat divisor when notes are drawn
+            if (this.currentBeatmap != beatmap)
+                this.currentBeatmap = beatmap;
+        }
+
+        public void ApplyToDrawableHitObject(DrawableHitObject drawable)
+        {
+            if (currentBeatmap.IsNull() || drawable.IsNull()) return;
+
+            drawable.OnUpdate += _ =>
+                drawable.AccentColour.Value = BindableBeatDivisor.GetColourFor(currentBeatmap.ControlPointInfo.GetClosestBeatDivisor(drawable.HitObject.StartTime), colours);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 922594a93a..23eea0e488 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -176,6 +176,7 @@ namespace osu.Game.Rulesets.Osu
                         new OsuModClassic(),
                         new OsuModRandom(),
                         new OsuModMirror(),
+                        new OsuModSnapColour(),
                         new MultiMod(new OsuModAlternate(), new OsuModSingleTap())
                     };
 
diff --git a/osu.Game/Rulesets/Mods/ModSnapColour.cs b/osu.Game/Rulesets/Mods/ModSnapColour.cs
new file mode 100644
index 0000000000..6f706f1cb2
--- /dev/null
+++ b/osu.Game/Rulesets/Mods/ModSnapColour.cs
@@ -0,0 +1,19 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Localisation;
+
+namespace osu.Game.Rulesets.Mods
+{
+    /// <summary>
+    /// Mod that colours hitobjects based on the musical division they are on
+    /// </summary>
+    public class ModSnapColour : Mod
+    {
+        public override string Name => "Snap Colour";
+        public override string Acronym => "SC";
+        public override LocalisableString Description => new LocalisableString("Colours hit objects based on the rhythm.");
+        public override double ScoreMultiplier => 1;
+        public override ModType Type => ModType.Conversion;
+    }
+}

From 24f07633f36e965532c15e2f2ca53699dbc481eb Mon Sep 17 00:00:00 2001
From: John <johntbiddle@gmail.com>
Date: Fri, 12 May 2023 19:43:28 -0700
Subject: [PATCH 0441/1604] Formatting fixes

---
 osu.Game.Rulesets.Osu/Mods/OsuModSnapColour.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModSnapColour.cs b/osu.Game.Rulesets.Osu/Mods/OsuModSnapColour.cs
index 87a2598695..556af7e6b4 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModSnapColour.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModSnapColour.cs
@@ -1,5 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
+
 #nullable disable
 
 using osu.Framework.Allocation;
@@ -36,7 +37,9 @@ namespace osu.Game.Rulesets.Osu.Mods
             if (currentBeatmap.IsNull() || drawable.IsNull()) return;
 
             drawable.OnUpdate += _ =>
-                drawable.AccentColour.Value = BindableBeatDivisor.GetColourFor(currentBeatmap.ControlPointInfo.GetClosestBeatDivisor(drawable.HitObject.StartTime), colours);
+                drawable.AccentColour.Value = BindableBeatDivisor.GetColourFor(
+                    currentBeatmap.ControlPointInfo.GetClosestBeatDivisor(drawable.HitObject.StartTime),
+                    colours);
         }
     }
 }

From 7a907f72070fd7248ca192c8918ed589da2bf2e6 Mon Sep 17 00:00:00 2001
From: John <johntbiddle@gmail.com>
Date: Fri, 12 May 2023 22:13:39 -0700
Subject: [PATCH 0442/1604] Code quality improvements (thanks to ItsShamed):
 Removed #nullable disable, fixed incorrect LocalisableString, removed
 incorrect dependency injection for OsuColour, fixed nullable dependency for
 IBeatmap

Removed unnecessary usage of "this." caught by the CI code quality check
---
 osu.Game.Rulesets.Osu/Mods/OsuModSnapColour.cs | 13 +++++--------
 osu.Game/Rulesets/Mods/ModSnapColour.cs        |  2 +-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModSnapColour.cs b/osu.Game.Rulesets.Osu/Mods/OsuModSnapColour.cs
index 556af7e6b4..69b8b1d4c3 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModSnapColour.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModSnapColour.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Game.Beatmaps;
@@ -19,17 +17,16 @@ namespace osu.Game.Rulesets.Osu.Mods
     /// </summary>
     public class OsuModSnapColour : ModSnapColour, IApplicableToBeatmap, IApplicableToDrawableHitObject
     {
-        [Resolved]
-        private OsuColour colours { get; set; } = new OsuColour();
+        private readonly OsuColour colours = new OsuColour();
 
-        [Resolved(canBeNull: true)]
-        private IBeatmap currentBeatmap { get; set; }
+        [Resolved]
+        private IBeatmap? currentBeatmap { get; set; }
 
         public void ApplyToBeatmap(IBeatmap beatmap)
         {
             //Store a reference to the current beatmap to look up the beat divisor when notes are drawn
-            if (this.currentBeatmap != beatmap)
-                this.currentBeatmap = beatmap;
+            if (currentBeatmap != beatmap)
+                currentBeatmap = beatmap;
         }
 
         public void ApplyToDrawableHitObject(DrawableHitObject drawable)
diff --git a/osu.Game/Rulesets/Mods/ModSnapColour.cs b/osu.Game/Rulesets/Mods/ModSnapColour.cs
index 6f706f1cb2..d7e51d8cf6 100644
--- a/osu.Game/Rulesets/Mods/ModSnapColour.cs
+++ b/osu.Game/Rulesets/Mods/ModSnapColour.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Mods
     {
         public override string Name => "Snap Colour";
         public override string Acronym => "SC";
-        public override LocalisableString Description => new LocalisableString("Colours hit objects based on the rhythm.");
+        public override LocalisableString Description => "Colours hit objects based on the rhythm.";
         public override double ScoreMultiplier => 1;
         public override ModType Type => ModType.Conversion;
     }

From 2cfc4eb515d50dcdd387020764bcad744c9bb9f5 Mon Sep 17 00:00:00 2001
From: timiimit <timi.korda@gmail.com>
Date: Sat, 13 May 2023 10:12:46 +0200
Subject: [PATCH 0443/1604] Fix unconsidered height change

---
 osu.Game/Screens/Play/SquareGraph.cs | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/SquareGraph.cs b/osu.Game/Screens/Play/SquareGraph.cs
index 27c6cae2fc..d5d2f1d3c2 100644
--- a/osu.Game/Screens/Play/SquareGraph.cs
+++ b/osu.Game/Screens/Play/SquareGraph.cs
@@ -110,6 +110,7 @@ namespace osu.Game.Screens.Play
             // early exit the most frequent case
             if (!haveValuesChanged && targetColumnCount == ColumnCount)
             {
+                updateColumnHeight();
                 columns.ForceRedraw();
                 return;
             }
@@ -124,6 +125,14 @@ namespace osu.Game.Screens.Play
             haveValuesChanged = false;
         }
 
+        private void updateColumnHeight()
+        {
+            foreach (var column in columns)
+            {
+                column.Height = DrawHeight;
+            }
+        }
+
         private void ensureColumnCount(int targetColumnCount)
         {
             // remove excess columns
@@ -132,11 +141,7 @@ namespace osu.Game.Screens.Play
                 columns.Remove(columns.Children[ColumnCount - 1], true);
             }
 
-            // update height of existing columns
-            foreach (var column in columns)
-            {
-                column.Height = DrawHeight;
-            }
+            updateColumnHeight();
 
             // add missing columns
             float x = ColumnCount * Column.WIDTH;

From 4b544903cb7bcd768aab655e34f40da0285785b6 Mon Sep 17 00:00:00 2001
From: timiimit <timi.korda@gmail.com>
Date: Sat, 13 May 2023 10:13:09 +0200
Subject: [PATCH 0444/1604] Optimize recalculateValues

---
 osu.Game/Screens/Play/SquareGraph.cs | 33 +++++++++++++---------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Screens/Play/SquareGraph.cs b/osu.Game/Screens/Play/SquareGraph.cs
index d5d2f1d3c2..061d1f7103 100644
--- a/osu.Game/Screens/Play/SquareGraph.cs
+++ b/osu.Game/Screens/Play/SquareGraph.cs
@@ -190,27 +190,24 @@ namespace osu.Game.Screens.Play
         /// </summary>
         private void recalculateValues()
         {
-            var newValues = new List<float>();
-
-            if (values == null)
+            int columnCount = ColumnCount;
+            if (values == null || values.Length == 0 || columnCount == 0)
             {
-                for (float i = 0; i < ColumnCount; i++)
-                {
-                    newValues.Add(0);
-                }
-            }
-            else
-            {
-                int max = values.Max();
-                float step = values.Length / (float)ColumnCount;
-
-                for (float i = 0; i < values.Length; i += step)
-                {
-                    newValues.Add((float)values[(int)i] / max);
-                }
+                calculatedValues = new float[0];
+                return;
             }
 
-            calculatedValues = newValues.ToArray();
+            float ratio = values.Length / (float)columnCount;
+
+            if (calculatedValues.Length != columnCount)
+                calculatedValues = new float[columnCount];
+
+            float max = (float)values.Max();
+
+            for (int i = 0; i < calculatedValues.Length; i++)
+            {
+                calculatedValues[i] = values[(int)(i * ratio)] / max;
+            }
         }
 
         public partial class Column : Container, IStateful<ColumnState>

From d81cdacb0d30368cfc1ab092c0465936c5fabe56 Mon Sep 17 00:00:00 2001
From: timiimit <timi.korda@gmail.com>
Date: Sat, 13 May 2023 11:28:05 +0200
Subject: [PATCH 0445/1604] Undo stupid changes

---
 .../TestSceneDefaultSongProgressGraph.cs      |   8 +-
 osu.Game/Screens/Play/SquareGraph.cs          | 126 +++++++-----------
 2 files changed, 51 insertions(+), 83 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneDefaultSongProgressGraph.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneDefaultSongProgressGraph.cs
index 8d0c26996c..66671a506f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneDefaultSongProgressGraph.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneDefaultSongProgressGraph.cs
@@ -63,12 +63,10 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             public int CreationCount { get; private set; }
 
-            protected override void UpdateGraph()
+            protected override void RecreateGraph()
             {
-                base.UpdateGraph();
-
-                if (ColumnCount > 0)
-                    CreationCount++;
+                base.RecreateGraph();
+                CreationCount++;
             }
         }
     }
diff --git a/osu.Game/Screens/Play/SquareGraph.cs b/osu.Game/Screens/Play/SquareGraph.cs
index 061d1f7103..037f2b5b78 100644
--- a/osu.Game/Screens/Play/SquareGraph.cs
+++ b/osu.Game/Screens/Play/SquareGraph.cs
@@ -6,6 +6,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using osu.Framework;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -15,6 +16,7 @@ using osuTK.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Allocation;
 using osu.Framework.Layout;
+using osu.Framework.Threading;
 
 namespace osu.Game.Screens.Play
 {
@@ -22,8 +24,6 @@ namespace osu.Game.Screens.Play
     {
         private BufferedContainer<Column> columns;
 
-        private readonly LayoutValue layout = new LayoutValue(Invalidation.DrawSize | Invalidation.DrawInfo);
-
         public int ColumnCount => columns?.Children.Count ?? 0;
 
         private int progress;
@@ -52,13 +52,10 @@ namespace osu.Game.Screens.Play
                 if (value == values) return;
 
                 values = value;
-                haveValuesChanged = true;
                 layout.Invalidate();
             }
         }
 
-        private bool haveValuesChanged;
-
         private Color4 fillColour;
 
         public Color4 FillColour
@@ -73,96 +70,66 @@ namespace osu.Game.Screens.Play
             }
         }
 
+        private ScheduledDelegate scheduledCreate;
+
+        private LayoutValue layout = new LayoutValue(Invalidation.DrawSize | Invalidation.DrawInfo);
+
         public SquareGraph()
         {
             AddLayout(layout);
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            Child = columns = new BufferedContainer<Column>(cachedFrameBuffer: true)
-            {
-                RedrawOnScale = false,
-                RelativeSizeAxes = Axes.Both
-            };
-        }
-
         protected override void Update()
         {
             base.Update();
 
             if (!layout.IsValid)
             {
-                UpdateGraph();
+                columns?.FadeOut(500, Easing.OutQuint).Expire();
+
+                scheduledCreate?.Cancel();
+                scheduledCreate = Scheduler.AddDelayed(RecreateGraph, 500);
+
                 layout.Validate();
             }
         }
 
+        private CancellationTokenSource cts;
+
         /// <summary>
-        /// Updates the graph by either adding or removing columns based on DrawWidth.
-        /// Does nothing if correct number of columns already exists and/or if <see cref="SquareGraph.values"/> haven't changed.
+        /// Recreates the entire graph.
         /// </summary>
-        protected virtual void UpdateGraph()
+        protected virtual void RecreateGraph()
         {
-            int targetColumnCount = values == null ? 0 : (int)(DrawWidth / Column.WIDTH);
-
-            // early exit the most frequent case
-            if (!haveValuesChanged && targetColumnCount == ColumnCount)
+            var newColumns = new BufferedContainer<Column>(cachedFrameBuffer: true)
             {
-                updateColumnHeight();
-                columns.ForceRedraw();
-                return;
-            }
+                RedrawOnScale = false,
+                RelativeSizeAxes = Axes.Both,
+            };
 
-            ensureColumnCount(targetColumnCount);
-
-            // fill graph data
-            recalculateValues();
-            redrawFilled();
-            redrawProgress();
-
-            haveValuesChanged = false;
-        }
-
-        private void updateColumnHeight()
-        {
-            foreach (var column in columns)
+            for (float x = 0; x < DrawWidth; x += Column.WIDTH)
             {
-                column.Height = DrawHeight;
-            }
-        }
-
-        private void ensureColumnCount(int targetColumnCount)
-        {
-            // remove excess columns
-            while (targetColumnCount < ColumnCount)
-            {
-                columns.Remove(columns.Children[ColumnCount - 1], true);
-            }
-
-            updateColumnHeight();
-
-            // add missing columns
-            float x = ColumnCount * Column.WIDTH;
-
-            while (targetColumnCount > ColumnCount)
-            {
-                var column = new Column
+                newColumns.Add(new Column(DrawHeight)
                 {
-                    Height = DrawHeight,
                     LitColour = fillColour,
                     Anchor = Anchor.BottomLeft,
                     Origin = Anchor.BottomLeft,
                     Position = new Vector2(x, 0),
                     State = ColumnState.Dimmed,
-                };
-
-                LoadComponentAsync(column);
-                columns.Add(column);
-
-                x += Column.WIDTH;
+                });
             }
+
+            cts?.Cancel();
+
+            LoadComponentAsync(newColumns, c =>
+            {
+                Child = columns = c;
+                columns.FadeInFromZero(500, Easing.OutQuint);
+
+                recalculateValues();
+                redrawFilled();
+                redrawProgress();
+            }, (cts = new CancellationTokenSource()).Token);
         }
 
         /// <summary>
@@ -190,24 +157,26 @@ namespace osu.Game.Screens.Play
         /// </summary>
         private void recalculateValues()
         {
-            int columnCount = ColumnCount;
-            if (values == null || values.Length == 0 || columnCount == 0)
+            var newValues = new List<float>();
+
+            if (values == null)
             {
-                calculatedValues = new float[0];
+                for (float i = 0; i < ColumnCount; i++)
+                    newValues.Add(0);
+
                 return;
             }
 
-            float ratio = values.Length / (float)columnCount;
+            int max = values.Max();
 
-            if (calculatedValues.Length != columnCount)
-                calculatedValues = new float[columnCount];
+            float step = values.Length / (float)ColumnCount;
 
-            float max = (float)values.Max();
-
-            for (int i = 0; i < calculatedValues.Length; i++)
+            for (float i = 0; i < values.Length; i += step)
             {
-                calculatedValues[i] = values[(int)(i * ratio)] / max;
+                newValues.Add((float)values[(int)i] / max);
             }
+
+            calculatedValues = newValues.ToArray();
         }
 
         public partial class Column : Container, IStateful<ColumnState>
@@ -256,9 +225,10 @@ namespace osu.Game.Screens.Play
                 }
             }
 
-            public Column()
+            public Column(float height)
             {
                 Width = WIDTH;
+                Height = height;
             }
 
             [BackgroundDependencyLoader]

From 18efdb0e4cb3d75fba4288fc7327a10a38214a82 Mon Sep 17 00:00:00 2001
From: timiimit <timi.korda@gmail.com>
Date: Sat, 13 May 2023 11:37:56 +0200
Subject: [PATCH 0446/1604] Make `layout` readonly

---
 osu.Game/Screens/Play/SquareGraph.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/SquareGraph.cs b/osu.Game/Screens/Play/SquareGraph.cs
index 037f2b5b78..b53e86a41b 100644
--- a/osu.Game/Screens/Play/SquareGraph.cs
+++ b/osu.Game/Screens/Play/SquareGraph.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Screens.Play
 
         private ScheduledDelegate scheduledCreate;
 
-        private LayoutValue layout = new LayoutValue(Invalidation.DrawSize | Invalidation.DrawInfo);
+        private readonly LayoutValue layout = new LayoutValue(Invalidation.DrawSize | Invalidation.DrawInfo);
 
         public SquareGraph()
         {

From 2e6fd4b321c6223ad1dccb3df1992c9ced5e4a0a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 13 May 2023 20:54:22 +0900
Subject: [PATCH 0447/1604] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index ff76e17184..c73c643d4b 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -11,7 +11,7 @@
     <AndroidManifestMerger>manifestmerger.jar</AndroidManifestMerger>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.510.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.513.0" />
   </ItemGroup>
   <ItemGroup>
     <AndroidManifestOverlay Include="$(MSBuildThisFileDirectory)osu.Android\Properties\AndroidManifestOverlay.xml" />
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 4315f44e07..3ea4a57c2c 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,7 +36,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="10.20.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.510.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.513.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.510.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index c5477f765e..a240dec963 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -16,6 +16,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.510.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.513.0" />
   </ItemGroup>
 </Project>

From 8c542c6c51134a7357a631f15a2d5fca0bfc5edc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 13 May 2023 21:12:21 +0900
Subject: [PATCH 0448/1604] Fix hold-for-right-click showing during gameplay

---
 osu.Game/Input/OsuUserInputManager.cs       | 5 +++++
 osu.Game/OsuGame.cs                         | 7 +++++++
 osu.Game/Rulesets/UI/RulesetInputManager.cs | 2 ++
 3 files changed, 14 insertions(+)

diff --git a/osu.Game/Input/OsuUserInputManager.cs b/osu.Game/Input/OsuUserInputManager.cs
index ab43497156..c205636ab9 100644
--- a/osu.Game/Input/OsuUserInputManager.cs
+++ b/osu.Game/Input/OsuUserInputManager.cs
@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using osu.Framework.Bindables;
 using osu.Framework.Input;
 using osuTK.Input;
 
@@ -10,6 +11,10 @@ namespace osu.Game.Input
 {
     public partial class OsuUserInputManager : UserInputManager
     {
+        protected override bool AllowRightClickFromLongTouch => !LocalUserPlaying.Value;
+
+        public readonly BindableBool LocalUserPlaying = new BindableBool();
+
         internal OsuUserInputManager()
         {
         }
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 7c9b03bd5b..fe6e479d19 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -269,6 +269,13 @@ namespace osu.Game
             if (hideToolbar) Toolbar.Hide();
         }
 
+        protected override UserInputManager CreateUserInputManager()
+        {
+            var userInputManager = base.CreateUserInputManager();
+            (userInputManager as OsuUserInputManager)?.LocalUserPlaying.BindTo(LocalUserPlaying);
+            return userInputManager;
+        }
+
         private DependencyContainer dependencies;
 
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) =>
diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 2ae54a3afe..a24e22f22b 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -28,6 +28,8 @@ namespace osu.Game.Rulesets.UI
     public abstract partial class RulesetInputManager<T> : PassThroughInputManager, ICanAttachHUDPieces, IHasReplayHandler, IHasRecordingHandler
         where T : struct
     {
+        protected override bool AllowRightClickFromLongTouch => false;
+
         public readonly KeyBindingContainer<T> KeyBindingContainer;
 
         [Resolved(CanBeNull = true)]

From f1f30b94a694204b84061e9b85e5b9fc2ecdabe4 Mon Sep 17 00:00:00 2001
From: timiimit <timi.korda@gmail.com>
Date: Sun, 14 May 2023 11:05:47 +0200
Subject: [PATCH 0449/1604] Add StarRating Property

---
 osu.Game/Online/Rooms/MultiplayerPlaylistItem.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Online/Rooms/MultiplayerPlaylistItem.cs b/osu.Game/Online/Rooms/MultiplayerPlaylistItem.cs
index c45f703b05..ef71e0ee17 100644
--- a/osu.Game/Online/Rooms/MultiplayerPlaylistItem.cs
+++ b/osu.Game/Online/Rooms/MultiplayerPlaylistItem.cs
@@ -53,6 +53,9 @@ namespace osu.Game.Online.Rooms
         [Key(9)]
         public DateTimeOffset? PlayedAt { get; set; }
 
+        [Key(10)]
+        public double StarRating { get; set; }
+
         public MultiplayerPlaylistItem()
         {
         }
@@ -69,6 +72,7 @@ namespace osu.Game.Online.Rooms
             Expired = item.Expired;
             PlaylistOrder = item.PlaylistOrder ?? 0;
             PlayedAt = item.PlayedAt;
+            // TODO: assign StarRating 
         }
     }
 }

From 9a327d95b883323a21c649519f7cacae30e95832 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 14 May 2023 11:24:24 +0200
Subject: [PATCH 0450/1604] Add test coverage

---
 .../Editing/TestScenePlacementBlueprint.cs    | 83 +++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Editing/TestScenePlacementBlueprint.cs

diff --git a/osu.Game.Tests/Visual/Editing/TestScenePlacementBlueprint.cs b/osu.Game.Tests/Visual/Editing/TestScenePlacementBlueprint.cs
new file mode 100644
index 0000000000..58eff9ade7
--- /dev/null
+++ b/osu.Game.Tests/Visual/Editing/TestScenePlacementBlueprint.cs
@@ -0,0 +1,83 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Screens;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Input.Bindings;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.UI;
+using osu.Game.Screens.Edit.Compose.Components;
+using osu.Game.Tests.Beatmaps;
+using osuTK.Input;
+
+namespace osu.Game.Tests.Visual.Editing
+{
+    public partial class TestScenePlacementBlueprint : EditorTestScene
+    {
+        protected override Ruleset CreateEditorRuleset() => new OsuRuleset();
+
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new TestBeatmap(ruleset, false);
+
+        private GlobalActionContainer globalActionContainer => this.ChildrenOfType<GlobalActionContainer>().Single();
+
+        [Test]
+        public void TestCommitPlacementViaGlobalAction()
+        {
+            Playfield playfield = null!;
+
+            AddStep("select slider placement tool", () => InputManager.Key(Key.Number3));
+            AddStep("move mouse to top left of playfield", () =>
+            {
+                playfield = this.ChildrenOfType<Playfield>().Single();
+                var location = (3 * playfield.ScreenSpaceDrawQuad.TopLeft + playfield.ScreenSpaceDrawQuad.BottomRight) / 4;
+                InputManager.MoveMouseTo(location);
+            });
+            AddStep("begin placement", () => InputManager.Click(MouseButton.Left));
+            AddStep("move mouse to bottom right of playfield", () =>
+            {
+                var location = (playfield.ScreenSpaceDrawQuad.TopLeft + 3 * playfield.ScreenSpaceDrawQuad.BottomRight) / 4;
+                InputManager.MoveMouseTo(location);
+            });
+            AddStep("confirm via global action", () =>
+            {
+                globalActionContainer.TriggerPressed(GlobalAction.Select);
+                globalActionContainer.TriggerReleased(GlobalAction.Select);
+            });
+            AddAssert("slider placed", () => EditorBeatmap.HitObjects.Count, () => Is.EqualTo(1));
+        }
+
+        [Test]
+        public void TestAbortPlacementViaGlobalAction()
+        {
+            Playfield playfield = null!;
+
+            AddStep("select slider placement tool", () => InputManager.Key(Key.Number3));
+            AddStep("move mouse to top left of playfield", () =>
+            {
+                playfield = this.ChildrenOfType<Playfield>().Single();
+                var location = (3 * playfield.ScreenSpaceDrawQuad.TopLeft + playfield.ScreenSpaceDrawQuad.BottomRight) / 4;
+                InputManager.MoveMouseTo(location);
+            });
+            AddStep("begin placement", () => InputManager.Click(MouseButton.Left));
+            AddStep("move mouse to bottom right of playfield", () =>
+            {
+                var location = (playfield.ScreenSpaceDrawQuad.TopLeft + 3 * playfield.ScreenSpaceDrawQuad.BottomRight) / 4;
+                InputManager.MoveMouseTo(location);
+            });
+            AddStep("abort via global action", () =>
+            {
+                globalActionContainer.TriggerPressed(GlobalAction.Back);
+                globalActionContainer.TriggerReleased(GlobalAction.Back);
+            });
+            AddAssert("editor is still current", () => Editor.IsCurrentScreen());
+            AddAssert("slider not placed", () => EditorBeatmap.HitObjects.Count, () => Is.EqualTo(0));
+            AddAssert("no active placement", () => this.ChildrenOfType<ComposeBlueprintContainer>().Single().CurrentPlacement.PlacementActive,
+                () => Is.EqualTo(PlacementBlueprint.PlacementState.Waiting));
+        }
+    }
+}

From 5d687013214366aa6ff7fe09e998dea7f91cd79e Mon Sep 17 00:00:00 2001
From: timiimit <timi.korda@gmail.com>
Date: Sun, 14 May 2023 12:08:37 +0200
Subject: [PATCH 0451/1604] Copy StarRange when creating PlaylistItem

---
 osu.Game/Online/Multiplayer/MultiplayerClient.cs | 2 +-
 osu.Game/Online/Rooms/PlaylistItem.cs            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 2be7327234..5716b7ad3b 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -783,7 +783,7 @@ namespace osu.Game.Online.Multiplayer
             RoomUpdated?.Invoke();
         }
 
-        private PlaylistItem createPlaylistItem(MultiplayerPlaylistItem item) => new PlaylistItem(new APIBeatmap { OnlineID = item.BeatmapID })
+        private PlaylistItem createPlaylistItem(MultiplayerPlaylistItem item) => new PlaylistItem(new APIBeatmap { OnlineID = item.BeatmapID, StarRating = item.StarRating })
         {
             ID = item.ID,
             OwnerID = item.OwnerID,
diff --git a/osu.Game/Online/Rooms/PlaylistItem.cs b/osu.Game/Online/Rooms/PlaylistItem.cs
index 2213311c67..a900d8f3d7 100644
--- a/osu.Game/Online/Rooms/PlaylistItem.cs
+++ b/osu.Game/Online/Rooms/PlaylistItem.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Online.Rooms
         }
 
         public PlaylistItem(MultiplayerPlaylistItem item)
-            : this(new APIBeatmap { OnlineID = item.BeatmapID })
+            : this(new APIBeatmap { OnlineID = item.BeatmapID, StarRating = item.StarRating })
         {
             ID = item.ID;
             OwnerID = item.OwnerID;

From fd80ffd52bd4741c82266e78d8e03f405d75b0c7 Mon Sep 17 00:00:00 2001
From: timiimit <timi.korda@gmail.com>
Date: Sun, 14 May 2023 12:09:15 +0200
Subject: [PATCH 0452/1604] Fix display update condition

---
 .../Screens/OnlinePlay/Components/StarRatingRangeDisplay.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Components/StarRatingRangeDisplay.cs b/osu.Game/Screens/OnlinePlay/Components/StarRatingRangeDisplay.cs
index 93c8faf0b0..2ee3bb30dd 100644
--- a/osu.Game/Screens/OnlinePlay/Components/StarRatingRangeDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/StarRatingRangeDisplay.cs
@@ -85,15 +85,15 @@ namespace osu.Game.Screens.OnlinePlay.Components
             StarDifficulty minDifficulty;
             StarDifficulty maxDifficulty;
 
-            if (DifficultyRange.Value != null)
+            if (DifficultyRange.Value != null && Playlist.Count == 0)
             {
+                // When Playlist is empty (in lounge) we take retrieved range
                 minDifficulty = new StarDifficulty(DifficultyRange.Value.Min, 0);
                 maxDifficulty = new StarDifficulty(DifficultyRange.Value.Max, 0);
             }
             else
             {
-                // In multiplayer rooms, the beatmaps of playlist items will not be populated to a point this can be correct.
-                // Either populating them via BeatmapLookupCache or polling the API for the room's DifficultyRange will be required.
+                // When Playlist is not empty (in room) we compute actual range
                 var orderedDifficulties = Playlist.Select(p => p.Beatmap).OrderBy(b => b.StarRating).ToArray();
 
                 minDifficulty = new StarDifficulty(orderedDifficulties.Length > 0 ? orderedDifficulties[0].StarRating : 0, 0);

From 86a834fb568922ae975f014c20d410e71969ce44 Mon Sep 17 00:00:00 2001
From: timiimit <timi.korda@gmail.com>
Date: Sun, 14 May 2023 12:20:16 +0200
Subject: [PATCH 0453/1604] Fix TODO comment

---
 osu.Game/Online/Rooms/MultiplayerPlaylistItem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/Rooms/MultiplayerPlaylistItem.cs b/osu.Game/Online/Rooms/MultiplayerPlaylistItem.cs
index ef71e0ee17..64f971a2e4 100644
--- a/osu.Game/Online/Rooms/MultiplayerPlaylistItem.cs
+++ b/osu.Game/Online/Rooms/MultiplayerPlaylistItem.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Online.Rooms
             Expired = item.Expired;
             PlaylistOrder = item.PlaylistOrder ?? 0;
             PlayedAt = item.PlayedAt;
-            // TODO: assign StarRating 
+            StarRating = item.Beatmap.StarRating; // generally not available, but lets at least try to use it
         }
     }
 }

From a99bf0fc5a5befc1961e5e6d3eb175879a4973e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 14 May 2023 12:29:24 +0200
Subject: [PATCH 0454/1604] Add test coverage

---
 .../Editing/TestScenePlacementBlueprint.cs    | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/osu.Game.Tests/Visual/Editing/TestScenePlacementBlueprint.cs b/osu.Game.Tests/Visual/Editing/TestScenePlacementBlueprint.cs
index 58eff9ade7..a5681bea4a 100644
--- a/osu.Game.Tests/Visual/Editing/TestScenePlacementBlueprint.cs
+++ b/osu.Game.Tests/Visual/Editing/TestScenePlacementBlueprint.cs
@@ -79,5 +79,28 @@ namespace osu.Game.Tests.Visual.Editing
             AddAssert("no active placement", () => this.ChildrenOfType<ComposeBlueprintContainer>().Single().CurrentPlacement.PlacementActive,
                 () => Is.EqualTo(PlacementBlueprint.PlacementState.Waiting));
         }
+
+        [Test]
+        public void TestCommitPlacementViaToolChange()
+        {
+            Playfield playfield = null!;
+
+            AddStep("select slider placement tool", () => InputManager.Key(Key.Number3));
+            AddStep("move mouse to top left of playfield", () =>
+            {
+                playfield = this.ChildrenOfType<Playfield>().Single();
+                var location = (3 * playfield.ScreenSpaceDrawQuad.TopLeft + playfield.ScreenSpaceDrawQuad.BottomRight) / 4;
+                InputManager.MoveMouseTo(location);
+            });
+            AddStep("begin placement", () => InputManager.Click(MouseButton.Left));
+            AddStep("move mouse to bottom right of playfield", () =>
+            {
+                var location = (playfield.ScreenSpaceDrawQuad.TopLeft + 3 * playfield.ScreenSpaceDrawQuad.BottomRight) / 4;
+                InputManager.MoveMouseTo(location);
+            });
+
+            AddStep("change tool to circle", () => InputManager.Key(Key.Number2));
+            AddAssert("slider placed", () => EditorBeatmap.HitObjects.Count, () => Is.EqualTo(1));
+        }
     }
 }

From 6647d95ea7e80e8430c3daa8cd0bae62c2844c42 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Sun, 14 May 2023 18:32:16 +0300
Subject: [PATCH 0455/1604] Kill search focus when clicking on `ModColumn`

---
 .../UserInterface/TestSceneModSelectOverlay.cs | 18 ++++++++++++++++++
 osu.Game/Overlays/Mods/ModSelectOverlay.cs     |  3 +++
 2 files changed, 21 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index d1cbe7d91c..ea81f9c96e 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -468,6 +468,24 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("unimplemented mod panel is filtered", () => !getPanelForMod(typeof(TestUnimplementedMod)).IsValid);
         }
 
+        [Test]
+        public void TestSearchFocusChange()
+        {
+            createScreen();
+
+            AddStep("click on search", navigateAndClick<ShearedSearchTextBox>);
+            AddAssert("focused", () => modSelectOverlay.SearchTextBox.HasFocus);
+
+            AddStep("click on mod column", navigateAndClick<ModColumn>);
+            AddAssert("lost focus", () => !modSelectOverlay.SearchTextBox.HasFocus);
+
+            void navigateAndClick<T>() where T : Drawable
+            {
+                InputManager.MoveMouseTo(modSelectOverlay.ChildrenOfType<T>().FirstOrDefault());
+                InputManager.Click(MouseButton.Left);
+            }
+        }
+
         [Test]
         public void TestDeselectAllViaKey()
         {
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index fdc948bcbf..ace5bf71d1 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -777,6 +777,9 @@ namespace osu.Game.Overlays.Mods
                 if (!Active.Value)
                     RequestScroll?.Invoke(this);
 
+                //Kill focus on SearchTextBox
+                Scheduler.Add(() => GetContainingInputManager().ChangeFocus(null));
+
                 return true;
             }
 

From d503312788f5e39173a0b2c94ba1b4f3af117f22 Mon Sep 17 00:00:00 2001
From: alix <me@alix.sh>
Date: Sun, 14 May 2023 13:37:44 -0400
Subject: [PATCH 0456/1604] updates and add changes

---
 osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
index 6affeb24d8..3224ff9eaf 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
@@ -9,7 +9,6 @@ using osu.Framework.Localisation;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
-using osu.Game.Overlays.Settings;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Beatmaps;
@@ -28,7 +27,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(OsuModTargetPractice)).ToArray();
 
-        [SettingSource("Angle sharpness", "How sharp angles should be", SettingControlType = typeof(AngleSharpnessSlider))]
+        [SettingSource("Angle sharpness", "How sharp angles should be")]
         public BindableFloat AngleSharpness { get; } = new BindableFloat(7)
         {
             MinValue = 1,
@@ -162,12 +161,4 @@ namespace osu.Game.Rulesets.Osu.Mods
             return previousObjectStartedCombo && random.NextDouble() < 0.6f;
         }
     }
-
-    public partial class AngleSharpnessSlider : SettingsSlider<float>
-    {
-        public AngleSharpnessSlider()
-        {
-            KeyboardStep = 0.5f;
-        }
-    }
 }

From cb8d5f459f40e4c0bd4f4da51867deb546d0c908 Mon Sep 17 00:00:00 2001
From: timiimit <timi.korda@gmail.com>
Date: Mon, 15 May 2023 07:34:27 +0200
Subject: [PATCH 0457/1604] Remove bad comment

---
 osu.Game/Online/Rooms/MultiplayerPlaylistItem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/Rooms/MultiplayerPlaylistItem.cs b/osu.Game/Online/Rooms/MultiplayerPlaylistItem.cs
index 64f971a2e4..a102d118fe 100644
--- a/osu.Game/Online/Rooms/MultiplayerPlaylistItem.cs
+++ b/osu.Game/Online/Rooms/MultiplayerPlaylistItem.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Online.Rooms
             Expired = item.Expired;
             PlaylistOrder = item.PlaylistOrder ?? 0;
             PlayedAt = item.PlayedAt;
-            StarRating = item.Beatmap.StarRating; // generally not available, but lets at least try to use it
+            StarRating = item.Beatmap.StarRating;
         }
     }
 }

From 83ceb3457f8cc800d320ceb1406a04f7f9e3ae55 Mon Sep 17 00:00:00 2001
From: timiimit <timi.korda@gmail.com>
Date: Mon, 15 May 2023 07:35:09 +0200
Subject: [PATCH 0458/1604] Add xmldoc comment

---
 osu.Game/Online/Rooms/MultiplayerPlaylistItem.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Online/Rooms/MultiplayerPlaylistItem.cs b/osu.Game/Online/Rooms/MultiplayerPlaylistItem.cs
index a102d118fe..daf45c5aee 100644
--- a/osu.Game/Online/Rooms/MultiplayerPlaylistItem.cs
+++ b/osu.Game/Online/Rooms/MultiplayerPlaylistItem.cs
@@ -60,6 +60,9 @@ namespace osu.Game.Online.Rooms
         {
         }
 
+        /// <summary>
+        /// This constructor should only be used for test purposes.
+        /// </summary>
         public MultiplayerPlaylistItem(PlaylistItem item)
         {
             ID = item.ID;

From 26ed50d8fdf13996c749bb05eeb3e1d18239fd6e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 May 2023 21:42:48 +0900
Subject: [PATCH 0459/1604] Add abbreviations found in framework functions

Brings total inspections down to zero when using local framework
checkout (in conjuncation with https://github.com/ppy/osu-framework/pull/5793).
---
 osu.sln.DotSettings | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index d7486273fb..b54794cd6d 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -329,6 +329,7 @@
 	<s:Boolean x:Key="/Default/CodeStyle/EncapsulateField/UseAutoProperty/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AABB/@EntryIndexedValue">AABB</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=API/@EntryIndexedValue">API</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ARGB/@EntryIndexedValue">ARGB</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BPM/@EntryIndexedValue">BPM</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=EF/@EntryIndexedValue">EF</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=FPS/@EntryIndexedValue">FPS</s:String>
@@ -336,6 +337,7 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GL/@EntryIndexedValue">GL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GLSL/@EntryIndexedValue">GLSL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HID/@EntryIndexedValue">HID</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HSL/@EntryIndexedValue">HSL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HSPA/@EntryIndexedValue">HSPA</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HSV/@EntryIndexedValue">HSV</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HTML/@EntryIndexedValue">HTML</s:String>
@@ -352,6 +354,7 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=OS/@EntryIndexedValue">OS</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PM/@EntryIndexedValue">PM</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RGB/@EntryIndexedValue">RGB</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RGBA/@EntryIndexedValue">RGBA</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RNG/@EntryIndexedValue">RNG</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SDL/@EntryIndexedValue">SDL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SHA/@EntryIndexedValue">SHA</s:String>

From 10d6f9ea5a9e64eaa92aae278b6f8466485081a5 Mon Sep 17 00:00:00 2001
From: timiimit <timi.korda@gmail.com>
Date: Tue, 16 May 2023 09:52:26 +0200
Subject: [PATCH 0460/1604] Create common online play pill

---
 .../Lounge/Components/OnlinePlayPill.cs       | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 osu.Game/Screens/OnlinePlay/Lounge/Components/OnlinePlayPill.cs

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/OnlinePlayPill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/OnlinePlayPill.cs
new file mode 100644
index 0000000000..45a0fd2a1b
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/OnlinePlayPill.cs
@@ -0,0 +1,37 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+#nullable disable
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+
+namespace osu.Game.Screens.OnlinePlay.Lounge.Components
+{
+    public partial class OnlinePlayPill : OnlinePlayComposite
+    {
+        protected PillContainer pill;
+        protected OsuTextFlowContainer textFlow;
+
+        public OnlinePlayPill()
+        {
+            AutoSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChild = pill = new PillContainer
+            {
+                Child = textFlow = new OsuTextFlowContainer(s => s.Font = OsuFont.GetFont(size: 12))
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft
+                }
+            };
+        }
+    }
+}

From 04893064f06a673e60ce7e61bb23fb07571b41b7 Mon Sep 17 00:00:00 2001
From: timiimit <timi.korda@gmail.com>
Date: Tue, 16 May 2023 09:53:11 +0200
Subject: [PATCH 0461/1604] Make used pills inherit from a common one

---
 .../Lounge/Components/MatchTypePill.cs        | 23 +----------
 .../Lounge/Components/PlaylistCountPill.cs    | 33 +++------------
 .../Lounge/Components/QueueModePill.cs        | 27 +------------
 .../Components/RoomSpecialCategoryPill.cs     | 40 +++----------------
 .../Lounge/Components/RoomStatusPill.cs       | 32 ++-------------
 5 files changed, 17 insertions(+), 138 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/MatchTypePill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/MatchTypePill.cs
index f96d547747..dd5f52155c 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/MatchTypePill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/MatchTypePill.cs
@@ -13,29 +13,8 @@ using osu.Game.Online.Rooms;
 
 namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
-    public partial class MatchTypePill : OnlinePlayComposite
+    public partial class MatchTypePill : OnlinePlayPill
     {
-        private OsuTextFlowContainer textFlow;
-
-        public MatchTypePill()
-        {
-            AutoSizeAxes = Axes.Both;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            InternalChild = new PillContainer
-            {
-                Child = textFlow = new OsuTextFlowContainer(s => s.Font = OsuFont.GetFont(size: 12))
-                {
-                    Anchor = Anchor.CentreLeft,
-                    Origin = Anchor.CentreLeft,
-                    AutoSizeAxes = Axes.Both,
-                }
-            };
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/PlaylistCountPill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/PlaylistCountPill.cs
index 81ba48d135..c3118ab285 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/PlaylistCountPill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/PlaylistCountPill.cs
@@ -5,40 +5,17 @@
 
 using System.Linq;
 using Humanizer;
-using osu.Framework.Allocation;
 using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
     /// <summary>
     /// A pill that displays the playlist item count.
     /// </summary>
-    public partial class PlaylistCountPill : OnlinePlayComposite
+    public partial class PlaylistCountPill : OnlinePlayPill
     {
-        private OsuTextFlowContainer count;
-
-        public PlaylistCountPill()
-        {
-            AutoSizeAxes = Axes.Both;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            InternalChild = new PillContainer
-            {
-                Child = count = new OsuTextFlowContainer(s => s.Font = OsuFont.GetFont(size: 12))
-                {
-                    AutoSizeAxes = Axes.Both,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                }
-            };
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -55,10 +32,10 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
                 ? Playlist.Count(i => !i.Expired)
                 : PlaylistItemStats.Value.CountActive;
 
-            count.Clear();
-            count.AddText(activeItems.ToLocalisableString(), s => s.Font = s.Font.With(weight: FontWeight.Bold));
-            count.AddText(" ");
-            count.AddText("Beatmap".ToQuantity(activeItems, ShowQuantityAs.None));
+            textFlow.Clear();
+            textFlow.AddText(activeItems.ToLocalisableString(), s => s.Font = s.Font.With(weight: FontWeight.Bold));
+            textFlow.AddText(" ");
+            textFlow.AddText("Beatmap".ToQuantity(activeItems, ShowQuantityAs.None));
         }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/QueueModePill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/QueueModePill.cs
index 0175418a96..d37dede961 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/QueueModePill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/QueueModePill.cs
@@ -3,39 +3,14 @@
 
 #nullable disable
 
-using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
-using osu.Framework.Graphics;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
 using osu.Game.Online.Multiplayer;
 
 namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
-    public partial class QueueModePill : OnlinePlayComposite
+    public partial class QueueModePill : OnlinePlayPill
     {
-        private OsuTextFlowContainer textFlow;
-
-        public QueueModePill()
-        {
-            AutoSizeAxes = Axes.Both;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            InternalChild = new PillContainer
-            {
-                Child = textFlow = new OsuTextFlowContainer(s => s.Font = OsuFont.GetFont(size: 12))
-                {
-                    Anchor = Anchor.CentreLeft,
-                    Origin = Anchor.CentreLeft,
-                    AutoSizeAxes = Axes.Both,
-                }
-            };
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomSpecialCategoryPill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomSpecialCategoryPill.cs
index 5d67a18d1f..a01d14ab40 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomSpecialCategoryPill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomSpecialCategoryPill.cs
@@ -5,54 +5,26 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osuTK.Graphics;
 
 namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
-    public partial class RoomSpecialCategoryPill : OnlinePlayComposite
+    public partial class RoomSpecialCategoryPill : OnlinePlayPill
     {
-        private SpriteText text;
-        private PillContainer pill;
-
         [Resolved]
         private OsuColour colours { get; set; }
 
-        public RoomSpecialCategoryPill()
-        {
-            AutoSizeAxes = Axes.Both;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            InternalChild = pill = new PillContainer
-            {
-                Background =
-                {
-                    Colour = colours.Pink,
-                    Alpha = 1
-                },
-                Child = text = new OsuSpriteText
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Font = OsuFont.GetFont(weight: FontWeight.SemiBold, size: 12),
-                    Colour = Color4.Black
-                }
-            };
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
+            pill.Background.Colour = colours.Pink;
+            pill.Background.Alpha = 1;
+
             Category.BindValueChanged(c =>
             {
-                text.Text = c.NewValue.GetLocalisableDescription();
+                textFlow.Clear();
+                textFlow.AddText(c.NewValue.GetLocalisableDescription());
 
                 var backgroundColour = colours.ForRoomCategory(Category.Value);
                 if (backgroundColour != null)
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs
index 201314851e..a4fdd39236 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs
@@ -6,46 +6,20 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Online.Rooms;
 using osu.Game.Online.Rooms.RoomStatuses;
-using osuTK.Graphics;
 
 namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
     /// <summary>
     /// A pill that displays the room's current status.
     /// </summary>
-    public partial class RoomStatusPill : OnlinePlayComposite
+    public partial class RoomStatusPill : OnlinePlayPill
     {
         [Resolved]
         private OsuColour colours { get; set; }
 
-        private PillContainer pill;
-        private SpriteText statusText;
-
-        public RoomStatusPill()
-        {
-            AutoSizeAxes = Axes.Both;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            InternalChild = pill = new PillContainer
-            {
-                Child = statusText = new OsuSpriteText
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Font = OsuFont.GetFont(weight: FontWeight.SemiBold, size: 12),
-                    Colour = Color4.Black
-                }
-            };
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -62,7 +36,9 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 
             pill.Background.Alpha = 1;
             pill.Background.FadeColour(status.GetAppropriateColour(colours), 100);
-            statusText.Text = status.Message;
+
+            textFlow.Clear();
+            textFlow.AddText(status.Message);
         }
 
         private RoomStatus getDisplayStatus()

From 40daa41a5272c78746f8c743ac0f72d0d0e917e4 Mon Sep 17 00:00:00 2001
From: timiimit <timi.korda@gmail.com>
Date: Tue, 16 May 2023 10:06:48 +0200
Subject: [PATCH 0462/1604] Fix naming & namespaces

---
 .../OnlinePlay/Lounge/Components/MatchTypePill.cs      |  8 ++------
 .../OnlinePlay/Lounge/Components/OnlinePlayPill.cs     |  8 ++++----
 .../OnlinePlay/Lounge/Components/PlaylistCountPill.cs  |  8 ++++----
 .../OnlinePlay/Lounge/Components/QueueModePill.cs      |  4 ++--
 .../Lounge/Components/RoomSpecialCategoryPill.cs       | 10 +++++-----
 .../OnlinePlay/Lounge/Components/RoomStatusPill.cs     |  8 ++++----
 6 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/MatchTypePill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/MatchTypePill.cs
index dd5f52155c..e019de0f6f 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/MatchTypePill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/MatchTypePill.cs
@@ -3,12 +3,8 @@
 
 #nullable disable
 
-using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
-using osu.Framework.Graphics;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
 using osu.Game.Online.Rooms;
 
 namespace osu.Game.Screens.OnlinePlay.Lounge.Components
@@ -24,8 +20,8 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 
         private void onMatchTypeChanged(ValueChangedEvent<MatchType> type)
         {
-            textFlow.Clear();
-            textFlow.AddText(type.NewValue.GetLocalisableDescription());
+            TextFlow.Clear();
+            TextFlow.AddText(type.NewValue.GetLocalisableDescription());
         }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/OnlinePlayPill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/OnlinePlayPill.cs
index 45a0fd2a1b..80e82c3856 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/OnlinePlayPill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/OnlinePlayPill.cs
@@ -12,8 +12,8 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
     public partial class OnlinePlayPill : OnlinePlayComposite
     {
-        protected PillContainer pill;
-        protected OsuTextFlowContainer textFlow;
+        protected PillContainer Pill;
+        protected OsuTextFlowContainer TextFlow;
 
         public OnlinePlayPill()
         {
@@ -23,9 +23,9 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
         [BackgroundDependencyLoader]
         private void load()
         {
-            InternalChild = pill = new PillContainer
+            InternalChild = Pill = new PillContainer
             {
-                Child = textFlow = new OsuTextFlowContainer(s => s.Font = OsuFont.GetFont(size: 12))
+                Child = TextFlow = new OsuTextFlowContainer(s => s.Font = OsuFont.GetFont(size: 12))
                 {
                     AutoSizeAxes = Axes.Both,
                     Anchor = Anchor.CentreLeft,
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/PlaylistCountPill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/PlaylistCountPill.cs
index c3118ab285..6687f30bc0 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/PlaylistCountPill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/PlaylistCountPill.cs
@@ -32,10 +32,10 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
                 ? Playlist.Count(i => !i.Expired)
                 : PlaylistItemStats.Value.CountActive;
 
-            textFlow.Clear();
-            textFlow.AddText(activeItems.ToLocalisableString(), s => s.Font = s.Font.With(weight: FontWeight.Bold));
-            textFlow.AddText(" ");
-            textFlow.AddText("Beatmap".ToQuantity(activeItems, ShowQuantityAs.None));
+            TextFlow.Clear();
+            TextFlow.AddText(activeItems.ToLocalisableString(), s => s.Font = s.Font.With(weight: FontWeight.Bold));
+            TextFlow.AddText(" ");
+            TextFlow.AddText("Beatmap".ToQuantity(activeItems, ShowQuantityAs.None));
         }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/QueueModePill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/QueueModePill.cs
index d37dede961..e402653c2f 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/QueueModePill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/QueueModePill.cs
@@ -20,8 +20,8 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 
         private void onQueueModeChanged(ValueChangedEvent<QueueMode> mode)
         {
-            textFlow.Clear();
-            textFlow.AddText(mode.NewValue.GetLocalisableDescription());
+            TextFlow.Clear();
+            TextFlow.AddText(mode.NewValue.GetLocalisableDescription());
         }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomSpecialCategoryPill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomSpecialCategoryPill.cs
index a01d14ab40..d266104cf5 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomSpecialCategoryPill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomSpecialCategoryPill.cs
@@ -18,17 +18,17 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
         {
             base.LoadComplete();
 
-            pill.Background.Colour = colours.Pink;
-            pill.Background.Alpha = 1;
+            Pill.Background.Colour = colours.Pink;
+            Pill.Background.Alpha = 1;
 
             Category.BindValueChanged(c =>
             {
-                textFlow.Clear();
-                textFlow.AddText(c.NewValue.GetLocalisableDescription());
+                TextFlow.Clear();
+                TextFlow.AddText(c.NewValue.GetLocalisableDescription());
 
                 var backgroundColour = colours.ForRoomCategory(Category.Value);
                 if (backgroundColour != null)
-                    pill.Background.Colour = backgroundColour.Value;
+                    Pill.Background.Colour = backgroundColour.Value;
             }, true);
         }
     }
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs
index a4fdd39236..fa5eba4b69 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs
@@ -34,11 +34,11 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
         {
             RoomStatus status = getDisplayStatus();
 
-            pill.Background.Alpha = 1;
-            pill.Background.FadeColour(status.GetAppropriateColour(colours), 100);
+            Pill.Background.Alpha = 1;
+            Pill.Background.FadeColour(status.GetAppropriateColour(colours), 100);
 
-            textFlow.Clear();
-            textFlow.AddText(status.Message);
+            TextFlow.Clear();
+            TextFlow.AddText(status.Message);
         }
 
         private RoomStatus getDisplayStatus()

From a9991d9dd4bce7145fde56a8c4cae6c266313ae9 Mon Sep 17 00:00:00 2001
From: timiimit <timi.korda@gmail.com>
Date: Tue, 16 May 2023 10:14:14 +0200
Subject: [PATCH 0463/1604] Remove another unused namespace

---
 .../Screens/OnlinePlay/Lounge/Components/PlaylistCountPill.cs    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/PlaylistCountPill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/PlaylistCountPill.cs
index 6687f30bc0..d1365c02f3 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/PlaylistCountPill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/PlaylistCountPill.cs
@@ -6,7 +6,6 @@
 using System.Linq;
 using Humanizer;
 using osu.Framework.Extensions.LocalisationExtensions;
-using osu.Framework.Graphics;
 using osu.Game.Graphics;
 
 namespace osu.Game.Screens.OnlinePlay.Lounge.Components

From 81b7737660260a2a5b3168afaf1c171278c1f5e9 Mon Sep 17 00:00:00 2001
From: timiimit <timi.korda@gmail.com>
Date: Tue, 16 May 2023 10:20:16 +0200
Subject: [PATCH 0464/1604] Fix text colour of RoomSpecialCategoryPill

---
 .../OnlinePlay/Lounge/Components/RoomSpecialCategoryPill.cs     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomSpecialCategoryPill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomSpecialCategoryPill.cs
index d266104cf5..b869ede9bd 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomSpecialCategoryPill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomSpecialCategoryPill.cs
@@ -6,6 +6,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Extensions;
 using osu.Game.Graphics;
+using osuTK.Graphics;
 
 namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
@@ -20,6 +21,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 
             Pill.Background.Colour = colours.Pink;
             Pill.Background.Alpha = 1;
+            TextFlow.Colour = Color4.Black;
 
             Category.BindValueChanged(c =>
             {

From 4ef74eb3f960257d2693b23a33b6358d91a7f954 Mon Sep 17 00:00:00 2001
From: timiimit <timi.korda@gmail.com>
Date: Tue, 16 May 2023 10:22:52 +0200
Subject: [PATCH 0465/1604] Fix `RoomStatusPill` text colour

---
 .../Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs
index fa5eba4b69..4206aaf167 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics;
 using osu.Game.Graphics;
 using osu.Game.Online.Rooms;
 using osu.Game.Online.Rooms.RoomStatuses;
+using osuTK.Graphics;
 
 namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
@@ -28,6 +29,8 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
             Status.BindValueChanged(_ => updateDisplay(), true);
 
             FinishTransforms(true);
+
+            TextFlow.Colour = Colour4.Black;
         }
 
         private void updateDisplay()

From cc6e4df93e3e1ec8ea06f14e434c1e4e0194b8d0 Mon Sep 17 00:00:00 2001
From: timiimit <timi.korda@gmail.com>
Date: Tue, 16 May 2023 10:27:46 +0200
Subject: [PATCH 0466/1604] Remove wrongly added back namepspace

---
 osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs
index 4206aaf167..f260d168a7 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics;
 using osu.Game.Graphics;
 using osu.Game.Online.Rooms;
 using osu.Game.Online.Rooms.RoomStatuses;
-using osuTK.Graphics;
 
 namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {

From 83dcd788262fb3cc51f94ddaa56f3fb1e202ef17 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 May 2023 16:29:24 +0900
Subject: [PATCH 0467/1604] Make `HitSampleInfo.Bank` non-nullable

---
 .../Drawables/DrawablePippidonHitObject.cs    |  3 +--
 .../Drawables/DrawablePippidonHitObject.cs    |  3 +--
 .../TestSceneAutoJuiceStream.cs               |  2 +-
 .../TestSceneSpinner.cs                       |  2 +-
 ...estSceneHitObjectSamplePointAdjustments.cs |  2 +-
 osu.Game/Audio/HitSampleInfo.cs               |  7 ++++---
 .../ControlPoints/SampleControlPoint.cs       |  2 +-
 osu.Game/Beatmaps/Formats/LegacyDecoder.cs    | 14 ++++++++-----
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs  |  2 +-
 .../Objects/Legacy/ConvertHitObjectParser.cs  | 20 ++++++++++++++-----
 10 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Objects/Drawables/DrawablePippidonHitObject.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Objects/Drawables/DrawablePippidonHitObject.cs
index 29203f0a20..c5ada4288d 100644
--- a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Objects/Drawables/DrawablePippidonHitObject.cs
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Objects/Drawables/DrawablePippidonHitObject.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
-using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
 using osuTK;
@@ -44,7 +43,7 @@ namespace osu.Game.Rulesets.Pippidon.Objects.Drawables
 
         public override IEnumerable<HitSampleInfo> GetSamples() => new[]
         {
-            new HitSampleInfo(HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK)
+            new HitSampleInfo(HitSampleInfo.HIT_NORMAL)
         };
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Objects/Drawables/DrawablePippidonHitObject.cs b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Objects/Drawables/DrawablePippidonHitObject.cs
index 554d03c79f..d198fa81cb 100644
--- a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Objects/Drawables/DrawablePippidonHitObject.cs
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Objects/Drawables/DrawablePippidonHitObject.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
-using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Pippidon.UI;
 using osu.Game.Rulesets.Scoring;
@@ -44,7 +43,7 @@ namespace osu.Game.Rulesets.Pippidon.Objects.Drawables
 
         public override IEnumerable<HitSampleInfo> GetSamples() => new[]
         {
-            new HitSampleInfo(HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK)
+            new HitSampleInfo(HitSampleInfo.HIT_NORMAL)
         };
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
index 40dc7d2403..9a78df23cf 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                     NewCombo = i % 8 == 0,
                     Samples = new List<HitSampleInfo>(new[]
                     {
-                        new HitSampleInfo(HitSampleInfo.HIT_NORMAL, "normal", volume: 100)
+                        new HitSampleInfo(HitSampleInfo.HIT_NORMAL, volume: 100)
                     })
                 });
             }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
index 74d0fb42a3..8cfd674f88 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
@@ -74,7 +74,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 EndTime = Time.Current + delay + length,
                 Samples = new List<HitSampleInfo>
                 {
-                    new HitSampleInfo("hitnormal")
+                    new HitSampleInfo(HitSampleInfo.HIT_NORMAL)
                 }
             };
 
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSamplePointAdjustments.cs b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSamplePointAdjustments.cs
index 7a0418cfec..230333ec35 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSamplePointAdjustments.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSamplePointAdjustments.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Tests.Visual.Editing
                     Position = (OsuPlayfield.BASE_SIZE - new Vector2(100, 0)) / 2,
                     Samples = new List<HitSampleInfo>
                     {
-                        new HitSampleInfo(HitSampleInfo.HIT_NORMAL, "normal", volume: 80)
+                        new HitSampleInfo(HitSampleInfo.HIT_NORMAL, volume: 80)
                     }
                 });
 
diff --git a/osu.Game/Audio/HitSampleInfo.cs b/osu.Game/Audio/HitSampleInfo.cs
index efa5562cb8..665ae3e1a7 100644
--- a/osu.Game/Audio/HitSampleInfo.cs
+++ b/osu.Game/Audio/HitSampleInfo.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
+using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Utils;
 
 namespace osu.Game.Audio
@@ -32,7 +33,7 @@ namespace osu.Game.Audio
         /// <summary>
         /// The bank to load the sample from.
         /// </summary>
-        public readonly string? Bank;
+        public readonly string Bank;
 
         /// <summary>
         /// An optional suffix to provide priority lookup. Falls back to non-suffixed <see cref="Name"/>.
@@ -44,7 +45,7 @@ namespace osu.Game.Audio
         /// </summary>
         public int Volume { get; }
 
-        public HitSampleInfo(string name, string? bank = null, string? suffix = null, int volume = 0)
+        public HitSampleInfo(string name, string bank = SampleControlPoint.DEFAULT_BANK, string? suffix = null, int volume = 0)
         {
             Name = name;
             Bank = bank;
@@ -76,7 +77,7 @@ namespace osu.Game.Audio
         /// <param name="newVolume">An optional new volume.</param>
         /// <returns>The new <see cref="HitSampleInfo"/>.</returns>
         public virtual HitSampleInfo With(Optional<string> newName = default, Optional<string?> newBank = default, Optional<string?> newSuffix = default, Optional<int> newVolume = default)
-            => new HitSampleInfo(newName.GetOr(Name), newBank.GetOr(Bank), newSuffix.GetOr(Suffix), newVolume.GetOr(Volume));
+            => new HitSampleInfo(newName.GetOr(Name), newBank.GetOr(Bank) ?? Bank, newSuffix.GetOr(Suffix), newVolume.GetOr(Volume));
 
         public bool Equals(HitSampleInfo? other)
             => other != null && Name == other.Name && Bank == other.Bank && Suffix == other.Suffix;
diff --git a/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
index 6cd4d74a31..522a8b7892 100644
--- a/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// <param name="hitSampleInfo">The <see cref="HitSampleInfo"/>. This will not be modified.</param>
         /// <returns>The modified <see cref="HitSampleInfo"/>. This does not share a reference with <paramref name="hitSampleInfo"/>.</returns>
         public virtual HitSampleInfo ApplyTo(HitSampleInfo hitSampleInfo)
-            => hitSampleInfo.With(newBank: hitSampleInfo.Bank ?? SampleBank, newVolume: hitSampleInfo.Volume > 0 ? hitSampleInfo.Volume : SampleVolume);
+            => hitSampleInfo.With(newBank: hitSampleInfo.Bank, newVolume: hitSampleInfo.Volume > 0 ? hitSampleInfo.Volume : SampleVolume);
 
         public override bool IsRedundant(ControlPoint? existing)
             => existing is SampleControlPoint existingSample
diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
index 704756e3dd..23440b8a1d 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -226,12 +226,16 @@ namespace osu.Game.Beatmaps.Formats
 
             public override HitSampleInfo ApplyTo(HitSampleInfo hitSampleInfo)
             {
-                var baseInfo = base.ApplyTo(hitSampleInfo);
+                if (hitSampleInfo is ConvertHitObjectParser.LegacyHitSampleInfo legacy)
+                {
+                    return legacy.With(
+                        newCustomSampleBank: legacy.CustomSampleBank > 0 ? legacy.CustomSampleBank : CustomSampleBank,
+                        newVolume: hitSampleInfo.Volume > 0 ? hitSampleInfo.Volume : SampleVolume,
+                        newBank: legacy.BankSpecified ? legacy.Bank : SampleBank
+                    );
+                }
 
-                if (baseInfo is ConvertHitObjectParser.LegacyHitSampleInfo legacy && legacy.CustomSampleBank == 0)
-                    return legacy.With(newCustomSampleBank: CustomSampleBank);
-
-                return baseInfo;
+                return base.ApplyTo(hitSampleInfo);
             }
 
             public override bool IsRedundant(ControlPoint? existing)
diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index 12c0ea1807..eae9f922a4 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Rulesets.Edit
             HitObject = hitObject;
 
             // adding the default hit sample should be the case regardless of the ruleset.
-            HitObject.Samples.Add(new HitSampleInfo(HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK, volume: 100));
+            HitObject.Samples.Add(new HitSampleInfo(HitSampleInfo.HIT_NORMAL, volume: 100));
 
             RelativeSizeAxes = Axes.Both;
 
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index ba5de6c14b..c0f02b0b5e 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -14,6 +14,7 @@ using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Utils;
+using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Legacy;
 using osu.Game.Skinning;
 using osu.Game.Utils;
@@ -446,9 +447,9 @@ namespace osu.Game.Rulesets.Objects.Legacy
             if (string.IsNullOrEmpty(bankInfo.Filename))
             {
                 soundTypes.Add(new LegacyHitSampleInfo(HitSampleInfo.HIT_NORMAL, bankInfo.BankForNormal, bankInfo.Volume, bankInfo.CustomSampleBank,
-                                // if the sound type doesn't have the Normal flag set, attach it anyway as a layered sample.
-                                // None also counts as a normal non-layered sample: https://osu.ppy.sh/help/wiki/osu!_File_Formats/Osu_(file_format)#hitsounds
-                                type != LegacyHitSoundType.None && !type.HasFlagFast(LegacyHitSoundType.Normal)));
+                    // if the sound type doesn't have the Normal flag set, attach it anyway as a layered sample.
+                    // None also counts as a normal non-layered sample: https://osu.ppy.sh/help/wiki/osu!_File_Formats/Osu_(file_format)#hitsounds
+                    type != LegacyHitSoundType.None && !type.HasFlagFast(LegacyHitSoundType.Normal)));
             }
             else
             {
@@ -479,12 +480,14 @@ namespace osu.Game.Rulesets.Objects.Legacy
             /// The bank identifier to use for the base ("hitnormal") sample.
             /// Transferred to <see cref="HitSampleInfo.Bank"/> when appropriate.
             /// </summary>
+            [CanBeNull]
             public string BankForNormal;
 
             /// <summary>
             /// The bank identifier to use for additions ("hitwhistle", "hitfinish", "hitclap").
             /// Transferred to <see cref="HitSampleInfo.Bank"/> when appropriate.
             /// </summary>
+            [CanBeNull]
             public string BankForAdditions;
 
             /// <summary>
@@ -518,10 +521,17 @@ namespace osu.Game.Rulesets.Objects.Legacy
             /// </remarks>
             public readonly bool IsLayered;
 
+            /// <summary>
+            /// Whether a bank was specified locally to the relevant hitobject.
+            /// If <c>false</c>, a bank will be retrieved from the closest control point.
+            /// </summary>
+            public bool BankSpecified;
+
             public LegacyHitSampleInfo(string name, string? bank = null, int volume = 0, int customSampleBank = 0, bool isLayered = false)
-                : base(name, bank, customSampleBank >= 2 ? customSampleBank.ToString() : null, volume)
+                : base(name, bank ?? SampleControlPoint.DEFAULT_BANK, customSampleBank >= 2 ? customSampleBank.ToString() : null, volume)
             {
                 CustomSampleBank = customSampleBank;
+                BankSpecified = !string.IsNullOrEmpty(bank);
                 IsLayered = isLayered;
             }
 
@@ -531,7 +541,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
             public virtual LegacyHitSampleInfo With(Optional<string> newName = default, Optional<string?> newBank = default, Optional<int> newVolume = default,
                                                     Optional<int> newCustomSampleBank = default,
                                                     Optional<bool> newIsLayered = default)
-                => new LegacyHitSampleInfo(newName.GetOr(Name), newBank.GetOr(Bank), newVolume.GetOr(Volume), newCustomSampleBank.GetOr(CustomSampleBank), newIsLayered.GetOr(IsLayered));
+                => new LegacyHitSampleInfo(newName.GetOr(Name), newBank.GetOr(Bank) ?? Bank, newVolume.GetOr(Volume), newCustomSampleBank.GetOr(CustomSampleBank), newIsLayered.GetOr(IsLayered));
 
             public bool Equals(LegacyHitSampleInfo? other)
                 // The additions to equality checks here are *required* to ensure that pooling works correctly.

From d9ae8229669b0f371810b5334ea563056642a735 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 May 2023 16:34:49 +0900
Subject: [PATCH 0468/1604] Fix bank not correctly being assigned when adding
 sample additions in editor

---
 osu.Game/Rulesets/Objects/HitObject.cs                          | 2 +-
 .../Edit/Compose/Components/ComposeBlueprintContainer.cs        | 2 +-
 .../Screens/Edit/Compose/Components/EditorSelectionHandler.cs   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs
index a4cb976d50..f5b9e9c8cd 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -210,7 +210,7 @@ namespace osu.Game.Rulesets.Objects
         /// </summary>
         /// <param name="sampleName">The name of the sample.</param>
         /// <returns>A populated <see cref="HitSampleInfo"/>.</returns>
-        protected HitSampleInfo GetSampleInfo(string sampleName = HitSampleInfo.HIT_NORMAL)
+        public HitSampleInfo GetSampleInfo(string sampleName = HitSampleInfo.HIT_NORMAL)
         {
             var hitnormalSample = Samples.FirstOrDefault(s => s.Name == HitSampleInfo.HIT_NORMAL);
             return hitnormalSample == null ? new HitSampleInfo(sampleName) : hitnormalSample.With(newName: sampleName);
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 07fb450628..73e3baf509 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -185,7 +185,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
                 case TernaryState.True:
                     if (existingSample == null)
-                        samples.Add(new HitSampleInfo(sampleName));
+                        samples.Add(CurrentPlacement.HitObject.GetSampleInfo(sampleName));
                     break;
             }
         }
diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
index 357cc940f2..694b24c567 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
@@ -122,7 +122,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 if (h.Samples.Any(s => s.Name == sampleName))
                     return;
 
-                h.Samples.Add(new HitSampleInfo(sampleName));
+                h.Samples.Add(h.GetSampleInfo(sampleName));
                 EditorBeatmap.Update(h);
             });
         }

From 31fff72eb6f8da11fb5f6d11d06775a1cd78f2ad Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 May 2023 16:35:58 +0900
Subject: [PATCH 0469/1604] Fix bank not correctly being assigned to some taiko
 hit cases

---
 osu.Game.Rulesets.Taiko/Objects/Hit.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Hit.cs b/osu.Game.Rulesets.Taiko/Objects/Hit.cs
index 787079bfee..d90c7016e9 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Hit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Hit.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Rulesets.Taiko.Objects
             if (isRimType != rimSamples.Any())
             {
                 if (isRimType)
-                    Samples.Add(new HitSampleInfo(HitSampleInfo.HIT_CLAP));
+                    Samples.Add(GetSampleInfo(HitSampleInfo.HIT_CLAP));
                 else
                 {
                     foreach (var sample in rimSamples)

From 8528fcaedc93bddd843be6fa6087cde82629f52e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 May 2023 18:31:10 +0900
Subject: [PATCH 0470/1604] Rename editor sample adjustment test scene to
 increase scope of tests

---
 ...intAdjustments.cs => TestSceneHitObjectSampleAdjustments.cs} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename osu.Game.Tests/Visual/Editing/{TestSceneHitObjectSamplePointAdjustments.cs => TestSceneHitObjectSampleAdjustments.cs} (99%)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSamplePointAdjustments.cs b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSampleAdjustments.cs
similarity index 99%
rename from osu.Game.Tests/Visual/Editing/TestSceneHitObjectSamplePointAdjustments.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneHitObjectSampleAdjustments.cs
index 230333ec35..6e3f403c19 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSamplePointAdjustments.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSampleAdjustments.cs
@@ -24,7 +24,7 @@ using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Editing
 {
-    public partial class TestSceneHitObjectSamplePointAdjustments : EditorTestScene
+    public partial class TestSceneHitObjectSampleAdjustments : EditorTestScene
     {
         protected override Ruleset CreateEditorRuleset() => new OsuRuleset();
 

From ebce39cd1c4ef3db38d6dbb92682252eb7c463ca Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 May 2023 18:52:35 +0900
Subject: [PATCH 0471/1604] Add test coverage of failing sample bank transfer

---
 .../TestSceneHitObjectSampleAdjustments.cs    | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSampleAdjustments.cs b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSampleAdjustments.cs
index 6e3f403c19..530bd5eb20 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSampleAdjustments.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSampleAdjustments.cs
@@ -58,6 +58,26 @@ namespace osu.Game.Tests.Visual.Editing
             });
         }
 
+        [Test]
+        public void TestAddSampleAddition()
+        {
+            AddStep("select both objects", () => EditorBeatmap.SelectedHitObjects.AddRange(EditorBeatmap.HitObjects));
+
+            AddStep("add clap addition", () => InputManager.Key(Key.R));
+
+            hitObjectHasSampleBank(0, "normal");
+            hitObjectHasSamples(0, HitSampleInfo.HIT_NORMAL, HitSampleInfo.HIT_CLAP);
+            hitObjectHasSampleBank(1, "soft");
+            hitObjectHasSamples(1, HitSampleInfo.HIT_NORMAL, HitSampleInfo.HIT_CLAP);
+
+            AddStep("remove clap addition", () => InputManager.Key(Key.R));
+
+            hitObjectHasSampleBank(0, "normal");
+            hitObjectHasSamples(0, HitSampleInfo.HIT_NORMAL);
+            hitObjectHasSampleBank(1, "soft");
+            hitObjectHasSamples(1, HitSampleInfo.HIT_NORMAL);
+        }
+
         [Test]
         public void TestPopoverHasFocus()
         {
@@ -271,6 +291,12 @@ namespace osu.Game.Tests.Visual.Editing
             InputManager.Key(Key.Enter);
         });
 
+        private void hitObjectHasSamples(int objectIndex, params string[] samples) => AddAssert($"{objectIndex.ToOrdinalWords()} has samples {string.Join(',', samples)}", () =>
+        {
+            var h = EditorBeatmap.HitObjects.ElementAt(objectIndex);
+            return h.Samples.Select(s => s.Name).SequenceEqual(samples);
+        });
+
         private void hitObjectHasSampleBank(int objectIndex, string bank) => AddAssert($"{objectIndex.ToOrdinalWords()} has bank {bank}", () =>
         {
             var h = EditorBeatmap.HitObjects.ElementAt(objectIndex);

From ddfdd712bd61b32c1f00614a840156b234c2e070 Mon Sep 17 00:00:00 2001
From: Huo Yaoyuan <huoyaoyuan@hotmail.com>
Date: Wed, 17 May 2023 00:07:06 +0800
Subject: [PATCH 0472/1604] Update InspectCode to 2022.3.3 and enable C# 11

---
 .config/dotnet-tools.json | 2 +-
 Directory.Build.props     | 2 +-
 osu.Game/osu.Game.csproj  | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 1f937e1837..d9f1e3985a 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "jetbrains.resharper.globaltools": {
-      "version": "2022.2.3",
+      "version": "2022.3.3",
       "commands": [
         "jb"
       ]
diff --git a/Directory.Build.props b/Directory.Build.props
index 734374c840..fccac79a45 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,7 @@
 <!-- Contains required properties for osu!framework projects. -->
 <Project>
   <PropertyGroup Label="C#">
-    <LangVersion>10.0</LangVersion>
+    <LangVersion>11.0</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 3ea4a57c2c..bf0c1dde17 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -1,9 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup Label="Project">
     <TargetFramework>net6.0</TargetFramework>
     <OutputType>Library</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <LangVersion>10</LangVersion>
   </PropertyGroup>
   <PropertyGroup Label="Nuget">
     <Title>osu!</Title>

From 84de463e2e9e11130fb8edd053796e1f722f15f6 Mon Sep 17 00:00:00 2001
From: Huo Yaoyuan <huoyaoyuan@hotmail.com>
Date: Wed, 17 May 2023 00:13:08 +0800
Subject: [PATCH 0473/1604] Turn off inspection of MSBuild unknown property

---
 osu.sln.DotSettings | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index b54794cd6d..5039831f76 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -234,6 +234,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TooWideLocalVariableScope/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TryCastAlwaysSucceeds/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnassignedField_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnknownProperty/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnnecessaryWhitespace/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedAutoPropertyAccessor_002EGlobal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMemberHierarchy_002EGlobal/@EntryIndexedValue">HINT</s:String>

From 88ce627c8ed5428b087e5c25c16a541cd1e66b11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 16 May 2023 20:40:12 +0200
Subject: [PATCH 0474/1604] Avoid bindable/event feedback when changing
 resolution

---
 .../Sections/Graphics/LayoutSettings.cs       | 41 ++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index 2e26d15105..d82b8b1ba3 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -244,7 +244,8 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
         {
             Scheduler.AddOnce(d =>
             {
-                displayDropdown.Items = d;
+                if (!displayDropdown.Items.SequenceEqual(d, DisplayListComparer.DEFAULT))
+                    displayDropdown.Items = d;
                 updateDisplaySettingsVisibility();
             }, displays);
         }
@@ -376,5 +377,43 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                 }
             }
         }
+
+        /// <summary>
+        /// Contrary to <see cref="Display.Equals(osu.Framework.Platform.Display?)"/>, this comparer disregards the value of <see cref="Display.Bounds"/>.
+        /// We want to just show a list of displays, and for the purposes of settings we don't care about their bounds when it comes to the list.
+        /// However, <see cref="IWindow.DisplaysChanged"/> fires even if only the resolution of the current display was changed
+        /// (because it causes the bounds of all displays to also change).
+        /// We're not interested in those changes, so compare only the rest that we actually care about.
+        /// This helps to avoid a bindable/event feedback loop, in which a resolution change
+        /// would trigger a display "change", which would in turn reset resolution again.
+        /// </summary>
+        private class DisplayListComparer : IEqualityComparer<Display>
+        {
+            public static readonly DisplayListComparer DEFAULT = new DisplayListComparer();
+
+            public bool Equals(Display? x, Display? y)
+            {
+                if (ReferenceEquals(x, y)) return true;
+                if (ReferenceEquals(x, null)) return false;
+                if (ReferenceEquals(y, null)) return false;
+
+                return x.Index == y.Index
+                       && x.Name == y.Name
+                       && x.DisplayModes.SequenceEqual(y.DisplayModes);
+            }
+
+            public int GetHashCode(Display obj)
+            {
+                var hashCode = new HashCode();
+
+                hashCode.Add(obj.Index);
+                hashCode.Add(obj.Name);
+                hashCode.Add(obj.DisplayModes.Length);
+                foreach (var displayMode in obj.DisplayModes)
+                    hashCode.Add(displayMode);
+
+                return hashCode.ToHashCode();
+            }
+        }
     }
 }

From 0dcf1b540e0ee5a652e09982eeffd5174733891d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 16 May 2023 21:14:09 +0200
Subject: [PATCH 0475/1604] Attempt to preserve old resolution when switching
 displays

---
 .../Settings/Sections/Graphics/LayoutSettings.cs         | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index d82b8b1ba3..6a4ad63799 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -193,6 +193,12 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
 
             currentDisplay.BindValueChanged(display => Schedule(() =>
             {
+                // there is no easy way to perform an atomic swap on the `resolutions` list, which is bound to the dropdown via `ItemSource`.
+                // this means, if the old resolution isn't saved, the `RemoveRange()` call below will cause `resolutionDropdown.Current` to reset value,
+                // therefore making it impossible to select any dropdown value other than "Default".
+                // to circumvent this locally, store the old value here, so that we can attempt to restore it later.
+                var oldResolution = resolutionDropdown.Current.Value;
+
                 resolutions.RemoveRange(1, resolutions.Count - 1);
 
                 if (display.NewValue != null)
@@ -204,6 +210,9 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                                                 .Distinct());
                 }
 
+                if (resolutions.Contains(oldResolution))
+                    resolutionDropdown.Current.Value = oldResolution;
+
                 updateDisplaySettingsVisibility();
             }), true);
 

From 2d7fe683110c18361d18ec979473e3ccb783e88e Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Tue, 16 May 2023 21:57:31 +0200
Subject: [PATCH 0476/1604] Prevent feedback by using atomic `.ReplaceRange()`

`display.NewValue` will never be null, checked on SDL + osuTK/Android.

On Android it's a 0x0 display, importantly not null.
---
 .../Settings/Sections/Graphics/LayoutSettings.cs  | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index 2e26d15105..f3ff2e87ba 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -193,16 +193,11 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
 
             currentDisplay.BindValueChanged(display => Schedule(() =>
             {
-                resolutions.RemoveRange(1, resolutions.Count - 1);
-
-                if (display.NewValue != null)
-                {
-                    resolutions.AddRange(display.NewValue.DisplayModes
-                                                .Where(m => m.Size.Width >= 800 && m.Size.Height >= 600)
-                                                .OrderByDescending(m => Math.Max(m.Size.Height, m.Size.Width))
-                                                .Select(m => m.Size)
-                                                .Distinct());
-                }
+                resolutions.ReplaceRange(1, resolutions.Count - 1, display.NewValue.DisplayModes
+                                                                          .Where(m => m.Size.Width >= 800 && m.Size.Height >= 600)
+                                                                          .OrderByDescending(m => Math.Max(m.Size.Height, m.Size.Width))
+                                                                          .Select(m => m.Size)
+                                                                          .Distinct());
 
                 updateDisplaySettingsVisibility();
             }), true);

From 70426a504223eb089b1bc1af2bcdeaca6f760d35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 16 May 2023 22:42:25 +0200
Subject: [PATCH 0477/1604] Add reference to youtrack issue to suppression

---
 osu.sln.DotSettings | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index 5039831f76..f9aff99267 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -234,6 +234,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TooWideLocalVariableScope/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TryCastAlwaysSucceeds/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnassignedField_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<!-- UnknownProperty triggers false positives on variables in Directory.Build.props: https://youtrack.jetbrains.com/issue/RSRP-490805 -->
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnknownProperty/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnnecessaryWhitespace/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedAutoPropertyAccessor_002EGlobal/@EntryIndexedValue">HINT</s:String>

From c97b7a077e274493fec0dfbdd3e5193669c98fcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 16 May 2023 23:47:47 +0200
Subject: [PATCH 0478/1604] Use better issue reference

---
 osu.sln.DotSettings | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index f9aff99267..9ca0fad2ab 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -234,7 +234,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TooWideLocalVariableScope/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TryCastAlwaysSucceeds/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnassignedField_002EGlobal/@EntryIndexedValue">HINT</s:String>
-	<!-- UnknownProperty triggers false positives on variables in Directory.Build.props: https://youtrack.jetbrains.com/issue/RSRP-490805 -->
+	<!-- UnknownProperty triggers false positives on $(MSBuildThisFileDirectory): https://youtrack.jetbrains.com/issue/RSRP-490368 -->
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnknownProperty/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnnecessaryWhitespace/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedAutoPropertyAccessor_002EGlobal/@EntryIndexedValue">HINT</s:String>

From e2633ae993ccd0d470a5684b3cf39ea1c850e0dd Mon Sep 17 00:00:00 2001
From: John <johntbiddle@gmail.com>
Date: Tue, 16 May 2023 21:08:56 -0700
Subject: [PATCH 0479/1604] Removed unnecessary [Resolved] attribute (thanks
 bdach) Moved accent color assignment from OnUpdate to ApplyCustomUpdateState.
 In order to get this to work, a flag needed to be added to
 DrawableHitObject.cs to disable combo color updates also being applied.

---
 osu.Game.Rulesets.Osu/Mods/OsuModSnapColour.cs        | 11 +++++++----
 .../Rulesets/Objects/Drawables/DrawableHitObject.cs   |  6 ++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModSnapColour.cs b/osu.Game.Rulesets.Osu/Mods/OsuModSnapColour.cs
index 69b8b1d4c3..7d36e73cdb 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModSnapColour.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModSnapColour.cs
@@ -33,10 +33,13 @@ namespace osu.Game.Rulesets.Osu.Mods
         {
             if (currentBeatmap.IsNull() || drawable.IsNull()) return;
 
-            drawable.OnUpdate += _ =>
-                drawable.AccentColour.Value = BindableBeatDivisor.GetColourFor(
-                    currentBeatmap.ControlPointInfo.GetClosestBeatDivisor(drawable.HitObject.StartTime),
-                    colours);
+            drawable.ApplyCustomUpdateState += (drawableObject, state) =>
+            {
+                int snapDivisor = currentBeatmap.ControlPointInfo.GetClosestBeatDivisor(drawableObject.HitObject.StartTime);
+
+                drawableObject.EnableComboColour = false;
+                drawableObject.AccentColour.Value = BindableBeatDivisor.GetColourFor(snapDivisor, colours);
+            };
         }
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 07c0d1f8a1..cbaa07bebc 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -74,6 +74,11 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
         public override bool PropagateNonPositionalInputSubTree => HandleUserInput;
 
+        /// <summary>
+        /// Whether this object should be coloured using its combo position
+        /// </summary>
+        public bool EnableComboColour { get; set; } = true;
+
         /// <summary>
         /// Invoked by this or a nested <see cref="DrawableHitObject"/> after a <see cref="JudgementResult"/> has been applied.
         /// </summary>
@@ -528,6 +533,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         protected void UpdateComboColour()
         {
             if (!(HitObject is IHasComboInformation combo)) return;
+            if (!EnableComboColour) return;
 
             Color4 colour = combo.GetComboColour(CurrentSkin);
 

From b7dc8d49bad8d28647bfae7f85a017d92b64a501 Mon Sep 17 00:00:00 2001
From: John <johntbiddle@gmail.com>
Date: Tue, 16 May 2023 21:14:55 -0700
Subject: [PATCH 0480/1604] Removed import for Allocation and other unnecessary
 [Resolved] tag missed in last commit

---
 osu.Game.Rulesets.Osu/Mods/OsuModSnapColour.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModSnapColour.cs b/osu.Game.Rulesets.Osu/Mods/OsuModSnapColour.cs
index 7d36e73cdb..4fda6130c0 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModSnapColour.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModSnapColour.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Framework.Allocation;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
@@ -19,7 +18,6 @@ namespace osu.Game.Rulesets.Osu.Mods
     {
         private readonly OsuColour colours = new OsuColour();
 
-        [Resolved]
         private IBeatmap? currentBeatmap { get; set; }
 
         public void ApplyToBeatmap(IBeatmap beatmap)

From d6fa44240d6009e3b902765f26feac6e648a96f3 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 16 May 2023 21:51:32 -0700
Subject: [PATCH 0481/1604] Fix storyboard video-only check being inverted

---
 osu.Game/Storyboards/Drawables/DrawableStoryboard.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
index aa264fa719..e674e7512c 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Storyboards.Drawables
 
             Size = new Vector2(640, 480);
 
-            bool onlyHasVideoElements = Storyboard.Layers.SelectMany(l => l.Elements).Any(e => !(e is StoryboardVideo));
+            bool onlyHasVideoElements = Storyboard.Layers.SelectMany(l => l.Elements).All(e => e is StoryboardVideo);
 
             Width = Height * (storyboard.BeatmapInfo.WidescreenStoryboard || onlyHasVideoElements ? 16 / 9f : 4 / 3f);
 

From a8bc337006918eb5579fb202c6537d0905075b17 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 May 2023 14:06:02 +0900
Subject: [PATCH 0482/1604] Change default volume when constructing a
 `HitSampleInfo` to non-zero

---
 osu.Game/Audio/HitSampleInfo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Audio/HitSampleInfo.cs b/osu.Game/Audio/HitSampleInfo.cs
index 665ae3e1a7..3cf8e84d56 100644
--- a/osu.Game/Audio/HitSampleInfo.cs
+++ b/osu.Game/Audio/HitSampleInfo.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Audio
         /// </summary>
         public int Volume { get; }
 
-        public HitSampleInfo(string name, string bank = SampleControlPoint.DEFAULT_BANK, string? suffix = null, int volume = 0)
+        public HitSampleInfo(string name, string bank = SampleControlPoint.DEFAULT_BANK, string? suffix = null, int volume = 100)
         {
             Name = name;
             Bank = bank;

From dc51d5ecf32fb23e3c45048b9aa848116f913f31 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 May 2023 14:07:48 +0900
Subject: [PATCH 0483/1604] Rename `GetSampleInfo` to better describe what
 method does

Also add full xmldoc
---
 osu.Game.Rulesets.Catch/Objects/BananaShower.cs    |  2 +-
 osu.Game.Rulesets.Osu/Objects/Spinner.cs           |  2 +-
 osu.Game.Rulesets.Taiko/Objects/Hit.cs             |  2 +-
 .../Objects/TaikoStrongableHitObject.cs            |  2 +-
 osu.Game/Rulesets/Objects/HitObject.cs             | 14 ++++++++++----
 .../Components/ComposeBlueprintContainer.cs        |  2 +-
 .../Compose/Components/EditorSelectionHandler.cs   |  2 +-
 7 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/BananaShower.cs b/osu.Game.Rulesets.Catch/Objects/BananaShower.cs
index 5bd4ac86f5..b05c8e5f77 100644
--- a/osu.Game.Rulesets.Catch/Objects/BananaShower.cs
+++ b/osu.Game.Rulesets.Catch/Objects/BananaShower.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Catch.Objects
                 {
                     StartTime = time,
                     BananaIndex = i,
-                    Samples = new List<HitSampleInfo> { new Banana.BananaHitSampleInfo(GetSampleInfo().Volume) }
+                    Samples = new List<HitSampleInfo> { new Banana.BananaHitSampleInfo(CreateHitSampleInfo().Volume) }
                 });
 
                 time += spacing;
diff --git a/osu.Game.Rulesets.Osu/Objects/Spinner.cs b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
index df5898fd67..ba0981e781 100644
--- a/osu.Game.Rulesets.Osu/Objects/Spinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Rulesets.Osu.Objects
 
                 AddNested(i < SpinsRequired
                     ? new SpinnerTick { StartTime = startTime, SpinnerDuration = Duration }
-                    : new SpinnerBonusTick { StartTime = startTime, SpinnerDuration = Duration, Samples = new[] { GetSampleInfo("spinnerbonus") } });
+                    : new SpinnerBonusTick { StartTime = startTime, SpinnerDuration = Duration, Samples = new[] { CreateHitSampleInfo("spinnerbonus") } });
             }
         }
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/Hit.cs b/osu.Game.Rulesets.Taiko/Objects/Hit.cs
index d90c7016e9..303447e672 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Hit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Hit.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Rulesets.Taiko.Objects
             if (isRimType != rimSamples.Any())
             {
                 if (isRimType)
-                    Samples.Add(GetSampleInfo(HitSampleInfo.HIT_CLAP));
+                    Samples.Add(CreateHitSampleInfo(HitSampleInfo.HIT_CLAP));
                 else
                 {
                     foreach (var sample in rimSamples)
diff --git a/osu.Game.Rulesets.Taiko/Objects/TaikoStrongableHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/TaikoStrongableHitObject.cs
index 0043f231d2..479ad8369a 100644
--- a/osu.Game.Rulesets.Taiko/Objects/TaikoStrongableHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/TaikoStrongableHitObject.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Taiko.Objects
             if (IsStrongBindable.Value != strongSamples.Any())
             {
                 if (IsStrongBindable.Value)
-                    Samples.Add(GetSampleInfo(HitSampleInfo.HIT_FINISH));
+                    Samples.Add(CreateHitSampleInfo(HitSampleInfo.HIT_FINISH));
                 else
                 {
                     foreach (var sample in strongSamples)
diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs
index f5b9e9c8cd..ed3d3a6eb2 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -206,14 +206,20 @@ namespace osu.Game.Rulesets.Objects
         }
 
         /// <summary>
-        /// Create a SampleInfo based on the sample settings of the hit normal sample in <see cref="Samples"/>.
+        /// Create a <see cref="HitSampleInfo"/> based on the sample settings of the first <see cref="HitSampleInfo.HIT_NORMAL"/> sample in <see cref="Samples"/>.
+        /// If no sample is available, sane default settings will be used instead.
         /// </summary>
+        /// <remarks>
+        /// In the case an existing sample exists, all settings apart from the sample name will be inherited. This includes volume, bank and suffix.
+        /// </remarks>
         /// <param name="sampleName">The name of the sample.</param>
         /// <returns>A populated <see cref="HitSampleInfo"/>.</returns>
-        public HitSampleInfo GetSampleInfo(string sampleName = HitSampleInfo.HIT_NORMAL)
+        public HitSampleInfo CreateHitSampleInfo(string sampleName = HitSampleInfo.HIT_NORMAL)
         {
-            var hitnormalSample = Samples.FirstOrDefault(s => s.Name == HitSampleInfo.HIT_NORMAL);
-            return hitnormalSample == null ? new HitSampleInfo(sampleName) : hitnormalSample.With(newName: sampleName);
+            if (Samples.FirstOrDefault(s => s.Name == HitSampleInfo.HIT_NORMAL) is HitSampleInfo existingSample)
+                return existingSample.With(newName: sampleName);
+
+            return new HitSampleInfo(sampleName);
         }
     }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 73e3baf509..b42118b983 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -185,7 +185,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
                 case TernaryState.True:
                     if (existingSample == null)
-                        samples.Add(CurrentPlacement.HitObject.GetSampleInfo(sampleName));
+                        samples.Add(CurrentPlacement.HitObject.CreateHitSampleInfo(sampleName));
                     break;
             }
         }
diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
index 694b24c567..3b49b76e7e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
@@ -122,7 +122,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 if (h.Samples.Any(s => s.Name == sampleName))
                     return;
 
-                h.Samples.Add(h.GetSampleInfo(sampleName));
+                h.Samples.Add(h.CreateHitSampleInfo(sampleName));
                 EditorBeatmap.Update(h);
             });
         }

From 510ebe1f234ffb9b1e8ca9c018e8ff2bb7839d3c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 May 2023 14:11:14 +0900
Subject: [PATCH 0484/1604] Fix weird optional usage in `HitSampleInfo.With`

---
 osu.Game.Rulesets.Catch/Objects/Banana.cs                 | 2 +-
 osu.Game/Audio/HitSampleInfo.cs                           | 4 ++--
 .../Rulesets/Objects/Legacy/ConvertHitObjectParser.cs     | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Banana.cs b/osu.Game.Rulesets.Catch/Objects/Banana.cs
index 4c66c054e1..b80527f379 100644
--- a/osu.Game.Rulesets.Catch/Objects/Banana.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Banana.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Rulesets.Catch.Objects
             {
             }
 
-            public sealed override HitSampleInfo With(Optional<string> newName = default, Optional<string?> newBank = default, Optional<string?> newSuffix = default, Optional<int> newVolume = default)
+            public sealed override HitSampleInfo With(Optional<string> newName = default, Optional<string> newBank = default, Optional<string?> newSuffix = default, Optional<int> newVolume = default)
                 => new BananaHitSampleInfo(newVolume.GetOr(Volume));
 
             public bool Equals(BananaHitSampleInfo? other)
diff --git a/osu.Game/Audio/HitSampleInfo.cs b/osu.Game/Audio/HitSampleInfo.cs
index 3cf8e84d56..5d1ce27c9f 100644
--- a/osu.Game/Audio/HitSampleInfo.cs
+++ b/osu.Game/Audio/HitSampleInfo.cs
@@ -76,8 +76,8 @@ namespace osu.Game.Audio
         /// <param name="newSuffix">An optional new lookup suffix.</param>
         /// <param name="newVolume">An optional new volume.</param>
         /// <returns>The new <see cref="HitSampleInfo"/>.</returns>
-        public virtual HitSampleInfo With(Optional<string> newName = default, Optional<string?> newBank = default, Optional<string?> newSuffix = default, Optional<int> newVolume = default)
-            => new HitSampleInfo(newName.GetOr(Name), newBank.GetOr(Bank) ?? Bank, newSuffix.GetOr(Suffix), newVolume.GetOr(Volume));
+        public virtual HitSampleInfo With(Optional<string> newName = default, Optional<string> newBank = default, Optional<string?> newSuffix = default, Optional<int> newVolume = default)
+            => new HitSampleInfo(newName.GetOr(Name), newBank.GetOr(Bank), newSuffix.GetOr(Suffix), newVolume.GetOr(Volume));
 
         public bool Equals(HitSampleInfo? other)
             => other != null && Name == other.Name && Bank == other.Bank && Suffix == other.Suffix;
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index c0f02b0b5e..d9738ecd0a 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -535,13 +535,13 @@ namespace osu.Game.Rulesets.Objects.Legacy
                 IsLayered = isLayered;
             }
 
-            public sealed override HitSampleInfo With(Optional<string> newName = default, Optional<string?> newBank = default, Optional<string?> newSuffix = default, Optional<int> newVolume = default)
+            public sealed override HitSampleInfo With(Optional<string> newName = default, Optional<string> newBank = default, Optional<string?> newSuffix = default, Optional<int> newVolume = default)
                 => With(newName, newBank, newVolume);
 
-            public virtual LegacyHitSampleInfo With(Optional<string> newName = default, Optional<string?> newBank = default, Optional<int> newVolume = default,
+            public virtual LegacyHitSampleInfo With(Optional<string> newName = default, Optional<string> newBank = default, Optional<int> newVolume = default,
                                                     Optional<int> newCustomSampleBank = default,
                                                     Optional<bool> newIsLayered = default)
-                => new LegacyHitSampleInfo(newName.GetOr(Name), newBank.GetOr(Bank) ?? Bank, newVolume.GetOr(Volume), newCustomSampleBank.GetOr(CustomSampleBank), newIsLayered.GetOr(IsLayered));
+                => new LegacyHitSampleInfo(newName.GetOr(Name), newBank.GetOr(Bank), newVolume.GetOr(Volume), newCustomSampleBank.GetOr(CustomSampleBank), newIsLayered.GetOr(IsLayered));
 
             public bool Equals(LegacyHitSampleInfo? other)
                 // The additions to equality checks here are *required* to ensure that pooling works correctly.
@@ -573,7 +573,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
                 Path.ChangeExtension(Filename, null)
             };
 
-            public sealed override LegacyHitSampleInfo With(Optional<string> newName = default, Optional<string?> newBank = default, Optional<int> newVolume = default,
+            public sealed override LegacyHitSampleInfo With(Optional<string> newName = default, Optional<string> newBank = default, Optional<int> newVolume = default,
                                                             Optional<int> newCustomSampleBank = default,
                                                             Optional<bool> newIsLayered = default)
                 => new FileHitSampleInfo(Filename, newVolume.GetOr(Volume));

From dc421bd2af6d093f9cd1f38a7080c3acde6fae35 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 May 2023 14:49:47 +0900
Subject: [PATCH 0485/1604] Revert "Merge pull request #23570 from
 huoyaoyuan/inspect-code-cs11"

This reverts commit ab2bd123e7e29c098f29e92b547826f3844809bb, reversing
changes made to 267e63320f5bfa1b83d15c85e9eea62106611a36.
---
 .config/dotnet-tools.json | 2 +-
 Directory.Build.props     | 2 +-
 osu.Game/osu.Game.csproj  | 3 ++-
 osu.sln.DotSettings       | 2 --
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index d9f1e3985a..1f937e1837 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "jetbrains.resharper.globaltools": {
-      "version": "2022.3.3",
+      "version": "2022.2.3",
       "commands": [
         "jb"
       ]
diff --git a/Directory.Build.props b/Directory.Build.props
index fccac79a45..734374c840 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,7 @@
 <!-- Contains required properties for osu!framework projects. -->
 <Project>
   <PropertyGroup Label="C#">
-    <LangVersion>11.0</LangVersion>
+    <LangVersion>10.0</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index bf0c1dde17..3ea4a57c2c 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -1,8 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup Label="Project">
     <TargetFramework>net6.0</TargetFramework>
     <OutputType>Library</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>10</LangVersion>
   </PropertyGroup>
   <PropertyGroup Label="Nuget">
     <Title>osu!</Title>
diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index 9ca0fad2ab..b54794cd6d 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -234,8 +234,6 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TooWideLocalVariableScope/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TryCastAlwaysSucceeds/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnassignedField_002EGlobal/@EntryIndexedValue">HINT</s:String>
-	<!-- UnknownProperty triggers false positives on $(MSBuildThisFileDirectory): https://youtrack.jetbrains.com/issue/RSRP-490368 -->
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnknownProperty/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnnecessaryWhitespace/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedAutoPropertyAccessor_002EGlobal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMemberHierarchy_002EGlobal/@EntryIndexedValue">HINT</s:String>

From 94b184712d175e075ed805741f730fd610a3e2f8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 May 2023 14:38:58 +0900
Subject: [PATCH 0486/1604] Fix random button hover state not correctly being
 reset on right click

---
 osu.Game/Screens/Select/FooterButtonRandom.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/FooterButtonRandom.cs b/osu.Game/Screens/Select/FooterButtonRandom.cs
index f413126e87..3a4bad43b3 100644
--- a/osu.Game/Screens/Select/FooterButtonRandom.cs
+++ b/osu.Game/Screens/Select/FooterButtonRandom.cs
@@ -119,14 +119,13 @@ namespace osu.Game.Screens.Select
 
         protected override void OnMouseUp(MouseUpEvent e)
         {
+            base.OnMouseUp(e);
+
             if (e.Button == MouseButton.Right && IsHovered)
             {
                 rewindSearch = true;
                 TriggerClick();
-                return;
             }
-
-            base.OnMouseUp(e);
         }
 
         public override bool OnPressed(KeyBindingPressEvent<GlobalAction> e)

From 764f0323f4727d412e77316a35c4d7f470158263 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 May 2023 14:42:07 +0900
Subject: [PATCH 0487/1604] Show "rewind" text on random button when beginning
 a right mouse press

---
 osu.Game/Screens/Select/FooterButtonRandom.cs | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Select/FooterButtonRandom.cs b/osu.Game/Screens/Select/FooterButtonRandom.cs
index 3a4bad43b3..2d5d049133 100644
--- a/osu.Game/Screens/Select/FooterButtonRandom.cs
+++ b/osu.Game/Screens/Select/FooterButtonRandom.cs
@@ -93,16 +93,22 @@ namespace osu.Game.Screens.Select
 
         protected override bool OnKeyDown(KeyDownEvent e)
         {
-            updateText(e.ShiftPressed);
+            updateText(e);
             return base.OnKeyDown(e);
         }
 
         protected override void OnKeyUp(KeyUpEvent e)
         {
-            updateText(e.ShiftPressed);
+            updateText(e);
             base.OnKeyUp(e);
         }
 
+        protected override bool OnMouseDown(MouseDownEvent e)
+        {
+            updateText(e);
+            return base.OnMouseDown(e);
+        }
+
         protected override bool OnClick(ClickEvent e)
         {
             try
@@ -126,6 +132,8 @@ namespace osu.Game.Screens.Select
                 rewindSearch = true;
                 TriggerClick();
             }
+
+            updateText(e);
         }
 
         public override bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
@@ -150,10 +158,12 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        private void updateText(bool rewind = false)
+        private void updateText(UIEvent e)
         {
-            randomSpriteText.Alpha = rewind ? 0 : 1;
-            rewindSpriteText.Alpha = rewind ? 1 : 0;
+            bool aboutToRewind = e.ShiftPressed || e.CurrentState.Mouse.IsPressed(MouseButton.Right);
+
+            randomSpriteText.Alpha = aboutToRewind ? 0 : 1;
+            rewindSpriteText.Alpha = aboutToRewind ? 1 : 0;
         }
     }
 }

From 9fe787acd89e04cdeb108129eb0055864343bbea Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 May 2023 15:03:59 +0900
Subject: [PATCH 0488/1604] Enable NRT on `AccuracyHeatmap`

---
 osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
index 0249b6d9b1..495fccf03a 100644
--- a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
+++ b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Diagnostics;
 using System.Linq;
@@ -36,8 +34,8 @@ namespace osu.Game.Rulesets.Osu.Statistics
 
         private const float rotation = 45;
 
-        private BufferedContainer bufferedGrid;
-        private GridContainer pointGrid;
+        private BufferedContainer bufferedGrid = null!;
+        private GridContainer pointGrid = null!;
 
         private readonly ScoreInfo score;
         private readonly IBeatmap playableBeatmap;

From 3054348c730db26c981cf5e06a36f2cc392da6ae Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 May 2023 15:22:48 +0900
Subject: [PATCH 0489/1604] Add text hints to accuracy heat map to better
 describe travel direction

---
 .../Statistics/AccuracyHeatmap.cs             | 80 ++++++++++++++-----
 1 file changed, 59 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
index 495fccf03a..9d9b3fb84a 100644
--- a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
+++ b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Scoring;
 using osuTK;
@@ -64,34 +65,36 @@ namespace osu.Game.Rulesets.Osu.Statistics
                 FillMode = FillMode.Fit,
                 Children = new Drawable[]
                 {
-                    new CircularContainer
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        RelativeSizeAxes = Axes.Both,
-                        Size = new Vector2(inner_portion),
-                        Masking = true,
-                        BorderThickness = line_thickness,
-                        BorderColour = Color4.White,
-                        Child = new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Colour = Color4Extensions.FromHex("#202624")
-                        }
-                    },
                     new Container
                     {
                         RelativeSizeAxes = Axes.Both,
                         Children = new Drawable[]
                         {
+                            new CircularContainer
+                            {
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                RelativeSizeAxes = Axes.Both,
+                                Size = new Vector2(inner_portion),
+                                Masking = true,
+                                BorderThickness = line_thickness,
+                                BorderColour = Color4.White,
+                                Child = new Box
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Colour = Color4Extensions.FromHex("#202624")
+                                }
+                            },
                             new Container
                             {
                                 RelativeSizeAxes = Axes.Both,
                                 Padding = new MarginPadding(1),
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Rotation = rotation,
                                 Child = new Container
                                 {
                                     RelativeSizeAxes = Axes.Both,
-                                    Masking = true,
                                     Children = new Drawable[]
                                     {
                                         new Box
@@ -100,9 +103,9 @@ namespace osu.Game.Rulesets.Osu.Statistics
                                             Origin = Anchor.Centre,
                                             EdgeSmoothness = new Vector2(1),
                                             RelativeSizeAxes = Axes.Y,
-                                            Height = 2, // We're rotating along a diagonal - we don't really care how big this is.
-                                            Width = line_thickness / 2,
-                                            Rotation = -rotation,
+                                            Width = line_thickness / 2, // adjust for edgesmoothness
+                                            Height = MathF.Sqrt(2),
+                                            Rotation = -rotation * 2,
                                             Alpha = 0.3f,
                                         },
                                         new Box
@@ -111,9 +114,44 @@ namespace osu.Game.Rulesets.Osu.Statistics
                                             Origin = Anchor.Centre,
                                             EdgeSmoothness = new Vector2(1),
                                             RelativeSizeAxes = Axes.Y,
-                                            Height = 2, // We're rotating along a diagonal - we don't really care how big this is.
                                             Width = line_thickness / 2, // adjust for edgesmoothness
-                                            Rotation = rotation
+                                            Height = MathF.Sqrt(2),
+                                        },
+                                        new OsuSpriteText
+                                        {
+                                            Text = "Next",
+                                            Anchor = Anchor.Centre,
+                                            Origin = Anchor.BottomRight,
+                                            Padding = new MarginPadding(3),
+                                            RelativePositionAxes = Axes.Both,
+                                            Y = -inner_portion / 2,
+                                        },
+                                        new OsuSpriteText
+                                        {
+                                            Text = "object",
+                                            Anchor = Anchor.Centre,
+                                            Origin = Anchor.BottomLeft,
+                                            Padding = new MarginPadding(3),
+                                            RelativePositionAxes = Axes.Both,
+                                            Y = -inner_portion / 2,
+                                        },
+                                        new OsuSpriteText
+                                        {
+                                            Text = "Last",
+                                            Anchor = Anchor.Centre,
+                                            Origin = Anchor.TopRight,
+                                            Padding = new MarginPadding(3),
+                                            RelativePositionAxes = Axes.Both,
+                                            Y = inner_portion / 2,
+                                        },
+                                        new OsuSpriteText
+                                        {
+                                            Text = "object",
+                                            Anchor = Anchor.Centre,
+                                            Origin = Anchor.TopLeft,
+                                            Padding = new MarginPadding(3),
+                                            RelativePositionAxes = Axes.Both,
+                                            Y = inner_portion / 2,
                                         },
                                     }
                                 },

From 79e1d978e7581f5303fc37270f2bc02aa9c1b60e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 May 2023 15:42:38 +0900
Subject: [PATCH 0490/1604] Ensure scroll-to-top button is displayed above all
 overlay content

---
 osu.Game/Overlays/OnlineOverlay.cs          |  8 ++++++++
 osu.Game/Overlays/OverlayScrollContainer.cs |  2 +-
 osu.Game/Overlays/UserProfileOverlay.cs     | 12 +++++++++++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/OnlineOverlay.cs b/osu.Game/Overlays/OnlineOverlay.cs
index 4d2c6bc9d0..8b7a82f899 100644
--- a/osu.Game/Overlays/OnlineOverlay.cs
+++ b/osu.Game/Overlays/OnlineOverlay.cs
@@ -77,6 +77,14 @@ namespace osu.Game.Overlays
             base.Content.Add(mainContent);
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            // Ensure the scroll-to-top button is displayed above the fixed header.
+            AddInternal(ScrollFlow.Button.CreateProxy());
+        }
+
         protected override void UpdateAfterChildren()
         {
             base.UpdateAfterChildren();
diff --git a/osu.Game/Overlays/OverlayScrollContainer.cs b/osu.Game/Overlays/OverlayScrollContainer.cs
index 2a615f0e12..9ff0a65652 100644
--- a/osu.Game/Overlays/OverlayScrollContainer.cs
+++ b/osu.Game/Overlays/OverlayScrollContainer.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Overlays
         /// </summary>
         private const int button_scroll_position = 200;
 
-        protected ScrollBackButton Button;
+        public ScrollBackButton Button { get; private set; }
 
         private readonly Bindable<float?> lastScrollTarget = new Bindable<float?>();
 
diff --git a/osu.Game/Overlays/UserProfileOverlay.cs b/osu.Game/Overlays/UserProfileOverlay.cs
index d1fe877e55..ab4f07b982 100644
--- a/osu.Game/Overlays/UserProfileOverlay.cs
+++ b/osu.Game/Overlays/UserProfileOverlay.cs
@@ -249,12 +249,14 @@ namespace osu.Game.Overlays
 
         private partial class ProfileSectionsContainer : SectionsContainer<ProfileSection>
         {
+            private OverlayScrollContainer scroll = null!;
+
             public ProfileSectionsContainer()
             {
                 RelativeSizeAxes = Axes.Both;
             }
 
-            protected override UserTrackingScrollContainer CreateScrollContainer() => new OverlayScrollContainer();
+            protected override UserTrackingScrollContainer CreateScrollContainer() => scroll = new OverlayScrollContainer();
 
             // Reverse child ID is required so expanding beatmap panels can appear above sections below them.
             // This can also be done by setting Depth when adding new sections above if using ReverseChildID turns out to have any issues.
@@ -267,6 +269,14 @@ namespace osu.Game.Overlays
                 Padding = new MarginPadding { Horizontal = 10 },
                 Margin = new MarginPadding { Bottom = 10 },
             };
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                // Ensure the scroll-to-top button is displayed above the fixed header.
+                AddInternal(scroll.Button.CreateProxy());
+            }
         }
     }
 }

From e97d027230362277c9a12dab6581d387cc91f9a8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 May 2023 16:13:03 +0900
Subject: [PATCH 0491/1604] Make `OnlinePlayPill` class `abstract`

---
 .../Screens/OnlinePlay/Lounge/Components/OnlinePlayPill.cs    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/OnlinePlayPill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/OnlinePlayPill.cs
index 80e82c3856..1235e5234c 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/OnlinePlayPill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/OnlinePlayPill.cs
@@ -10,12 +10,12 @@ using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
-    public partial class OnlinePlayPill : OnlinePlayComposite
+    public abstract partial class OnlinePlayPill : OnlinePlayComposite
     {
         protected PillContainer Pill;
         protected OsuTextFlowContainer TextFlow;
 
-        public OnlinePlayPill()
+        protected OnlinePlayPill()
         {
             AutoSizeAxes = Axes.Both;
         }

From 730bc3a9616e03d129224704373273fe93fc293f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 May 2023 16:13:54 +0900
Subject: [PATCH 0492/1604] Apply NRT and simplify some remaining code

---
 .../OnlinePlay/Lounge/Components/MatchTypePill.cs        | 3 +--
 .../OnlinePlay/Lounge/Components/OnlinePlayPill.cs       | 6 ++----
 .../OnlinePlay/Lounge/Components/QueueModePill.cs        | 3 +--
 .../Lounge/Components/RoomSpecialCategoryPill.cs         | 9 ++-------
 .../OnlinePlay/Lounge/Components/RoomStatusPill.cs       | 6 ++----
 5 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/MatchTypePill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/MatchTypePill.cs
index e019de0f6f..35e0482f2b 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/MatchTypePill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/MatchTypePill.cs
@@ -20,8 +20,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 
         private void onMatchTypeChanged(ValueChangedEvent<MatchType> type)
         {
-            TextFlow.Clear();
-            TextFlow.AddText(type.NewValue.GetLocalisableDescription());
+            TextFlow.Text = type.NewValue.GetLocalisableDescription();
         }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/OnlinePlayPill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/OnlinePlayPill.cs
index 1235e5234c..983fab8525 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/OnlinePlayPill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/OnlinePlayPill.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
@@ -12,8 +10,8 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
     public abstract partial class OnlinePlayPill : OnlinePlayComposite
     {
-        protected PillContainer Pill;
-        protected OsuTextFlowContainer TextFlow;
+        protected PillContainer Pill { get; private set; } = null!;
+        protected OsuTextFlowContainer TextFlow { get; private set; } = null!;
 
         protected OnlinePlayPill()
         {
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/QueueModePill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/QueueModePill.cs
index e402653c2f..208c11c155 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/QueueModePill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/QueueModePill.cs
@@ -20,8 +20,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 
         private void onQueueModeChanged(ValueChangedEvent<QueueMode> mode)
         {
-            TextFlow.Clear();
-            TextFlow.AddText(mode.NewValue.GetLocalisableDescription());
+            TextFlow.Text = mode.NewValue.GetLocalisableDescription();
         }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomSpecialCategoryPill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomSpecialCategoryPill.cs
index b869ede9bd..e88624f877 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomSpecialCategoryPill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomSpecialCategoryPill.cs
@@ -19,18 +19,13 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
         {
             base.LoadComplete();
 
-            Pill.Background.Colour = colours.Pink;
             Pill.Background.Alpha = 1;
             TextFlow.Colour = Color4.Black;
 
             Category.BindValueChanged(c =>
             {
-                TextFlow.Clear();
-                TextFlow.AddText(c.NewValue.GetLocalisableDescription());
-
-                var backgroundColour = colours.ForRoomCategory(Category.Value);
-                if (backgroundColour != null)
-                    Pill.Background.Colour = backgroundColour.Value;
+                TextFlow.Text = c.NewValue.GetLocalisableDescription();
+                Pill.Background.Colour = colours.ForRoomCategory(c.NewValue) ?? colours.Pink;
             }, true);
         }
     }
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs
index f260d168a7..ab3d293db8 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs
@@ -30,17 +30,15 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
             FinishTransforms(true);
 
             TextFlow.Colour = Colour4.Black;
+            Pill.Background.Alpha = 1;
         }
 
         private void updateDisplay()
         {
             RoomStatus status = getDisplayStatus();
 
-            Pill.Background.Alpha = 1;
             Pill.Background.FadeColour(status.GetAppropriateColour(colours), 100);
-
-            TextFlow.Clear();
-            TextFlow.AddText(status.Message);
+            TextFlow.Text = status.Message;
         }
 
         private RoomStatus getDisplayStatus()

From ec2b9165d59a1ebdba6a2703cfa908f406ec931f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 May 2023 16:33:58 +0900
Subject: [PATCH 0493/1604] Adjust `BeatDivisorControl` test to show control
 mmuch larger

---
 osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs b/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
index 56b16301be..c3d5ecac5c 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
@@ -42,7 +42,8 @@ namespace osu.Game.Tests.Visual.Editing
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Size = new Vector2(90, 90)
+                    Size = new Vector2(90, 90),
+                    Scale = new Vector2(3),
                 }
             };
         });

From 87ff28b0220c40691eab57038f98f366b2601986 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 May 2023 16:34:10 +0900
Subject: [PATCH 0494/1604] Update beat divisor control to show ticks in more
 visually correct locations

As proposed in https://github.com/ppy/osu/discussions/23527.
---
 .../Edit/Compose/Components/BeatDivisorControl.cs    | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
index 9f422d5aa9..3bfe81e6a7 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
@@ -410,6 +410,16 @@ namespace osu.Game.Screens.Edit.Compose.Components
                     });
                 }
 
+                // Add a fake 1/1 at the end to give context.
+                AddInternal(new Tick(1)
+                {
+                    Anchor = Anchor.CentreRight,
+                    Origin = Anchor.Centre,
+                    Depth = float.MaxValue,
+                    Alpha = 0.05f,
+                    Colour = BindableBeatDivisor.GetColourFor(1, colours),
+                });
+
                 AddInternal(marker = new Marker());
                 CurrentNumber.ValueChanged += moveMarker;
                 CurrentNumber.TriggerChange();
@@ -483,7 +493,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 OnUserChange(Current.Value);
             }
 
-            private float getMappedPosition(float divisor) => MathF.Pow((divisor - 1) / (beatDivisor.ValidDivisors.Value.Presets.Last() - 1), 0.90f);
+            private float getMappedPosition(float divisor) => 1 - 1 / divisor;
 
             private partial class Tick : Circle
             {

From 7d7d402d4e06459e6834db800018d7000b2fa61b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 May 2023 16:58:23 +0900
Subject: [PATCH 0495/1604] Apply NRT to `PlacementBlueprint`

---
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index 12c0ea1807..5eca4f8ccd 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using System.Threading;
 using osu.Framework.Allocation;
@@ -38,16 +36,16 @@ namespace osu.Game.Rulesets.Edit
         /// </summary>
         public readonly HitObject HitObject;
 
-        [Resolved(canBeNull: true)]
-        protected EditorClock EditorClock { get; private set; }
+        [Resolved]
+        protected EditorClock? EditorClock { get; private set; }
 
         [Resolved]
-        private EditorBeatmap beatmap { get; set; }
+        private EditorBeatmap beatmap { get; set; } = null!;
 
-        private Bindable<double> startTimeBindable;
+        private Bindable<double> startTimeBindable = null!;
 
         [Resolved]
-        private IPlacementHandler placementHandler { get; set; }
+        private IPlacementHandler placementHandler { get; set; } = null!;
 
         /// <summary>
         /// Whether this blueprint is currently in a state that can be committed.

From e43f2c2c439bbc5c524606b20ee1bfb651cacb06 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 May 2023 16:58:43 +0900
Subject: [PATCH 0496/1604] Improve previous hitobject lookup efficient and
 correctness

---
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index 5eca4f8ccd..9ef208bcb5 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -44,6 +44,8 @@ namespace osu.Game.Rulesets.Edit
 
         private Bindable<double> startTimeBindable = null!;
 
+        private HitObject? getPreviousHitObject() => beatmap.HitObjects.TakeWhile(h => h.StartTime <= startTimeBindable.Value).LastOrDefault();
+
         [Resolved]
         private IPlacementHandler placementHandler { get; set; } = null!;
 
@@ -84,7 +86,7 @@ namespace osu.Game.Rulesets.Edit
         protected void BeginPlacement(bool commitStart = false)
         {
             // Take the hitnormal sample of the last hit object
-            var lastHitNormal = beatmap.HitObjects.LastOrDefault(h => h.GetEndTime() < HitObject.StartTime)?.Samples?.FirstOrDefault(o => o.Name == HitSampleInfo.HIT_NORMAL);
+            var lastHitNormal = getPreviousHitObject()?.Samples?.FirstOrDefault(o => o.Name == HitSampleInfo.HIT_NORMAL);
             if (lastHitNormal != null)
                 HitObject.Samples[0] = lastHitNormal;
 

From 8d925c8a8a5f06c33bddcf28b543a784a159b71a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 May 2023 17:19:07 +0900
Subject: [PATCH 0497/1604] Move combo information updating to an interface
 level helper method

---
 osu.Game/Beatmaps/BeatmapProcessor.cs         | 27 +++----------------
 .../Objects/Types/IHasComboInformation.cs     | 23 ++++++++++++++--
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapProcessor.cs b/osu.Game/Beatmaps/BeatmapProcessor.cs
index 8f3d0b7445..fb5313469f 100644
--- a/osu.Game/Beatmaps/BeatmapProcessor.cs
+++ b/osu.Game/Beatmaps/BeatmapProcessor.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using osu.Game.Rulesets.Objects.Types;
 
@@ -22,34 +20,17 @@ namespace osu.Game.Beatmaps
 
         public virtual void PreProcess()
         {
-            IHasComboInformation lastObj = null;
-
-            bool isFirst = true;
+            IHasComboInformation? lastObj = null;
 
             foreach (var obj in Beatmap.HitObjects.OfType<IHasComboInformation>())
             {
-                if (isFirst)
+                if (lastObj == null)
                 {
-                    obj.NewCombo = true;
-
                     // first hitobject should always be marked as a new combo for sanity.
-                    isFirst = false;
-                }
-
-                obj.ComboIndex = lastObj?.ComboIndex ?? 0;
-                obj.ComboIndexWithOffsets = lastObj?.ComboIndexWithOffsets ?? 0;
-                obj.IndexInCurrentCombo = (lastObj?.IndexInCurrentCombo + 1) ?? 0;
-
-                if (obj.NewCombo)
-                {
-                    obj.IndexInCurrentCombo = 0;
-                    obj.ComboIndex++;
-                    obj.ComboIndexWithOffsets += obj.ComboOffset + 1;
-
-                    if (lastObj != null)
-                        lastObj.LastInCombo = true;
+                    obj.NewCombo = true;
                 }
 
+                obj.UpdateComboInformation(lastObj);
                 lastObj = obj;
             }
         }
diff --git a/osu.Game/Rulesets/Objects/Types/IHasComboInformation.cs b/osu.Game/Rulesets/Objects/Types/IHasComboInformation.cs
index b45ea989f3..d34e71021f 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasComboInformation.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasComboInformation.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Bindables;
 using osu.Game.Skinning;
 using osuTK.Graphics;
@@ -65,5 +63,26 @@ namespace osu.Game.Rulesets.Objects.Types
         {
             return skin.GetConfig<SkinComboColourLookup, Color4>(new SkinComboColourLookup(comboIndex, combo))?.Value ?? Color4.White;
         }
+
+        /// <summary>
+        /// Given the previous object in the beatmap, update relevant combo information.
+        /// </summary>
+        /// <param name="lastObj">The previous hitobject, or null if this is the first object in the beatmap.</param>
+        void UpdateComboInformation(IHasComboInformation? lastObj)
+        {
+            ComboIndex = lastObj?.ComboIndex ?? 0;
+            ComboIndexWithOffsets = lastObj?.ComboIndexWithOffsets ?? 0;
+            IndexInCurrentCombo = (lastObj?.IndexInCurrentCombo + 1) ?? 0;
+
+            if (NewCombo || lastObj == null)
+            {
+                IndexInCurrentCombo = 0;
+                ComboIndex++;
+                ComboIndexWithOffsets += ComboOffset + 1;
+
+                if (lastObj != null)
+                    lastObj.LastInCombo = true;
+            }
+        }
     }
 }

From 9563d4f73004ad5794e0031f2046fdfd1bd5dda9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 May 2023 17:19:18 +0900
Subject: [PATCH 0498/1604] Fix weird purple tint on placement object in
 timeline

---
 .../Compose/Components/Timeline/TimelineBlueprintContainer.cs   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index f93fb0679f..30f56814ba 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -83,7 +83,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             {
                 placementBlueprint = CreateBlueprintFor(obj.NewValue).AsNonNull();
 
-                placementBlueprint.Colour = Color4.MediumPurple;
+                placementBlueprint.Colour = OsuColour.Gray(0.9f);
 
                 SelectionBlueprints.Add(placementBlueprint);
             }

From 0b25818bd218d0d6388af0a5da2d7a0f0190c68d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 May 2023 17:20:15 +0900
Subject: [PATCH 0499/1604] Update combo information on placement blueprint

---
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index 9ef208bcb5..84e32d99f8 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -14,6 +14,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Input.Bindings;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Compose;
 using osuTK;
@@ -148,7 +149,12 @@ namespace osu.Game.Rulesets.Edit
         public virtual void UpdateTimeAndPosition(SnapResult result)
         {
             if (PlacementActive == PlacementState.Waiting)
+            {
                 HitObject.StartTime = result.Time ?? EditorClock?.CurrentTime ?? Time.Current;
+
+                if (HitObject is IHasComboInformation comboInformation)
+                    comboInformation.UpdateComboInformation(getPreviousHitObject() as IHasComboInformation);
+            }
         }
 
         /// <summary>

From 214d7e07fa1ad2b4016a751b2ee6f495384b6ac5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 May 2023 17:49:04 +0900
Subject: [PATCH 0500/1604] Add TODO regarding failing stack display code

---
 .../Compose/Components/Timeline/TimelineBlueprintContainer.cs    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index 30f56814ba..b60e04afc1 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -85,6 +85,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
                 placementBlueprint.Colour = OsuColour.Gray(0.9f);
 
+                // TODO: this is out of order, causing incorrect stacking height.
                 SelectionBlueprints.Add(placementBlueprint);
             }
         }

From b58ab28765974714537a893a60e5bfff39e71f29 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 May 2023 20:54:17 +0900
Subject: [PATCH 0501/1604] Make `EditorClock` non-nullable in
 `PlacementBlueprint`

---
 .../Edit/Blueprints/Spinners/SpinnerPlacementBlueprint.cs | 8 ++------
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs              | 4 ++--
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerPlacementBlueprint.cs
index 73ee5df9dc..f59be0e0e9 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerPlacementBlueprint.cs
@@ -1,10 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
@@ -24,9 +21,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners
 
         private bool isPlacingEnd;
 
-        [Resolved(CanBeNull = true)]
-        [CanBeNull]
-        private IBeatSnapProvider beatSnapProvider { get; set; }
+        [Resolved]
+        private IBeatSnapProvider? beatSnapProvider { get; set; }
 
         public SpinnerPlacementBlueprint()
             : base(new Spinner { Position = OsuPlayfield.BASE_SIZE / 2 })
diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index 84e32d99f8..b10f1a2af5 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Edit
         public readonly HitObject HitObject;
 
         [Resolved]
-        protected EditorClock? EditorClock { get; private set; }
+        protected EditorClock EditorClock { get; private set; } = null!;
 
         [Resolved]
         private EditorBeatmap beatmap { get; set; } = null!;
@@ -150,7 +150,7 @@ namespace osu.Game.Rulesets.Edit
         {
             if (PlacementActive == PlacementState.Waiting)
             {
-                HitObject.StartTime = result.Time ?? EditorClock?.CurrentTime ?? Time.Current;
+                HitObject.StartTime = result.Time ?? EditorClock.CurrentTime;
 
                 if (HitObject is IHasComboInformation comboInformation)
                     comboInformation.UpdateComboInformation(getPreviousHitObject() as IHasComboInformation);

From 7ac6688a0fd8c57f5d04c846ff0c04e069d61c89 Mon Sep 17 00:00:00 2001
From: Dimmitsaras <dimpapapostolou@windowslive.com>
Date: Wed, 17 May 2023 18:34:39 +0300
Subject: [PATCH 0502/1604] Chat message notifications always play on unfocused
 window

---
 osu.Game/Online/Chat/MessageNotifier.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Chat/MessageNotifier.cs b/osu.Game/Online/Chat/MessageNotifier.cs
index 9b2ad666b2..cb29fc4535 100644
--- a/osu.Game/Online/Chat/MessageNotifier.cs
+++ b/osu.Game/Online/Chat/MessageNotifier.cs
@@ -12,6 +12,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Platform;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Online.API;
@@ -35,6 +36,9 @@ namespace osu.Game.Online.Chat
         [Resolved]
         private ChannelManager channelManager { get; set; }
 
+        [Resolved]
+        private GameHost host { get; set; }
+
         private Bindable<bool> notifyOnUsername;
         private Bindable<bool> notifyOnPrivateMessage;
 
@@ -89,8 +93,8 @@ namespace osu.Game.Online.Chat
             if (channel == null)
                 return;
 
-            // Only send notifications, if ChatOverlay and the target channel aren't visible.
-            if (chatOverlay.IsPresent && channelManager.CurrentChannel.Value == channel)
+            // Only send notifications, if ChatOverlay and the target channel aren't visible, or if the window is unfocused
+            if (chatOverlay.IsPresent && channelManager.CurrentChannel.Value == channel && host.IsActive.Value)
                 return;
 
             foreach (var message in messages.OrderByDescending(m => m.Id))
@@ -99,6 +103,7 @@ namespace osu.Game.Online.Chat
                 if (message.Id <= channel.LastReadId)
                     return;
 
+                // ignore notifications triggered by your own chat messages
                 if (message.Sender.Id == localUser.Value.Id)
                     continue;
 

From caa79704acb69efd92dff2c40dc450988bf0230d Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Wed, 17 May 2023 20:23:37 -0700
Subject: [PATCH 0503/1604] Add test coverage for failing case

---
 .../Resources/storyboard_only_video.osu       | 31 +++++++++++++++++++
 .../Visual/Gameplay/TestSceneStoryboard.cs    | 18 ++++++++++-
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Tests/Resources/storyboard_only_video.osu

diff --git a/osu.Game.Tests/Resources/storyboard_only_video.osu b/osu.Game.Tests/Resources/storyboard_only_video.osu
new file mode 100644
index 0000000000..25f1ff6361
--- /dev/null
+++ b/osu.Game.Tests/Resources/storyboard_only_video.osu
@@ -0,0 +1,31 @@
+osu file format v14
+
+[Events]
+//Background and Video events
+0,0,"BG.jpg",0,0
+Video,0,"video.avi"
+//Break Periods
+//Storyboard Layer 0 (Background)
+//Storyboard Layer 1 (Fail)
+//Storyboard Layer 2 (Pass)
+//Storyboard Layer 3 (Foreground)
+//Storyboard Layer 4 (Overlay)
+//Storyboard Sound Samples
+
+[TimingPoints]
+1674,333.333333333333,4,2,1,70,1,0
+1674,-100,4,2,1,70,0,0
+3340,-100,4,2,1,70,0,0
+3507,-100,4,2,1,70,0,0
+3673,-100,4,2,1,70,0,0
+
+[Colours]
+Combo1 : 240,80,80
+Combo2 : 171,252,203
+Combo3 : 128,128,255
+Combo4 : 249,254,186
+
+[HitObjects]
+148,303,1674,5,6,3:2:0:0:
+378,252,1840,1,0,0:0:0:0:
+389,270,2340,5,2,0:1:0:0:
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs
index dbce62cbef..a6663f3086 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -8,6 +9,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Timing;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.IO;
@@ -42,6 +44,18 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("Load storyboard with missing video", () => loadStoryboard("storyboard_no_video.osu"));
         }
 
+        [Test]
+        public void TestVideoSize()
+        {
+            AddStep("load storyboard with only video", () =>
+            {
+                // LegacyStoryboardDecoder doesn't parse WidescreenStoryboard, so it is set manually
+                loadStoryboard("storyboard_only_video.osu", s => s.BeatmapInfo.WidescreenStoryboard = false);
+            });
+
+            AddAssert("storyboard is correct width", () => Precision.AlmostEquals(storyboard?.Width ?? 0f, 480 * 16 / 9f));
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -102,7 +116,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             decoupledClock.ChangeSource(Beatmap.Value.Track);
         }
 
-        private void loadStoryboard(string filename)
+        private void loadStoryboard(string filename, Action<Storyboard>? setUpStoryboard = null)
         {
             Storyboard loaded;
 
@@ -113,6 +127,8 @@ namespace osu.Game.Tests.Visual.Gameplay
                 loaded = decoder.Decode(bfr);
             }
 
+            setUpStoryboard?.Invoke(loaded);
+
             loadStoryboard(loaded);
         }
     }

From ee522253cb0373b8ca231557e8d56ec2d888945f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 May 2023 14:12:57 +0900
Subject: [PATCH 0504/1604] Remove a couple of unnecessary `volume`
 declarations

---
 osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs | 2 +-
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
index 9a78df23cf..f21825668f 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                     NewCombo = i % 8 == 0,
                     Samples = new List<HitSampleInfo>(new[]
                     {
-                        new HitSampleInfo(HitSampleInfo.HIT_NORMAL, volume: 100)
+                        new HitSampleInfo(HitSampleInfo.HIT_NORMAL)
                     })
                 });
             }
diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index eae9f922a4..919a3cdfdf 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Rulesets.Edit
             HitObject = hitObject;
 
             // adding the default hit sample should be the case regardless of the ruleset.
-            HitObject.Samples.Add(new HitSampleInfo(HitSampleInfo.HIT_NORMAL, volume: 100));
+            HitObject.Samples.Add(new HitSampleInfo(HitSampleInfo.HIT_NORMAL));
 
             RelativeSizeAxes = Axes.Both;
 

From f2483a1cf8c4f91fd8c9374b803e2bd553fe68f4 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 18 May 2023 17:27:47 +0900
Subject: [PATCH 0505/1604] Add some helper methods, fix precision differences

Introduces some error at all times, but if we're to store scores everywhere as
`long`, then the same precision should be applied to the "during
gameplay" path as well.
---
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs | 40 ++++++++++++++++-----
 osu.Game/Scoring/IScoreInfo.cs              |  3 ++
 osu.Game/Scoring/ScoreManager.cs            | 10 +++---
 3 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 9172034ff6..cbcf0dceaf 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -274,20 +274,44 @@ namespace osu.Game.Rulesets.Scoring
         {
             Accuracy.Value = currentMaxBasicScore > 0 ? currentBasicScore / currentMaxBasicScore : 1;
 
-            double standardisedScore = ComputeTotalScore();
+            long standardisedScore = (long)Math.Round(ComputeTotalScore());
 
-            if (Mode.Value == ScoringMode.Standardised)
-                TotalScore.Value = (long)Math.Round(standardisedScore);
-            else
-                TotalScore.Value = ConvertToClassic(standardisedScore);
+            TotalScore.Value = Mode.Value == ScoringMode.Standardised
+                ? standardisedScore
+                : convertToClassic(standardisedScore, MaxBasicJudgements, ClassicScoreMultiplier);
         }
 
-        public long ConvertToClassic(double standardised)
+        /// <summary>
+        /// Retrieves the total score from a <see cref="ScoreInfo"/> in the given scoring mode.
+        /// </summary>
+        /// <param name="mode">The mode to return the total score in.</param>
+        /// <param name="scoreInfo">The score to get the total score of.</param>
+        /// <returns>The total score.</returns>
+        public long ComputeScore(ScoringMode mode, ScoreInfo scoreInfo)
+        {
+            int maxBasicJudgements = scoreInfo.MaximumStatistics.Where(k => k.Key.IsBasic())
+                                              .Select(k => k.Value)
+                                              .DefaultIfEmpty(0)
+                                              .Sum();
+
+            return mode == ScoringMode.Standardised
+                ? scoreInfo.TotalScore
+                : convertToClassic(scoreInfo.TotalScore, maxBasicJudgements, ClassicScoreMultiplier);
+        }
+
+        /// <summary>
+        /// Converts a standardised total score to the classic score.
+        /// </summary>
+        /// <param name="score">The standardised score.</param>
+        /// <param name="maxBasicJudgements">The maximum possible number of basic judgements.</param>
+        /// <param name="classicMultiplier">The classic multiplier.</param>
+        /// <returns>The classic score.</returns>
+        private static long convertToClassic(long score, int maxBasicJudgements, double classicMultiplier)
         {
             // This gives a similar feeling to osu!stable scoring (ScoreV1) while keeping classic scoring as only a constant multiple of standardised scoring.
             // The invariant is important to ensure that scores don't get re-ordered on leaderboards between the two scoring modes.
-            double scaledRawScore = standardised / MAX_SCORE;
-            return (long)Math.Round(Math.Pow(scaledRawScore * Math.Max(1, MaxBasicJudgements), 2) * ClassicScoreMultiplier);
+            double scaledRawScore = score / MAX_SCORE;
+            return (long)Math.Round(Math.Pow(scaledRawScore * Math.Max(1, maxBasicJudgements), 2) * classicMultiplier);
         }
 
         protected abstract double ComputeTotalScore();
diff --git a/osu.Game/Scoring/IScoreInfo.cs b/osu.Game/Scoring/IScoreInfo.cs
index 289679a724..ffc30384d2 100644
--- a/osu.Game/Scoring/IScoreInfo.cs
+++ b/osu.Game/Scoring/IScoreInfo.cs
@@ -15,6 +15,9 @@ namespace osu.Game.Scoring
     {
         IUser User { get; }
 
+        /// <summary>
+        /// The standardised total score.
+        /// </summary>
         long TotalScore { get; }
 
         int MaxCombo { get; }
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 0674947f30..f616c6db6d 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -107,15 +107,13 @@ namespace osu.Game.Scoring
         /// <returns>The total score.</returns>
         public long GetTotalScore([NotNull] ScoreInfo score, ScoringMode mode = ScoringMode.Standardised)
         {
+            // Shortcut to avoid potentially creating many ruleset objects in the default scoring mode.
             if (mode == ScoringMode.Standardised)
                 return score.TotalScore;
 
-            var ruleset = score.Ruleset.CreateInstance();
-            var scoreProcessor = ruleset.CreateScoreProcessor();
-            scoreProcessor.Mods.Value = score.Mods;
-
-            // Todo: This loses precision because we're dealing with pre-rounded total scores.
-            return scoreProcessor.ConvertToClassic(score.TotalScore);
+            return score.Ruleset.CreateInstance()
+                        .CreateScoreProcessor()
+                        .ComputeScore(mode, score);
         }
 
         /// <summary>

From 829e47d30b279ca949b9b2f02d57724a9048e27e Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 18 May 2023 17:47:25 +0900
Subject: [PATCH 0506/1604] Add MaxTotalScore for performance breakdown
 calculator

---
 .../Rulesets/Difficulty/PerformanceBreakdownCalculator.cs  | 6 +++---
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs                | 7 +++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Difficulty/PerformanceBreakdownCalculator.cs b/osu.Game/Rulesets/Difficulty/PerformanceBreakdownCalculator.cs
index 03bd0f7509..3dd7f934a8 100644
--- a/osu.Game/Rulesets/Difficulty/PerformanceBreakdownCalculator.cs
+++ b/osu.Game/Rulesets/Difficulty/PerformanceBreakdownCalculator.cs
@@ -62,13 +62,13 @@ namespace osu.Game.Rulesets.Difficulty
                                                 .GroupBy(hr => hr, (hr, list) => (hitResult: hr, count: list.Count()))
                                                 .ToDictionary(pair => pair.hitResult, pair => pair.count);
                 perfectPlay.Statistics = statistics;
+                perfectPlay.MaximumStatistics = statistics;
 
                 // calculate total score
                 ScoreProcessor scoreProcessor = ruleset.CreateScoreProcessor();
                 scoreProcessor.Mods.Value = perfectPlay.Mods;
-
-                // Todo:
-                // perfectPlay.TotalScore = scoreProcessor.ComputeScore(ScoringMode.Standardised, perfectPlay);
+                scoreProcessor.ApplyBeatmap(playableBeatmap);
+                perfectPlay.TotalScore = scoreProcessor.MaxTotalScore;
 
                 // compute rank achieved
                 // default to SS, then adjust the rank with mods
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index cbcf0dceaf..ebecc39aa7 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -97,6 +97,11 @@ namespace osu.Game.Rulesets.Scoring
         /// </summary>
         public readonly Ruleset Ruleset;
 
+        /// <summary>
+        /// The maximum achievable total score.
+        /// </summary>
+        public long MaxTotalScore { get; private set; }
+
         /// <summary>
         /// The sum of all basic judgements at the current time.
         /// </summary>
@@ -334,6 +339,8 @@ namespace osu.Game.Rulesets.Scoring
 
                 maximumResultCounts.Clear();
                 maximumResultCounts.AddRange(scoreResultCounts);
+
+                MaxTotalScore = TotalScore.Value;
             }
 
             scoreResultCounts.Clear();

From 510b8e4c7887df92574ec0963154082a9ebb8347 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 18 May 2023 18:53:43 +0900
Subject: [PATCH 0507/1604] Remove ScoreManager.Mode, handle per-use

---
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs   | 48 +------------------
 .../Scoring/Legacy/ScoreInfoExtensions.cs     | 45 +++++++++++++++++
 osu.Game/Scoring/ScoreManager.cs              | 12 +----
 .../Play/HUD/GameplayLeaderboardScore.cs      | 18 ++++++-
 .../Screens/Play/HUD/GameplayScoreCounter.cs  |  5 +-
 .../Screens/Play/HUD/ILeaderboardScore.cs     |  4 ++
 .../Play/HUD/SoloGameplayLeaderboard.cs       | 18 ++-----
 osu.Game/Screens/Play/Player.cs               |  3 --
 8 files changed, 77 insertions(+), 76 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index ebecc39aa7..bda2d7140d 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Scoring
 {
     public abstract partial class ScoreProcessor : JudgementProcessor
     {
-        protected const double MAX_SCORE = 1000000;
+        public const double MAX_SCORE = 1000000;
 
         private const double accuracy_cutoff_x = 1;
         private const double accuracy_cutoff_s = 0.95;
@@ -76,11 +76,6 @@ namespace osu.Game.Rulesets.Scoring
         /// </summary>
         public readonly BindableInt HighestCombo = new BindableInt();
 
-        /// <summary>
-        /// The <see cref="ScoringMode"/> used to calculate scores.
-        /// </summary>
-        public readonly Bindable<ScoringMode> Mode = new Bindable<ScoringMode>();
-
         /// <summary>
         /// The <see cref="HitEvent"/>s collected during gameplay thus far.
         /// Intended for use with various statistics displays.
@@ -173,7 +168,6 @@ namespace osu.Game.Rulesets.Scoring
                     Rank.Value = mod.AdjustRank(Rank.Value, accuracy.NewValue);
             };
 
-            Mode.ValueChanged += _ => updateScore();
             Mods.ValueChanged += mods =>
             {
                 ScoreMultiplier = 1;
@@ -278,45 +272,7 @@ namespace osu.Game.Rulesets.Scoring
         private void updateScore()
         {
             Accuracy.Value = currentMaxBasicScore > 0 ? currentBasicScore / currentMaxBasicScore : 1;
-
-            long standardisedScore = (long)Math.Round(ComputeTotalScore());
-
-            TotalScore.Value = Mode.Value == ScoringMode.Standardised
-                ? standardisedScore
-                : convertToClassic(standardisedScore, MaxBasicJudgements, ClassicScoreMultiplier);
-        }
-
-        /// <summary>
-        /// Retrieves the total score from a <see cref="ScoreInfo"/> in the given scoring mode.
-        /// </summary>
-        /// <param name="mode">The mode to return the total score in.</param>
-        /// <param name="scoreInfo">The score to get the total score of.</param>
-        /// <returns>The total score.</returns>
-        public long ComputeScore(ScoringMode mode, ScoreInfo scoreInfo)
-        {
-            int maxBasicJudgements = scoreInfo.MaximumStatistics.Where(k => k.Key.IsBasic())
-                                              .Select(k => k.Value)
-                                              .DefaultIfEmpty(0)
-                                              .Sum();
-
-            return mode == ScoringMode.Standardised
-                ? scoreInfo.TotalScore
-                : convertToClassic(scoreInfo.TotalScore, maxBasicJudgements, ClassicScoreMultiplier);
-        }
-
-        /// <summary>
-        /// Converts a standardised total score to the classic score.
-        /// </summary>
-        /// <param name="score">The standardised score.</param>
-        /// <param name="maxBasicJudgements">The maximum possible number of basic judgements.</param>
-        /// <param name="classicMultiplier">The classic multiplier.</param>
-        /// <returns>The classic score.</returns>
-        private static long convertToClassic(long score, int maxBasicJudgements, double classicMultiplier)
-        {
-            // This gives a similar feeling to osu!stable scoring (ScoreV1) while keeping classic scoring as only a constant multiple of standardised scoring.
-            // The invariant is important to ensure that scores don't get re-ordered on leaderboards between the two scoring modes.
-            double scaledRawScore = score / MAX_SCORE;
-            return (long)Math.Round(Math.Pow(scaledRawScore * Math.Max(1, maxBasicJudgements), 2) * classicMultiplier);
+            TotalScore.Value = (long)Math.Round(ComputeTotalScore());
         }
 
         protected abstract double ComputeTotalScore();
diff --git a/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs b/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
index e42f6caf26..af991c7ea3 100644
--- a/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
+++ b/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
@@ -3,13 +3,58 @@
 
 #nullable disable
 
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Scoring.Legacy
 {
     public static class ScoreInfoExtensions
     {
+        public static long GetDisplayScore(this ScoreProcessor scoreProcessor, ScoringMode mode)
+            => getDisplayScore(scoreProcessor.Ruleset.RulesetInfo.OnlineID, scoreProcessor.TotalScore.Value, mode, scoreProcessor.MaximumStatistics);
+
+        public static long GetDisplayScore(this ScoreInfo scoreInfo, ScoringMode mode)
+            => getDisplayScore(scoreInfo.Ruleset.OnlineID, scoreInfo.TotalScore, mode, scoreInfo.MaximumStatistics);
+
+        private static long getDisplayScore(int rulesetId, long score, ScoringMode mode, IReadOnlyDictionary<HitResult, int> maximumStatistics)
+        {
+            if (mode == ScoringMode.Standardised)
+                return score;
+
+            double multiplier;
+
+            switch (rulesetId)
+            {
+                case 0:
+                    multiplier = 36;
+                    break;
+
+                case 1:
+                    multiplier = 22;
+                    break;
+
+                case 2:
+                    multiplier = 28;
+                    break;
+
+                case 3:
+                    multiplier = 16;
+                    break;
+
+                default:
+                    return score;
+            }
+
+            int maxBasicJudgements = maximumStatistics.Where(k => k.Key.IsBasic()).Select(k => k.Value).DefaultIfEmpty(0).Sum();
+
+            // This gives a similar feeling to osu!stable scoring (ScoreV1) while keeping classic scoring as only a constant multiple of standardised scoring.
+            // The invariant is important to ensure that scores don't get re-ordered on leaderboards between the two scoring modes.
+            double scaledRawScore = score / ScoreProcessor.MAX_SCORE;
+            return (long)Math.Round(Math.Pow(scaledRawScore * Math.Max(1, maxBasicJudgements), 2) * multiplier);
+        }
+
         public static int? GetCountGeki(this ScoreInfo scoreInfo)
         {
             switch (scoreInfo.Ruleset.OnlineID)
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index f616c6db6d..fa5a9fc7c1 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -20,6 +20,7 @@ using osu.Game.Overlays.Notifications;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Online.API;
+using osu.Game.Scoring.Legacy;
 
 namespace osu.Game.Scoring
 {
@@ -105,16 +106,7 @@ namespace osu.Game.Scoring
         /// <param name="score">The <see cref="ScoreInfo"/> to calculate the total score of.</param>
         /// <param name="mode">The <see cref="ScoringMode"/> to return the total score as.</param>
         /// <returns>The total score.</returns>
-        public long GetTotalScore([NotNull] ScoreInfo score, ScoringMode mode = ScoringMode.Standardised)
-        {
-            // Shortcut to avoid potentially creating many ruleset objects in the default scoring mode.
-            if (mode == ScoringMode.Standardised)
-                return score.TotalScore;
-
-            return score.Ruleset.CreateInstance()
-                        .CreateScoreProcessor()
-                        .ComputeScore(mode, score);
-        }
+        public long GetTotalScore([NotNull] ScoreInfo score, ScoringMode mode = ScoringMode.Standardised) => score.GetDisplayScore(mode);
 
         /// <summary>
         /// Retrieves the maximum achievable combo for the provided score.
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 07b80feb3e..74a3925435 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -11,8 +11,10 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Users;
 using osu.Game.Users.Drawables;
 using osu.Game.Utils;
@@ -55,6 +57,7 @@ namespace osu.Game.Screens.Play.HUD
         public BindableInt Combo { get; } = new BindableInt();
         public BindableBool HasQuit { get; } = new BindableBool();
         public Bindable<long> DisplayOrder { get; } = new Bindable<long>();
+        public Func<ScoringMode, long> GetDisplayScore { get; set; }
 
         public Color4? BackgroundColour { get; set; }
 
@@ -100,6 +103,8 @@ namespace osu.Game.Screens.Play.HUD
 
         private Container scoreComponents;
 
+        private IBindable<ScoringMode> scoreDisplayMode;
+
         /// <summary>
         /// Creates a new <see cref="GameplayLeaderboardScore"/>.
         /// </summary>
@@ -112,10 +117,12 @@ namespace osu.Game.Screens.Play.HUD
 
             AutoSizeAxes = Axes.X;
             Height = PANEL_HEIGHT;
+
+            GetDisplayScore = _ => TotalScore.Value;
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OsuColour colours, OsuConfigManager osuConfigManager)
         {
             Container avatarContainer;
 
@@ -286,7 +293,9 @@ namespace osu.Game.Screens.Play.HUD
 
             LoadComponentAsync(new DrawableAvatar(User), avatarContainer.Add);
 
-            TotalScore.BindValueChanged(v => scoreText.Text = v.NewValue.ToString("N0"), true);
+            scoreDisplayMode = osuConfigManager.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode);
+            scoreDisplayMode.BindValueChanged(_ => updateScore());
+            TotalScore.BindValueChanged(_ => updateScore(), true);
 
             Accuracy.BindValueChanged(v =>
             {
@@ -303,6 +312,11 @@ namespace osu.Game.Screens.Play.HUD
             HasQuit.BindValueChanged(_ => updateState());
         }
 
+        private void updateScore()
+        {
+            scoreText.Text = GetDisplayScore(scoreDisplayMode.Value).ToString("N0");
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
diff --git a/osu.Game/Screens/Play/HUD/GameplayScoreCounter.cs b/osu.Game/Screens/Play/HUD/GameplayScoreCounter.cs
index a11cccd97c..a696d2cad7 100644
--- a/osu.Game/Screens/Play/HUD/GameplayScoreCounter.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayScoreCounter.cs
@@ -9,12 +9,14 @@ using osu.Framework.Bindables;
 using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring.Legacy;
 
 namespace osu.Game.Screens.Play.HUD
 {
     public abstract partial class GameplayScoreCounter : ScoreCounter
     {
         private Bindable<ScoringMode> scoreDisplayMode;
+        private Bindable<long> totalScoreBindable;
 
         protected GameplayScoreCounter()
             : base(6)
@@ -42,7 +44,8 @@ namespace osu.Game.Screens.Play.HUD
                 }
             }, true);
 
-            Current.BindTo(scoreProcessor.TotalScore);
+            totalScoreBindable = scoreProcessor.TotalScore.GetBoundCopy();
+            totalScoreBindable.BindValueChanged(_ => Current.Value = scoreProcessor.GetDisplayScore(scoreDisplayMode.Value), true);
         }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/ILeaderboardScore.cs b/osu.Game/Screens/Play/HUD/ILeaderboardScore.cs
index 428390f90c..cc1d83e0c7 100644
--- a/osu.Game/Screens/Play/HUD/ILeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/ILeaderboardScore.cs
@@ -3,7 +3,9 @@
 
 #nullable disable
 
+using System;
 using osu.Framework.Bindables;
+using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Screens.Play.HUD
 {
@@ -20,5 +22,7 @@ namespace osu.Game.Screens.Play.HUD
         /// Lower numbers will appear higher in cases of <see cref="TotalScore"/> ties.
         /// </summary>
         Bindable<long> DisplayOrder { get; }
+
+        Func<ScoringMode, long> GetDisplayScore { get; set; }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs
index 9f92880919..e9bb1d2101 100644
--- a/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -10,6 +9,7 @@ using osu.Game.Configuration;
 using osu.Game.Online.API.Requests;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
+using osu.Game.Scoring.Legacy;
 using osu.Game.Screens.Select;
 using osu.Game.Users;
 
@@ -27,15 +27,9 @@ namespace osu.Game.Screens.Play.HUD
 
         public readonly IBindableList<ScoreInfo> Scores = new BindableList<ScoreInfo>();
 
-        // hold references to ensure bindables are updated.
-        private readonly List<Bindable<long>> scoreBindables = new List<Bindable<long>>();
-
         [Resolved]
         private ScoreProcessor scoreProcessor { get; set; } = null!;
 
-        [Resolved]
-        private ScoreManager scoreManager { get; set; } = null!;
-
         /// <summary>
         /// Whether the leaderboard should be visible regardless of the configuration value.
         /// This is true by default, but can be changed.
@@ -70,7 +64,6 @@ namespace osu.Game.Screens.Play.HUD
         private void showScores()
         {
             Clear();
-            scoreBindables.Clear();
 
             if (!Scores.Any())
                 return;
@@ -79,12 +72,8 @@ namespace osu.Game.Screens.Play.HUD
             {
                 var score = Add(s.User, false);
 
-                var bindableTotal = scoreManager.GetBindableTotalScore(s);
-
-                // Direct binding not possible due to differing types (see https://github.com/ppy/osu/issues/20298).
-                bindableTotal.BindValueChanged(total => score.TotalScore.Value = total.NewValue, true);
-                scoreBindables.Add(bindableTotal);
-
+                score.GetDisplayScore = s.GetDisplayScore;
+                score.TotalScore.Value = s.TotalScore;
                 score.Accuracy.Value = s.Accuracy;
                 score.Combo.Value = s.MaxCombo;
                 score.DisplayOrder.Value = s.OnlineID > 0 ? s.OnlineID : s.Date.ToUnixTimeSeconds();
@@ -92,6 +81,7 @@ namespace osu.Game.Screens.Play.HUD
 
             ILeaderboardScore local = Add(trackingUser, true);
 
+            local.GetDisplayScore = scoreProcessor.GetDisplayScore;
             local.TotalScore.BindTarget = scoreProcessor.TotalScore;
             local.Accuracy.BindTarget = scoreProcessor.Accuracy;
             local.Combo.BindTarget = scoreProcessor.HighestCombo;
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 5174adfc06..18ea9d0acb 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -237,9 +237,6 @@ namespace osu.Game.Screens.Play
 
             dependencies.CacheAs(HealthProcessor);
 
-            if (!ScoreProcessor.Mode.Disabled)
-                config.BindWith(OsuSetting.ScoreDisplayMode, ScoreProcessor.Mode);
-
             InternalChild = GameplayClockContainer = CreateGameplayClockContainer(Beatmap.Value, DrawableRuleset.GameplayStartTime);
 
             AddInternal(screenSuspension = new ScreenSuspensionHandler(GameplayClockContainer));

From f3591f83a2d831a737f094afed372c365c3a40a5 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 18 May 2023 18:55:10 +0900
Subject: [PATCH 0508/1604] Remove ScoreManager.GetTotalScore()

---
 osu.Game/Scoring/ScoreManager.cs           | 17 ++++-------------
 osu.Game/Screens/Ranking/ScorePanelList.cs |  2 +-
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index fa5a9fc7c1..d5509538fd 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Scoring
         /// <param name="scores">The array of <see cref="ScoreInfo"/>s to reorder.</param>
         /// <returns>The given <paramref name="scores"/> ordered by decreasing total score.</returns>
         public IEnumerable<ScoreInfo> OrderByTotalScore(IEnumerable<ScoreInfo> scores)
-            => scores.OrderByDescending(s => GetTotalScore(s))
+            => scores.OrderByDescending(s => s.TotalScore)
                      .ThenBy(s => s.OnlineID)
                      // Local scores may not have an online ID. Fall back to date in these cases.
                      .ThenBy(s => s.Date);
@@ -88,7 +88,7 @@ namespace osu.Game.Scoring
         /// </remarks>
         /// <param name="score">The <see cref="ScoreInfo"/> to retrieve the bindable for.</param>
         /// <returns>The bindable containing the total score.</returns>
-        public Bindable<long> GetBindableTotalScore([NotNull] ScoreInfo score) => new TotalScoreBindable(score, this, configManager);
+        public Bindable<long> GetBindableTotalScore([NotNull] ScoreInfo score) => new TotalScoreBindable(score, configManager);
 
         /// <summary>
         /// Retrieves a bindable that represents the formatted total score string of a <see cref="ScoreInfo"/>.
@@ -100,14 +100,6 @@ namespace osu.Game.Scoring
         /// <returns>The bindable containing the formatted total score string.</returns>
         public Bindable<string> GetBindableTotalScoreString([NotNull] ScoreInfo score) => new TotalScoreStringBindable(GetBindableTotalScore(score));
 
-        /// <summary>
-        /// Retrieves the total score of a <see cref="ScoreInfo"/> in the given <see cref="ScoringMode"/>.
-        /// </summary>
-        /// <param name="score">The <see cref="ScoreInfo"/> to calculate the total score of.</param>
-        /// <param name="mode">The <see cref="ScoringMode"/> to return the total score as.</param>
-        /// <returns>The total score.</returns>
-        public long GetTotalScore([NotNull] ScoreInfo score, ScoringMode mode = ScoringMode.Standardised) => score.GetDisplayScore(mode);
-
         /// <summary>
         /// Retrieves the maximum achievable combo for the provided score.
         /// </summary>
@@ -126,12 +118,11 @@ namespace osu.Game.Scoring
             /// Creates a new <see cref="TotalScoreBindable"/>.
             /// </summary>
             /// <param name="score">The <see cref="ScoreInfo"/> to provide the total score of.</param>
-            /// <param name="scoreManager">The <see cref="ScoreManager"/>.</param>
             /// <param name="configManager">The config.</param>
-            public TotalScoreBindable(ScoreInfo score, ScoreManager scoreManager, OsuConfigManager configManager)
+            public TotalScoreBindable(ScoreInfo score, OsuConfigManager configManager)
             {
                 configManager?.BindWith(OsuSetting.ScoreDisplayMode, scoringMode);
-                scoringMode.BindValueChanged(mode => Value = scoreManager.GetTotalScore(score, mode.NewValue), true);
+                scoringMode.BindValueChanged(mode => Value = score.GetDisplayScore(mode.NewValue), true);
             }
         }
 
diff --git a/osu.Game/Screens/Ranking/ScorePanelList.cs b/osu.Game/Screens/Ranking/ScorePanelList.cs
index 29dec42083..1f93389e94 100644
--- a/osu.Game/Screens/Ranking/ScorePanelList.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelList.cs
@@ -149,7 +149,7 @@ namespace osu.Game.Screens.Ranking
 
             var score = trackingContainer.Panel.Score;
 
-            flow.SetLayoutPosition(trackingContainer, scoreManager.GetTotalScore(score));
+            flow.SetLayoutPosition(trackingContainer, score.TotalScore);
 
             trackingContainer.Show();
 

From 808818768bf46710191b7071f67f512078cddd2e Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 18 May 2023 19:02:49 +0900
Subject: [PATCH 0509/1604] Add TotalScore to replay frame headers

---
 osu.Game/Online/Spectator/FrameHeader.cs             | 10 +++++++++-
 osu.Game/Online/Spectator/SpectatorScoreProcessor.cs |  4 +---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/Spectator/FrameHeader.cs b/osu.Game/Online/Spectator/FrameHeader.cs
index b6dcd8aaa5..4d1ff23530 100644
--- a/osu.Game/Online/Spectator/FrameHeader.cs
+++ b/osu.Game/Online/Spectator/FrameHeader.cs
@@ -44,6 +44,12 @@ namespace osu.Game.Online.Spectator
         [Key(4)]
         public DateTimeOffset ReceivedTime { get; set; }
 
+        /// <summary>
+        /// The total score.
+        /// </summary>
+        [Key(5)]
+        public long TotalScore { get; set; }
+
         /// <summary>
         /// Construct header summary information from a point-in-time reference to a score which is actively being played.
         /// </summary>
@@ -53,6 +59,7 @@ namespace osu.Game.Online.Spectator
             Combo = score.Combo;
             MaxCombo = score.MaxCombo;
             Accuracy = score.Accuracy;
+            TotalScore = score.TotalScore;
 
             // copy for safety
             Statistics = new Dictionary<HitResult, int>(score.Statistics);
@@ -60,13 +67,14 @@ namespace osu.Game.Online.Spectator
 
         [JsonConstructor]
         [SerializationConstructor]
-        public FrameHeader(double accuracy, int combo, int maxCombo, Dictionary<HitResult, int> statistics, DateTimeOffset receivedTime)
+        public FrameHeader(double accuracy, int combo, int maxCombo, Dictionary<HitResult, int> statistics, DateTimeOffset receivedTime, long totalScore)
         {
             Combo = combo;
             MaxCombo = maxCombo;
             Accuracy = accuracy;
             Statistics = statistics;
             ReceivedTime = receivedTime;
+            TotalScore = totalScore;
         }
     }
 }
diff --git a/osu.Game/Online/Spectator/SpectatorScoreProcessor.cs b/osu.Game/Online/Spectator/SpectatorScoreProcessor.cs
index cb23164c00..90b584a89f 100644
--- a/osu.Game/Online/Spectator/SpectatorScoreProcessor.cs
+++ b/osu.Game/Online/Spectator/SpectatorScoreProcessor.cs
@@ -153,12 +153,10 @@ namespace osu.Game.Online.Spectator
             scoreInfo.MaxCombo = frame.Header.MaxCombo;
             scoreInfo.Statistics = frame.Header.Statistics;
             scoreInfo.MaximumStatistics = spectatorState.MaximumStatistics;
+            scoreInfo.TotalScore = frame.Header.TotalScore;
 
             Accuracy.Value = frame.Header.Accuracy;
             Combo.Value = frame.Header.Combo;
-
-            // Todo:
-            // TotalScore.Value = scoreProcessor.ComputeScore(Mode.Value, scoreInfo);
         }
 
         protected override void Dispose(bool isDisposing)

From c33e4fe75ea22c129bfbae9a5df268d8036a1ddb Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 18 May 2023 20:10:28 +0900
Subject: [PATCH 0510/1604] Remove unnecessary override

---
 .../Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs    | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
index 7b77785c7a..b0e4585986 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
@@ -6,14 +6,12 @@
 using System;
 using System.Diagnostics;
 using System.Linq;
-using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Screens;
 using osu.Game.Extensions;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
-using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking;
@@ -63,14 +61,6 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
             return new PlaylistsResultsScreen(score, Room.RoomID.Value.Value, PlaylistItem, true);
         }
 
-        protected override async Task PrepareScoreForResultsAsync(Score score)
-        {
-            await base.PrepareScoreForResultsAsync(score).ConfigureAwait(false);
-
-            // Todo:
-            // Score.ScoreInfo.TotalScore = ScoreProcessor.ComputeScore(ScoringMode.Standardised, Score.ScoreInfo);
-        }
-
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);

From ef86be6d21c56a3350bc0969705a91074d7b112d Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 18 May 2023 20:29:26 +0900
Subject: [PATCH 0511/1604] Fix base score added for non-accuracy-affecting
 objects

---
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs | 44 ++++++++++++++-------
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index bda2d7140d..1162b6ac04 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -98,14 +98,20 @@ namespace osu.Game.Rulesets.Scoring
         public long MaxTotalScore { get; private set; }
 
         /// <summary>
-        /// The sum of all basic judgements at the current time.
+        /// The sum of all accuracy-affecting judgements at the current time.
         /// </summary>
-        private double currentBasicScore;
+        /// <remarks>
+        /// Used to compute accuracy.
+        /// </remarks>
+        private double currentBaseScore;
 
         /// <summary>
-        /// The maximum sum of basic judgements at the current time.
+        /// The maximum sum of accuracy-affecting judgements at the current time.
         /// </summary>
-        private double currentMaxBasicScore;
+        /// <remarks>
+        /// Used to compute accuracy.
+        /// </remarks>
+        private double currentMaxBaseScore;
 
         /// <summary>
         /// The total count of basic judgements in the beatmap.
@@ -206,8 +212,11 @@ namespace osu.Game.Rulesets.Scoring
             if (result.Type.IsBasic())
                 CurrentBasicJudgements++;
 
-            currentMaxBasicScore += Judgement.ToNumericResult(result.Judgement.MaxResult);
-            currentBasicScore += Judgement.ToNumericResult(result.Type);
+            if (result.Type.AffectsAccuracy())
+            {
+                currentMaxBaseScore += Judgement.ToNumericResult(result.Judgement.MaxResult);
+                currentBaseScore += Judgement.ToNumericResult(result.Type);
+            }
 
             AddScoreChange(result);
 
@@ -241,8 +250,11 @@ namespace osu.Game.Rulesets.Scoring
             if (result.Type.IsBasic())
                 CurrentBasicJudgements--;
 
-            currentMaxBasicScore -= Judgement.ToNumericResult(result.Judgement.MaxResult);
-            currentBasicScore -= Judgement.ToNumericResult(result.Type);
+            if (result.Type.AffectsAccuracy())
+            {
+                currentMaxBaseScore -= Judgement.ToNumericResult(result.Judgement.MaxResult);
+                currentBaseScore -= Judgement.ToNumericResult(result.Type);
+            }
 
             RemoveScoreChange(result);
 
@@ -257,7 +269,8 @@ namespace osu.Game.Rulesets.Scoring
         {
             if (result.Type.IsBonus())
                 BonusPortion += Judgement.ToNumericResult(result.Type);
-            else
+
+            if (result.Type.AffectsCombo())
                 ComboPortion += Judgement.ToNumericResult(result.Type) * (1 + result.ComboAtJudgement / 10d);
         }
 
@@ -265,13 +278,14 @@ namespace osu.Game.Rulesets.Scoring
         {
             if (result.Type.IsBonus())
                 BonusPortion -= Judgement.ToNumericResult(result.Type);
-            else
+
+            if (result.Type.AffectsCombo())
                 ComboPortion -= Judgement.ToNumericResult(result.Type) * (1 + result.ComboAtJudgement / 10d);
         }
 
         private void updateScore()
         {
-            Accuracy.Value = currentMaxBasicScore > 0 ? currentBasicScore / currentMaxBasicScore : 1;
+            Accuracy.Value = currentMaxBaseScore > 0 ? currentBaseScore / currentMaxBaseScore : 1;
             TotalScore.Value = (long)Math.Round(ComputeTotalScore());
         }
 
@@ -301,8 +315,8 @@ namespace osu.Game.Rulesets.Scoring
 
             scoreResultCounts.Clear();
 
-            currentBasicScore = 0;
-            currentMaxBasicScore = 0;
+            currentBaseScore = 0;
+            currentMaxBaseScore = 0;
             CurrentBasicJudgements = 0;
             ComboPortion = 0;
             BonusPortion = 0;
@@ -314,8 +328,8 @@ namespace osu.Game.Rulesets.Scoring
             Rank.Value = ScoreRank.X;
             HighestCombo.Value = 0;
 
-            currentBasicScore = 0;
-            currentMaxBasicScore = 0;
+            currentBaseScore = 0;
+            currentMaxBaseScore = 0;
         }
 
         /// <summary>

From 00e0411369a14e724705fcc35f2088832aa91bcb Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 18 May 2023 20:37:13 +0900
Subject: [PATCH 0512/1604] Fix/rework ModAccuracyChallenge calculation

---
 .../Rulesets/Mods/ModAccuracyChallenge.cs     | 37 +++++++++++++------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModAccuracyChallenge.cs b/osu.Game/Rulesets/Mods/ModAccuracyChallenge.cs
index 13b8ad5d84..57284b7eaa 100644
--- a/osu.Game/Rulesets/Mods/ModAccuracyChallenge.cs
+++ b/osu.Game/Rulesets/Mods/ModAccuracyChallenge.cs
@@ -42,9 +42,29 @@ namespace osu.Game.Rulesets.Mods
             Value = 0.9,
         };
 
-        private ScoreProcessor scoreProcessor = null!;
+        private int baseScore;
+        private int maxBaseScore;
 
-        public void ApplyToScoreProcessor(ScoreProcessor scoreProcessor) => this.scoreProcessor = scoreProcessor;
+        public void ApplyToScoreProcessor(ScoreProcessor scoreProcessor)
+        {
+            scoreProcessor.NewJudgement += j =>
+            {
+                if (!j.Type.AffectsAccuracy())
+                    return;
+
+                baseScore += Judgement.ToNumericResult(j.Type);
+                maxBaseScore += Judgement.ToNumericResult(j.Judgement.MaxResult);
+            };
+
+            scoreProcessor.JudgementReverted += j =>
+            {
+                if (!j.Type.AffectsAccuracy())
+                    return;
+
+                baseScore -= Judgement.ToNumericResult(j.Type);
+                maxBaseScore -= Judgement.ToNumericResult(j.Judgement.MaxResult);
+            };
+        }
 
         public ScoreRank AdjustRank(ScoreRank rank, double accuracy) => rank;
 
@@ -58,16 +78,11 @@ namespace osu.Game.Rulesets.Mods
 
         private double getAccuracyWithImminentResultAdded(JudgementResult result)
         {
-            var score = new ScoreInfo { Ruleset = scoreProcessor.Ruleset.RulesetInfo };
+            // baseScore and maxBaseScore are always exactly one judgement behind because the health processor is processed first (see: Player).
+            int imminentBaseScore = baseScore + Judgement.ToNumericResult(result.Type);
+            int imminentMaxBaseScore = maxBaseScore + Judgement.ToNumericResult(result.Judgement.MaxResult);
 
-            // This is super ugly, but if we don't do it this way we will not have the most recent result added to the accuracy value.
-            // Hopefully we can improve this in the future.
-            scoreProcessor.PopulateScore(score);
-            score.Statistics[result.Type]++;
-
-            // Todo:
-            return 0;
-            // return scoreProcessor.ComputeAccuracy(score);
+            return imminentMaxBaseScore > 0 ? imminentBaseScore / (double)imminentMaxBaseScore : 1;
         }
     }
 }

From 8b56a3f87d568dfd2c9fdf63b8bd534181b18d2f Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 18 May 2023 20:52:40 +0900
Subject: [PATCH 0513/1604] Remove ClassicScoreMultiplier and
 DefaultScoreProcessor

---
 osu.Game.Rulesets.Catch/CatchRuleset.cs       |  2 +-
 .../Scoring/CatchScoreProcessor.cs            |  8 +++----
 osu.Game.Rulesets.Mania/ManiaRuleset.cs       |  2 +-
 .../Scoring/ManiaScoreProcessor.cs            |  8 +++----
 osu.Game.Rulesets.Osu/OsuRuleset.cs           |  2 +-
 .../Scoring/OsuScoreProcessor.cs              |  8 +++----
 .../Scoring/TaikoScoreProcessor.cs            |  8 +++----
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs       |  2 +-
 osu.Game/Rulesets/Ruleset.cs                  | 21 +------------------
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs   | 20 +++++++++++-------
 10 files changed, 29 insertions(+), 52 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index e2255fa6f7..8a0b8250d5 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Catch
     {
         public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod>? mods = null) => new DrawableCatchRuleset(this, beatmap, mods);
 
-        public override ScoreProcessor CreateScoreProcessor() => new CatchScoreProcessor(this);
+        public override ScoreProcessor CreateScoreProcessor() => new CatchScoreProcessor();
 
         public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => new CatchBeatmapConverter(beatmap, this);
 
diff --git a/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs b/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
index 9c5359ebeb..435b39150b 100644
--- a/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -13,15 +13,13 @@ namespace osu.Game.Rulesets.Catch.Scoring
         private const int combo_cap = 200;
         private const double combo_base = 4;
 
-        protected override double ClassicScoreMultiplier => 28;
-
         private double tinyDropletScale;
 
         private int maximumTinyDroplets;
         private int hitTinyDroplets;
 
-        public CatchScoreProcessor(Ruleset ruleset)
-            : base(ruleset)
+        public CatchScoreProcessor()
+            : base(new CatchRuleset())
         {
         }
 
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index c6065c9b96..d324682989 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Rulesets.Mania
 
         public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod>? mods = null) => new DrawableManiaRuleset(this, beatmap, mods);
 
-        public override ScoreProcessor CreateScoreProcessor() => new ManiaScoreProcessor(this);
+        public override ScoreProcessor CreateScoreProcessor() => new ManiaScoreProcessor();
 
         public override HealthProcessor CreateHealthProcessor(double drainStartTime) => new ManiaHealthProcessor(drainStartTime);
 
diff --git a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
index 19f8a4a639..1c55f9ffce 100644
--- a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
+++ b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -11,10 +11,8 @@ namespace osu.Game.Rulesets.Mania.Scoring
     {
         private const double combo_base = 4;
 
-        protected override double ClassicScoreMultiplier => 16;
-
-        public ManiaScoreProcessor(Ruleset ruleset)
-            : base(ruleset)
+        public ManiaScoreProcessor()
+            : base(new ManiaRuleset())
         {
         }
 
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 497d405436..922594a93a 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Rulesets.Osu
     {
         public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod>? mods = null) => new DrawableOsuRuleset(this, beatmap, mods);
 
-        public override ScoreProcessor CreateScoreProcessor() => new OsuScoreProcessor(this);
+        public override ScoreProcessor CreateScoreProcessor() => new OsuScoreProcessor();
 
         public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => new OsuBeatmapConverter(beatmap, this);
 
diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
index f8cbf1a641..d4677d92c1 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -8,10 +8,8 @@ namespace osu.Game.Rulesets.Osu.Scoring
 {
     public partial class OsuScoreProcessor : ScoreProcessor
     {
-        protected override double ClassicScoreMultiplier => 36;
-
-        public OsuScoreProcessor(Ruleset ruleset)
-            : base(ruleset)
+        public OsuScoreProcessor()
+            : base(new OsuRuleset())
         {
         }
 
diff --git a/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs b/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
index 71eb0b1602..e2b442739b 100644
--- a/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
+++ b/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -12,10 +12,8 @@ namespace osu.Game.Rulesets.Taiko.Scoring
     {
         private const double combo_base = 4;
 
-        protected override double ClassicScoreMultiplier => 22;
-
-        public TaikoScoreProcessor(Ruleset ruleset)
-            : base(ruleset)
+        public TaikoScoreProcessor()
+            : base(new TaikoRuleset())
         {
         }
 
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 599d0dc33c..a35fdb890d 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Taiko
     {
         public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod>? mods = null) => new DrawableTaikoRuleset(this, beatmap, mods);
 
-        public override ScoreProcessor CreateScoreProcessor() => new TaikoScoreProcessor(this);
+        public override ScoreProcessor CreateScoreProcessor() => new TaikoScoreProcessor();
 
         public override HealthProcessor CreateHealthProcessor(double drainStartTime) => new TaikoHealthProcessor();
 
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index 2e7a58b96c..a77068eb14 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -232,7 +232,7 @@ namespace osu.Game.Rulesets
         /// Creates a <see cref="ScoreProcessor"/> for this <see cref="Ruleset"/>.
         /// </summary>
         /// <returns>The score processor.</returns>
-        public virtual ScoreProcessor CreateScoreProcessor() => new DefaultScoreProcessor(this);
+        public virtual ScoreProcessor CreateScoreProcessor() => new ScoreProcessor(this);
 
         /// <summary>
         /// Creates a <see cref="HealthProcessor"/> for this <see cref="Ruleset"/>.
@@ -381,23 +381,4 @@ namespace osu.Game.Rulesets
         /// </summary>
         public virtual RulesetSetupSection? CreateEditorSetupSection() => null;
     }
-
-    public partial class DefaultScoreProcessor : ScoreProcessor
-    {
-        public DefaultScoreProcessor(Ruleset ruleset)
-            : base(ruleset)
-        {
-        }
-
-        protected override double ComputeTotalScore()
-        {
-            return
-                (int)Math.Round
-                ((
-                    700000 * ComboPortion / MaxComboPortion +
-                    300000 * Math.Pow(Accuracy.Value, 10) * ((double)CurrentBasicJudgements / MaxBasicJudgements) +
-                    BonusPortion
-                ) * ScoreMultiplier);
-        }
-    }
 }
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 1162b6ac04..4ded3d5d91 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -18,7 +18,7 @@ using osu.Game.Scoring;
 
 namespace osu.Game.Rulesets.Scoring
 {
-    public abstract partial class ScoreProcessor : JudgementProcessor
+    public partial class ScoreProcessor : JudgementProcessor
     {
         public const double MAX_SCORE = 1000000;
 
@@ -82,11 +82,6 @@ namespace osu.Game.Rulesets.Scoring
         /// </summary>
         public IReadOnlyList<HitEvent> HitEvents => hitEvents;
 
-        /// <summary>
-        /// An arbitrary multiplier to scale scores in the <see cref="ScoringMode.Classic"/> scoring mode.
-        /// </summary>
-        protected virtual double ClassicScoreMultiplier => 36;
-
         /// <summary>
         /// The ruleset this score processor is valid for.
         /// </summary>
@@ -162,7 +157,7 @@ namespace osu.Game.Rulesets.Scoring
         private readonly List<HitEvent> hitEvents = new List<HitEvent>();
         private HitObject? lastHitObject;
 
-        protected ScoreProcessor(Ruleset ruleset)
+        public ScoreProcessor(Ruleset ruleset)
         {
             Ruleset = ruleset;
 
@@ -289,7 +284,16 @@ namespace osu.Game.Rulesets.Scoring
             TotalScore.Value = (long)Math.Round(ComputeTotalScore());
         }
 
-        protected abstract double ComputeTotalScore();
+        protected virtual double ComputeTotalScore()
+        {
+            return
+                (int)Math.Round
+                ((
+                    700000 * ComboPortion / MaxComboPortion +
+                    300000 * Math.Pow(Accuracy.Value, 10) * ((double)CurrentBasicJudgements / MaxBasicJudgements) +
+                    BonusPortion
+                ) * ScoreMultiplier);
+        }
 
         /// <summary>
         /// Resets this ScoreProcessor to a default state.

From 035d0d5c9ce27d79d84ffee0b24b89064699b538 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 19 May 2023 13:16:57 +0900
Subject: [PATCH 0514/1604] Fix multiplayer leaderboard not working

---
 .../Spectator/SpectatorScoreProcessor.cs      | 25 ++++++++++---------
 .../HUD/MultiplayerGameplayLeaderboard.cs     |  1 +
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Online/Spectator/SpectatorScoreProcessor.cs b/osu.Game/Online/Spectator/SpectatorScoreProcessor.cs
index 90b584a89f..3242e21994 100644
--- a/osu.Game/Online/Spectator/SpectatorScoreProcessor.cs
+++ b/osu.Game/Online/Spectator/SpectatorScoreProcessor.cs
@@ -14,6 +14,7 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
+using osu.Game.Scoring.Legacy;
 
 namespace osu.Game.Online.Spectator
 {
@@ -46,7 +47,9 @@ namespace osu.Game.Online.Spectator
         /// <summary>
         /// The applied <see cref="Mod"/>s.
         /// </summary>
-        public IReadOnlyList<Mod> Mods => scoreProcessor?.Mods.Value ?? Array.Empty<Mod>();
+        public IReadOnlyList<Mod> Mods => scoreInfo?.Mods ?? Array.Empty<Mod>();
+
+        public Func<ScoringMode, long> GetDisplayScore => mode => scoreInfo?.GetDisplayScore(mode) ?? 0;
 
         private IClock? referenceClock;
 
@@ -70,7 +73,6 @@ namespace osu.Game.Online.Spectator
         private readonly int userId;
 
         private SpectatorState? spectatorState;
-        private ScoreProcessor? scoreProcessor;
         private ScoreInfo? scoreInfo;
 
         public SpectatorScoreProcessor(int userId)
@@ -94,19 +96,15 @@ namespace osu.Game.Online.Spectator
         {
             if (!spectatorStates.TryGetValue(userId, out var userState) || userState.BeatmapID == null || userState.RulesetID == null)
             {
-                scoreProcessor?.RemoveAndDisposeImmediately();
-                scoreProcessor = null;
                 scoreInfo = null;
                 spectatorState = null;
                 replayFrames.Clear();
                 return;
             }
 
-            if (scoreProcessor != null)
+            if (scoreInfo != null)
                 return;
 
-            Debug.Assert(scoreInfo == null);
-
             RulesetInfo? rulesetInfo = rulesetStore.GetRuleset(userState.RulesetID.Value);
             if (rulesetInfo == null)
                 return;
@@ -114,9 +112,11 @@ namespace osu.Game.Online.Spectator
             Ruleset ruleset = rulesetInfo.CreateInstance();
 
             spectatorState = userState;
-            scoreInfo = new ScoreInfo { Ruleset = rulesetInfo };
-            scoreProcessor = ruleset.CreateScoreProcessor();
-            scoreProcessor.Mods.Value = userState.Mods.Select(m => m.ToMod(ruleset)).ToArray();
+            scoreInfo = new ScoreInfo
+            {
+                Ruleset = rulesetInfo,
+                Mods = userState.Mods.Select(m => m.ToMod(ruleset)).ToArray()
+            };
         }
 
         private void onNewFrames(int incomingUserId, FrameDataBundle bundle)
@@ -126,7 +126,7 @@ namespace osu.Game.Online.Spectator
 
             Schedule(() =>
             {
-                if (scoreProcessor == null)
+                if (scoreInfo == null)
                     return;
 
                 replayFrames.Add(new TimedFrame(bundle.Frames.First().Time, bundle.Header));
@@ -140,7 +140,6 @@ namespace osu.Game.Online.Spectator
                 return;
 
             Debug.Assert(spectatorState != null);
-            Debug.Assert(scoreProcessor != null);
 
             int frameIndex = replayFrames.BinarySearch(new TimedFrame(ReferenceClock.CurrentTime));
             if (frameIndex < 0)
@@ -150,6 +149,7 @@ namespace osu.Game.Online.Spectator
             TimedFrame frame = replayFrames[frameIndex];
             Debug.Assert(frame.Header != null);
 
+            scoreInfo.Accuracy = frame.Header.Accuracy;
             scoreInfo.MaxCombo = frame.Header.MaxCombo;
             scoreInfo.Statistics = frame.Header.Statistics;
             scoreInfo.MaximumStatistics = spectatorState.MaximumStatistics;
@@ -157,6 +157,7 @@ namespace osu.Game.Online.Spectator
 
             Accuracy.Value = frame.Header.Accuracy;
             Combo.Value = frame.Header.Combo;
+            TotalScore.Value = frame.Header.TotalScore;
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index 620f3718c2..922def6174 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -98,6 +98,7 @@ namespace osu.Game.Screens.Play.HUD
                                        var trackedUser = UserScores[user.Id];
 
                                        var leaderboardScore = Add(user, user.Id == api.LocalUser.Value.Id);
+                                       leaderboardScore.GetDisplayScore = trackedUser.ScoreProcessor.GetDisplayScore;
                                        leaderboardScore.Accuracy.BindTo(trackedUser.ScoreProcessor.Accuracy);
                                        leaderboardScore.TotalScore.BindTo(trackedUser.ScoreProcessor.TotalScore);
                                        leaderboardScore.Combo.BindTo(trackedUser.ScoreProcessor.Combo);

From 4d14467d95cf3b0a1cab08b70a5408d587f056f7 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 19 May 2023 13:23:04 +0900
Subject: [PATCH 0515/1604] Invert order of operations

---
 osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs b/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
index e2b442739b..f86a6669ca 100644
--- a/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
+++ b/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
@@ -29,15 +29,15 @@ namespace osu.Game.Rulesets.Taiko.Scoring
         protected override void AddScoreChange(JudgementResult result)
         {
             var change = computeScoreChange(result);
-            BonusPortion += change.bonus;
             ComboPortion += change.combo;
+            BonusPortion += change.bonus;
         }
 
         protected override void RemoveScoreChange(JudgementResult result)
         {
             var change = computeScoreChange(result);
-            BonusPortion -= change.bonus;
             ComboPortion -= change.combo;
+            BonusPortion -= change.bonus;
         }
 
         private (double combo, double bonus) computeScoreChange(JudgementResult result)

From 73544231de1c75263e0dc116890b5119350abc7a Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 19 May 2023 14:06:46 +0900
Subject: [PATCH 0516/1604] Fix TestSceneTopLocalRank

---
 osu.Game.Tests/Resources/TestResources.cs             |  2 +-
 .../Visual/SongSelect/TestSceneTopLocalRank.cs        | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Resources/TestResources.cs b/osu.Game.Tests/Resources/TestResources.cs
index a2d81c0a75..a77dc8d49b 100644
--- a/osu.Game.Tests/Resources/TestResources.cs
+++ b/osu.Game.Tests/Resources/TestResources.cs
@@ -179,7 +179,7 @@ namespace osu.Game.Tests.Resources
             BeatmapHash = beatmap.Hash,
             Ruleset = beatmap.Ruleset,
             Mods = new Mod[] { new TestModHardRock(), new TestModDoubleTime() },
-            TotalScore = 2845370,
+            TotalScore = 284537,
             Accuracy = 0.95,
             MaxCombo = 999,
             Position = 1,
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneTopLocalRank.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneTopLocalRank.cs
index cf0de14541..79baae53e8 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneTopLocalRank.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneTopLocalRank.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Diagnostics;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
@@ -12,7 +11,6 @@ using osu.Framework.Platform;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
-using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Select.Carousel;
 using osu.Game.Tests.Resources;
@@ -143,25 +141,20 @@ namespace osu.Game.Tests.Visual.SongSelect
 
                 testScoreInfo.User = API.LocalUser.Value;
                 testScoreInfo.Rank = ScoreRank.B;
-                testScoreInfo.TotalScore = scoreManager.GetTotalScore(testScoreInfo, ScoringMode.Classic);
 
                 scoreManager.Import(testScoreInfo);
             });
 
             AddUntilStep("B rank displayed", () => topLocalRank.DisplayedRank == ScoreRank.B);
 
-            AddStep("Add higher score for current user", () =>
+            AddStep("Add higher-graded score for current user", () =>
             {
                 var testScoreInfo2 = TestResources.CreateTestScoreInfo(importedBeatmap);
 
                 testScoreInfo2.User = API.LocalUser.Value;
                 testScoreInfo2.Rank = ScoreRank.X;
                 testScoreInfo2.Statistics = testScoreInfo2.MaximumStatistics;
-                testScoreInfo2.TotalScore = scoreManager.GetTotalScore(testScoreInfo2);
-
-                // ensure second score has a total score (standardised) less than first one (classic)
-                // despite having better statistics, otherwise this test is pointless.
-                Debug.Assert(testScoreInfo2.TotalScore < testScoreInfo.TotalScore);
+                testScoreInfo2.TotalScore = testScoreInfo.TotalScore + 1;
 
                 scoreManager.Import(testScoreInfo2);
             });

From 9a1d749020e365fe0519e5ca06a6b551370c4aa6 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 19 May 2023 14:06:53 +0900
Subject: [PATCH 0517/1604] Fix TestSceneDrawableTaikoMascot

---
 .../Skinning/TestSceneDrawableTaikoMascot.cs                 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
index e4e68c7207..dd8748f6e3 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
@@ -91,8 +91,9 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
         {
             prepareDrawableRulesetAndBeatmap(false);
 
-            assertStateAfterResult(new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Great }, TaikoMascotAnimationState.Idle);
-            assertStateAfterResult(new JudgementResult(new Hit.StrongNestedHit(), new TaikoStrongJudgement()) { Type = HitResult.IgnoreMiss }, TaikoMascotAnimationState.Idle);
+            var hit = new Hit();
+            assertStateAfterResult(new JudgementResult(hit, new TaikoJudgement()) { Type = HitResult.Great }, TaikoMascotAnimationState.Idle);
+            assertStateAfterResult(new JudgementResult(new Hit.StrongNestedHit(hit), new TaikoStrongJudgement()) { Type = HitResult.IgnoreMiss }, TaikoMascotAnimationState.Idle);
         }
 
         [Test]

From 7cbf48ffcff775dcfa77a5787fa72d0f89df7d8e Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 19 May 2023 14:09:19 +0900
Subject: [PATCH 0518/1604] Fix TestSceneScoring and incorrect combo
 calculations

---
 .../Scoring/CatchScoreProcessor.cs                    |  2 +-
 .../Scoring/ManiaScoreProcessor.cs                    |  2 +-
 .../Scoring/TaikoScoreProcessor.cs                    |  2 +-
 osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs    | 11 ++++++-----
 osu.Game/Rulesets/Judgements/JudgementResult.cs       |  5 +++++
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs           |  6 ++++--
 6 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs b/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
index 435b39150b..ae3966ccc5 100644
--- a/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Rulesets.Catch.Scoring
             if (result.Type.IsBonus())
                 return (0, Judgement.ToNumericResult(result.Type), 0);
 
-            return (Judgement.ToNumericResult(result.Type) * Math.Min(Math.Max(0.5, Math.Log(result.ComboAtJudgement, combo_base)), Math.Log(combo_cap, combo_base)), 0, 0);
+            return (Judgement.ToNumericResult(result.Type) * Math.Min(Math.Max(0.5, Math.Log(result.ComboAfterJudgement, combo_base)), Math.Log(combo_cap, combo_base)), 0, 0);
         }
 
         protected override void Reset(bool storeResults)
diff --git a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
index 1c55f9ffce..4c8f8ef65e 100644
--- a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
+++ b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Mania.Scoring
             if (result.Type.IsBonus())
                 return (0, Judgement.ToNumericResult(result.Type));
 
-            return (Judgement.ToNumericResult(result.Type) * Math.Min(Math.Max(0.5, Math.Log(result.ComboAtJudgement, combo_base)), Math.Log(400, combo_base)), 0);
+            return (Judgement.ToNumericResult(result.Type) * Math.Min(Math.Max(0.5, Math.Log(result.ComboAfterJudgement, combo_base)), Math.Log(400, combo_base)), 0);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs b/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
index f86a6669ca..2ecd962d72 100644
--- a/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
+++ b/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Rulesets.Taiko.Scoring
             if (result.Type.IsBonus())
                 return (0, hitValue);
 
-            return (hitValue * Math.Min(Math.Max(0.5, Math.Log(result.ComboAtJudgement, combo_base)), Math.Log(400, combo_base)), 0);
+            return (hitValue * Math.Min(Math.Max(0.5, Math.Log(result.ComboAfterJudgement, combo_base)), Math.Log(400, combo_base)), 0);
         }
     }
 }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
index 8fff07e6d8..2b378c8013 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
@@ -22,6 +22,7 @@ using osu.Game.Rulesets.Osu.Beatmaps;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring.Legacy;
 using osuTK;
 using osuTK.Graphics;
 using osuTK.Input;
@@ -124,8 +125,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             graphs.Clear();
             legend.Clear();
 
-            runForProcessor("lazer-standardised", Color4.YellowGreen, new ScoreProcessor(new OsuRuleset()) { Mode = { Value = ScoringMode.Standardised } });
-            runForProcessor("lazer-classic", Color4.MediumPurple, new ScoreProcessor(new OsuRuleset()) { Mode = { Value = ScoringMode.Classic } });
+            runForProcessor("lazer-standardised", Color4.YellowGreen, new ScoreProcessor(new OsuRuleset()), ScoringMode.Standardised);
+            runForProcessor("lazer-classic", Color4.MediumPurple, new ScoreProcessor(new OsuRuleset()), ScoringMode.Classic);
 
             runScoreV1();
             runScoreV2();
@@ -218,7 +219,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 });
         }
 
-        private void runForProcessor(string name, Color4 colour, ScoreProcessor processor)
+        private void runForProcessor(string name, Color4 colour, ScoreProcessor processor, ScoringMode mode)
         {
             int maxCombo = sliderMaxCombo.Current.Value;
 
@@ -232,10 +233,10 @@ namespace osu.Game.Tests.Visual.Gameplay
                 () => processor.ApplyResult(new OsuJudgementResult(new HitCircle(), new OsuJudgement()) { Type = HitResult.Great }),
                 () => processor.ApplyResult(new OsuJudgementResult(new HitCircle(), new OsuJudgement()) { Type = HitResult.Ok }),
                 () => processor.ApplyResult(new OsuJudgementResult(new HitCircle(), new OsuJudgement()) { Type = HitResult.Miss }),
-                () => (int)processor.TotalScore.Value);
+                () => processor.GetDisplayScore(mode));
         }
 
-        private void runForAlgorithm(string name, Color4 colour, Action applyHit, Action applyNonPerfect, Action applyMiss, Func<int> getTotalScore)
+        private void runForAlgorithm(string name, Color4 colour, Action applyHit, Action applyNonPerfect, Action applyMiss, Func<long> getTotalScore)
         {
             int maxCombo = sliderMaxCombo.Current.Value;
 
diff --git a/osu.Game/Rulesets/Judgements/JudgementResult.cs b/osu.Game/Rulesets/Judgements/JudgementResult.cs
index bf29919e34..34d1f1f6e9 100644
--- a/osu.Game/Rulesets/Judgements/JudgementResult.cs
+++ b/osu.Game/Rulesets/Judgements/JudgementResult.cs
@@ -64,6 +64,11 @@ namespace osu.Game.Rulesets.Judgements
         /// </summary>
         public int ComboAtJudgement { get; internal set; }
 
+        /// <summary>
+        /// The combo after this <see cref="JudgementResult"/> occurred.
+        /// </summary>
+        public int ComboAfterJudgement { get; internal set; }
+
         /// <summary>
         /// The highest combo achieved prior to this <see cref="JudgementResult"/> occurring.
         /// </summary>
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 4ded3d5d91..b014b12297 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -204,6 +204,8 @@ namespace osu.Game.Rulesets.Scoring
             else if (result.Type.BreaksCombo())
                 Combo.Value = 0;
 
+            result.ComboAfterJudgement = Combo.Value;
+
             if (result.Type.IsBasic())
                 CurrentBasicJudgements++;
 
@@ -266,7 +268,7 @@ namespace osu.Game.Rulesets.Scoring
                 BonusPortion += Judgement.ToNumericResult(result.Type);
 
             if (result.Type.AffectsCombo())
-                ComboPortion += Judgement.ToNumericResult(result.Type) * (1 + result.ComboAtJudgement / 10d);
+                ComboPortion += Judgement.ToNumericResult(result.Type) * (1 + result.ComboAfterJudgement / 10d);
         }
 
         protected virtual void RemoveScoreChange(JudgementResult result)
@@ -275,7 +277,7 @@ namespace osu.Game.Rulesets.Scoring
                 BonusPortion -= Judgement.ToNumericResult(result.Type);
 
             if (result.Type.AffectsCombo())
-                ComboPortion -= Judgement.ToNumericResult(result.Type) * (1 + result.ComboAtJudgement / 10d);
+                ComboPortion -= Judgement.ToNumericResult(result.Type) * (1 + result.ComboAfterJudgement / 10d);
         }
 
         private void updateScore()

From 2ae34530f787e9420bdaefda85583bc165984075 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 19 May 2023 14:14:34 +0900
Subject: [PATCH 0519/1604] Avoid NaN values during ApplyBeatmap processing()

---
 osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs | 3 ++-
 osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs | 7 +++++--
 osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs     | 7 +++++--
 osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs | 7 +++++--
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs            | 7 +++++--
 5 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs b/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
index ae3966ccc5..dc6d5b28ee 100644
--- a/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
@@ -25,12 +25,13 @@ namespace osu.Game.Rulesets.Catch.Scoring
 
         protected override double ComputeTotalScore()
         {
+            double comboRatio = MaxComboPortion > 0 ? ComboPortion / MaxComboPortion : 1;
             double fruitHitsRatio = maximumTinyDroplets == 0 ? 0 : (double)hitTinyDroplets / maximumTinyDroplets;
 
             const int tiny_droplets_portion = 400000;
 
             return (
-                ((1000000 - tiny_droplets_portion) + tiny_droplets_portion * (1 - tinyDropletScale)) * ComboPortion / MaxComboPortion +
+                ((1000000 - tiny_droplets_portion) + tiny_droplets_portion * (1 - tinyDropletScale)) * comboRatio +
                 tiny_droplets_portion * tinyDropletScale * fruitHitsRatio +
                 BonusPortion
             ) * ScoreMultiplier;
diff --git a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
index 4c8f8ef65e..544b9add32 100644
--- a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
+++ b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
@@ -18,9 +18,12 @@ namespace osu.Game.Rulesets.Mania.Scoring
 
         protected override double ComputeTotalScore()
         {
+            double comboRatio = MaxComboPortion > 0 ? ComboPortion / MaxComboPortion : 1;
+            double accuracyRatio = MaxBasicJudgements > 0 ? (double)CurrentBasicJudgements / MaxBasicJudgements : 1;
+
             return (
-                200000 * ComboPortion / MaxComboPortion +
-                800000 * Math.Pow(Accuracy.Value, 2 + 2 * Accuracy.Value) * ((double)CurrentBasicJudgements / MaxBasicJudgements) +
+                200000 * comboRatio +
+                800000 * Math.Pow(Accuracy.Value, 2 + 2 * Accuracy.Value) * accuracyRatio +
                 BonusPortion
             ) * ScoreMultiplier;
         }
diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
index d4677d92c1..edd0880271 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
@@ -15,9 +15,12 @@ namespace osu.Game.Rulesets.Osu.Scoring
 
         protected override double ComputeTotalScore()
         {
+            double comboRatio = MaxComboPortion > 0 ? ComboPortion / MaxComboPortion : 1;
+            double accuracyRatio = MaxBasicJudgements > 0 ? (double)CurrentBasicJudgements / MaxBasicJudgements : 1;
+
             return (
-                700000 * ComboPortion / MaxComboPortion +
-                300000 * Math.Pow(Accuracy.Value, 10) * ((double)CurrentBasicJudgements / MaxBasicJudgements) +
+                700000 * comboRatio +
+                300000 * Math.Pow(Accuracy.Value, 10) * accuracyRatio +
                 BonusPortion
             ) * ScoreMultiplier;
         }
diff --git a/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs b/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
index 2ecd962d72..32f4421ed2 100644
--- a/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
+++ b/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
@@ -19,9 +19,12 @@ namespace osu.Game.Rulesets.Taiko.Scoring
 
         protected override double ComputeTotalScore()
         {
+            double comboRatio = MaxComboPortion > 0 ? ComboPortion / MaxComboPortion : 1;
+            double accuracyRatio = MaxBasicJudgements > 0 ? (double)CurrentBasicJudgements / MaxBasicJudgements : 1;
+
             return (
-                250000 * ComboPortion / MaxComboPortion +
-                750000 * Math.Pow(Accuracy.Value, 3.6) * ((double)CurrentBasicJudgements / MaxBasicJudgements) +
+                250000 * comboRatio +
+                750000 * Math.Pow(Accuracy.Value, 3.6) * accuracyRatio +
                 BonusPortion
             ) * ScoreMultiplier;
         }
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index b014b12297..0ec9c884c3 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -288,11 +288,14 @@ namespace osu.Game.Rulesets.Scoring
 
         protected virtual double ComputeTotalScore()
         {
+            double comboRatio = MaxComboPortion > 0 ? ComboPortion / MaxComboPortion : 1;
+            double accuracyRatio = MaxBasicJudgements > 0 ? (double)CurrentBasicJudgements / MaxBasicJudgements : 1;
+
             return
                 (int)Math.Round
                 ((
-                    700000 * ComboPortion / MaxComboPortion +
-                    300000 * Math.Pow(Accuracy.Value, 10) * ((double)CurrentBasicJudgements / MaxBasicJudgements) +
+                    700000 * comboRatio +
+                    300000 * Math.Pow(Accuracy.Value, 10) * accuracyRatio +
                     BonusPortion
                 ) * ScoreMultiplier);
         }

From d74bf2a096575a0f55f74f417724ad4d3593f8cf Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 19 May 2023 14:37:26 +0900
Subject: [PATCH 0520/1604] Refactor for safety

---
 .../Scoring/CatchScoreProcessor.cs            |  51 ++++----
 .../Scoring/ManiaScoreProcessor.cs            |  36 +-----
 .../Scoring/OsuScoreProcessor.cs              |  13 +-
 .../Scoring/TaikoScoreProcessor.cs            |  44 ++-----
 .../PerformanceBreakdownCalculator.cs         |   2 +-
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs   | 117 ++++++++++--------
 6 files changed, 111 insertions(+), 152 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs b/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
index dc6d5b28ee..c74d4b84e4 100644
--- a/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
@@ -17,51 +17,48 @@ namespace osu.Game.Rulesets.Catch.Scoring
 
         private int maximumTinyDroplets;
         private int hitTinyDroplets;
+        private int maximumBasicJudgements;
+        private int currentBasicJudgements;
 
         public CatchScoreProcessor()
             : base(new CatchRuleset())
         {
         }
 
-        protected override double ComputeTotalScore()
+        protected override double ComputeTotalScore(double comboRatio, double accuracyRatio, double bonusPortion)
         {
-            double comboRatio = MaxComboPortion > 0 ? ComboPortion / MaxComboPortion : 1;
             double fruitHitsRatio = maximumTinyDroplets == 0 ? 0 : (double)hitTinyDroplets / maximumTinyDroplets;
 
             const int tiny_droplets_portion = 400000;
 
-            return (
-                ((1000000 - tiny_droplets_portion) + tiny_droplets_portion * (1 - tinyDropletScale)) * comboRatio +
-                tiny_droplets_portion * tinyDropletScale * fruitHitsRatio +
-                BonusPortion
-            ) * ScoreMultiplier;
+            return ((1000000 - tiny_droplets_portion) + tiny_droplets_portion * (1 - tinyDropletScale)) * comboRatio
+                   + tiny_droplets_portion * tinyDropletScale * fruitHitsRatio
+                   + bonusPortion;
         }
 
-        protected override void AddScoreChange(JudgementResult result)
+        protected override double GetComboScoreChange(JudgementResult result)
+            => Judgement.ToNumericResult(result.Type) * Math.Min(Math.Max(0.5, Math.Log(result.ComboAfterJudgement, combo_base)), Math.Log(combo_cap, combo_base));
+
+        protected override void ApplyScoreChange(JudgementResult result)
         {
-            var change = computeScoreChange(result);
-            ComboPortion += change.combo;
-            BonusPortion += change.bonus;
-            hitTinyDroplets += change.tinyDropletHits;
+            base.ApplyScoreChange(result);
+
+            if (result.HitObject is TinyDroplet)
+                hitTinyDroplets++;
+
+            if (result.Type.IsBasic())
+                currentBasicJudgements++;
         }
 
         protected override void RemoveScoreChange(JudgementResult result)
         {
-            var change = computeScoreChange(result);
-            ComboPortion -= change.combo;
-            BonusPortion -= change.bonus;
-            hitTinyDroplets -= change.tinyDropletHits;
-        }
+            base.RemoveScoreChange(result);
 
-        private (double combo, double bonus, int tinyDropletHits) computeScoreChange(JudgementResult result)
-        {
             if (result.HitObject is TinyDroplet)
-                return (0, 0, 1);
+                hitTinyDroplets--;
 
-            if (result.Type.IsBonus())
-                return (0, Judgement.ToNumericResult(result.Type), 0);
-
-            return (Judgement.ToNumericResult(result.Type) * Math.Min(Math.Max(0.5, Math.Log(result.ComboAfterJudgement, combo_base)), Math.Log(combo_cap, combo_base)), 0, 0);
+            if (result.Type.IsBasic())
+                currentBasicJudgements--;
         }
 
         protected override void Reset(bool storeResults)
@@ -71,14 +68,16 @@ namespace osu.Game.Rulesets.Catch.Scoring
             if (storeResults)
             {
                 maximumTinyDroplets = hitTinyDroplets;
+                maximumBasicJudgements = currentBasicJudgements;
 
-                if (maximumTinyDroplets + MaxBasicJudgements == 0)
+                if (maximumTinyDroplets + maximumBasicJudgements == 0)
                     tinyDropletScale = 0;
                 else
-                    tinyDropletScale = (double)maximumTinyDroplets / (maximumTinyDroplets + MaxBasicJudgements);
+                    tinyDropletScale = (double)maximumTinyDroplets / (maximumTinyDroplets + maximumBasicJudgements);
             }
 
             hitTinyDroplets = 0;
+            currentBasicJudgements = 0;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
index 544b9add32..214aded2d7 100644
--- a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
+++ b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
@@ -16,38 +16,14 @@ namespace osu.Game.Rulesets.Mania.Scoring
         {
         }
 
-        protected override double ComputeTotalScore()
+        protected override double ComputeTotalScore(double comboRatio, double accuracyRatio, double bonusPortion)
         {
-            double comboRatio = MaxComboPortion > 0 ? ComboPortion / MaxComboPortion : 1;
-            double accuracyRatio = MaxBasicJudgements > 0 ? (double)CurrentBasicJudgements / MaxBasicJudgements : 1;
-
-            return (
-                200000 * comboRatio +
-                800000 * Math.Pow(Accuracy.Value, 2 + 2 * Accuracy.Value) * accuracyRatio +
-                BonusPortion
-            ) * ScoreMultiplier;
+            return 200000 * comboRatio
+                   + 800000 * Math.Pow(Accuracy.Value, 2 + 2 * Accuracy.Value) * accuracyRatio
+                   + bonusPortion;
         }
 
-        protected override void AddScoreChange(JudgementResult result)
-        {
-            var change = computeScoreChange(result);
-            ComboPortion += change.combo;
-            BonusPortion += change.bonus;
-        }
-
-        protected override void RemoveScoreChange(JudgementResult result)
-        {
-            var change = computeScoreChange(result);
-            ComboPortion -= change.combo;
-            BonusPortion -= change.bonus;
-        }
-
-        private (double combo, double bonus) computeScoreChange(JudgementResult result)
-        {
-            if (result.Type.IsBonus())
-                return (0, Judgement.ToNumericResult(result.Type));
-
-            return (Judgement.ToNumericResult(result.Type) * Math.Min(Math.Max(0.5, Math.Log(result.ComboAfterJudgement, combo_base)), Math.Log(400, combo_base)), 0);
-        }
+        protected override double GetComboScoreChange(JudgementResult result)
+            => Judgement.ToNumericResult(result.Type) * Math.Min(Math.Max(0.5, Math.Log(result.ComboAfterJudgement, combo_base)), Math.Log(400, combo_base));
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
index edd0880271..5028d5b8d6 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
@@ -13,16 +13,11 @@ namespace osu.Game.Rulesets.Osu.Scoring
         {
         }
 
-        protected override double ComputeTotalScore()
+        protected override double ComputeTotalScore(double comboRatio, double accuracyRatio, double bonusPortion)
         {
-            double comboRatio = MaxComboPortion > 0 ? ComboPortion / MaxComboPortion : 1;
-            double accuracyRatio = MaxBasicJudgements > 0 ? (double)CurrentBasicJudgements / MaxBasicJudgements : 1;
-
-            return (
-                700000 * comboRatio +
-                300000 * Math.Pow(Accuracy.Value, 10) * accuracyRatio +
-                BonusPortion
-            ) * ScoreMultiplier;
+            return 700000 * comboRatio
+                   + 300000 * Math.Pow(Accuracy.Value, 10) * accuracyRatio
+                   + bonusPortion;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs b/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
index 32f4421ed2..e0f83505cf 100644
--- a/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
+++ b/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
@@ -17,46 +17,28 @@ namespace osu.Game.Rulesets.Taiko.Scoring
         {
         }
 
-        protected override double ComputeTotalScore()
+        protected override double ComputeTotalScore(double comboRatio, double accuracyRatio, double bonusPortion)
         {
-            double comboRatio = MaxComboPortion > 0 ? ComboPortion / MaxComboPortion : 1;
-            double accuracyRatio = MaxBasicJudgements > 0 ? (double)CurrentBasicJudgements / MaxBasicJudgements : 1;
-
-            return (
-                250000 * comboRatio +
-                750000 * Math.Pow(Accuracy.Value, 3.6) * accuracyRatio +
-                BonusPortion
-            ) * ScoreMultiplier;
+            return 250000 * comboRatio
+                   + 750000 * Math.Pow(Accuracy.Value, 3.6) * accuracyRatio
+                   + bonusPortion;
         }
 
-        protected override void AddScoreChange(JudgementResult result)
+        protected override double GetBonusScoreChange(JudgementResult result) => base.GetBonusScoreChange(result) * strongScaleValue(result);
+
+        protected override double GetComboScoreChange(JudgementResult result)
         {
-            var change = computeScoreChange(result);
-            ComboPortion += change.combo;
-            BonusPortion += change.bonus;
+            return Judgement.ToNumericResult(result.Type)
+                   * Math.Min(Math.Max(0.5, Math.Log(result.ComboAfterJudgement, combo_base)), Math.Log(400, combo_base))
+                   * strongScaleValue(result);
         }
 
-        protected override void RemoveScoreChange(JudgementResult result)
+        private double strongScaleValue(JudgementResult result)
         {
-            var change = computeScoreChange(result);
-            ComboPortion -= change.combo;
-            BonusPortion -= change.bonus;
-        }
-
-        private (double combo, double bonus) computeScoreChange(JudgementResult result)
-        {
-            double hitValue = Judgement.ToNumericResult(result.Type);
-
             if (result.HitObject is StrongNestedHitObject strong)
-            {
-                double strongBonus = strong.Parent is DrumRollTick ? 3 : 7;
-                hitValue *= strongBonus;
-            }
+                return strong.Parent is DrumRollTick ? 3 : 7;
 
-            if (result.Type.IsBonus())
-                return (0, hitValue);
-
-            return (hitValue * Math.Min(Math.Max(0.5, Math.Log(result.ComboAfterJudgement, combo_base)), Math.Log(400, combo_base)), 0);
+            return 1;
         }
     }
 }
diff --git a/osu.Game/Rulesets/Difficulty/PerformanceBreakdownCalculator.cs b/osu.Game/Rulesets/Difficulty/PerformanceBreakdownCalculator.cs
index 3dd7f934a8..64a04f896f 100644
--- a/osu.Game/Rulesets/Difficulty/PerformanceBreakdownCalculator.cs
+++ b/osu.Game/Rulesets/Difficulty/PerformanceBreakdownCalculator.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Rulesets.Difficulty
                 ScoreProcessor scoreProcessor = ruleset.CreateScoreProcessor();
                 scoreProcessor.Mods.Value = perfectPlay.Mods;
                 scoreProcessor.ApplyBeatmap(playableBeatmap);
-                perfectPlay.TotalScore = scoreProcessor.MaxTotalScore;
+                perfectPlay.TotalScore = scoreProcessor.MaximumTotalScore;
 
                 // compute rank achieved
                 // default to SS, then adjust the rank with mods
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 0ec9c884c3..a94ee9c181 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -90,10 +90,18 @@ namespace osu.Game.Rulesets.Scoring
         /// <summary>
         /// The maximum achievable total score.
         /// </summary>
-        public long MaxTotalScore { get; private set; }
+        public long MaximumTotalScore { get; private set; }
 
         /// <summary>
-        /// The sum of all accuracy-affecting judgements at the current time.
+        /// The maximum sum of accuracy-affecting judgements at the current point in time.
+        /// </summary>
+        /// <remarks>
+        /// Used to compute accuracy.
+        /// </remarks>
+        private double currentMaximumBaseScore;
+
+        /// <summary>
+        /// The sum of all accuracy-affecting judgements at the current point in time.
         /// </summary>
         /// <remarks>
         /// Used to compute accuracy.
@@ -101,42 +109,34 @@ namespace osu.Game.Rulesets.Scoring
         private double currentBaseScore;
 
         /// <summary>
-        /// The maximum sum of accuracy-affecting judgements at the current time.
+        /// The count of all basic judgements in the beatmap.
         /// </summary>
-        /// <remarks>
-        /// Used to compute accuracy.
-        /// </remarks>
-        private double currentMaxBaseScore;
+        private int maximumCountBasicJudgements;
 
         /// <summary>
-        /// The total count of basic judgements in the beatmap.
+        /// The count of basic judgements at the current point in time.
         /// </summary>
-        protected int MaxBasicJudgements { get; private set; }
+        private int currentCountBasicJudgements;
 
         /// <summary>
-        /// The current count of basic judgements by the player.
+        /// The maximum combo score in the beatmap.
         /// </summary>
-        protected int CurrentBasicJudgements { get; private set; }
+        private double maximumComboPortion;
 
         /// <summary>
-        /// The current combo score.
+        /// The combo score at the current point in time.
         /// </summary>
-        protected double ComboPortion { get; set; }
+        private double currentComboPortion;
 
         /// <summary>
-        /// The maximum achievable combo score.
+        /// The bonus score at the current point in time.
         /// </summary>
-        protected double MaxComboPortion { get; private set; }
-
-        /// <summary>
-        /// The current bonus score.
-        /// </summary>
-        protected double BonusPortion { get; set; }
+        private double currentBonusPortion;
 
         /// <summary>
         /// The total score multiplier.
         /// </summary>
-        protected double ScoreMultiplier { get; private set; } = 1;
+        private double scoreMultiplier = 1;
 
         public Dictionary<HitResult, int> MaximumStatistics
         {
@@ -171,10 +171,10 @@ namespace osu.Game.Rulesets.Scoring
 
             Mods.ValueChanged += mods =>
             {
-                ScoreMultiplier = 1;
+                scoreMultiplier = 1;
 
                 foreach (var m in mods.NewValue)
-                    ScoreMultiplier *= m.ScoreMultiplier;
+                    scoreMultiplier *= m.ScoreMultiplier;
 
                 updateScore();
             };
@@ -207,15 +207,21 @@ namespace osu.Game.Rulesets.Scoring
             result.ComboAfterJudgement = Combo.Value;
 
             if (result.Type.IsBasic())
-                CurrentBasicJudgements++;
+                currentCountBasicJudgements++;
 
             if (result.Type.AffectsAccuracy())
             {
-                currentMaxBaseScore += Judgement.ToNumericResult(result.Judgement.MaxResult);
+                currentMaximumBaseScore += Judgement.ToNumericResult(result.Judgement.MaxResult);
                 currentBaseScore += Judgement.ToNumericResult(result.Type);
             }
 
-            AddScoreChange(result);
+            if (result.Type.IsBonus())
+                currentBonusPortion += GetBonusScoreChange(result);
+
+            if (result.Type.AffectsCombo())
+                currentComboPortion += GetComboScoreChange(result);
+
+            ApplyScoreChange(result);
 
             hitEvents.Add(CreateHitEvent(result));
             lastHitObject = result.HitObject;
@@ -245,14 +251,20 @@ namespace osu.Game.Rulesets.Scoring
                 return;
 
             if (result.Type.IsBasic())
-                CurrentBasicJudgements--;
+                currentCountBasicJudgements--;
 
             if (result.Type.AffectsAccuracy())
             {
-                currentMaxBaseScore -= Judgement.ToNumericResult(result.Judgement.MaxResult);
+                currentMaximumBaseScore -= Judgement.ToNumericResult(result.Judgement.MaxResult);
                 currentBaseScore -= Judgement.ToNumericResult(result.Type);
             }
 
+            if (result.Type.IsBonus())
+                currentBonusPortion -= GetBonusScoreChange(result);
+
+            if (result.Type.AffectsCombo())
+                currentComboPortion -= GetComboScoreChange(result);
+
             RemoveScoreChange(result);
 
             Debug.Assert(hitEvents.Count > 0);
@@ -262,42 +274,37 @@ namespace osu.Game.Rulesets.Scoring
             updateScore();
         }
 
-        protected virtual void AddScoreChange(JudgementResult result)
-        {
-            if (result.Type.IsBonus())
-                BonusPortion += Judgement.ToNumericResult(result.Type);
+        protected virtual double GetBonusScoreChange(JudgementResult result) => Judgement.ToNumericResult(result.Type);
 
-            if (result.Type.AffectsCombo())
-                ComboPortion += Judgement.ToNumericResult(result.Type) * (1 + result.ComboAfterJudgement / 10d);
+        protected virtual double GetComboScoreChange(JudgementResult result) => Judgement.ToNumericResult(result.Type) * (1 + result.ComboAfterJudgement / 10d);
+
+        protected virtual void ApplyScoreChange(JudgementResult result)
+        {
         }
 
         protected virtual void RemoveScoreChange(JudgementResult result)
         {
-            if (result.Type.IsBonus())
-                BonusPortion -= Judgement.ToNumericResult(result.Type);
-
-            if (result.Type.AffectsCombo())
-                ComboPortion -= Judgement.ToNumericResult(result.Type) * (1 + result.ComboAfterJudgement / 10d);
         }
 
         private void updateScore()
         {
-            Accuracy.Value = currentMaxBaseScore > 0 ? currentBaseScore / currentMaxBaseScore : 1;
-            TotalScore.Value = (long)Math.Round(ComputeTotalScore());
+            Accuracy.Value = currentMaximumBaseScore > 0 ? currentBaseScore / currentMaximumBaseScore : 1;
+
+            double comboRatio = maximumComboPortion > 0 ? currentComboPortion / maximumComboPortion : 1;
+            double accuracyRatio = maximumCountBasicJudgements > 0 ? (double)currentCountBasicJudgements / maximumCountBasicJudgements : 1;
+
+            TotalScore.Value = (long)Math.Round(ComputeTotalScore(comboRatio, accuracyRatio, currentBonusPortion) * scoreMultiplier);
         }
 
-        protected virtual double ComputeTotalScore()
+        protected virtual double ComputeTotalScore(double comboRatio, double accuracyRatio, double bonusPortion)
         {
-            double comboRatio = MaxComboPortion > 0 ? ComboPortion / MaxComboPortion : 1;
-            double accuracyRatio = MaxBasicJudgements > 0 ? (double)CurrentBasicJudgements / MaxBasicJudgements : 1;
-
             return
                 (int)Math.Round
                 ((
                     700000 * comboRatio +
                     300000 * Math.Pow(Accuracy.Value, 10) * accuracyRatio +
-                    BonusPortion
-                ) * ScoreMultiplier);
+                    bonusPortion
+                ) * scoreMultiplier);
         }
 
         /// <summary>
@@ -313,22 +320,22 @@ namespace osu.Game.Rulesets.Scoring
 
             if (storeResults)
             {
-                MaxComboPortion = ComboPortion;
-                MaxBasicJudgements = CurrentBasicJudgements;
+                maximumComboPortion = currentComboPortion;
+                maximumCountBasicJudgements = currentCountBasicJudgements;
 
                 maximumResultCounts.Clear();
                 maximumResultCounts.AddRange(scoreResultCounts);
 
-                MaxTotalScore = TotalScore.Value;
+                MaximumTotalScore = TotalScore.Value;
             }
 
             scoreResultCounts.Clear();
 
             currentBaseScore = 0;
-            currentMaxBaseScore = 0;
-            CurrentBasicJudgements = 0;
-            ComboPortion = 0;
-            BonusPortion = 0;
+            currentMaximumBaseScore = 0;
+            currentCountBasicJudgements = 0;
+            currentComboPortion = 0;
+            currentBonusPortion = 0;
 
             TotalScore.Value = 0;
             Accuracy.Value = 1;
@@ -338,7 +345,7 @@ namespace osu.Game.Rulesets.Scoring
             HighestCombo.Value = 0;
 
             currentBaseScore = 0;
-            currentMaxBaseScore = 0;
+            currentMaximumBaseScore = 0;
         }
 
         /// <summary>

From 6c6f8621c1ae5b7ea26116b3883c9ae9683b8bde Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 19 May 2023 16:25:52 +0900
Subject: [PATCH 0521/1604] Add score processor statistics to replay header

---
 .../Scoring/CatchScoreProcessor.cs            | 17 +++++++
 osu.Game/Online/Spectator/FrameDataBundle.cs  |  5 ++-
 osu.Game/Online/Spectator/FrameHeader.cs      | 45 ++++++++++++-------
 osu.Game/Online/Spectator/SpectatorClient.cs  |  6 ++-
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs   | 27 +++++++++--
 .../Visual/Spectator/TestSpectatorClient.cs   |  7 ++-
 6 files changed, 83 insertions(+), 24 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs b/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
index c74d4b84e4..63937600bb 100644
--- a/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
@@ -79,5 +80,21 @@ namespace osu.Game.Rulesets.Catch.Scoring
             hitTinyDroplets = 0;
             currentBasicJudgements = 0;
         }
+
+        public override void WriteScoreProcessorStatistics(IDictionary<string, object> statistics)
+        {
+            base.WriteScoreProcessorStatistics(statistics);
+
+            statistics.Add(nameof(hitTinyDroplets), hitTinyDroplets);
+            statistics.Add(nameof(currentBasicJudgements), currentBasicJudgements);
+        }
+
+        public override void ReadScoreProcessorStatistics(IReadOnlyDictionary<string, object> statistics)
+        {
+            base.ReadScoreProcessorStatistics(statistics);
+
+            hitTinyDroplets = (int)statistics.GetValueOrDefault(nameof(hitTinyDroplets), 0);
+            currentBasicJudgements = (int)statistics.GetValueOrDefault(nameof(currentBasicJudgements), 0);
+        }
     }
 }
diff --git a/osu.Game/Online/Spectator/FrameDataBundle.cs b/osu.Game/Online/Spectator/FrameDataBundle.cs
index 97ae468875..b936847434 100644
--- a/osu.Game/Online/Spectator/FrameDataBundle.cs
+++ b/osu.Game/Online/Spectator/FrameDataBundle.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using MessagePack;
 using Newtonsoft.Json;
 using osu.Game.Replays.Legacy;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 
 namespace osu.Game.Online.Spectator
@@ -20,10 +21,10 @@ namespace osu.Game.Online.Spectator
         [Key(1)]
         public IList<LegacyReplayFrame> Frames { get; set; }
 
-        public FrameDataBundle(ScoreInfo score, IList<LegacyReplayFrame> frames)
+        public FrameDataBundle(ScoreInfo score, ScoreProcessor scoreProcessor, IList<LegacyReplayFrame> frames)
         {
             Frames = frames;
-            Header = new FrameHeader(score);
+            Header = new FrameHeader(score, scoreProcessor);
         }
 
         [JsonConstructor]
diff --git a/osu.Game/Online/Spectator/FrameHeader.cs b/osu.Game/Online/Spectator/FrameHeader.cs
index 4d1ff23530..baebb28e4f 100644
--- a/osu.Game/Online/Spectator/FrameHeader.cs
+++ b/osu.Game/Online/Spectator/FrameHeader.cs
@@ -15,66 +15,77 @@ namespace osu.Game.Online.Spectator
     public class FrameHeader
     {
         /// <summary>
-        /// The current accuracy of the score.
+        /// The total score.
         /// </summary>
         [Key(0)]
+        public long TotalScore { get; set; }
+
+        /// <summary>
+        /// The current accuracy of the score.
+        /// </summary>
+        [Key(1)]
         public double Accuracy { get; set; }
 
         /// <summary>
         /// The current combo of the score.
         /// </summary>
-        [Key(1)]
+        [Key(2)]
         public int Combo { get; set; }
 
         /// <summary>
         /// The maximum combo achieved up to the current point in time.
         /// </summary>
-        [Key(2)]
+        [Key(3)]
         public int MaxCombo { get; set; }
 
         /// <summary>
         /// Cumulative hit statistics.
         /// </summary>
-        [Key(3)]
+        [Key(4)]
         public Dictionary<HitResult, int> Statistics { get; set; }
 
+        /// <summary>
+        /// Additional statistics that guides the score processor to calculate the correct score for this frame.
+        /// </summary>
+        [Key(5)]
+        public Dictionary<string, object> ScoreProcessorStatistics { get; set; }
+
         /// <summary>
         /// The time at which this frame was received by the server.
         /// </summary>
-        [Key(4)]
+        [Key(6)]
         public DateTimeOffset ReceivedTime { get; set; }
 
-        /// <summary>
-        /// The total score.
-        /// </summary>
-        [Key(5)]
-        public long TotalScore { get; set; }
-
         /// <summary>
         /// Construct header summary information from a point-in-time reference to a score which is actively being played.
         /// </summary>
         /// <param name="score">The score for reference.</param>
-        public FrameHeader(ScoreInfo score)
+        /// <param name="scoreProcessor">The score processor for reference.</param>
+        public FrameHeader(ScoreInfo score, ScoreProcessor scoreProcessor)
         {
+            TotalScore = score.TotalScore;
+            Accuracy = score.Accuracy;
             Combo = score.Combo;
             MaxCombo = score.MaxCombo;
-            Accuracy = score.Accuracy;
-            TotalScore = score.TotalScore;
 
             // copy for safety
             Statistics = new Dictionary<HitResult, int>(score.Statistics);
+
+            ScoreProcessorStatistics = new Dictionary<string, object>();
+            scoreProcessor.WriteScoreProcessorStatistics(ScoreProcessorStatistics);
         }
 
         [JsonConstructor]
         [SerializationConstructor]
-        public FrameHeader(double accuracy, int combo, int maxCombo, Dictionary<HitResult, int> statistics, DateTimeOffset receivedTime, long totalScore)
+        public FrameHeader(long totalScore, double accuracy, int combo, int maxCombo, Dictionary<HitResult, int> statistics, Dictionary<string, object> scoreProcessorStatistics, DateTimeOffset receivedTime)
         {
+            TotalScore = totalScore;
+            Accuracy = accuracy;
             Combo = combo;
             MaxCombo = maxCombo;
-            Accuracy = accuracy;
             Statistics = statistics;
+            ScoreProcessorStatistics = scoreProcessorStatistics;
             ReceivedTime = receivedTime;
-            TotalScore = totalScore;
         }
     }
 }
diff --git a/osu.Game/Online/Spectator/SpectatorClient.cs b/osu.Game/Online/Spectator/SpectatorClient.cs
index 55ec75f4ce..89da8b9d32 100644
--- a/osu.Game/Online/Spectator/SpectatorClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorClient.cs
@@ -16,6 +16,7 @@ using osu.Game.Online.API;
 using osu.Game.Replays.Legacy;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Replays.Types;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 
@@ -82,6 +83,7 @@ namespace osu.Game.Online.Spectator
         private IBeatmap? currentBeatmap;
         private Score? currentScore;
         private long? currentScoreToken;
+        private ScoreProcessor? currentScoreProcessor;
 
         private readonly Queue<FrameDataBundle> pendingFrameBundles = new Queue<FrameDataBundle>();
 
@@ -192,6 +194,7 @@ namespace osu.Game.Online.Spectator
                 currentBeatmap = state.Beatmap;
                 currentScore = score;
                 currentScoreToken = scoreToken;
+                currentScoreProcessor = state.ScoreProcessor;
 
                 BeginPlayingInternal(currentScoreToken, currentState);
             });
@@ -302,9 +305,10 @@ namespace osu.Game.Online.Spectator
                 return;
 
             Debug.Assert(currentScore != null);
+            Debug.Assert(currentScoreProcessor != null);
 
             var frames = pendingFrames.ToArray();
-            var bundle = new FrameDataBundle(currentScore.ScoreInfo, frames);
+            var bundle = new FrameDataBundle(currentScore.ScoreInfo, currentScoreProcessor, frames);
 
             pendingFrames.Clear();
             lastPurgeTime = Time.Current;
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index a94ee9c181..0244e7f5e3 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -394,19 +394,34 @@ namespace osu.Game.Rulesets.Scoring
 
             Combo.Value = frame.Header.Combo;
             HighestCombo.Value = frame.Header.MaxCombo;
+            TotalScore.Value = frame.Header.TotalScore;
 
             scoreResultCounts.Clear();
             scoreResultCounts.AddRange(frame.Header.Statistics);
 
+            ReadScoreProcessorStatistics(frame.Header.ScoreProcessorStatistics);
+
             updateScore();
 
             OnResetFromReplayFrame?.Invoke();
         }
 
-        protected override void Dispose(bool isDisposing)
+        public virtual void WriteScoreProcessorStatistics(IDictionary<string, object> statistics)
         {
-            base.Dispose(isDisposing);
-            hitEvents.Clear();
+            statistics.Add(nameof(currentMaximumBaseScore), currentMaximumBaseScore);
+            statistics.Add(nameof(currentBaseScore), currentBaseScore);
+            statistics.Add(nameof(currentCountBasicJudgements), currentCountBasicJudgements);
+            statistics.Add(nameof(currentComboPortion), currentComboPortion);
+            statistics.Add(nameof(currentBonusPortion), currentBonusPortion);
+        }
+
+        public virtual void ReadScoreProcessorStatistics(IReadOnlyDictionary<string, object> statistics)
+        {
+            currentMaximumBaseScore = (double)statistics.GetValueOrDefault(nameof(currentMaximumBaseScore), 0);
+            currentBaseScore = (double)statistics.GetValueOrDefault(nameof(currentBaseScore), 0);
+            currentCountBasicJudgements = (int)statistics.GetValueOrDefault(nameof(currentCountBasicJudgements), 0);
+            currentComboPortion = (double)statistics.GetValueOrDefault(nameof(currentComboPortion), 0);
+            currentBonusPortion = (double)statistics.GetValueOrDefault(nameof(currentBonusPortion), 0);
         }
 
         #region Static helper methods
@@ -464,6 +479,12 @@ namespace osu.Game.Rulesets.Scoring
         }
 
         #endregion
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            hitEvents.Clear();
+        }
     }
 
     public enum ScoringMode
diff --git a/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs b/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs
index 1db35b3aaa..305a615102 100644
--- a/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs
+++ b/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs
@@ -12,7 +12,9 @@ using osu.Framework.Utils;
 using osu.Game.Online.API;
 using osu.Game.Online.Spectator;
 using osu.Game.Replays.Legacy;
+using osu.Game.Rulesets;
 using osu.Game.Rulesets.Replays;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 
 namespace osu.Game.Tests.Visual.Spectator
@@ -44,6 +46,9 @@ namespace osu.Game.Tests.Visual.Spectator
         [Resolved]
         private IAPIProvider api { get; set; } = null!;
 
+        [Resolved]
+        private RulesetStore rulesetStore { get; set; } = null!;
+
         public TestSpectatorClient()
         {
             OnNewFrames += (i, bundle) => lastReceivedUserFrames[i] = bundle.Frames[^1];
@@ -119,7 +124,7 @@ namespace osu.Game.Tests.Visual.Spectator
                 if (frames.Count == 0)
                     return;
 
-                var bundle = new FrameDataBundle(new ScoreInfo { Combo = currentFrameIndex }, frames.ToArray());
+                var bundle = new FrameDataBundle(new ScoreInfo { Combo = currentFrameIndex }, new ScoreProcessor(rulesetStore.GetRuleset(0)!.CreateInstance()), frames.ToArray());
                 ((ISpectatorClient)this).UserSentFrames(userId, bundle);
 
                 frames.Clear();

From 30a296bd094604d5f2c7a2c3ddc1e9d03c60fa80 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 19 May 2023 17:27:02 +0900
Subject: [PATCH 0522/1604] Rename parameters

---
 osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs | 4 ++--
 osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs | 6 +++---
 osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs     | 6 +++---
 osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs | 6 +++---
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs            | 6 +++---
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs b/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
index 63937600bb..9d5fc553de 100644
--- a/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
@@ -26,13 +26,13 @@ namespace osu.Game.Rulesets.Catch.Scoring
         {
         }
 
-        protected override double ComputeTotalScore(double comboRatio, double accuracyRatio, double bonusPortion)
+        protected override double ComputeTotalScore(double comboProgress, double accuracyProgress, double bonusPortion)
         {
             double fruitHitsRatio = maximumTinyDroplets == 0 ? 0 : (double)hitTinyDroplets / maximumTinyDroplets;
 
             const int tiny_droplets_portion = 400000;
 
-            return ((1000000 - tiny_droplets_portion) + tiny_droplets_portion * (1 - tinyDropletScale)) * comboRatio
+            return ((1000000 - tiny_droplets_portion) + tiny_droplets_portion * (1 - tinyDropletScale)) * comboProgress
                    + tiny_droplets_portion * tinyDropletScale * fruitHitsRatio
                    + bonusPortion;
         }
diff --git a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
index 214aded2d7..3341f834dd 100644
--- a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
+++ b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
@@ -16,10 +16,10 @@ namespace osu.Game.Rulesets.Mania.Scoring
         {
         }
 
-        protected override double ComputeTotalScore(double comboRatio, double accuracyRatio, double bonusPortion)
+        protected override double ComputeTotalScore(double comboProgress, double accuracyProgress, double bonusPortion)
         {
-            return 200000 * comboRatio
-                   + 800000 * Math.Pow(Accuracy.Value, 2 + 2 * Accuracy.Value) * accuracyRatio
+            return 200000 * comboProgress
+                   + 800000 * Math.Pow(Accuracy.Value, 2 + 2 * Accuracy.Value) * accuracyProgress
                    + bonusPortion;
         }
 
diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
index 5028d5b8d6..ab07ac3e9d 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
@@ -13,10 +13,10 @@ namespace osu.Game.Rulesets.Osu.Scoring
         {
         }
 
-        protected override double ComputeTotalScore(double comboRatio, double accuracyRatio, double bonusPortion)
+        protected override double ComputeTotalScore(double comboProgress, double accuracyProgress, double bonusPortion)
         {
-            return 700000 * comboRatio
-                   + 300000 * Math.Pow(Accuracy.Value, 10) * accuracyRatio
+            return 700000 * comboProgress
+                   + 300000 * Math.Pow(Accuracy.Value, 10) * accuracyProgress
                    + bonusPortion;
         }
     }
diff --git a/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs b/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
index e0f83505cf..a77e6db6f3 100644
--- a/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
+++ b/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
@@ -17,10 +17,10 @@ namespace osu.Game.Rulesets.Taiko.Scoring
         {
         }
 
-        protected override double ComputeTotalScore(double comboRatio, double accuracyRatio, double bonusPortion)
+        protected override double ComputeTotalScore(double comboProgress, double accuracyProgress, double bonusPortion)
         {
-            return 250000 * comboRatio
-                   + 750000 * Math.Pow(Accuracy.Value, 3.6) * accuracyRatio
+            return 250000 * comboProgress
+                   + 750000 * Math.Pow(Accuracy.Value, 3.6) * accuracyProgress
                    + bonusPortion;
         }
 
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 0244e7f5e3..d0bbe863fb 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -296,13 +296,13 @@ namespace osu.Game.Rulesets.Scoring
             TotalScore.Value = (long)Math.Round(ComputeTotalScore(comboRatio, accuracyRatio, currentBonusPortion) * scoreMultiplier);
         }
 
-        protected virtual double ComputeTotalScore(double comboRatio, double accuracyRatio, double bonusPortion)
+        protected virtual double ComputeTotalScore(double comboProgress, double accuracyProgress, double bonusPortion)
         {
             return
                 (int)Math.Round
                 ((
-                    700000 * comboRatio +
-                    300000 * Math.Pow(Accuracy.Value, 10) * accuracyRatio +
+                    700000 * comboProgress +
+                    300000 * Math.Pow(Accuracy.Value, 10) * accuracyProgress +
                     bonusPortion
                 ) * scoreMultiplier);
         }

From e8cb19e40aead0744621afe052944f57fa81ea02 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 May 2023 17:49:26 +0900
Subject: [PATCH 0523/1604] Pin builds to .NET 6

As more things move to having the 7 SDK installed, let's pin for now.

This helps with mobile build scenarios, which fall over on the new SDKs
and require further attention.
---
 global.json | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 global.json

diff --git a/global.json b/global.json
new file mode 100644
index 0000000000..5dcd5f425a
--- /dev/null
+++ b/global.json
@@ -0,0 +1,7 @@
+{
+  "sdk": {
+    "version": "6.0.100",
+    "rollForward": "latestFeature"
+  }
+}
+

From 25d72d370e95c8e0722bbccb96b0cc01a78e61f9 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Sat, 20 May 2023 00:24:43 +0900
Subject: [PATCH 0524/1604] Always add non-bonus change to combo portion

---
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index d0bbe863fb..f2b1607f5e 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -217,8 +217,7 @@ namespace osu.Game.Rulesets.Scoring
 
             if (result.Type.IsBonus())
                 currentBonusPortion += GetBonusScoreChange(result);
-
-            if (result.Type.AffectsCombo())
+            else
                 currentComboPortion += GetComboScoreChange(result);
 
             ApplyScoreChange(result);
@@ -261,8 +260,7 @@ namespace osu.Game.Rulesets.Scoring
 
             if (result.Type.IsBonus())
                 currentBonusPortion -= GetBonusScoreChange(result);
-
-            if (result.Type.AffectsCombo())
+            else
                 currentComboPortion -= GetComboScoreChange(result);
 
             RemoveScoreChange(result);

From 8e0a97ca4965a5d058fc16abb03ec9bc91ad0067 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 20 May 2023 18:02:12 +0200
Subject: [PATCH 0525/1604] Remove usage of `HasSubmenu`

Property has been removed in the appropriate framework-side PR and
instead folded into `IsActionable`.

See: https://github.com/ppy/osu-framework/pull/5658#discussion_r1114834647
---
 osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs b/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs
index 0adff11342..eb046932e6 100644
--- a/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs
+++ b/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs
@@ -77,12 +77,10 @@ namespace osu.Game.Graphics.UserInterface
 
         private void updateState()
         {
-            bool enabledState = IsActionable || HasSubmenu;
+            hoverClickSounds.Enabled.Value = IsActionable;
+            Alpha = IsActionable ? 1 : 0.2f;
 
-            hoverClickSounds.Enabled.Value = enabledState;
-            Alpha = enabledState ? 1 : 0.2f;
-
-            if (IsHovered && enabledState)
+            if (IsHovered && IsActionable)
             {
                 text.BoldText.FadeIn(transition_length, Easing.OutQuint);
                 text.NormalText.FadeOut(transition_length, Easing.OutQuint);

From a677d87d39b49e1ba9f471f720d61c292d9c3547 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 20 May 2023 19:29:59 +0200
Subject: [PATCH 0526/1604] Touch up inline comments

---
 osu.Game/Online/Chat/MessageNotifier.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Chat/MessageNotifier.cs b/osu.Game/Online/Chat/MessageNotifier.cs
index cb29fc4535..52bdd36169 100644
--- a/osu.Game/Online/Chat/MessageNotifier.cs
+++ b/osu.Game/Online/Chat/MessageNotifier.cs
@@ -93,7 +93,7 @@ namespace osu.Game.Online.Chat
             if (channel == null)
                 return;
 
-            // Only send notifications, if ChatOverlay and the target channel aren't visible, or if the window is unfocused
+            // Only send notifications if ChatOverlay or the target channel aren't visible, or if the window is unfocused
             if (chatOverlay.IsPresent && channelManager.CurrentChannel.Value == channel && host.IsActive.Value)
                 return;
 
@@ -103,7 +103,7 @@ namespace osu.Game.Online.Chat
                 if (message.Id <= channel.LastReadId)
                     return;
 
-                // ignore notifications triggered by your own chat messages
+                // ignore notifications triggered by local user's own chat messages
                 if (message.Sender.Id == localUser.Value.Id)
                     continue;
 

From ec5f0bbf421828ee8d3ab42ddcec3ab2679baf1c Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sat, 20 May 2023 16:29:49 -0700
Subject: [PATCH 0527/1604] Fix clicking area of news sidebar post links

Side effect is that the hover color is yellow and pressing it opens an external dialog, but those are temporary (pending implementation of link underline to make `Light1` hover more readable and set at a higher level and news pages).
---
 .../Overlays/News/Sidebar/MonthSection.cs     | 29 +++----------------
 1 file changed, 4 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/MonthSection.cs b/osu.Game/Overlays/News/Sidebar/MonthSection.cs
index 30d29048ba..4dccc07eff 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthSection.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthSection.cs
@@ -20,7 +20,7 @@ using System.Diagnostics;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Extensions.LocalisationExtensions;
-using osu.Framework.Platform;
+using osu.Game.Online.Chat;
 
 namespace osu.Game.Overlays.News.Sidebar
 {
@@ -123,35 +123,14 @@ namespace osu.Game.Overlays.News.Sidebar
             }
         }
 
-        private partial class PostButton : OsuHoverContainer
+        private partial class PostButton : LinkFlowContainer
         {
-            protected override IEnumerable<Drawable> EffectTargets => new[] { text };
-
-            private readonly TextFlowContainer text;
-            private readonly APINewsPost post;
-
             public PostButton(APINewsPost post)
+                : base(t => t.Font = OsuFont.GetFont(size: 12))
             {
-                this.post = post;
-
                 RelativeSizeAxes = Axes.X;
                 AutoSizeAxes = Axes.Y;
-                Child = text = new TextFlowContainer(t => t.Font = OsuFont.GetFont(size: 12))
-                {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Text = post.Title
-                };
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(OverlayColourProvider overlayColours, GameHost host)
-            {
-                IdleColour = overlayColours.Light2;
-                HoverColour = overlayColours.Light1;
-
-                TooltipText = "view in browser";
-                Action = () => host.OpenUrlExternally("https://osu.ppy.sh/home/news/" + post.Slug);
+                AddLink(post.Title, LinkAction.External, "https://osu.ppy.sh/home/news/" + post.Slug, "view in browser");
             }
         }
 

From 8aefb62532aebf3430f19aae09bbcedce8fce7c7 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sat, 20 May 2023 16:38:56 -0700
Subject: [PATCH 0528/1604] Rename `PostButton` to `PostLink`

---
 osu.Game/Overlays/News/Sidebar/MonthSection.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/MonthSection.cs b/osu.Game/Overlays/News/Sidebar/MonthSection.cs
index 4dccc07eff..b586d156ad 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthSection.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthSection.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Overlays.News.Sidebar
                     new PostsContainer
                     {
                         Expanded = { BindTarget = Expanded },
-                        Children = posts.Select(p => new PostButton(p)).ToArray()
+                        Children = posts.Select(p => new PostLink(p)).ToArray()
                     }
                 }
             };
@@ -123,9 +123,9 @@ namespace osu.Game.Overlays.News.Sidebar
             }
         }
 
-        private partial class PostButton : LinkFlowContainer
+        private partial class PostLink : LinkFlowContainer
         {
-            public PostButton(APINewsPost post)
+            public PostLink(APINewsPost post)
                 : base(t => t.Font = OsuFont.GetFont(size: 12))
             {
                 RelativeSizeAxes = Axes.X;

From 67bf1b4dfe5117cbf1e7a30b1a98caf271f8d637 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Sun, 21 May 2023 11:05:01 +0300
Subject: [PATCH 0529/1604] Select/deselect first visible mod when
 `GlobalAction.Select` is triggered

---
 .../UserInterface/TestSceneModSelectOverlay.cs | 18 ++++++++++++++++++
 osu.Game/Overlays/Mods/ModSelectOverlay.cs     | 18 ++++++++++++++++--
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index ea81f9c96e..499a30f0dc 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -468,6 +468,24 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("unimplemented mod panel is filtered", () => !getPanelForMod(typeof(TestUnimplementedMod)).IsValid);
         }
 
+        [Test]
+        public void TestFirstModSelectDeselect()
+        {
+            createScreen();
+
+            AddStep("apply search", () => modSelectOverlay.SearchTerm = "HD");
+
+            AddStep("press enter", () => InputManager.Key(Key.Enter));
+            AddAssert("hidden selected", () => getPanelForMod(typeof(OsuModHidden)).Active.Value);
+
+            AddStep("press enter again", () => InputManager.Key(Key.Enter));
+            AddAssert("hidden deselected", () => !getPanelForMod(typeof(OsuModHidden)).Active.Value);
+
+            AddStep("clear search", () => modSelectOverlay.SearchTerm = string.Empty);
+            AddStep("press enter", () => InputManager.Key(Key.Enter));
+            AddAssert("mod select hidden", () => modSelectOverlay.State.Value == Visibility.Hidden);
+        }
+
         [Test]
         public void TestSearchFocusChange()
         {
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index ace5bf71d1..eb0e797eac 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -612,10 +612,24 @@ namespace osu.Game.Overlays.Mods
                 // This is handled locally here because this overlay is being registered at the game level
                 // and therefore takes away keyboard focus from the screen stack.
                 case GlobalAction.ToggleModSelection:
+                    // Pressing toggle should completely hide the overlay in one shot.
+                    hideOverlay(true);
+                    return true;
+
                 case GlobalAction.Select:
                 {
-                    // Pressing toggle or select should completely hide the overlay in one shot.
-                    hideOverlay(true);
+                    // Pressing select should select first filtered mod or completely hide the overlay in one shot if search term is empty.
+                    if (string.IsNullOrEmpty(SearchTerm))
+                    {
+                        hideOverlay(true);
+                        return true;
+                    }
+
+                    ModState? firstMod = columnFlow.Columns.OfType<ModColumn>().FirstOrDefault(m => m.IsPresent)?.AvailableMods.FirstOrDefault(x => x.IsValid);
+
+                    if (firstMod is not null)
+                        firstMod.Active.Value = !firstMod.Active.Value;
+
                     return true;
                 }
             }

From 5229cf7343ea6d562598fbbdf67a6c2e19bb51b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 21 May 2023 16:47:16 +0200
Subject: [PATCH 0530/1604] Add failing test cases for drum roll/swell sample
 playback

---
 .../TestSceneDrumSampleTriggerSource.cs       | 273 ++++++++++++++++++
 .../UI/GameplaySampleTriggerSource.cs         |   2 +-
 2 files changed, 274 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs
new file mode 100644
index 0000000000..0c8f18badd
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs
@@ -0,0 +1,273 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Timing;
+using osu.Game.Audio;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.Objects.Drawables;
+using osu.Game.Rulesets.Taiko.UI;
+using osu.Game.Rulesets.UI;
+using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Taiko.Tests
+{
+    public partial class TestSceneDrumSampleTriggerSource : OsuTestScene
+    {
+        private readonly ManualClock manualClock = new ManualClock();
+
+        [Cached(typeof(IScrollingInfo))]
+        private ScrollingTestContainer.TestScrollingInfo info = new ScrollingTestContainer.TestScrollingInfo
+        {
+            Direction = { Value = ScrollingDirection.Left },
+            TimeRange = { Value = 200 },
+        };
+
+        private ScrollingHitObjectContainer hitObjectContainer = null!;
+        private TestDrumSampleTriggerSource triggerSource = null!;
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
+        {
+            hitObjectContainer = new ScrollingHitObjectContainer();
+            manualClock.CurrentTime = 0;
+
+            Child = new Container
+            {
+                Clock = new FramedClock(manualClock),
+                RelativeSizeAxes = Axes.Both,
+                Children = new Drawable[]
+                {
+                    hitObjectContainer,
+                    triggerSource = new TestDrumSampleTriggerSource(hitObjectContainer)
+                }
+            };
+        });
+
+        [Test]
+        public void TestNormalHit()
+        {
+            AddStep("add hit with normal samples", () =>
+            {
+                var hit = new Hit
+                {
+                    StartTime = 100,
+                    Samples = new List<HitSampleInfo>
+                    {
+                        new HitSampleInfo(HitSampleInfo.HIT_NORMAL)
+                    }
+                };
+                hit.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+                var drawableHit = new DrawableHit(hit);
+                hitObjectContainer.Add(drawableHit);
+            });
+
+            AddAssert("most valid object is hit", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Hit>);
+            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
+            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
+
+            AddStep("seek past hit", () => manualClock.CurrentTime = 200);
+            AddAssert("most valid object is hit", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Hit>);
+            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
+            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
+        }
+
+        [Test]
+        public void TestSoftHit()
+        {
+            AddStep("add hit with soft samples", () =>
+            {
+                var hit = new Hit
+                {
+                    StartTime = 100,
+                    Samples = new List<HitSampleInfo>
+                    {
+                        new HitSampleInfo(HitSampleInfo.HIT_NORMAL, "soft")
+                    }
+                };
+                hit.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+                var drawableHit = new DrawableHit(hit);
+                hitObjectContainer.Add(drawableHit);
+            });
+
+            AddAssert("most valid object is hit", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Hit>);
+            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, "soft");
+            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, "soft");
+
+            AddStep("seek past hit", () => manualClock.CurrentTime = 200);
+            AddAssert("most valid object is hit", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Hit>);
+            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, "soft");
+            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, "soft");
+        }
+
+        [Test]
+        public void TestNormalDrumRoll()
+        {
+            AddStep("add drum roll with normal samples", () =>
+            {
+                var drumRoll = new DrumRoll
+                {
+                    StartTime = 100,
+                    EndTime = 1100,
+                    Samples = new List<HitSampleInfo>
+                    {
+                        new HitSampleInfo(HitSampleInfo.HIT_NORMAL)
+                    }
+                };
+                drumRoll.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+                var drawableDrumRoll = new DrawableDrumRoll(drumRoll);
+                hitObjectContainer.Add(drawableDrumRoll);
+            });
+
+            AddAssert("most valid object is drum roll tick", () => triggerSource.GetMostValidObject(), Is.InstanceOf<DrumRollTick>);
+            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
+            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
+
+            AddStep("seek to middle of drum roll", () => manualClock.CurrentTime = 600);
+            AddAssert("most valid object is drum roll tick", () => triggerSource.GetMostValidObject(), Is.InstanceOf<DrumRollTick>);
+            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
+            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
+
+            AddStep("seek past drum roll", () => manualClock.CurrentTime = 1200);
+            AddAssert("most valid object is drum roll", () => triggerSource.GetMostValidObject(), Is.InstanceOf<DrumRoll>);
+            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
+            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
+        }
+
+        [Test]
+        public void TestSoftDrumRoll()
+        {
+            AddStep("add drum roll with soft samples", () =>
+            {
+                var drumRoll = new DrumRoll
+                {
+                    StartTime = 100,
+                    EndTime = 1100,
+                    Samples = new List<HitSampleInfo>
+                    {
+                        new HitSampleInfo(HitSampleInfo.HIT_NORMAL, "soft")
+                    }
+                };
+                drumRoll.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+                var drawableDrumRoll = new DrawableDrumRoll(drumRoll);
+                hitObjectContainer.Add(drawableDrumRoll);
+            });
+
+            AddAssert("most valid object is drum roll tick", () => triggerSource.GetMostValidObject(), Is.InstanceOf<DrumRollTick>);
+            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, "soft");
+            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, "soft");
+
+            AddStep("seek to middle of drum roll", () => manualClock.CurrentTime = 600);
+            AddAssert("most valid object is drum roll tick", () => triggerSource.GetMostValidObject(), Is.InstanceOf<DrumRollTick>);
+            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, "soft");
+            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, "soft");
+
+            AddStep("seek past drum roll", () => manualClock.CurrentTime = 1200);
+            AddAssert("most valid object is drum roll", () => triggerSource.GetMostValidObject(), Is.InstanceOf<DrumRoll>);
+            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, "soft");
+            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, "soft");
+        }
+
+        [Test]
+        public void TestNormalSwell()
+        {
+            AddStep("add swell with normal samples", () =>
+            {
+                var swell = new Swell
+                {
+                    StartTime = 100,
+                    EndTime = 1100,
+                    Samples = new List<HitSampleInfo>
+                    {
+                        new HitSampleInfo(HitSampleInfo.HIT_NORMAL)
+                    }
+                };
+                swell.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+                var drawableSwell = new DrawableSwell(swell);
+                hitObjectContainer.Add(drawableSwell);
+            });
+
+            AddAssert("most valid object is swell tick", () => triggerSource.GetMostValidObject(), Is.InstanceOf<SwellTick>);
+            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
+            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
+
+            AddStep("seek to middle of swell", () => manualClock.CurrentTime = 600);
+            AddAssert("most valid object is swell tick", () => triggerSource.GetMostValidObject(), Is.InstanceOf<SwellTick>);
+            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
+            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
+
+            AddStep("seek past swell", () => manualClock.CurrentTime = 1200);
+            AddAssert("most valid object is swell", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Swell>);
+            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
+            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
+        }
+
+        [Test]
+        public void TestDrumSwell()
+        {
+            AddStep("add swell with drum samples", () =>
+            {
+                var swell = new Swell()
+                {
+                    StartTime = 100,
+                    EndTime = 1100,
+                    Samples = new List<HitSampleInfo>
+                    {
+                        new HitSampleInfo(HitSampleInfo.HIT_NORMAL, "drum")
+                    }
+                };
+                swell.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+                var drawableSwell = new DrawableSwell(swell);
+                hitObjectContainer.Add(drawableSwell);
+            });
+
+            AddAssert("most valid object is swell tick", () => triggerSource.GetMostValidObject(), Is.InstanceOf<SwellTick>);
+            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, "drum");
+            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, "drum");
+
+            AddStep("seek to middle of swell", () => manualClock.CurrentTime = 600);
+            AddAssert("most valid object is swell tick", () => triggerSource.GetMostValidObject(), Is.InstanceOf<SwellTick>);
+            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, "drum");
+            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, "drum");
+
+            AddStep("seek past swell", () => manualClock.CurrentTime = 1200);
+            AddAssert("most valid object is swell", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Swell>);
+            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, "drum");
+            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, "drum");
+        }
+
+        private void checkSound(HitType hitType, string expectedName, string expectedBank)
+        {
+            AddStep($"hit {hitType}", () => triggerSource.Play(hitType));
+            AddAssert($"last played sample is {expectedName}", () => triggerSource.LastPlayedSamples!.OfType<HitSampleInfo>().Single().Name, () => Is.EqualTo(expectedName));
+            AddAssert($"last played sample has {expectedBank} bank", () => triggerSource.LastPlayedSamples!.OfType<HitSampleInfo>().Single().Bank, () => Is.EqualTo(expectedBank));
+        }
+
+        private partial class TestDrumSampleTriggerSource : DrumSampleTriggerSource
+        {
+            public ISampleInfo[]? LastPlayedSamples { get; private set; }
+
+            public TestDrumSampleTriggerSource(HitObjectContainer hitObjectContainer)
+                : base(hitObjectContainer)
+            {
+            }
+
+            protected override void PlaySamples(ISampleInfo[] samples)
+            {
+                base.PlaySamples(samples);
+                LastPlayedSamples = samples;
+            }
+
+            public new HitObject GetMostValidObject() => base.GetMostValidObject();
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs b/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
index d4510a4519..fbb7a20a5d 100644
--- a/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
+++ b/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Rulesets.UI
             PlaySamples(samples);
         }
 
-        protected void PlaySamples(ISampleInfo[] samples) => Schedule(() =>
+        protected virtual void PlaySamples(ISampleInfo[] samples) => Schedule(() =>
         {
             var hitSound = getNextSample();
             hitSound.Samples = samples;

From 6d325651dcca275091d51bbfbad3e59fa4ce4dc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 21 May 2023 16:49:17 +0200
Subject: [PATCH 0531/1604] Propagate samples to drum roll/swell ticks for
 correct playback

In d97daee96be2c10f90709cc30beceb1f369ae225, `DrumSampleTriggerSource`
was changed such that in order to play sounds for the user's inputs, the
bank of the normal sound would always be used.

The problem is that in the case of taiko objects which have nested
objects (swells and drum rolls), the samples were not propagated fully
(drum rolls, where only the finish sample was kept, for the purposes of
determining strongability), or not propagated at all (swells) to ticks.

As ticks of both objects are valid return values of
`GetMostValidHitObject()`, this would lead to the drum making no sounds
if the next object was a drum roll or swell, until that drum roll or
swell was completed. To fix, propagate the full set of samples, so that
`DrumSampleTriggerSource` can retrieve the normal sound to copy the bank
from.

Note that this may not necessarily reproduce prior behaviour. This is
because it is not guaranteed that all realised samples for a given
hitobject have the same bank - some may have been overriden locally on a
given hitobject. Previously, the bank would have been retrieved from the
sample control point, wherein there is only one possible bank to use;
however, when deciding the sound to play on the basis of a constructed
hitobject, it is possible that there are cases wherein the hitnormal
sample was overridden on that given hitobject, and in such cases, this
PR would make samples _play_, but not necessarily the _same_ samples
as prior to #23308.

If that turns out to be the case, this will have to be revisited.
---
 osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs | 4 +---
 osu.Game.Rulesets.Taiko/Objects/Swell.cs    | 5 ++++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
index b4a12fd314..ba68967fbe 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
@@ -3,11 +3,9 @@
 
 #nullable disable
 
-using System.Linq;
 using osu.Game.Rulesets.Objects.Types;
 using System.Threading;
 using osu.Framework.Bindables;
-using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Formats;
@@ -98,7 +96,7 @@ namespace osu.Game.Rulesets.Taiko.Objects
                     TickSpacing = tickSpacing,
                     StartTime = t,
                     IsStrong = IsStrong,
-                    Samples = Samples.Where(s => s.Name == HitSampleInfo.HIT_FINISH).ToList()
+                    Samples = Samples
                 });
 
                 first = false;
diff --git a/osu.Game.Rulesets.Taiko/Objects/Swell.cs b/osu.Game.Rulesets.Taiko/Objects/Swell.cs
index cb91c46b4d..9ad783ba7e 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Swell.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Swell.cs
@@ -33,7 +33,10 @@ namespace osu.Game.Rulesets.Taiko.Objects
             for (int i = 0; i < RequiredHits; i++)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                AddNested(new SwellTick());
+                AddNested(new SwellTick
+                {
+                    Samples = Samples
+                });
             }
         }
 

From 812df9d652e73c55565a0667f09f8e0e480fcb29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 21 May 2023 17:14:24 +0200
Subject: [PATCH 0532/1604] Add failing test cases for strong object sample
 playback

---
 .../TestSceneDrumSampleTriggerSource.cs       | 66 ++++++++++++++++++-
 1 file changed, 65 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs
index 0c8f18badd..74da69e3eb 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs
@@ -109,6 +109,35 @@ namespace osu.Game.Rulesets.Taiko.Tests
             checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, "soft");
         }
 
+        [Test]
+        public void TestDrumStrongHit()
+        {
+            AddStep("add strong hit with drum samples", () =>
+            {
+                var hit = new Hit
+                {
+                    StartTime = 100,
+                    Samples = new List<HitSampleInfo>
+                    {
+                        new HitSampleInfo(HitSampleInfo.HIT_NORMAL, "drum"),
+                        new HitSampleInfo(HitSampleInfo.HIT_FINISH, "drum") // implies strong
+                    }
+                };
+                hit.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+                var drawableHit = new DrawableHit(hit);
+                hitObjectContainer.Add(drawableHit);
+            });
+
+            AddAssert("most valid object is strong nested hit", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Hit.StrongNestedHit>);
+            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, "drum");
+            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, "drum");
+
+            AddStep("seek past hit", () => manualClock.CurrentTime = 200);
+            AddAssert("most valid object is hit", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Hit>);
+            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, "drum");
+            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, "drum");
+        }
+
         [Test]
         public void TestNormalDrumRoll()
         {
@@ -177,6 +206,41 @@ namespace osu.Game.Rulesets.Taiko.Tests
             checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, "soft");
         }
 
+        [Test]
+        public void TestDrumStrongDrumRoll()
+        {
+            AddStep("add strong drum roll with drum samples", () =>
+            {
+                var drumRoll = new DrumRoll
+                {
+                    StartTime = 100,
+                    EndTime = 1100,
+                    Samples = new List<HitSampleInfo>
+                    {
+                        new HitSampleInfo(HitSampleInfo.HIT_NORMAL, "drum"),
+                        new HitSampleInfo(HitSampleInfo.HIT_FINISH, "drum") // implies strong
+                    }
+                };
+                drumRoll.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+                var drawableDrumRoll = new DrawableDrumRoll(drumRoll);
+                hitObjectContainer.Add(drawableDrumRoll);
+            });
+
+            AddAssert("most valid object is drum roll tick's nested strong hit", () => triggerSource.GetMostValidObject(), Is.InstanceOf<DrumRollTick.StrongNestedHit>);
+            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, "drum");
+            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, "drum");
+
+            AddStep("seek to middle of drum roll", () => manualClock.CurrentTime = 600);
+            AddAssert("most valid object is drum roll tick's nested strong hit", () => triggerSource.GetMostValidObject(), Is.InstanceOf<DrumRollTick.StrongNestedHit>);
+            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, "drum");
+            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, "drum");
+
+            AddStep("seek past drum roll", () => manualClock.CurrentTime = 1200);
+            AddAssert("most valid object is drum roll", () => triggerSource.GetMostValidObject(), Is.InstanceOf<DrumRoll>);
+            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, "drum");
+            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, "drum");
+        }
+
         [Test]
         public void TestNormalSwell()
         {
@@ -216,7 +280,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
         {
             AddStep("add swell with drum samples", () =>
             {
-                var swell = new Swell()
+                var swell = new Swell
                 {
                     StartTime = 100,
                     EndTime = 1100,

From 4a7b011a53773d547b60401f609d7e394482a3ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 21 May 2023 18:28:30 +0200
Subject: [PATCH 0533/1604] Propagate samples to strong nested hits too

The rationale is the same as in
6d325651dcca275091d51bbfbad3e59fa4ce4dc8. Due to the recursive nature of
`GameplaySampleTriggerSource.GetMostValidObject()`, in the case of
nested hits, drum rolls and drum roll ticks, the nested strong hits
would become the most valid object, and so without propagating
the samples down to that level too, nothing would play.
---
 osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs     | 6 +++++-
 osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs | 6 +++++-
 osu.Game.Rulesets.Taiko/Objects/Hit.cs          | 6 +++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
index ba68967fbe..aa5da6d710 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
@@ -107,7 +107,11 @@ namespace osu.Game.Rulesets.Taiko.Objects
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
 
-        protected override StrongNestedHitObject CreateStrongNestedHit(double startTime) => new StrongNestedHit { StartTime = startTime };
+        protected override StrongNestedHitObject CreateStrongNestedHit(double startTime) => new StrongNestedHit
+        {
+            StartTime = startTime,
+            Samples = Samples
+        };
 
         public class StrongNestedHit : StrongNestedHitObject
         {
diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
index 6bcb8674e6..f8203d793d 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
@@ -33,7 +33,11 @@ namespace osu.Game.Rulesets.Taiko.Objects
 
         public override double MaximumJudgementOffset => HitWindow;
 
-        protected override StrongNestedHitObject CreateStrongNestedHit(double startTime) => new StrongNestedHit { StartTime = startTime };
+        protected override StrongNestedHitObject CreateStrongNestedHit(double startTime) => new StrongNestedHit
+        {
+            StartTime = startTime,
+            Samples = Samples
+        };
 
         public class StrongNestedHit : StrongNestedHitObject
         {
diff --git a/osu.Game.Rulesets.Taiko/Objects/Hit.cs b/osu.Game.Rulesets.Taiko/Objects/Hit.cs
index 303447e672..8935878f0e 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Hit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Hit.cs
@@ -72,7 +72,11 @@ namespace osu.Game.Rulesets.Taiko.Objects
             }
         }
 
-        protected override StrongNestedHitObject CreateStrongNestedHit(double startTime) => new StrongNestedHit { StartTime = startTime };
+        protected override StrongNestedHitObject CreateStrongNestedHit(double startTime) => new StrongNestedHit
+        {
+            StartTime = startTime,
+            Samples = Samples
+        };
 
         public class StrongNestedHit : StrongNestedHitObject
         {

From 9915fac2c825a5b06555bf440f61748b10cccd06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 21 May 2023 18:31:26 +0200
Subject: [PATCH 0534/1604] Fix sample silence being one level too low

4a7b011a53773d547b60401f609d7e394482a3ab inadvertently unearthed that
nested strong hits could play samples of their own accord, rather than
delegating to `DrumSampleTriggerSource` as they were supposed to. This
was an unfortunate omission due to how the inheritance structure of
`TaikoHitObject` looks like (some irrelevant classes omitted for
brevity):

	DrawableTaikoHitObject
		DrawableTaikoHitObject<TObject> <-- `GetSamples()` was overridden to empty here
			DrawableTaikoStrongableHitObject
				DrawableHit
				DrawableDrumRoll
				DrawableDrumRollTick
			DrawableSwell
			DrawableSwellTick
		DrawableStrongNestedHit <-- all strong nested hits are here => didn't receive `GetSamples()` override
			DrawableHit.StrongNestedHit
			DrawableDrumRoll.StrongNestedHit
			DrawableDrumRollTick.StrongNestedHit

To fix, move the `GetSamples()` override one level higher, to the
non-generic `DrawableTaikoHitObject`, to suppress the spurious sample
playbacks.

The stale reference in the comment was also updated to match current
code.
---
 .../Objects/Drawables/DrawableTaikoHitObject.cs             | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
index f695c505a4..1b5d641612 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
@@ -118,6 +118,9 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         {
             public override bool RemoveWhenNotAlive => false;
         }
+
+        // Most osu!taiko hitsounds are managed by the drum (see DrumSampleTriggerSource).
+        public override IEnumerable<HitSampleInfo> GetSamples() => Enumerable.Empty<HitSampleInfo>();
     }
 
     public abstract partial class DrawableTaikoHitObject<TObject> : DrawableTaikoHitObject
@@ -157,9 +160,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             Content.Add(MainPiece = CreateMainPiece());
         }
 
-        // Most osu!taiko hitsounds are managed by the drum (see DrumSampleMapping).
-        public override IEnumerable<HitSampleInfo> GetSamples() => Enumerable.Empty<HitSampleInfo>();
-
         protected abstract SkinnableDrawable CreateMainPiece();
     }
 }

From 88c112612f05c71cb75b5364753cc38bb310848f Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sun, 21 May 2023 10:35:22 -0700
Subject: [PATCH 0535/1604] Remove hardcoded website url
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 osu.Game/Overlays/News/Sidebar/MonthSection.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/News/Sidebar/MonthSection.cs b/osu.Game/Overlays/News/Sidebar/MonthSection.cs
index b586d156ad..9a748b2001 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthSection.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthSection.cs
@@ -130,7 +130,7 @@ namespace osu.Game.Overlays.News.Sidebar
             {
                 RelativeSizeAxes = Axes.X;
                 AutoSizeAxes = Axes.Y;
-                AddLink(post.Title, LinkAction.External, "https://osu.ppy.sh/home/news/" + post.Slug, "view in browser");
+                AddLink(post.Title, LinkAction.External, @"/home/news/" + post.Slug, "view in browser");
             }
         }
 

From 19816ae0137d49709b53753dc55d137224be89a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 21 May 2023 20:38:27 +0200
Subject: [PATCH 0536/1604] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 4 ++--
 osu.iOS.props            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index c73c643d4b..6aebae665d 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -11,7 +11,7 @@
     <AndroidManifestMerger>manifestmerger.jar</AndroidManifestMerger>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.513.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.521.0" />
   </ItemGroup>
   <ItemGroup>
     <AndroidManifestOverlay Include="$(MSBuildThisFileDirectory)osu.Android\Properties\AndroidManifestOverlay.xml" />
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 3ea4a57c2c..0fd2b0c2c5 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -30,13 +30,13 @@
     <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="7.0.2" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
     <PackageReference Include="Microsoft.Toolkit.HighPerformance" Version="7.1.2" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="ppy.LocalisationAnalyser" Version="2022.809.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="10.20.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.513.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.521.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.510.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index a240dec963..e4a169f8e5 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -16,6 +16,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.513.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.521.0" />
   </ItemGroup>
 </Project>

From b3527b92b60670dd2f5a6d18af135987e0e08d60 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 22 May 2023 09:25:17 +0900
Subject: [PATCH 0537/1604] Handle case in tests where current display becomes
 null

---
 .../Overlays/Settings/Sections/Graphics/LayoutSettings.cs   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index b76b9a40f9..a3290bc81c 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -193,6 +193,12 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
 
             currentDisplay.BindValueChanged(display => Schedule(() =>
             {
+                if (display.NewValue == null)
+                {
+                    resolutions.Clear();
+                    return;
+                }
+
                 resolutions.ReplaceRange(1, resolutions.Count - 1, display.NewValue.DisplayModes
                                                                           .Where(m => m.Size.Width >= 800 && m.Size.Height >= 600)
                                                                           .OrderByDescending(m => Math.Max(m.Size.Height, m.Size.Width))

From 2279aad360a6f733068aa355855f17f383822782 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sun, 21 May 2023 19:27:20 -0700
Subject: [PATCH 0538/1604] Apply NRT to `NewsCard`

---
 osu.Game/Overlays/News/NewsCard.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/News/NewsCard.cs b/osu.Game/Overlays/News/NewsCard.cs
index e0be5cc4a9..18ca46a995 100644
--- a/osu.Game/Overlays/News/NewsCard.cs
+++ b/osu.Game/Overlays/News/NewsCard.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
@@ -27,8 +25,8 @@ namespace osu.Game.Overlays.News
 
         private readonly APINewsPost post;
 
-        private Box background;
-        private TextFlowContainer main;
+        private Box background = null!;
+        private TextFlowContainer main = null!;
 
         public NewsCard(APINewsPost post)
         {

From 7392109bcef1ff00170d26539cf13e29460790c4 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sun, 21 May 2023 19:28:12 -0700
Subject: [PATCH 0539/1604] Apply same behavioral changes to `NewsCard`

---
 osu.Game/Overlays/News/NewsCard.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/News/NewsCard.cs b/osu.Game/Overlays/News/NewsCard.cs
index 18ca46a995..b12aa4509e 100644
--- a/osu.Game/Overlays/News/NewsCard.cs
+++ b/osu.Game/Overlays/News/NewsCard.cs
@@ -11,7 +11,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
-using osu.Framework.Platform;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
@@ -39,12 +38,12 @@ namespace osu.Game.Overlays.News
         }
 
         [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider, GameHost host)
+        private void load(OverlayColourProvider colourProvider, OsuGame? game)
         {
             if (post.Slug != null)
             {
                 TooltipText = "view in browser";
-                Action = () => host.OpenUrlExternally("https://osu.ppy.sh/home/news/" + post.Slug);
+                Action = () => game?.OpenUrlExternally(@"/home/news/" + post.Slug);
             }
 
             AddRange(new Drawable[]

From 843d2903d237a12c92781ced262576f7a65c9ff9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 22 May 2023 21:17:21 +0200
Subject: [PATCH 0540/1604] Add failing test case for slider velocity undo

---
 ...TestSceneHitObjectDifficultyPointAdjustments.cs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectDifficultyPointAdjustments.cs b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectDifficultyPointAdjustments.cs
index 3b998b4219..c874b39028 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectDifficultyPointAdjustments.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectDifficultyPointAdjustments.cs
@@ -92,6 +92,20 @@ namespace osu.Game.Tests.Visual.Editing
             hitObjectHasVelocity(1, 5);
         }
 
+        [Test]
+        public void TestUndo()
+        {
+            clickDifficultyPiece(1);
+            velocityPopoverHasSingleValue(2);
+
+            setVelocityViaPopover(5);
+            hitObjectHasVelocity(1, 5);
+            dismissPopover();
+
+            AddStep("undo", () => Editor.Undo());
+            hitObjectHasVelocity(1, 2);
+        }
+
         [Test]
         public void TestMultipleSelectionWithSameSliderVelocity()
         {

From f253d17a7f0af2d21985fbf92ca8835a510e9ee5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 22 May 2023 22:19:10 +0200
Subject: [PATCH 0541/1604] Fix slider velocity changes not being applied in
 patcher

---
 .../Screens/Edit/LegacyEditorBeatmapPatcher.cs     | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs b/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
index b4647c2b64..33f8cd5c78 100644
--- a/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
+++ b/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
@@ -15,7 +15,9 @@ using osu.Framework.Graphics.Textures;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Formats;
+using osu.Game.Beatmaps.Legacy;
 using osu.Game.IO;
+using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Skinning;
 using Decoder = osu.Game.Beatmaps.Formats.Decoder;
 
@@ -42,6 +44,7 @@ namespace osu.Game.Screens.Edit
             editorBeatmap.BeginChange();
             processHitObjects(result, () => newBeatmap ??= readBeatmap(newState));
             processTimingPoints(() => newBeatmap ??= readBeatmap(newState));
+            processSliderVelocity(() => newBeatmap ??= readBeatmap(newState));
             editorBeatmap.EndChange();
         }
 
@@ -71,6 +74,17 @@ namespace osu.Game.Screens.Edit
             }
         }
 
+        private void processSliderVelocity(Func<IBeatmap> getNewBeatmap)
+        {
+            var legacyControlPoints = (LegacyControlPointInfo)getNewBeatmap().ControlPointInfo;
+
+            foreach (var hitObject in editorBeatmap.HitObjects.Where(ho => ho is IHasSliderVelocity))
+            {
+                var difficultyPoint = legacyControlPoints.DifficultyPointAt(hitObject.StartTime);
+                ((IHasSliderVelocity)hitObject).SliderVelocity = difficultyPoint.SliderVelocity;
+            }
+        }
+
         private void processHitObjects(DiffResult result, Func<IBeatmap> getNewBeatmap)
         {
             findChangedIndices(result, LegacyDecoder<Beatmap>.Section.HitObjects, out var removedIndices, out var addedIndices);

From 2ce150ba2bbff1763a4be142ec802a5d942c96fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 22 May 2023 22:23:05 +0200
Subject: [PATCH 0542/1604] Add failing test case for sample undo

---
 .../TestSceneHitObjectSampleAdjustments.cs        | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSampleAdjustments.cs b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSampleAdjustments.cs
index 530bd5eb20..d812aed0f6 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSampleAdjustments.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSampleAdjustments.cs
@@ -109,6 +109,21 @@ namespace osu.Game.Tests.Visual.Editing
             hitObjectHasSampleBank(1, "drum");
         }
 
+        [Test]
+        public void TestUndo()
+        {
+            clickSamplePiece(1);
+            samplePopoverHasSingleBank("soft");
+            samplePopoverHasSingleVolume(60);
+
+            setVolumeViaPopover(90);
+            hitObjectHasSampleVolume(1, 90);
+            dismissPopover();
+
+            AddStep("undo", () => Editor.Undo());
+            hitObjectHasSampleVolume(1, 60);
+        }
+
         [Test]
         public void TestMultipleSelectionWithSameSampleVolume()
         {

From e0b7539c2a1338f079b8052bff0cf1eeb5e1de37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 22 May 2023 22:33:41 +0200
Subject: [PATCH 0543/1604] Fix sample changes not being applied in patcher

---
 .../Edit/LegacyEditorBeatmapPatcher.cs        | 46 +++++++++++++------
 1 file changed, 33 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs b/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
index 33f8cd5c78..ae7105ee34 100644
--- a/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
+++ b/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -15,7 +16,7 @@ using osu.Framework.Graphics.Textures;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Formats;
-using osu.Game.Beatmaps.Legacy;
+using osu.Game.Extensions;
 using osu.Game.IO;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Skinning;
@@ -44,7 +45,7 @@ namespace osu.Game.Screens.Edit
             editorBeatmap.BeginChange();
             processHitObjects(result, () => newBeatmap ??= readBeatmap(newState));
             processTimingPoints(() => newBeatmap ??= readBeatmap(newState));
-            processSliderVelocity(() => newBeatmap ??= readBeatmap(newState));
+            processHitObjectLocalData(() => newBeatmap ??= readBeatmap(newState));
             editorBeatmap.EndChange();
         }
 
@@ -74,17 +75,6 @@ namespace osu.Game.Screens.Edit
             }
         }
 
-        private void processSliderVelocity(Func<IBeatmap> getNewBeatmap)
-        {
-            var legacyControlPoints = (LegacyControlPointInfo)getNewBeatmap().ControlPointInfo;
-
-            foreach (var hitObject in editorBeatmap.HitObjects.Where(ho => ho is IHasSliderVelocity))
-            {
-                var difficultyPoint = legacyControlPoints.DifficultyPointAt(hitObject.StartTime);
-                ((IHasSliderVelocity)hitObject).SliderVelocity = difficultyPoint.SliderVelocity;
-            }
-        }
-
         private void processHitObjects(DiffResult result, Func<IBeatmap> getNewBeatmap)
         {
             findChangedIndices(result, LegacyDecoder<Beatmap>.Section.HitObjects, out var removedIndices, out var addedIndices);
@@ -101,6 +91,36 @@ namespace osu.Game.Screens.Edit
             }
         }
 
+        private void processHitObjectLocalData(Func<IBeatmap> getNewBeatmap)
+        {
+            // This method handles data that are stored in control points in the legacy format,
+            // but were moved to the hitobjects themselves in lazer.
+            // Specifically, the data being referred to here consists of: slider velocity and sample information.
+
+            // For simplicity, this implementation relies on the editor beatmap already having the same hitobjects in sequence as the new beatmap.
+            // To guarantee that, `processHitObjects()` must be ran prior to this method for correct operation.
+            // This is done to avoid the necessity of reimplementing/reusing parts of LegacyBeatmapDecoder that already treat this data correctly.
+
+            var oldObjects = editorBeatmap.HitObjects;
+            var newObjects = getNewBeatmap().HitObjects;
+
+            Debug.Assert(oldObjects.Count == newObjects.Count);
+
+            foreach (var (oldObject, newObject) in oldObjects.Zip(newObjects))
+            {
+                if (oldObject is IHasSliderVelocity oldWithVelocity && newObject is IHasSliderVelocity newWithVelocity)
+                    oldWithVelocity.SliderVelocity = newWithVelocity.SliderVelocity;
+
+                oldObject.Samples = newObject.Samples;
+
+                if (oldObject is IHasRepeats oldWithRepeats && newObject is IHasRepeats newWithRepeats)
+                {
+                    oldWithRepeats.NodeSamples.Clear();
+                    oldWithRepeats.NodeSamples.AddRange(newWithRepeats.NodeSamples);
+                }
+            }
+        }
+
         private void findChangedIndices(DiffResult result, LegacyDecoder<Beatmap>.Section section, out List<int> removedIndices, out List<int> addedIndices)
         {
             removedIndices = new List<int>();

From 38b4bd8aefd738af26e26c1bf2309995f7253aee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 22 May 2023 22:45:39 +0200
Subject: [PATCH 0544/1604] Fix undo not behaving as expected sometimes

---
 osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs b/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
index ae7105ee34..2cf823ca0c 100644
--- a/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
+++ b/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
@@ -108,6 +108,11 @@ namespace osu.Game.Screens.Edit
 
             foreach (var (oldObject, newObject) in oldObjects.Zip(newObjects))
             {
+                // if `oldObject` and `newObject` are the same, it means that `oldObject` was inserted into `editorBeatmap` by `processHitObjects()`.
+                // in that case, there is nothing to do (and some of the subsequent changes may even prove destructive).
+                if (ReferenceEquals(oldObject, newObject))
+                    continue;
+
                 if (oldObject is IHasSliderVelocity oldWithVelocity && newObject is IHasSliderVelocity newWithVelocity)
                     oldWithVelocity.SliderVelocity = newWithVelocity.SliderVelocity;
 

From c291d6fc829d02103230f4cb0881fe2bdeca1985 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 22 May 2023 12:02:44 +0900
Subject: [PATCH 0545/1604] Remove catch tiny droplet portion

---
 .../Scoring/CatchScoreProcessor.cs            | 74 +------------------
 1 file changed, 2 insertions(+), 72 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs b/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
index 9d5fc553de..9323296b7f 100644
--- a/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
@@ -2,8 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
-using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 
@@ -14,13 +12,6 @@ namespace osu.Game.Rulesets.Catch.Scoring
         private const int combo_cap = 200;
         private const double combo_base = 4;
 
-        private double tinyDropletScale;
-
-        private int maximumTinyDroplets;
-        private int hitTinyDroplets;
-        private int maximumBasicJudgements;
-        private int currentBasicJudgements;
-
         public CatchScoreProcessor()
             : base(new CatchRuleset())
         {
@@ -28,73 +19,12 @@ namespace osu.Game.Rulesets.Catch.Scoring
 
         protected override double ComputeTotalScore(double comboProgress, double accuracyProgress, double bonusPortion)
         {
-            double fruitHitsRatio = maximumTinyDroplets == 0 ? 0 : (double)hitTinyDroplets / maximumTinyDroplets;
-
-            const int tiny_droplets_portion = 400000;
-
-            return ((1000000 - tiny_droplets_portion) + tiny_droplets_portion * (1 - tinyDropletScale)) * comboProgress
-                   + tiny_droplets_portion * tinyDropletScale * fruitHitsRatio
+            return 600000 * comboProgress
+                   + 400000 * Accuracy.Value * accuracyProgress
                    + bonusPortion;
         }
 
         protected override double GetComboScoreChange(JudgementResult result)
             => Judgement.ToNumericResult(result.Type) * Math.Min(Math.Max(0.5, Math.Log(result.ComboAfterJudgement, combo_base)), Math.Log(combo_cap, combo_base));
-
-        protected override void ApplyScoreChange(JudgementResult result)
-        {
-            base.ApplyScoreChange(result);
-
-            if (result.HitObject is TinyDroplet)
-                hitTinyDroplets++;
-
-            if (result.Type.IsBasic())
-                currentBasicJudgements++;
-        }
-
-        protected override void RemoveScoreChange(JudgementResult result)
-        {
-            base.RemoveScoreChange(result);
-
-            if (result.HitObject is TinyDroplet)
-                hitTinyDroplets--;
-
-            if (result.Type.IsBasic())
-                currentBasicJudgements--;
-        }
-
-        protected override void Reset(bool storeResults)
-        {
-            base.Reset(storeResults);
-
-            if (storeResults)
-            {
-                maximumTinyDroplets = hitTinyDroplets;
-                maximumBasicJudgements = currentBasicJudgements;
-
-                if (maximumTinyDroplets + maximumBasicJudgements == 0)
-                    tinyDropletScale = 0;
-                else
-                    tinyDropletScale = (double)maximumTinyDroplets / (maximumTinyDroplets + maximumBasicJudgements);
-            }
-
-            hitTinyDroplets = 0;
-            currentBasicJudgements = 0;
-        }
-
-        public override void WriteScoreProcessorStatistics(IDictionary<string, object> statistics)
-        {
-            base.WriteScoreProcessorStatistics(statistics);
-
-            statistics.Add(nameof(hitTinyDroplets), hitTinyDroplets);
-            statistics.Add(nameof(currentBasicJudgements), currentBasicJudgements);
-        }
-
-        public override void ReadScoreProcessorStatistics(IReadOnlyDictionary<string, object> statistics)
-        {
-            base.ReadScoreProcessorStatistics(statistics);
-
-            hitTinyDroplets = (int)statistics.GetValueOrDefault(nameof(hitTinyDroplets), 0);
-            currentBasicJudgements = (int)statistics.GetValueOrDefault(nameof(currentBasicJudgements), 0);
-        }
     }
 }

From e1feeded127aeb95b6a5f34c95c93ee0cd484b78 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 22 May 2023 12:49:41 +0900
Subject: [PATCH 0546/1604] Change statistics type, remove overridability

---
 osu.Game/Online/Spectator/FrameHeader.cs    |  7 ++-
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs | 49 +++++++++++++++------
 2 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Online/Spectator/FrameHeader.cs b/osu.Game/Online/Spectator/FrameHeader.cs
index baebb28e4f..4d1c2c2cff 100644
--- a/osu.Game/Online/Spectator/FrameHeader.cs
+++ b/osu.Game/Online/Spectator/FrameHeader.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Online.Spectator
         /// Additional statistics that guides the score processor to calculate the correct score for this frame.
         /// </summary>
         [Key(5)]
-        public Dictionary<string, object> ScoreProcessorStatistics { get; set; }
+        public ScoreProcessorStatistics ScoreProcessorStatistics { get; set; }
 
         /// <summary>
         /// The time at which this frame was received by the server.
@@ -71,13 +71,12 @@ namespace osu.Game.Online.Spectator
             // copy for safety
             Statistics = new Dictionary<HitResult, int>(score.Statistics);
 
-            ScoreProcessorStatistics = new Dictionary<string, object>();
-            scoreProcessor.WriteScoreProcessorStatistics(ScoreProcessorStatistics);
+            ScoreProcessorStatistics = scoreProcessor.GetScoreProcessorStatistics();
         }
 
         [JsonConstructor]
         [SerializationConstructor]
-        public FrameHeader(long totalScore, double accuracy, int combo, int maxCombo, Dictionary<HitResult, int> statistics, Dictionary<string, object> scoreProcessorStatistics, DateTimeOffset receivedTime)
+        public FrameHeader(long totalScore, double accuracy, int combo, int maxCombo, Dictionary<HitResult, int> statistics, ScoreProcessorStatistics scoreProcessorStatistics, DateTimeOffset receivedTime)
         {
             TotalScore = totalScore;
             Accuracy = accuracy;
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index f2b1607f5e..013dd4b8e7 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using MessagePack;
 using osu.Framework.Bindables;
 using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
@@ -397,29 +398,29 @@ namespace osu.Game.Rulesets.Scoring
             scoreResultCounts.Clear();
             scoreResultCounts.AddRange(frame.Header.Statistics);
 
-            ReadScoreProcessorStatistics(frame.Header.ScoreProcessorStatistics);
+            SetScoreProcessorStatistics(frame.Header.ScoreProcessorStatistics);
 
             updateScore();
 
             OnResetFromReplayFrame?.Invoke();
         }
 
-        public virtual void WriteScoreProcessorStatistics(IDictionary<string, object> statistics)
+        public ScoreProcessorStatistics GetScoreProcessorStatistics() => new ScoreProcessorStatistics
         {
-            statistics.Add(nameof(currentMaximumBaseScore), currentMaximumBaseScore);
-            statistics.Add(nameof(currentBaseScore), currentBaseScore);
-            statistics.Add(nameof(currentCountBasicJudgements), currentCountBasicJudgements);
-            statistics.Add(nameof(currentComboPortion), currentComboPortion);
-            statistics.Add(nameof(currentBonusPortion), currentBonusPortion);
-        }
+            MaximumBaseScore = currentMaximumBaseScore,
+            BaseScore = currentBaseScore,
+            CountBasicJudgements = currentCountBasicJudgements,
+            ComboPortion = currentComboPortion,
+            BonusPortion = currentBonusPortion
+        };
 
-        public virtual void ReadScoreProcessorStatistics(IReadOnlyDictionary<string, object> statistics)
+        public void SetScoreProcessorStatistics(ScoreProcessorStatistics statistics)
         {
-            currentMaximumBaseScore = (double)statistics.GetValueOrDefault(nameof(currentMaximumBaseScore), 0);
-            currentBaseScore = (double)statistics.GetValueOrDefault(nameof(currentBaseScore), 0);
-            currentCountBasicJudgements = (int)statistics.GetValueOrDefault(nameof(currentCountBasicJudgements), 0);
-            currentComboPortion = (double)statistics.GetValueOrDefault(nameof(currentComboPortion), 0);
-            currentBonusPortion = (double)statistics.GetValueOrDefault(nameof(currentBonusPortion), 0);
+            currentMaximumBaseScore = statistics.MaximumBaseScore;
+            currentBaseScore = statistics.BaseScore;
+            currentCountBasicJudgements = statistics.CountBasicJudgements;
+            currentComboPortion = statistics.ComboPortion;
+            currentBonusPortion = statistics.BonusPortion;
         }
 
         #region Static helper methods
@@ -493,4 +494,24 @@ namespace osu.Game.Rulesets.Scoring
         [LocalisableDescription(typeof(GameplaySettingsStrings), nameof(GameplaySettingsStrings.ClassicScoreDisplay))]
         Classic
     }
+
+    [Serializable]
+    [MessagePackObject]
+    public class ScoreProcessorStatistics
+    {
+        [Key(0)]
+        public double MaximumBaseScore { get; set; }
+
+        [Key(1)]
+        public double BaseScore { get; set; }
+
+        [Key(2)]
+        public int CountBasicJudgements { get; set; }
+
+        [Key(3)]
+        public double ComboPortion { get; set; }
+
+        [Key(4)]
+        public double BonusPortion { get; set; }
+    }
 }

From 62d504af921f7de8ac6c7933425aec975f6c3206 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 23 May 2023 15:59:24 +0900
Subject: [PATCH 0547/1604] Fix base implementation of ComputeTotalScore

---
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 013dd4b8e7..2108e99def 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -297,13 +297,9 @@ namespace osu.Game.Rulesets.Scoring
 
         protected virtual double ComputeTotalScore(double comboProgress, double accuracyProgress, double bonusPortion)
         {
-            return
-                (int)Math.Round
-                ((
-                    700000 * comboProgress +
-                    300000 * Math.Pow(Accuracy.Value, 10) * accuracyProgress +
-                    bonusPortion
-                ) * scoreMultiplier);
+            return 700000 * comboProgress +
+                   300000 * Math.Pow(Accuracy.Value, 10) * accuracyProgress +
+                   bonusPortion;
         }
 
         /// <summary>

From c8303d55cd72c2e152ad40393325f5ec887ff4f8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 May 2023 16:21:56 +0900
Subject: [PATCH 0548/1604] Adjust text and alignment

---
 .../Statistics/AccuracyHeatmap.cs             | 72 ++++++++-----------
 1 file changed, 30 insertions(+), 42 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
index 9d9b3fb84a..5d2f6a14c7 100644
--- a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
+++ b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
@@ -57,6 +57,8 @@ namespace osu.Game.Rulesets.Osu.Statistics
         [BackgroundDependencyLoader]
         private void load()
         {
+            const float line_extension = 0.2f;
+
             InternalChild = new Container
             {
                 Anchor = Anchor.Centre,
@@ -97,81 +99,67 @@ namespace osu.Game.Rulesets.Osu.Statistics
                                     RelativeSizeAxes = Axes.Both,
                                     Children = new Drawable[]
                                     {
-                                        new Box
+                                        new Circle
                                         {
                                             Anchor = Anchor.Centre,
                                             Origin = Anchor.Centre,
-                                            EdgeSmoothness = new Vector2(1),
                                             RelativeSizeAxes = Axes.Y,
-                                            Width = line_thickness / 2, // adjust for edgesmoothness
-                                            Height = MathF.Sqrt(2),
+                                            Width = line_thickness,
+                                            Height = inner_portion + line_extension,
                                             Rotation = -rotation * 2,
-                                            Alpha = 0.3f,
+                                            Alpha = 0.6f,
                                         },
-                                        new Box
+                                        new Circle
                                         {
                                             Anchor = Anchor.Centre,
                                             Origin = Anchor.Centre,
-                                            EdgeSmoothness = new Vector2(1),
                                             RelativeSizeAxes = Axes.Y,
-                                            Width = line_thickness / 2, // adjust for edgesmoothness
-                                            Height = MathF.Sqrt(2),
+                                            Width = line_thickness,
+                                            Height = inner_portion + line_extension,
                                         },
                                         new OsuSpriteText
                                         {
-                                            Text = "Next",
+                                            Text = "Overshoot",
                                             Anchor = Anchor.Centre,
-                                            Origin = Anchor.BottomRight,
+                                            Origin = Anchor.BottomCentre,
                                             Padding = new MarginPadding(3),
                                             RelativePositionAxes = Axes.Both,
-                                            Y = -inner_portion / 2,
+                                            Y = -(inner_portion + line_extension) / 2,
                                         },
                                         new OsuSpriteText
                                         {
-                                            Text = "object",
+                                            Text = "Undershoot",
                                             Anchor = Anchor.Centre,
-                                            Origin = Anchor.BottomLeft,
+                                            Origin = Anchor.TopCentre,
                                             Padding = new MarginPadding(3),
                                             RelativePositionAxes = Axes.Both,
-                                            Y = -inner_portion / 2,
+                                            Y = (inner_portion + line_extension) / 2,
                                         },
-                                        new OsuSpriteText
+                                        new Circle
                                         {
-                                            Text = "Last",
                                             Anchor = Anchor.Centre,
-                                            Origin = Anchor.TopRight,
-                                            Padding = new MarginPadding(3),
+                                            Origin = Anchor.TopCentre,
                                             RelativePositionAxes = Axes.Both,
-                                            Y = inner_portion / 2,
+                                            Y = -(inner_portion + line_extension) / 2,
+                                            Margin = new MarginPadding(-line_thickness / 2),
+                                            Width = line_thickness,
+                                            Height = 10,
+                                            Rotation = 45,
                                         },
-                                        new OsuSpriteText
+                                        new Circle
                                         {
-                                            Text = "object",
                                             Anchor = Anchor.Centre,
-                                            Origin = Anchor.TopLeft,
-                                            Padding = new MarginPadding(3),
+                                            Origin = Anchor.TopCentre,
                                             RelativePositionAxes = Axes.Both,
-                                            Y = inner_portion / 2,
-                                        },
+                                            Y = -(inner_portion + line_extension) / 2,
+                                            Margin = new MarginPadding(-line_thickness / 2),
+                                            Width = line_thickness,
+                                            Height = 10,
+                                            Rotation = -45,
+                                        }
                                     }
                                 },
                             },
-                            new Box
-                            {
-                                Anchor = Anchor.TopRight,
-                                Origin = Anchor.TopRight,
-                                Width = 10,
-                                EdgeSmoothness = new Vector2(1),
-                                Height = line_thickness / 2, // adjust for edgesmoothness
-                            },
-                            new Box
-                            {
-                                Anchor = Anchor.TopRight,
-                                Origin = Anchor.TopRight,
-                                EdgeSmoothness = new Vector2(1),
-                                Width = line_thickness / 2, // adjust for edgesmoothness
-                                Height = 10,
-                            }
                         }
                     },
                     bufferedGrid = new BufferedContainer(cachedFrameBuffer: true)

From f8101fbbc7b3606d6e8510846eb186f221bef85e Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 23 May 2023 17:44:17 +0900
Subject: [PATCH 0549/1604] Rename variables

---
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 2108e99def..c539820f13 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -289,10 +289,10 @@ namespace osu.Game.Rulesets.Scoring
         {
             Accuracy.Value = currentMaximumBaseScore > 0 ? currentBaseScore / currentMaximumBaseScore : 1;
 
-            double comboRatio = maximumComboPortion > 0 ? currentComboPortion / maximumComboPortion : 1;
-            double accuracyRatio = maximumCountBasicJudgements > 0 ? (double)currentCountBasicJudgements / maximumCountBasicJudgements : 1;
+            double comboProgress = maximumComboPortion > 0 ? currentComboPortion / maximumComboPortion : 1;
+            double accuracyProcess = maximumCountBasicJudgements > 0 ? (double)currentCountBasicJudgements / maximumCountBasicJudgements : 1;
 
-            TotalScore.Value = (long)Math.Round(ComputeTotalScore(comboRatio, accuracyRatio, currentBonusPortion) * scoreMultiplier);
+            TotalScore.Value = (long)Math.Round(ComputeTotalScore(comboProgress, accuracyProcess, currentBonusPortion) * scoreMultiplier);
         }
 
         protected virtual double ComputeTotalScore(double comboProgress, double accuracyProgress, double bonusPortion)

From 8570f825ed20a32733f104a2778df0685d92261e Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 23 May 2023 17:47:35 +0900
Subject: [PATCH 0550/1604] Consider all accuracy judgements in accuracy
 progress

---
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs | 28 +++++++++------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index c539820f13..8c3cd27012 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -110,14 +110,14 @@ namespace osu.Game.Rulesets.Scoring
         private double currentBaseScore;
 
         /// <summary>
-        /// The count of all basic judgements in the beatmap.
+        /// The count of all accuracy-affecting judgements in the beatmap.
         /// </summary>
-        private int maximumCountBasicJudgements;
+        private int maximumCountAccuracyJudgements;
 
         /// <summary>
-        /// The count of basic judgements at the current point in time.
+        /// The count of accuracy-affecting judgements at the current point in time.
         /// </summary>
-        private int currentCountBasicJudgements;
+        private int currentCountAccuracyJudgements;
 
         /// <summary>
         /// The maximum combo score in the beatmap.
@@ -207,13 +207,11 @@ namespace osu.Game.Rulesets.Scoring
 
             result.ComboAfterJudgement = Combo.Value;
 
-            if (result.Type.IsBasic())
-                currentCountBasicJudgements++;
-
             if (result.Type.AffectsAccuracy())
             {
                 currentMaximumBaseScore += Judgement.ToNumericResult(result.Judgement.MaxResult);
                 currentBaseScore += Judgement.ToNumericResult(result.Type);
+                currentCountAccuracyJudgements++;
             }
 
             if (result.Type.IsBonus())
@@ -250,13 +248,11 @@ namespace osu.Game.Rulesets.Scoring
             if (!result.Type.IsScorable())
                 return;
 
-            if (result.Type.IsBasic())
-                currentCountBasicJudgements--;
-
             if (result.Type.AffectsAccuracy())
             {
                 currentMaximumBaseScore -= Judgement.ToNumericResult(result.Judgement.MaxResult);
                 currentBaseScore -= Judgement.ToNumericResult(result.Type);
+                currentCountAccuracyJudgements--;
             }
 
             if (result.Type.IsBonus())
@@ -290,7 +286,7 @@ namespace osu.Game.Rulesets.Scoring
             Accuracy.Value = currentMaximumBaseScore > 0 ? currentBaseScore / currentMaximumBaseScore : 1;
 
             double comboProgress = maximumComboPortion > 0 ? currentComboPortion / maximumComboPortion : 1;
-            double accuracyProcess = maximumCountBasicJudgements > 0 ? (double)currentCountBasicJudgements / maximumCountBasicJudgements : 1;
+            double accuracyProcess = maximumCountAccuracyJudgements > 0 ? (double)currentCountAccuracyJudgements / maximumCountAccuracyJudgements : 1;
 
             TotalScore.Value = (long)Math.Round(ComputeTotalScore(comboProgress, accuracyProcess, currentBonusPortion) * scoreMultiplier);
         }
@@ -316,7 +312,7 @@ namespace osu.Game.Rulesets.Scoring
             if (storeResults)
             {
                 maximumComboPortion = currentComboPortion;
-                maximumCountBasicJudgements = currentCountBasicJudgements;
+                maximumCountAccuracyJudgements = currentCountAccuracyJudgements;
 
                 maximumResultCounts.Clear();
                 maximumResultCounts.AddRange(scoreResultCounts);
@@ -328,7 +324,7 @@ namespace osu.Game.Rulesets.Scoring
 
             currentBaseScore = 0;
             currentMaximumBaseScore = 0;
-            currentCountBasicJudgements = 0;
+            currentCountAccuracyJudgements = 0;
             currentComboPortion = 0;
             currentBonusPortion = 0;
 
@@ -405,7 +401,7 @@ namespace osu.Game.Rulesets.Scoring
         {
             MaximumBaseScore = currentMaximumBaseScore,
             BaseScore = currentBaseScore,
-            CountBasicJudgements = currentCountBasicJudgements,
+            CountAccuracyJudgements = currentCountAccuracyJudgements,
             ComboPortion = currentComboPortion,
             BonusPortion = currentBonusPortion
         };
@@ -414,7 +410,7 @@ namespace osu.Game.Rulesets.Scoring
         {
             currentMaximumBaseScore = statistics.MaximumBaseScore;
             currentBaseScore = statistics.BaseScore;
-            currentCountBasicJudgements = statistics.CountBasicJudgements;
+            currentCountAccuracyJudgements = statistics.CountAccuracyJudgements;
             currentComboPortion = statistics.ComboPortion;
             currentBonusPortion = statistics.BonusPortion;
         }
@@ -502,7 +498,7 @@ namespace osu.Game.Rulesets.Scoring
         public double BaseScore { get; set; }
 
         [Key(2)]
-        public int CountBasicJudgements { get; set; }
+        public int CountAccuracyJudgements { get; set; }
 
         [Key(3)]
         public double ComboPortion { get; set; }

From adf9a596b5fd4cb5e71519e79c990b371dbb7132 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 May 2023 17:58:10 +0900
Subject: [PATCH 0551/1604] Fix weird state when attempting to enter gameplay
 skin editor scene from multiplayer

Closes https://github.com/ppy/osu/issues/23626.
---
 osu.Game/Overlays/SkinEditor/SkinEditorSceneLibrary.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinEditorSceneLibrary.cs b/osu.Game/Overlays/SkinEditor/SkinEditorSceneLibrary.cs
index 61195d7175..9b021632cf 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditorSceneLibrary.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditorSceneLibrary.cs
@@ -113,7 +113,7 @@ namespace osu.Game.Overlays.SkinEditor
 
                                         if (replayGeneratingMod != null)
                                             screen.Push(new PlayerLoader(() => new ReplayPlayer((beatmap, mods) => replayGeneratingMod.CreateScoreFromReplayData(beatmap, mods))));
-                                    }, new[] { typeof(Player), typeof(SongSelect) })
+                                    }, new[] { typeof(Player), typeof(PlaySongSelect) })
                                 },
                             }
                         },

From 3598ca91251ed4991d716c32878d751e8de13e60 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 23 May 2023 18:05:10 +0900
Subject: [PATCH 0552/1604] Adjust xmldoc

---
 osu.Game/Rulesets/Scoring/HitResult.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Scoring/HitResult.cs b/osu.Game/Rulesets/Scoring/HitResult.cs
index 83ed98768c..0013a9f20d 100644
--- a/osu.Game/Rulesets/Scoring/HitResult.cs
+++ b/osu.Game/Rulesets/Scoring/HitResult.cs
@@ -150,7 +150,7 @@ namespace osu.Game.Rulesets.Scoring
             => AffectsCombo(result) && !IsHit(result);
 
         /// <summary>
-        /// Whether a <see cref="HitResult"/> increases/breaks the combo, and affects the combo portion of the score.
+        /// Whether a <see cref="HitResult"/> increases or breaks the combo.
         /// </summary>
         public static bool AffectsCombo(this HitResult result)
         {

From 7cf50b1e18a74b74fc34396a1c4ddaf444d6dc6e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 May 2023 18:06:04 +0900
Subject: [PATCH 0553/1604] Disallow game to check for updates while gameplay
 is active

---
 osu.Desktop/Updater/SquirrelUpdateManager.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Desktop/Updater/SquirrelUpdateManager.cs b/osu.Desktop/Updater/SquirrelUpdateManager.cs
index 3d4db88471..941ab335e8 100644
--- a/osu.Desktop/Updater/SquirrelUpdateManager.cs
+++ b/osu.Desktop/Updater/SquirrelUpdateManager.cs
@@ -9,6 +9,7 @@ using osu.Framework.Logging;
 using osu.Game;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
+using osu.Game.Screens.Play;
 using Squirrel;
 using Squirrel.SimpleSplat;
 using LogLevel = Squirrel.SimpleSplat.LogLevel;
@@ -36,6 +37,9 @@ namespace osu.Desktop.Updater
         [Resolved]
         private OsuGameBase game { get; set; } = null!;
 
+        [Resolved]
+        private ILocalUserPlayInfo? localUserInfo { get; set; }
+
         [BackgroundDependencyLoader]
         private void load(INotificationOverlay notifications)
         {
@@ -55,6 +59,10 @@ namespace osu.Desktop.Updater
 
             try
             {
+                // Avoid any kind of update checking while gameplay is running.
+                if (localUserInfo?.IsPlaying.Value == true)
+                    return false;
+
                 updateManager ??= new GithubUpdateManager(@"https://github.com/ppy/osu", false, github_token, @"osulazer");
 
                 var info = await updateManager.CheckForUpdate(!useDeltaPatching).ConfigureAwait(false);

From d45b54399b376289531a37f5635f03dfa64cc8c2 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 23 May 2023 18:15:32 +0900
Subject: [PATCH 0554/1604] Add back minimum/maximum accuracy

---
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 8c3cd27012..b470c09859 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -109,6 +109,11 @@ namespace osu.Game.Rulesets.Scoring
         /// </remarks>
         private double currentBaseScore;
 
+        /// <summary>
+        /// The maximum sum of all accuracy-affecting judgements in the beatmap.
+        /// </summary>
+        private double maximumBaseScore;
+
         /// <summary>
         /// The count of all accuracy-affecting judgements in the beatmap.
         /// </summary>
@@ -284,6 +289,8 @@ namespace osu.Game.Rulesets.Scoring
         private void updateScore()
         {
             Accuracy.Value = currentMaximumBaseScore > 0 ? currentBaseScore / currentMaximumBaseScore : 1;
+            MinimumAccuracy.Value = maximumBaseScore > 0 ? currentBaseScore / maximumBaseScore : 0;
+            MaximumAccuracy.Value = maximumBaseScore > 0 ? (currentBaseScore + (maximumBaseScore - currentMaximumBaseScore)) / maximumBaseScore : 1;
 
             double comboProgress = maximumComboPortion > 0 ? currentComboPortion / maximumComboPortion : 1;
             double accuracyProcess = maximumCountAccuracyJudgements > 0 ? (double)currentCountAccuracyJudgements / maximumCountAccuracyJudgements : 1;
@@ -311,6 +318,8 @@ namespace osu.Game.Rulesets.Scoring
 
             if (storeResults)
             {
+                maximumBaseScore = currentBaseScore;
+
                 maximumComboPortion = currentComboPortion;
                 maximumCountAccuracyJudgements = currentCountAccuracyJudgements;
 
@@ -334,9 +343,6 @@ namespace osu.Game.Rulesets.Scoring
             Rank.Disabled = false;
             Rank.Value = ScoreRank.X;
             HighestCombo.Value = 0;
-
-            currentBaseScore = 0;
-            currentMaximumBaseScore = 0;
         }
 
         /// <summary>

From 844c023fb71fc6b87386650e820c621b6ca5b2bd Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 23 May 2023 18:18:27 +0900
Subject: [PATCH 0555/1604] Fix tests

---
 .../Gameplay/TestSceneScoreProcessor.cs       |  20 +-
 .../Rulesets/Scoring/ScoreProcessorTest.cs    | 189 +++++-------------
 ...MultiplayerGameplayLeaderboardTestScene.cs |  14 +-
 3 files changed, 75 insertions(+), 148 deletions(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneScoreProcessor.cs b/osu.Game.Tests/Gameplay/TestSceneScoreProcessor.cs
index 90c7688443..fbe4dba8ed 100644
--- a/osu.Game.Tests/Gameplay/TestSceneScoreProcessor.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneScoreProcessor.cs
@@ -76,22 +76,38 @@ namespace osu.Game.Tests.Gameplay
             // Reset with a miss instead.
             scoreProcessor.ResetFromReplayFrame(new OsuReplayFrame
             {
-                Header = new FrameHeader(0, 0, 0, new Dictionary<HitResult, int> { { HitResult.Miss, 1 } }, DateTimeOffset.Now)
+                Header = new FrameHeader(0, 0, 0, 0, new Dictionary<HitResult, int> { { HitResult.Miss, 1 } }, new ScoreProcessorStatistics
+                {
+                    MaximumBaseScore = 300,
+                    BaseScore = 0,
+                    CountAccuracyJudgements = 1,
+                    ComboPortion = 0,
+                    BonusPortion = 0
+                }, DateTimeOffset.Now)
             });
 
             Assert.That(scoreProcessor.TotalScore.Value, Is.Zero);
             Assert.That(scoreProcessor.JudgedHits, Is.EqualTo(1));
             Assert.That(scoreProcessor.Combo.Value, Is.EqualTo(0));
+            Assert.That(scoreProcessor.Accuracy.Value, Is.EqualTo(0));
 
             // Reset with no judged hit.
             scoreProcessor.ResetFromReplayFrame(new OsuReplayFrame
             {
-                Header = new FrameHeader(0, 0, 0, new Dictionary<HitResult, int>(), DateTimeOffset.Now)
+                Header = new FrameHeader(0, 0, 0, 0, new Dictionary<HitResult, int>(), new ScoreProcessorStatistics
+                {
+                    MaximumBaseScore = 0,
+                    BaseScore = 0,
+                    CountAccuracyJudgements = 0,
+                    ComboPortion = 0,
+                    BonusPortion = 0
+                }, DateTimeOffset.Now)
             });
 
             Assert.That(scoreProcessor.TotalScore.Value, Is.Zero);
             Assert.That(scoreProcessor.JudgedHits, Is.Zero);
             Assert.That(scoreProcessor.Combo.Value, Is.EqualTo(0));
+            Assert.That(scoreProcessor.Accuracy.Value, Is.EqualTo(1));
         }
 
         [Test]
diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index 826c610f56..f51a4ad52b 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -14,11 +14,12 @@ using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
-using osu.Game.Scoring;
+using osu.Game.Scoring.Legacy;
 using osu.Game.Tests.Beatmaps;
 
 namespace osu.Game.Tests.Rulesets.Scoring
@@ -31,7 +32,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [SetUp]
         public void SetUp()
         {
-            scoreProcessor = new ScoreProcessor(new TestRuleset());
+            scoreProcessor = new ScoreProcessor(new OsuRuleset());
             beatmap = new TestBeatmap(new RulesetInfo())
             {
                 HitObjects = new List<HitObject>
@@ -41,15 +42,14 @@ namespace osu.Game.Tests.Rulesets.Scoring
             };
         }
 
-        [TestCase(ScoringMode.Standardised, HitResult.Meh, 750_000)]
-        [TestCase(ScoringMode.Standardised, HitResult.Ok, 800_000)]
+        [TestCase(ScoringMode.Standardised, HitResult.Meh, 116_667)]
+        [TestCase(ScoringMode.Standardised, HitResult.Ok, 233_338)]
         [TestCase(ScoringMode.Standardised, HitResult.Great, 1_000_000)]
-        [TestCase(ScoringMode.Classic, HitResult.Meh, 20)]
-        [TestCase(ScoringMode.Classic, HitResult.Ok, 23)]
+        [TestCase(ScoringMode.Classic, HitResult.Meh, 0)]
+        [TestCase(ScoringMode.Classic, HitResult.Ok, 2)]
         [TestCase(ScoringMode.Classic, HitResult.Great, 36)]
         public void TestSingleOsuHit(ScoringMode scoringMode, HitResult hitResult, int expectedScore)
         {
-            scoreProcessor.Mode.Value = scoringMode;
             scoreProcessor.ApplyBeatmap(beatmap);
 
             var judgementResult = new JudgementResult(beatmap.HitObjects.Single(), new OsuJudgement())
@@ -58,7 +58,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
             };
             scoreProcessor.ApplyResult(judgementResult);
 
-            Assert.That(scoreProcessor.TotalScore.Value, Is.EqualTo(expectedScore).Within(0.5d));
+            Assert.That(scoreProcessor.GetDisplayScore(scoringMode), Is.EqualTo(expectedScore).Within(0.5d));
         }
 
         /// <summary>
@@ -70,39 +70,29 @@ namespace osu.Game.Tests.Rulesets.Scoring
         /// <param name="expectedScore">Expected score after all objects have been judged, rounded to the nearest integer.</param>
         /// <remarks>
         /// This test intentionally misses the 3rd hitobject to achieve lower than 75% accuracy and 50% max combo.
-        /// <para>
-        /// For standardised scoring, <paramref name="expectedScore"/> is calculated using the following formula:
-        /// 1_000_000 * (((3 * <paramref name="hitResult"/>) / (4 * <paramref name="maxResult"/>)) * 30% + (bestCombo / maxCombo) * 70%)
-        /// </para>
-        /// <para>
-        /// For classic scoring, <paramref name="expectedScore"/> is calculated using the following formula:
-        /// <paramref name="hitResult"/> / <paramref name="maxResult"/> * 936
-        /// where 936 is simplified from:
-        /// 75% * 4 * 300 * (1 + 1/25)
-        /// </para>
         /// </remarks>
-        [TestCase(ScoringMode.Standardised, HitResult.Miss, HitResult.Great, 0)] // (3 * 0) / (4 * 300) * 300_000 + (0 / 4) * 700_000
-        [TestCase(ScoringMode.Standardised, HitResult.Meh, HitResult.Great, 387_500)] // (3 * 50) / (4 * 300) * 300_000 + (2 / 4) * 700_000
-        [TestCase(ScoringMode.Standardised, HitResult.Ok, HitResult.Great, 425_000)] // (3 * 100) / (4 * 300) * 300_000 + (2 / 4) * 700_000
-        [TestCase(ScoringMode.Standardised, HitResult.Good, HitResult.Perfect, 492_857)] // (3 * 200) / (4 * 350) * 300_000 + (2 / 4) * 700_000
-        [TestCase(ScoringMode.Standardised, HitResult.Great, HitResult.Great, 575_000)] // (3 * 300) / (4 * 300) * 300_000 + (2 / 4) * 700_000
-        [TestCase(ScoringMode.Standardised, HitResult.Perfect, HitResult.Perfect, 575_000)] // (3 * 350) / (4 * 350) * 300_000 + (2 / 4) * 700_000
-        [TestCase(ScoringMode.Standardised, HitResult.SmallTickMiss, HitResult.SmallTickHit, 700_000)] // (3 * 0) / (4 * 10) * 300_000 + 700_000 (max combo 0)
-        [TestCase(ScoringMode.Standardised, HitResult.SmallTickHit, HitResult.SmallTickHit, 925_000)] // (3 * 10) / (4 * 10) * 300_000 + 700_000 (max combo 0)
-        [TestCase(ScoringMode.Standardised, HitResult.LargeTickMiss, HitResult.LargeTickHit, 0)] // (3 * 0) / (4 * 30) * 300_000 + (0 / 4) * 700_000
-        [TestCase(ScoringMode.Standardised, HitResult.LargeTickHit, HitResult.LargeTickHit, 575_000)] // (3 * 30) / (4 * 30) * 300_000 + (0 / 4) * 700_000
-        [TestCase(ScoringMode.Standardised, HitResult.SmallBonus, HitResult.SmallBonus, 1_000_030)] // 1 * 300_000 + 700_000 (max combo 0) + 3 * 10 (bonus points)
-        [TestCase(ScoringMode.Standardised, HitResult.LargeBonus, HitResult.LargeBonus, 1_000_150)] // 1 * 300_000 + 700_000 (max combo 0) + 3 * 50 (bonus points)
+        [TestCase(ScoringMode.Standardised, HitResult.Miss, HitResult.Great, 0)]
+        [TestCase(ScoringMode.Standardised, HitResult.Meh, HitResult.Great, 79_333)]
+        [TestCase(ScoringMode.Standardised, HitResult.Ok, HitResult.Great, 158_667)]
+        [TestCase(ScoringMode.Standardised, HitResult.Good, HitResult.Perfect, 302_402)]
+        [TestCase(ScoringMode.Standardised, HitResult.Great, HitResult.Great, 492_894)]
+        [TestCase(ScoringMode.Standardised, HitResult.Perfect, HitResult.Perfect, 492_894)]
+        [TestCase(ScoringMode.Standardised, HitResult.SmallTickMiss, HitResult.SmallTickHit, 0)]
+        [TestCase(ScoringMode.Standardised, HitResult.SmallTickHit, HitResult.SmallTickHit, 541_894)]
+        [TestCase(ScoringMode.Standardised, HitResult.LargeTickMiss, HitResult.LargeTickHit, 0)]
+        [TestCase(ScoringMode.Standardised, HitResult.LargeTickHit, HitResult.LargeTickHit, 492_894)]
+        [TestCase(ScoringMode.Standardised, HitResult.SmallBonus, HitResult.SmallBonus, 1_000_030)]
+        [TestCase(ScoringMode.Standardised, HitResult.LargeBonus, HitResult.LargeBonus, 1_000_150)]
         [TestCase(ScoringMode.Classic, HitResult.Miss, HitResult.Great, 0)]
-        [TestCase(ScoringMode.Classic, HitResult.Meh, HitResult.Great, 86)]
-        [TestCase(ScoringMode.Classic, HitResult.Ok, HitResult.Great, 104)]
-        [TestCase(ScoringMode.Classic, HitResult.Good, HitResult.Perfect, 140)]
-        [TestCase(ScoringMode.Classic, HitResult.Great, HitResult.Great, 190)]
-        [TestCase(ScoringMode.Classic, HitResult.Perfect, HitResult.Perfect, 190)]
-        [TestCase(ScoringMode.Classic, HitResult.SmallTickMiss, HitResult.SmallTickHit, 18)]
-        [TestCase(ScoringMode.Classic, HitResult.SmallTickHit, HitResult.SmallTickHit, 31)]
+        [TestCase(ScoringMode.Classic, HitResult.Meh, HitResult.Great, 4)]
+        [TestCase(ScoringMode.Classic, HitResult.Ok, HitResult.Great, 15)]
+        [TestCase(ScoringMode.Classic, HitResult.Good, HitResult.Perfect, 53)]
+        [TestCase(ScoringMode.Classic, HitResult.Great, HitResult.Great, 140)]
+        [TestCase(ScoringMode.Classic, HitResult.Perfect, HitResult.Perfect, 140)]
+        [TestCase(ScoringMode.Classic, HitResult.SmallTickMiss, HitResult.SmallTickHit, 0)]
+        [TestCase(ScoringMode.Classic, HitResult.SmallTickHit, HitResult.SmallTickHit, 11)]
         [TestCase(ScoringMode.Classic, HitResult.LargeTickMiss, HitResult.LargeTickHit, 0)]
-        [TestCase(ScoringMode.Classic, HitResult.LargeTickHit, HitResult.LargeTickHit, 12)]
+        [TestCase(ScoringMode.Classic, HitResult.LargeTickHit, HitResult.LargeTickHit, 9)]
         [TestCase(ScoringMode.Classic, HitResult.SmallBonus, HitResult.SmallBonus, 36)]
         [TestCase(ScoringMode.Classic, HitResult.LargeBonus, HitResult.LargeBonus, 36)]
         public void TestFourVariousResultsOneMiss(ScoringMode scoringMode, HitResult hitResult, HitResult maxResult, int expectedScore)
@@ -113,59 +103,18 @@ namespace osu.Game.Tests.Rulesets.Scoring
             {
                 HitObjects = new List<HitObject>(Enumerable.Repeat(new TestHitObject(maxResult), 4))
             };
-            scoreProcessor.Mode.Value = scoringMode;
             scoreProcessor.ApplyBeatmap(fourObjectBeatmap);
 
             for (int i = 0; i < 4; i++)
             {
-                var judgementResult = new JudgementResult(fourObjectBeatmap.HitObjects[i], new Judgement())
+                var judgementResult = new JudgementResult(fourObjectBeatmap.HitObjects[i], new TestJudgement(maxResult))
                 {
                     Type = i == 2 ? minResult : hitResult
                 };
                 scoreProcessor.ApplyResult(judgementResult);
             }
 
-            Assert.That(scoreProcessor.TotalScore.Value, Is.EqualTo(expectedScore).Within(0.5d));
-        }
-
-        /// <remarks>
-        /// This test uses a beatmap with four small ticks and one object with the <see cref="Judgement.MaxResult"/> of <see cref="HitResult.Ok"/>.
-        /// Its goal is to ensure that with the <see cref="ScoringMode"/> of <see cref="ScoringMode.Standardised"/>,
-        /// small ticks contribute to the accuracy portion, but not the combo portion.
-        /// In contrast, <see cref="ScoringMode.Classic"/> does not have separate combo and accuracy portion (they are multiplied by each other).
-        /// </remarks>
-        [TestCase(ScoringMode.Standardised, HitResult.SmallTickHit, 978_571)] // (3 * 10 + 100) / (4 * 10 + 100) * 300_000 + (1 / 1) * 700_000
-        [TestCase(ScoringMode.Standardised, HitResult.SmallTickMiss, 914_286)] // (3 * 0 + 100) / (4 * 10 + 100) * 300_000 + (1 / 1) * 700_000
-        [TestCase(ScoringMode.Classic, HitResult.SmallTickHit, 34)]
-        [TestCase(ScoringMode.Classic, HitResult.SmallTickMiss, 30)]
-        public void TestSmallTicksAccuracy(ScoringMode scoringMode, HitResult hitResult, int expectedScore)
-        {
-            IEnumerable<HitObject> hitObjects = Enumerable
-                                                .Repeat(new TestHitObject(HitResult.SmallTickHit), 4)
-                                                .Append(new TestHitObject(HitResult.Ok));
-            IBeatmap fiveObjectBeatmap = new TestBeatmap(new RulesetInfo())
-            {
-                HitObjects = hitObjects.ToList()
-            };
-            scoreProcessor.Mode.Value = scoringMode;
-            scoreProcessor.ApplyBeatmap(fiveObjectBeatmap);
-
-            for (int i = 0; i < 4; i++)
-            {
-                var judgementResult = new JudgementResult(fiveObjectBeatmap.HitObjects[i], new Judgement())
-                {
-                    Type = i == 2 ? HitResult.SmallTickMiss : hitResult
-                };
-                scoreProcessor.ApplyResult(judgementResult);
-            }
-
-            var lastJudgementResult = new JudgementResult(fiveObjectBeatmap.HitObjects.Last(), new Judgement())
-            {
-                Type = HitResult.Ok
-            };
-            scoreProcessor.ApplyResult(lastJudgementResult);
-
-            Assert.That(scoreProcessor.TotalScore.Value, Is.EqualTo(expectedScore).Within(0.5d));
+            Assert.That(scoreProcessor.GetDisplayScore(scoringMode), Is.EqualTo(expectedScore).Within(0.5d));
         }
 
         [Test]
@@ -173,10 +122,9 @@ namespace osu.Game.Tests.Rulesets.Scoring
             [Values(ScoringMode.Standardised, ScoringMode.Classic)]
             ScoringMode scoringMode)
         {
-            scoreProcessor.Mode.Value = scoringMode;
             scoreProcessor.ApplyBeatmap(new TestBeatmap(new RulesetInfo()));
 
-            Assert.That(scoreProcessor.TotalScore.Value, Is.Zero);
+            Assert.That(scoreProcessor.GetDisplayScore(scoringMode), Is.Zero);
         }
 
         [TestCase(HitResult.IgnoreHit, HitResult.IgnoreMiss)]
@@ -294,28 +242,6 @@ namespace osu.Game.Tests.Rulesets.Scoring
             Assert.AreEqual(expectedReturnValue, hitResult.IsScorable());
         }
 
-        [TestCase(HitResult.Perfect, 1_000_000)]
-        [TestCase(HitResult.SmallTickHit, 1_000_000)]
-        [TestCase(HitResult.LargeTickHit, 1_000_000)]
-        [TestCase(HitResult.SmallBonus, 1_000_000 + Judgement.SMALL_BONUS_SCORE)]
-        [TestCase(HitResult.LargeBonus, 1_000_000 + Judgement.LARGE_BONUS_SCORE)]
-        public void TestGetScoreWithExternalStatistics(HitResult result, int expectedScore)
-        {
-            var statistic = new Dictionary<HitResult, int> { { result, 1 } };
-
-            scoreProcessor.ApplyBeatmap(new Beatmap
-            {
-                HitObjects = { new TestHitObject(result) }
-            });
-
-            Assert.That(scoreProcessor.ComputeScore(ScoringMode.Standardised, new ScoreInfo
-            {
-                Ruleset = new TestRuleset().RulesetInfo,
-                MaxCombo = result.AffectsCombo() ? 1 : 0,
-                Statistics = statistic
-            }), Is.EqualTo(expectedScore).Within(0.5d));
-        }
-
 #pragma warning disable CS0618
         [Test]
         public void TestLegacyComboIncrease()
@@ -330,29 +256,6 @@ namespace osu.Game.Tests.Rulesets.Scoring
             Assert.That(HitResult.LegacyComboIncrease.IsHit(), Is.True);
             Assert.That(HitResult.LegacyComboIncrease.IsScorable(), Is.True);
             Assert.That(HitResultExtensions.ALL_TYPES, Does.Not.Contain(HitResult.LegacyComboIncrease));
-
-            // Cannot be used to apply results.
-            Assert.Throws<ArgumentException>(() => scoreProcessor.ApplyBeatmap(new Beatmap
-            {
-                HitObjects = { new TestHitObject(HitResult.LegacyComboIncrease) }
-            }));
-
-            ScoreInfo testScore = new ScoreInfo
-            {
-                MaxCombo = 1,
-                Statistics = new Dictionary<HitResult, int>
-                {
-                    { HitResult.Great, 1 }
-                },
-                MaximumStatistics = new Dictionary<HitResult, int>
-                {
-                    { HitResult.Great, 1 },
-                    { HitResult.LegacyComboIncrease, 1 }
-                }
-            };
-
-            double totalScore = new TestScoreProcessor().ComputeScore(ScoringMode.Standardised, testScore);
-            Assert.That(totalScore, Is.EqualTo(750_000)); // 500K from accuracy (100%), and 250K from combo (50%).
         }
 #pragma warning restore CS0618
 
@@ -362,16 +265,24 @@ namespace osu.Game.Tests.Rulesets.Scoring
             const int count_judgements = 1000;
             const int count_misses = 1;
 
-            double actual = new TestScoreProcessor().ComputeAccuracy(new ScoreInfo
+            beatmap = new TestBeatmap(new RulesetInfo())
             {
-                Statistics = new Dictionary<HitResult, int>
+                HitObjects = new List<HitObject>(Enumerable.Repeat(new TestHitObject(HitResult.Great), count_judgements))
+            };
+
+            scoreProcessor = new TestScoreProcessor();
+            scoreProcessor.ApplyBeatmap(beatmap);
+
+            for (int i = 0; i < beatmap.HitObjects.Count; i++)
+            {
+                scoreProcessor.ApplyResult(new JudgementResult(beatmap.HitObjects[i], new TestJudgement(HitResult.Great))
                 {
-                    { HitResult.Great, count_judgements - count_misses },
-                    { HitResult.Miss, count_misses }
-                }
-            });
+                    Type = i == 0 ? HitResult.Miss : HitResult.Great
+                });
+            }
 
             const double expected = (count_judgements - count_misses) / (double)count_judgements;
+            double actual = scoreProcessor.Accuracy.Value;
 
             Assert.That(actual, Is.Not.EqualTo(0.0));
             Assert.That(actual, Is.Not.EqualTo(1.0));
@@ -419,14 +330,18 @@ namespace osu.Game.Tests.Rulesets.Scoring
 
         private partial class TestScoreProcessor : ScoreProcessor
         {
-            protected override double DefaultAccuracyPortion => 0.5;
-            protected override double DefaultComboPortion => 0.5;
-
             public TestScoreProcessor()
                 : base(new TestRuleset())
             {
             }
 
+            protected override double ComputeTotalScore(double comboProgress, double accuracyProgress, double bonusPortion)
+            {
+                return 500000 * comboProgress +
+                       500000 * Accuracy.Value * accuracyProgress +
+                       bonusPortion;
+            }
+
             // ReSharper disable once MemberHidesStaticFromOuterClass
             private class TestRuleset : Ruleset
             {
diff --git a/osu.Game.Tests/Visual/Multiplayer/MultiplayerGameplayLeaderboardTestScene.cs b/osu.Game.Tests/Visual/Multiplayer/MultiplayerGameplayLeaderboardTestScene.cs
index 649c662e41..906eea9553 100644
--- a/osu.Game.Tests/Visual/Multiplayer/MultiplayerGameplayLeaderboardTestScene.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/MultiplayerGameplayLeaderboardTestScene.cs
@@ -21,7 +21,6 @@ using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Spectator;
 using osu.Game.Replays.Legacy;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Scoring;
 using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Tests.Visual.Multiplayer
@@ -188,15 +187,12 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
                 if (!lastHeaders.TryGetValue(userId, out var header))
                 {
-                    lastHeaders[userId] = header = new FrameHeader(new ScoreInfo
+                    lastHeaders[userId] = header = new FrameHeader(0, 0, 0, 0, new Dictionary<HitResult, int>
                     {
-                        Statistics = new Dictionary<HitResult, int>
-                        {
-                            [HitResult.Miss] = 0,
-                            [HitResult.Meh] = 0,
-                            [HitResult.Great] = 0
-                        }
-                    });
+                        [HitResult.Miss] = 0,
+                        [HitResult.Meh] = 0,
+                        [HitResult.Great] = 0
+                    }, new ScoreProcessorStatistics(), DateTimeOffset.Now);
                 }
 
                 switch (RNG.Next(0, 3))

From 6f4e2b37edfdf443f993caf679c061bb38909d38 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 May 2023 18:47:56 +0900
Subject: [PATCH 0556/1604] Add shadow to notifications and settings overlays
 to better distinguish from other overlays

---
 osu.Game/Overlays/NotificationOverlay.cs | 13 +++++++++++++
 osu.Game/Overlays/SettingsPanel.cs       | 13 +++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index 71a4c58afd..4a69fb6240 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -5,9 +5,11 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Localisation;
 using osu.Framework.Logging;
@@ -16,6 +18,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Resources.Localisation.Web;
 using osuTK;
+using osuTK.Graphics;
 using NotificationsStrings = osu.Game.Localisation.NotificationsStrings;
 
 namespace osu.Game.Overlays
@@ -72,6 +75,14 @@ namespace osu.Game.Overlays
                 mainContent = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
+                    Masking = true,
+                    EdgeEffect = new EdgeEffectParameters
+                    {
+                        Colour = Color4.Black.Opacity(0),
+                        Type = EdgeEffectType.Shadow,
+                        Radius = 10,
+                        Hollow = true,
+                    },
                     Children = new Drawable[]
                     {
                         new Box
@@ -199,6 +210,7 @@ namespace osu.Game.Overlays
 
             this.MoveToX(0, TRANSITION_LENGTH, Easing.OutQuint);
             mainContent.FadeTo(1, TRANSITION_LENGTH, Easing.OutQuint);
+            mainContent.FadeEdgeEffectTo(0.4f, WaveContainer.APPEAR_DURATION, Easing.Out);
 
             toastTray.FlushAllToasts();
         }
@@ -211,6 +223,7 @@ namespace osu.Game.Overlays
 
             this.MoveToX(WIDTH, TRANSITION_LENGTH, Easing.OutQuint);
             mainContent.FadeTo(0, TRANSITION_LENGTH, Easing.OutQuint);
+            mainContent.FadeEdgeEffectTo(0, WaveContainer.DISAPPEAR_DURATION, Easing.In);
         }
 
         private void notificationClosed() => Schedule(() =>
diff --git a/osu.Game/Overlays/SettingsPanel.cs b/osu.Game/Overlays/SettingsPanel.cs
index aefaccdb5d..382423eb57 100644
--- a/osu.Game/Overlays/SettingsPanel.cs
+++ b/osu.Game/Overlays/SettingsPanel.cs
@@ -10,15 +10,18 @@ using System.Threading.Tasks;
 using osuTK;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays.Settings;
+using osuTK.Graphics;
 
 namespace osu.Game.Overlays
 {
@@ -105,6 +108,13 @@ namespace osu.Game.Overlays
             Add(SectionsContainer = new SettingsSectionsContainer
             {
                 Masking = true,
+                EdgeEffect = new EdgeEffectParameters
+                {
+                    Colour = Color4.Black.Opacity(0),
+                    Type = EdgeEffectType.Shadow,
+                    Hollow = true,
+                    Radius = 10
+                },
                 RelativeSizeAxes = Axes.Both,
                 ExpandableHeader = CreateHeader(),
                 SelectedSection = { BindTarget = CurrentSection },
@@ -156,6 +166,8 @@ namespace osu.Game.Overlays
 
             ContentContainer.MoveToX(ExpandedPosition, TRANSITION_LENGTH, Easing.OutQuint);
 
+            SectionsContainer.FadeEdgeEffectTo(0.4f, WaveContainer.APPEAR_DURATION, Easing.Out);
+
             // delay load enough to ensure it doesn't overlap with the initial animation.
             // this is done as there is still a brief stutter during load completion which is more visible if the transition is in progress.
             // the eventual goal would be to remove the need for this by splitting up load into smaller work pieces, or fixing the remaining
@@ -175,6 +187,7 @@ namespace osu.Game.Overlays
         {
             base.PopOut();
 
+            SectionsContainer.FadeEdgeEffectTo(0, WaveContainer.DISAPPEAR_DURATION, Easing.In);
             ContentContainer.MoveToX(-WIDTH + ExpandedPosition, TRANSITION_LENGTH, Easing.OutQuint);
 
             Sidebar?.MoveToX(-sidebar_width, TRANSITION_LENGTH, Easing.OutQuint);

From 02d8e3a11e4d245f7b5587c59b4217418718d00a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 May 2023 18:48:10 +0900
Subject: [PATCH 0557/1604] Mark `FullscreenOverlay`'s shadow effect as
 `Hollow` to save on shader overhead

---
 osu.Game/Overlays/FullscreenOverlay.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Overlays/FullscreenOverlay.cs b/osu.Game/Overlays/FullscreenOverlay.cs
index 2cc8354e50..007791387c 100644
--- a/osu.Game/Overlays/FullscreenOverlay.cs
+++ b/osu.Game/Overlays/FullscreenOverlay.cs
@@ -56,6 +56,7 @@ namespace osu.Game.Overlays
             {
                 Colour = Color4.Black.Opacity(0),
                 Type = EdgeEffectType.Shadow,
+                Hollow = true,
                 Radius = 10
             };
 

From 7658536b5afcd3b499aa0b5b5bc70ba5b22b88ec Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 23 May 2023 19:32:19 +0900
Subject: [PATCH 0558/1604] Fix CI issues

---
 .../Rulesets/Scoring/ScoreProcessorTest.cs         | 14 --------------
 osu.Game/Screens/Ranking/ScorePanelList.cs         |  4 ----
 2 files changed, 18 deletions(-)

diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index f51a4ad52b..e5e96d2033 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -289,20 +289,6 @@ namespace osu.Game.Tests.Rulesets.Scoring
             Assert.That(actual, Is.EqualTo(expected).Within(Precision.FLOAT_EPSILON));
         }
 
-        private class TestRuleset : Ruleset
-        {
-            public override IEnumerable<Mod> GetModsFor(ModType type) => throw new NotImplementedException();
-
-            public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => throw new NotImplementedException();
-
-            public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => throw new NotImplementedException();
-
-            public override DifficultyCalculator CreateDifficultyCalculator(IWorkingBeatmap beatmap) => throw new NotImplementedException();
-
-            public override string Description => string.Empty;
-            public override string ShortName => string.Empty;
-        }
-
         private class TestJudgement : Judgement
         {
             public override HitResult MaxResult { get; }
diff --git a/osu.Game/Screens/Ranking/ScorePanelList.cs b/osu.Game/Screens/Ranking/ScorePanelList.cs
index 1f93389e94..b75f3d86ff 100644
--- a/osu.Game/Screens/Ranking/ScorePanelList.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelList.cs
@@ -9,7 +9,6 @@ using System.Diagnostics;
 using System.Linq;
 using System.Threading;
 using JetBrains.Annotations;
-using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -67,9 +66,6 @@ namespace osu.Game.Screens.Ranking
 
         public readonly Bindable<ScoreInfo> SelectedScore = new Bindable<ScoreInfo>();
 
-        [Resolved]
-        private ScoreManager scoreManager { get; set; }
-
         private readonly CancellationTokenSource loadCancellationSource = new CancellationTokenSource();
         private readonly Flow flow;
         private readonly Scroll scroll;

From ebda35c3c9a896861ec526bad90ebc2e154b3131 Mon Sep 17 00:00:00 2001
From: Johannes vd Berg <bakafish.com@gmail.com>
Date: Tue, 23 May 2023 12:57:25 +0200
Subject: [PATCH 0559/1604] Add ghost ticks to exhibit current divisor on
 `BeatDivisorControl`

---
 .../Compose/Components/BeatDivisorControl.cs  | 37 +++++++++++--------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
index 3bfe81e6a7..431fb2f659 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
@@ -398,28 +398,25 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 ClearInternal();
                 CurrentNumber.ValueChanged -= moveMarker;
 
-                foreach (int divisor in beatDivisor.ValidDivisors.Value.Presets)
+                int largestDivisor = beatDivisor.ValidDivisors.Value.Presets.Max();
+                for (int tickIndex = 0; tickIndex <= largestDivisor; tickIndex++)
                 {
-                    AddInternal(new Tick(divisor)
+                    int divisor = largestDivisor;
+                    foreach (int validDivisor in beatDivisor.ValidDivisors.Value.Presets)
+                    {
+                        if (divisor > validDivisor && (tickIndex * validDivisor) % largestDivisor == 0)
+                            divisor = validDivisor;
+                    }
+                    bool solidTick = divisor * (largestDivisor - tickIndex) == largestDivisor;
+                    AddInternal(new Tick(solidTick, divisor)
                     {
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.Centre,
                         RelativePositionAxes = Axes.Both,
                         Colour = BindableBeatDivisor.GetColourFor(divisor, colours),
-                        X = getMappedPosition(divisor),
+                        X = tickIndex / (float)largestDivisor,
                     });
                 }
-
-                // Add a fake 1/1 at the end to give context.
-                AddInternal(new Tick(1)
-                {
-                    Anchor = Anchor.CentreRight,
-                    Origin = Anchor.Centre,
-                    Depth = float.MaxValue,
-                    Alpha = 0.05f,
-                    Colour = BindableBeatDivisor.GetColourFor(1, colours),
-                });
-
                 AddInternal(marker = new Marker());
                 CurrentNumber.ValueChanged += moveMarker;
                 CurrentNumber.TriggerChange();
@@ -428,6 +425,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
             private void moveMarker(ValueChangedEvent<int> divisor)
             {
                 marker.MoveToX(getMappedPosition(divisor.NewValue), 100, Easing.OutQuint);
+
+                foreach (Tick child in InternalChildren.OfType<Tick>())
+                {
+                    float newAlpha = child.Solid ? 1f : divisor.NewValue % child.Divisor == 0 ? 0.2f : 0f;
+                    child.FadeTo(newAlpha);
+                }
             }
 
             protected override void UpdateValue(float value)
@@ -497,8 +500,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             private partial class Tick : Circle
             {
-                public Tick(int divisor)
+                public bool Solid;
+                public int Divisor;
+                public Tick(bool solid, int divisor)
                 {
+                    Solid = solid;
+                    Divisor = divisor;
                     Size = new Vector2(6f, 12) * BindableBeatDivisor.GetSize(divisor);
                     InternalChild = new Box { RelativeSizeAxes = Axes.Both };
                 }

From 37a796306d65a5c940d8cd715021083bdef9990a Mon Sep 17 00:00:00 2001
From: Gyoshi <bakafish.com@gmail.com>
Date: Tue, 23 May 2023 14:30:35 +0200
Subject: [PATCH 0560/1604] Small format & comment

---
 .../Screens/Edit/Compose/Components/BeatDivisorControl.cs  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
index 431fb2f659..04cc736e7d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
@@ -402,13 +402,15 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 for (int tickIndex = 0; tickIndex <= largestDivisor; tickIndex++)
                 {
                     int divisor = largestDivisor;
+                    // Find lowest divisor that the tick fits into
                     foreach (int validDivisor in beatDivisor.ValidDivisors.Value.Presets)
                     {
                         if (divisor > validDivisor && (tickIndex * validDivisor) % largestDivisor == 0)
                             divisor = validDivisor;
                     }
-                    bool solidTick = divisor * (largestDivisor - tickIndex) == largestDivisor;
-                    AddInternal(new Tick(solidTick, divisor)
+
+                    bool isSolidTick = divisor * (largestDivisor - tickIndex) == largestDivisor;
+                    AddInternal(new Tick(isSolidTick, divisor)
                     {
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.Centre,
@@ -417,6 +419,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                         X = tickIndex / (float)largestDivisor,
                     });
                 }
+
                 AddInternal(marker = new Marker());
                 CurrentNumber.ValueChanged += moveMarker;
                 CurrentNumber.TriggerChange();

From 1b32370c6a489ec618e7022b197f3c82518a183a Mon Sep 17 00:00:00 2001
From: Gyoshi <bakafish.com@gmail.com>
Date: Tue, 23 May 2023 15:05:38 +0200
Subject: [PATCH 0561/1604] Remove duplicate code by making
 `GetDivisorForBeatIndex` method more general

---
 osu.Game/Screens/Edit/BindableBeatDivisor.cs              | 7 +++++--
 .../Screens/Edit/Compose/Components/BeatDivisorControl.cs | 8 +-------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Edit/BindableBeatDivisor.cs b/osu.Game/Screens/Edit/BindableBeatDivisor.cs
index aa8e202e22..f1b97571bd 100644
--- a/osu.Game/Screens/Edit/BindableBeatDivisor.cs
+++ b/osu.Game/Screens/Edit/BindableBeatDivisor.cs
@@ -154,12 +154,15 @@ namespace osu.Game.Screens.Edit
         /// </summary>
         /// <param name="index">The 0-based beat index.</param>
         /// <param name="beatDivisor">The beat divisor.</param>
+        /// <param name="validDivisors">The list of valid divisors which can be chosen from. Assumes ordered from low to high.</param>
         /// <returns>The applicable divisor.</returns>
-        public static int GetDivisorForBeatIndex(int index, int beatDivisor)
+        public static int GetDivisorForBeatIndex(int index, int beatDivisor, int[] validDivisors = null)
         {
+            validDivisors ??= PREDEFINED_DIVISORS;
+
             int beat = index % beatDivisor;
 
-            foreach (int divisor in PREDEFINED_DIVISORS)
+            foreach (int divisor in validDivisors)
             {
                 if ((beat * divisor) % beatDivisor == 0)
                     return divisor;
diff --git a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
index 04cc736e7d..2dd5791943 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
@@ -401,13 +401,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 int largestDivisor = beatDivisor.ValidDivisors.Value.Presets.Max();
                 for (int tickIndex = 0; tickIndex <= largestDivisor; tickIndex++)
                 {
-                    int divisor = largestDivisor;
-                    // Find lowest divisor that the tick fits into
-                    foreach (int validDivisor in beatDivisor.ValidDivisors.Value.Presets)
-                    {
-                        if (divisor > validDivisor && (tickIndex * validDivisor) % largestDivisor == 0)
-                            divisor = validDivisor;
-                    }
+                    int divisor = BindableBeatDivisor.GetDivisorForBeatIndex(tickIndex, largestDivisor, (int[])beatDivisor.ValidDivisors.Value.Presets);
 
                     bool isSolidTick = divisor * (largestDivisor - tickIndex) == largestDivisor;
                     AddInternal(new Tick(isSolidTick, divisor)

From 7b1e8ede54498bf66d54965769220dc626240c1f Mon Sep 17 00:00:00 2001
From: Gyoshi <bakafish.com@gmail.com>
Date: Tue, 23 May 2023 15:11:27 +0200
Subject: [PATCH 0562/1604] Small format

---
 osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
index 2dd5791943..1af7d25dcd 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
@@ -402,8 +402,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 for (int tickIndex = 0; tickIndex <= largestDivisor; tickIndex++)
                 {
                     int divisor = BindableBeatDivisor.GetDivisorForBeatIndex(tickIndex, largestDivisor, (int[])beatDivisor.ValidDivisors.Value.Presets);
-
                     bool isSolidTick = divisor * (largestDivisor - tickIndex) == largestDivisor;
+
                     AddInternal(new Tick(isSolidTick, divisor)
                     {
                         Anchor = Anchor.CentreLeft,

From 921d7e4d89351a50fe6ec4e65f1ec01b3d650a36 Mon Sep 17 00:00:00 2001
From: Gyoshi <bakafish.com@gmail.com>
Date: Tue, 23 May 2023 16:46:08 +0200
Subject: [PATCH 0563/1604] More fitting tests for new layout

---
 .../Editing/TestSceneBeatDivisorControl.cs      | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs b/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
index c3d5ecac5c..b74e9f436b 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
@@ -65,17 +65,24 @@ namespace osu.Game.Tests.Visual.Editing
                 InputManager.MoveMouseTo(tickMarkerHead.ScreenSpaceDrawQuad.Centre);
                 InputManager.PressButton(MouseButton.Left);
             });
-            AddStep("move to 8 and release", () =>
+            AddStep("move to 1", () => InputManager.MoveMouseTo(getPositionForDivisor(1)));
+            AddStep("move to 16 and release", () =>
             {
-                InputManager.MoveMouseTo(tickSliderBar.ScreenSpaceDrawQuad.Centre);
+                InputManager.MoveMouseTo(getPositionForDivisor(16));
                 InputManager.ReleaseButton(MouseButton.Left);
             });
-            AddAssert("divisor is 8", () => bindableBeatDivisor.Value == 8);
+            AddAssert("divisor is 16", () => bindableBeatDivisor.Value == 16);
             AddStep("hold marker", () => InputManager.PressButton(MouseButton.Left));
-            AddStep("move to 16", () => InputManager.MoveMouseTo(getPositionForDivisor(16)));
-            AddStep("move to ~10 and release", () =>
+            AddStep("move to ~6 and release", () =>
+            {
+                InputManager.MoveMouseTo(getPositionForDivisor(6));
+                InputManager.ReleaseButton(MouseButton.Left);
+            });
+            AddAssert("divisor clamped to 8", () => bindableBeatDivisor.Value == 8);
+            AddStep("move to ~10 and click", () =>
             {
                 InputManager.MoveMouseTo(getPositionForDivisor(10));
+                InputManager.PressButton(MouseButton.Left);
                 InputManager.ReleaseButton(MouseButton.Left);
             });
             AddAssert("divisor clamped to 8", () => bindableBeatDivisor.Value == 8);

From fa00f8b92a56db6669835efa70131e69308c9f67 Mon Sep 17 00:00:00 2001
From: Gyoshi <bakafish.com@gmail.com>
Date: Tue, 23 May 2023 16:46:40 +0200
Subject: [PATCH 0564/1604] replace manual code with existing method

---
 .../Visual/Editing/TestSceneBeatDivisorControl.cs     | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs b/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
index b74e9f436b..a4b36ef93a 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
@@ -90,12 +90,11 @@ namespace osu.Game.Tests.Visual.Editing
 
         private Vector2 getPositionForDivisor(int divisor)
         {
-            float relativePosition = (float)Math.Clamp(divisor, 0, 16) / 16;
-            var sliderDrawQuad = tickSliderBar.ScreenSpaceDrawQuad;
-            return new Vector2(
-                sliderDrawQuad.TopLeft.X + sliderDrawQuad.Width * relativePosition,
-                sliderDrawQuad.Centre.Y
-            );
+            float localX = 1 - 1 / (float)divisor;
+            return tickSliderBar.ToScreenSpace(new Vector2(
+                localX,
+                0.5f
+            ));
         }
 
         [Test]

From b5f8093941873b6aa95bc62a61f7eb5d29e9ce52 Mon Sep 17 00:00:00 2001
From: Gyoshi <bakafish.com@gmail.com>
Date: Tue, 23 May 2023 17:59:07 +0200
Subject: [PATCH 0565/1604] Use `RangePadding` to align mouse with slider

---
 osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs  | 4 ++--
 .../Screens/Edit/Compose/Components/BeatDivisorControl.cs     | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs b/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
index a4b36ef93a..353acfa4ba 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
@@ -90,10 +90,10 @@ namespace osu.Game.Tests.Visual.Editing
 
         private Vector2 getPositionForDivisor(int divisor)
         {
-            float localX = 1 - 1 / (float)divisor;
+            float localX = (1 - 1 / (float)divisor) * tickSliderBar.UsableWidth + tickSliderBar.RangePadding;
             return tickSliderBar.ToScreenSpace(new Vector2(
                 localX,
-                0.5f
+                tickSliderBar.DrawHeight / 2
             ));
         }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
index 3bfe81e6a7..cec9806e94 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
@@ -383,7 +383,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
             {
                 CurrentNumber.BindTo(this.beatDivisor = beatDivisor);
 
-                Padding = new MarginPadding { Horizontal = 5 };
+                RangePadding = 5;
+                Padding = new MarginPadding { Horizontal = RangePadding };
             }
 
             protected override void LoadComplete()

From c5ef3ae1811f9216c2023c92de67ae2d548f4a66 Mon Sep 17 00:00:00 2001
From: Gyoshi <bakafish.com@gmail.com>
Date: Tue, 23 May 2023 18:44:20 +0200
Subject: [PATCH 0566/1604] Code styling

---
 .../Screens/Edit/Compose/Components/BeatDivisorControl.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
index 1af7d25dcd..4c3c9872a0 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
@@ -425,7 +425,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
                 foreach (Tick child in InternalChildren.OfType<Tick>())
                 {
-                    float newAlpha = child.Solid ? 1f : divisor.NewValue % child.Divisor == 0 ? 0.2f : 0f;
+                    float newAlpha = child.IsSolid ? 1f : divisor.NewValue % child.Divisor == 0 ? 0.2f : 0f;
                     child.FadeTo(newAlpha);
                 }
             }
@@ -497,11 +497,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             private partial class Tick : Circle
             {
-                public bool Solid;
+                public bool IsSolid;
                 public int Divisor;
-                public Tick(bool solid, int divisor)
+                public Tick(bool isSolid, int divisor)
                 {
-                    Solid = solid;
+                    IsSolid = isSolid;
                     Divisor = divisor;
                     Size = new Vector2(6f, 12) * BindableBeatDivisor.GetSize(divisor);
                     InternalChild = new Box { RelativeSizeAxes = Axes.Both };

From 7fe19d1992633fc13e3cf68c35fb21e3734d39dd Mon Sep 17 00:00:00 2001
From: Gyoshi <bakafish.com@gmail.com>
Date: Tue, 23 May 2023 18:45:49 +0200
Subject: [PATCH 0567/1604] `Last` instead of `Max` divisor to match code
 elsewhere

---
 osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
index 4c3c9872a0..4982ab9ef2 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
@@ -398,7 +398,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 ClearInternal();
                 CurrentNumber.ValueChanged -= moveMarker;
 
-                int largestDivisor = beatDivisor.ValidDivisors.Value.Presets.Max();
+                int largestDivisor = beatDivisor.ValidDivisors.Value.Presets.Last();
                 for (int tickIndex = 0; tickIndex <= largestDivisor; tickIndex++)
                 {
                     int divisor = BindableBeatDivisor.GetDivisorForBeatIndex(tickIndex, largestDivisor, (int[])beatDivisor.ValidDivisors.Value.Presets);

From 0ea3eea8d6acad4049dc7da12a6961f3e6e8454b Mon Sep 17 00:00:00 2001
From: Robin Oger <roger@qcify.com>
Date: Tue, 23 May 2023 19:21:44 +0200
Subject: [PATCH 0568/1604] Make GameplayMenuOverlay translatable

This allows translator to translate the pause and failed in game menus
---
 .../GameplayMenuOverlayStrings.cs             | 49 +++++++++++++++++++
 osu.Game/Screens/Play/FailOverlay.cs          | 10 ++--
 osu.Game/Screens/Play/GameplayMenuOverlay.cs  |  7 +--
 osu.Game/Screens/Play/PauseOverlay.cs         | 12 +++--
 4 files changed, 66 insertions(+), 12 deletions(-)
 create mode 100644 osu.Game/Localisation/GameplayMenuOverlayStrings.cs

diff --git a/osu.Game/Localisation/GameplayMenuOverlayStrings.cs b/osu.Game/Localisation/GameplayMenuOverlayStrings.cs
new file mode 100644
index 0000000000..bba16e014a
--- /dev/null
+++ b/osu.Game/Localisation/GameplayMenuOverlayStrings.cs
@@ -0,0 +1,49 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Localisation;
+
+namespace osu.Game.Localisation
+{
+    public static class GameplayMenuOverlayStrings
+    {
+        private const string prefix = @"osu.Game.Resources.Localisation.GameplayMenuOverlay";
+
+        /// <summary>
+        /// "Continue"
+        /// </summary>
+        public static LocalisableString Continue => new TranslatableString(getKey(@"continue"), @"Continue");
+
+        /// <summary>
+        /// "Retry"
+        /// </summary>
+        public static LocalisableString Retry => new TranslatableString(getKey(@"retry"), @"Retry");
+
+        /// <summary>
+        /// "Quit"
+        /// </summary>
+        public static LocalisableString Quit => new TranslatableString(getKey(@"quit"), @"Quit");
+
+        /// <summary>
+        /// "failed"
+        /// </summary>
+        public static LocalisableString FailedHeader => new TranslatableString(getKey(@"failed_header"), @"failed");
+
+        /// <summary>
+        /// "paused"
+        /// </summary>
+        public static LocalisableString PausedHeader => new TranslatableString(getKey(@"paused_header"), @"paused");
+
+        /// <summary>
+        /// "you're dead, try again?"
+        /// </summary>
+        public static LocalisableString FailedDescription => new TranslatableString(getKey(@"failed_description"), @"you're dead, try again?");
+
+        /// <summary>
+        /// "you're not going to do what i think you're going to do, are ya?"
+        /// </summary>
+        public static LocalisableString PausedDescription => new TranslatableString(getKey(@"paused_description"), @"you're not going to do what i think you're going to do, are ya?");
+
+        private static string getKey(string key) => $@"{prefix}:{key}";
+    }
+}
diff --git a/osu.Game/Screens/Play/FailOverlay.cs b/osu.Game/Screens/Play/FailOverlay.cs
index 4fbc937b59..5b026a4c06 100644
--- a/osu.Game/Screens/Play/FailOverlay.cs
+++ b/osu.Game/Screens/Play/FailOverlay.cs
@@ -15,6 +15,8 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Localisation;
+using osu.Game.Localisation;
 
 namespace osu.Game.Screens.Play
 {
@@ -22,14 +24,14 @@ namespace osu.Game.Screens.Play
     {
         public Func<Task<ScoreInfo>> SaveReplay;
 
-        public override string Header => "failed";
-        public override string Description => "you're dead, try again?";
+        public override LocalisableString Header => GameplayMenuOverlayStrings.FailedHeader;
+        public override LocalisableString Description => GameplayMenuOverlayStrings.FailedDescription;
 
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            AddButton("Retry", colours.YellowDark, () => OnRetry?.Invoke());
-            AddButton("Quit", new Color4(170, 27, 39, 255), () => OnQuit?.Invoke());
+            AddButton(GameplayMenuOverlayStrings.Retry, colours.YellowDark, () => OnRetry?.Invoke());
+            AddButton(GameplayMenuOverlayStrings.Quit, new Color4(170, 27, 39, 255), () => OnQuit?.Invoke());
             // from #10339 maybe this is a better visual effect
             Add(new Container
             {
diff --git a/osu.Game/Screens/Play/GameplayMenuOverlay.cs b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
index 81146a4ea6..b83d17fdb2 100644
--- a/osu.Game/Screens/Play/GameplayMenuOverlay.cs
+++ b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
@@ -15,6 +15,7 @@ using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
@@ -51,9 +52,9 @@ namespace osu.Game.Screens.Play
         /// </summary>
         protected virtual Action SelectAction => () => InternalButtons.Selected?.TriggerClick();
 
-        public abstract string Header { get; }
+        public abstract LocalisableString Header { get; }
 
-        public abstract string Description { get; }
+        public abstract LocalisableString Description { get; }
 
         protected SelectionCycleFillFlowContainer<DialogButton> InternalButtons;
         public IReadOnlyList<DialogButton> Buttons => InternalButtons;
@@ -170,7 +171,7 @@ namespace osu.Game.Screens.Play
 
         protected override bool OnMouseMove(MouseMoveEvent e) => true;
 
-        protected void AddButton(string text, Color4 colour, Action action)
+        protected void AddButton(LocalisableString text, Color4 colour, Action action)
         {
             var button = new Button
             {
diff --git a/osu.Game/Screens/Play/PauseOverlay.cs b/osu.Game/Screens/Play/PauseOverlay.cs
index db42998c45..c3c1c493d4 100644
--- a/osu.Game/Screens/Play/PauseOverlay.cs
+++ b/osu.Game/Screens/Play/PauseOverlay.cs
@@ -9,9 +9,11 @@ using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 using osu.Game.Audio;
 using osu.Game.Graphics;
 using osu.Game.Input.Bindings;
+using osu.Game.Localisation;
 using osu.Game.Skinning;
 using osuTK.Graphics;
 
@@ -23,8 +25,8 @@ namespace osu.Game.Screens.Play
 
         public override bool IsPresent => base.IsPresent || pauseLoop.IsPlaying;
 
-        public override string Header => "paused";
-        public override string Description => "you're not going to do what i think you're going to do, are ya?";
+        public override LocalisableString Header => GameplayMenuOverlayStrings.PausedHeader;
+        public override LocalisableString Description => GameplayMenuOverlayStrings.PausedDescription;
 
         private SkinnableSound pauseLoop;
 
@@ -33,9 +35,9 @@ namespace osu.Game.Screens.Play
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            AddButton("Continue", colours.Green, () => OnResume?.Invoke());
-            AddButton("Retry", colours.YellowDark, () => OnRetry?.Invoke());
-            AddButton("Quit", new Color4(170, 27, 39, 255), () => OnQuit?.Invoke());
+            AddButton(GameplayMenuOverlayStrings.Continue, colours.Green, () => OnResume?.Invoke());
+            AddButton(GameplayMenuOverlayStrings.Retry, colours.YellowDark, () => OnRetry?.Invoke());
+            AddButton(GameplayMenuOverlayStrings.Quit, new Color4(170, 27, 39, 255), () => OnQuit?.Invoke());
 
             AddInternal(pauseLoop = new SkinnableSound(new SampleInfo("Gameplay/pause-loop"))
             {

From a24da89908958d1879851b5a756e11f2b48402b4 Mon Sep 17 00:00:00 2001
From: Robin Oger <roger@qcify.com>
Date: Tue, 23 May 2023 21:37:12 +0200
Subject: [PATCH 0569/1604] Change to sentence casing

See: https://github.com/ppy/osu/pull/23640#discussion_r1202879352
---
 osu.Game/Localisation/GameplayMenuOverlayStrings.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Localisation/GameplayMenuOverlayStrings.cs b/osu.Game/Localisation/GameplayMenuOverlayStrings.cs
index bba16e014a..c89c35775b 100644
--- a/osu.Game/Localisation/GameplayMenuOverlayStrings.cs
+++ b/osu.Game/Localisation/GameplayMenuOverlayStrings.cs
@@ -35,14 +35,14 @@ namespace osu.Game.Localisation
         public static LocalisableString PausedHeader => new TranslatableString(getKey(@"paused_header"), @"paused");
 
         /// <summary>
-        /// "you're dead, try again?"
+        /// "You're dead, try again?"
         /// </summary>
-        public static LocalisableString FailedDescription => new TranslatableString(getKey(@"failed_description"), @"you're dead, try again?");
+        public static LocalisableString FailedDescription => new TranslatableString(getKey(@"failed_description"), @"You're dead, try again?");
 
         /// <summary>
-        /// "you're not going to do what i think you're going to do, are ya?"
+        /// "You're not going to do what i think you're going to do, are ya?"
         /// </summary>
-        public static LocalisableString PausedDescription => new TranslatableString(getKey(@"paused_description"), @"you're not going to do what i think you're going to do, are ya?");
+        public static LocalisableString PausedDescription => new TranslatableString(getKey(@"paused_description"), @"You're not going to do what i think you're going to do, are ya?");
 
         private static string getKey(string key) => $@"{prefix}:{key}";
     }

From 067328233cf5715e8ce00936a6ce6bbe1b9795cd Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 23 May 2023 13:14:57 -0700
Subject: [PATCH 0570/1604] Remove `OsuScreen.ApplyLogoArrivingDefaults()`

---
 osu.Game/Screens/OsuScreen.cs | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index bc4cc2b00f..9c098794a6 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -233,7 +233,13 @@ namespace osu.Game.Screens
         /// </summary>
         protected virtual void LogoArriving(OsuLogo logo, bool resuming)
         {
-            ApplyLogoArrivingDefaults(logo);
+            logo.Action = null;
+            logo.FadeOut(300, Easing.OutQuint);
+            logo.Anchor = Anchor.TopLeft;
+            logo.Origin = Anchor.Centre;
+            logo.RelativePositionAxes = Axes.Both;
+            logo.Triangles = true;
+            logo.Ripple = true;
         }
 
         private void applyArrivingDefaults(bool isResuming)
@@ -244,22 +250,6 @@ namespace osu.Game.Screens
             }, true);
         }
 
-        /// <summary>
-        /// Applies default animations to an arriving logo.
-        /// Todo: This should not exist.
-        /// </summary>
-        /// <param name="logo">The logo to apply animations to.</param>
-        public static void ApplyLogoArrivingDefaults(OsuLogo logo)
-        {
-            logo.Action = null;
-            logo.FadeOut(300, Easing.OutQuint);
-            logo.Anchor = Anchor.TopLeft;
-            logo.Origin = Anchor.Centre;
-            logo.RelativePositionAxes = Axes.Both;
-            logo.Triangles = true;
-            logo.Ripple = true;
-        }
-
         private void onExitingLogo()
         {
             logo?.AppendAnimatingAction(() => LogoExiting(logo), false);

From e5451d1d79c7cceb3479515b8611c0954706f95c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 May 2023 12:38:27 +0900
Subject: [PATCH 0571/1604] Centralise definition of overlay shadow opacity and
 reduce slightly

---
 osu.Game/Graphics/Containers/WaveContainer.cs | 1 +
 osu.Game/Overlays/FullscreenOverlay.cs        | 2 +-
 osu.Game/Overlays/NotificationOverlay.cs      | 2 +-
 osu.Game/Overlays/SettingsPanel.cs            | 3 ++-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Graphics/Containers/WaveContainer.cs b/osu.Game/Graphics/Containers/WaveContainer.cs
index 952ef3f182..05a666721a 100644
--- a/osu.Game/Graphics/Containers/WaveContainer.cs
+++ b/osu.Game/Graphics/Containers/WaveContainer.cs
@@ -17,6 +17,7 @@ namespace osu.Game.Graphics.Containers
     {
         public const float APPEAR_DURATION = 800;
         public const float DISAPPEAR_DURATION = 500;
+        public const float SHADOW_OPACITY = 0.2f;
 
         private const Easing easing_show = Easing.OutSine;
         private const Easing easing_hide = Easing.InSine;
diff --git a/osu.Game/Overlays/FullscreenOverlay.cs b/osu.Game/Overlays/FullscreenOverlay.cs
index 007791387c..032821f215 100644
--- a/osu.Game/Overlays/FullscreenOverlay.cs
+++ b/osu.Game/Overlays/FullscreenOverlay.cs
@@ -102,7 +102,7 @@ namespace osu.Game.Overlays
         protected override void PopIn()
         {
             base.PopIn();
-            FadeEdgeEffectTo(0.4f, WaveContainer.APPEAR_DURATION, Easing.Out);
+            FadeEdgeEffectTo(WaveContainer.SHADOW_OPACITY, WaveContainer.APPEAR_DURATION, Easing.Out);
         }
 
         protected override void PopOut()
diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index 4a69fb6240..f2eefb6e4b 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -210,7 +210,7 @@ namespace osu.Game.Overlays
 
             this.MoveToX(0, TRANSITION_LENGTH, Easing.OutQuint);
             mainContent.FadeTo(1, TRANSITION_LENGTH, Easing.OutQuint);
-            mainContent.FadeEdgeEffectTo(0.4f, WaveContainer.APPEAR_DURATION, Easing.Out);
+            mainContent.FadeEdgeEffectTo(WaveContainer.SHADOW_OPACITY, WaveContainer.APPEAR_DURATION, Easing.Out);
 
             toastTray.FlushAllToasts();
         }
diff --git a/osu.Game/Overlays/SettingsPanel.cs b/osu.Game/Overlays/SettingsPanel.cs
index 382423eb57..d571557993 100644
--- a/osu.Game/Overlays/SettingsPanel.cs
+++ b/osu.Game/Overlays/SettingsPanel.cs
@@ -115,6 +115,7 @@ namespace osu.Game.Overlays
                     Hollow = true,
                     Radius = 10
                 },
+                MaskingSmoothness = 0,
                 RelativeSizeAxes = Axes.Both,
                 ExpandableHeader = CreateHeader(),
                 SelectedSection = { BindTarget = CurrentSection },
@@ -166,7 +167,7 @@ namespace osu.Game.Overlays
 
             ContentContainer.MoveToX(ExpandedPosition, TRANSITION_LENGTH, Easing.OutQuint);
 
-            SectionsContainer.FadeEdgeEffectTo(0.4f, WaveContainer.APPEAR_DURATION, Easing.Out);
+            SectionsContainer.FadeEdgeEffectTo(WaveContainer.SHADOW_OPACITY, WaveContainer.APPEAR_DURATION, Easing.Out);
 
             // delay load enough to ensure it doesn't overlap with the initial animation.
             // this is done as there is still a brief stutter during load completion which is more visible if the transition is in progress.

From 561b759bf980216beca1ff2639da1018bc05c742 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 May 2023 13:49:29 +0900
Subject: [PATCH 0572/1604] Tidy up implementation and ensure non-solid ticks
 start at zero alpha

---
 .../Compose/Components/BeatDivisorControl.cs  | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
index 07330a6e10..432c5ea280 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
@@ -400,12 +400,13 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 CurrentNumber.ValueChanged -= moveMarker;
 
                 int largestDivisor = beatDivisor.ValidDivisors.Value.Presets.Last();
+
                 for (int tickIndex = 0; tickIndex <= largestDivisor; tickIndex++)
                 {
                     int divisor = BindableBeatDivisor.GetDivisorForBeatIndex(tickIndex, largestDivisor, (int[])beatDivisor.ValidDivisors.Value.Presets);
                     bool isSolidTick = divisor * (largestDivisor - tickIndex) == largestDivisor;
 
-                    AddInternal(new Tick(isSolidTick, divisor)
+                    AddInternal(new Tick(divisor, isSolidTick)
                     {
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.Centre,
@@ -424,10 +425,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
             {
                 marker.MoveToX(getMappedPosition(divisor.NewValue), 100, Easing.OutQuint);
 
-                foreach (Tick child in InternalChildren.OfType<Tick>())
+                foreach (Tick tick in InternalChildren.OfType<Tick>().Where(t => !t.AlwaysDisplayed))
                 {
-                    float newAlpha = child.IsSolid ? 1f : divisor.NewValue % child.Divisor == 0 ? 0.2f : 0f;
-                    child.FadeTo(newAlpha);
+                    tick.FadeTo(divisor.NewValue % tick.Divisor == 0 ? 0.2f : 0f, 100, Easing.OutQuint);
                 }
             }
 
@@ -498,13 +498,18 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             private partial class Tick : Circle
             {
-                public bool IsSolid;
-                public int Divisor;
-                public Tick(bool isSolid, int divisor)
+                public readonly bool AlwaysDisplayed;
+
+                public readonly int Divisor;
+
+                public Tick(int divisor, bool alwaysDisplayed)
                 {
-                    IsSolid = isSolid;
+                    AlwaysDisplayed = alwaysDisplayed;
                     Divisor = divisor;
+
                     Size = new Vector2(6f, 12) * BindableBeatDivisor.GetSize(divisor);
+                    Alpha = alwaysDisplayed ? 1 : 0;
+
                     InternalChild = new Box { RelativeSizeAxes = Axes.Both };
                 }
             }

From e68ba6366c88554db3bee4332be5f1563e4257c1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 May 2023 14:04:10 +0900
Subject: [PATCH 0573/1604] Update new usages of "soft" to use the new constant

---
 .../Editor/TestSceneSliderSplitting.cs        |  2 +-
 .../TestSceneDrumSampleTriggerSource.cs       | 24 +++++++++----------
 .../TestSceneHitObjectSampleAdjustments.cs    | 10 ++++----
 .../TestSceneGameplaySampleTriggerSource.cs   |  2 +-
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs
index a104433ea9..605771fb20 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs
@@ -181,7 +181,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             {
                 if (slider is null) return;
 
-                sample = new HitSampleInfo("hitwhistle", "soft", volume: 70);
+                sample = new HitSampleInfo("hitwhistle", HitSampleInfo.BANK_SOFT, volume: 70);
                 slider.Samples.Add(sample.With());
             });
 
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs
index 74da69e3eb..287d90b406 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
                     StartTime = 100,
                     Samples = new List<HitSampleInfo>
                     {
-                        new HitSampleInfo(HitSampleInfo.HIT_NORMAL, "soft")
+                        new HitSampleInfo(HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT)
                     }
                 };
                 hit.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
@@ -100,13 +100,13 @@ namespace osu.Game.Rulesets.Taiko.Tests
             });
 
             AddAssert("most valid object is hit", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Hit>);
-            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, "soft");
-            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, "soft");
+            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT);
+            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT);
 
             AddStep("seek past hit", () => manualClock.CurrentTime = 200);
             AddAssert("most valid object is hit", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Hit>);
-            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, "soft");
-            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, "soft");
+            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT);
+            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT);
         }
 
         [Test]
@@ -183,7 +183,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
                     EndTime = 1100,
                     Samples = new List<HitSampleInfo>
                     {
-                        new HitSampleInfo(HitSampleInfo.HIT_NORMAL, "soft")
+                        new HitSampleInfo(HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT)
                     }
                 };
                 drumRoll.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
@@ -192,18 +192,18 @@ namespace osu.Game.Rulesets.Taiko.Tests
             });
 
             AddAssert("most valid object is drum roll tick", () => triggerSource.GetMostValidObject(), Is.InstanceOf<DrumRollTick>);
-            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, "soft");
-            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, "soft");
+            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT);
+            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT);
 
             AddStep("seek to middle of drum roll", () => manualClock.CurrentTime = 600);
             AddAssert("most valid object is drum roll tick", () => triggerSource.GetMostValidObject(), Is.InstanceOf<DrumRollTick>);
-            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, "soft");
-            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, "soft");
+            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT);
+            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT);
 
             AddStep("seek past drum roll", () => manualClock.CurrentTime = 1200);
             AddAssert("most valid object is drum roll", () => triggerSource.GetMostValidObject(), Is.InstanceOf<DrumRoll>);
-            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, "soft");
-            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, "soft");
+            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT);
+            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT);
         }
 
         [Test]
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSampleAdjustments.cs b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSampleAdjustments.cs
index 0581ff269c..eb39221211 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSampleAdjustments.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSampleAdjustments.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Tests.Visual.Editing
                     Position = (OsuPlayfield.BASE_SIZE + new Vector2(100, 0)) / 2,
                     Samples = new List<HitSampleInfo>
                     {
-                        new HitSampleInfo(HitSampleInfo.HIT_NORMAL, "soft", volume: 60)
+                        new HitSampleInfo(HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT, volume: 60)
                     }
                 });
             });
@@ -67,14 +67,14 @@ namespace osu.Game.Tests.Visual.Editing
 
             hitObjectHasSampleBank(0, "normal");
             hitObjectHasSamples(0, HitSampleInfo.HIT_NORMAL, HitSampleInfo.HIT_CLAP);
-            hitObjectHasSampleBank(1, "soft");
+            hitObjectHasSampleBank(1, HitSampleInfo.BANK_SOFT);
             hitObjectHasSamples(1, HitSampleInfo.HIT_NORMAL, HitSampleInfo.HIT_CLAP);
 
             AddStep("remove clap addition", () => InputManager.Key(Key.R));
 
             hitObjectHasSampleBank(0, "normal");
             hitObjectHasSamples(0, HitSampleInfo.HIT_NORMAL);
-            hitObjectHasSampleBank(1, "soft");
+            hitObjectHasSampleBank(1, HitSampleInfo.BANK_SOFT);
             hitObjectHasSamples(1, HitSampleInfo.HIT_NORMAL);
         }
 
@@ -113,7 +113,7 @@ namespace osu.Game.Tests.Visual.Editing
         public void TestUndo()
         {
             clickSamplePiece(1);
-            samplePopoverHasSingleBank("soft");
+            samplePopoverHasSingleBank(HitSampleInfo.BANK_SOFT);
             samplePopoverHasSingleVolume(60);
 
             setVolumeViaPopover(90);
@@ -178,7 +178,7 @@ namespace osu.Game.Tests.Visual.Editing
                 {
                     for (int i = 0; i < h.Samples.Count; i++)
                     {
-                        h.Samples[i] = h.Samples[i].With(newBank: "soft");
+                        h.Samples[i] = h.Samples[i].With(newBank: HitSampleInfo.BANK_SOFT);
                     }
                 }
             });
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs
index bf69da8c12..e52ec6f8cc 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs
@@ -83,7 +83,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 {
                     StartTime = t += spacing,
                     Path = new SliderPath(PathType.Linear, new[] { Vector2.Zero, Vector2.UnitY * 200 }),
-                    Samples = new[] { new HitSampleInfo(HitSampleInfo.HIT_WHISTLE, "soft") },
+                    Samples = new[] { new HitSampleInfo(HitSampleInfo.HIT_WHISTLE, HitSampleInfo.BANK_SOFT) },
                 },
             });
 

From a9ba16a2be5d8355248d658ddb90867799dc86ba Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 May 2023 14:20:38 +0900
Subject: [PATCH 0574/1604] Update to support non-control-point sample changes

---
 .../Components/ComposeBlueprintContainer.cs   |  4 ++--
 .../Components/EditorSelectionHandler.cs      | 23 ++++---------------
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index b4f2236847..3f3b4ad327 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -199,12 +199,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private void bankChanged(string bankName, TernaryState state)
         {
-            if (currentPlacement == null) return;
+            if (CurrentPlacement == null) return;
 
             switch (state)
             {
                 case TernaryState.True:
-                    currentPlacement.HitObject.SampleControlPoint.SampleBank = bankName;
+                    CurrentPlacement.HitObject.Samples = CurrentPlacement.HitObject.Samples.Select(s => s.With(newBank: bankName)).ToList();
                     break;
             }
         }
diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
index 5d2eb33d8d..fa3a4cddaa 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                             {
                                 // Never remove a sample bank.
                                 // These are basically radio buttons, not toggles.
-                                if (SelectedItems.All(h => h.SampleControlPoint.SampleBank == bankName))
+                                if (SelectedItems.All(h => h.Samples.All(s => s.Bank == bankName)))
                                     bindable.Value = TernaryState.True;
                             }
 
@@ -167,7 +167,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             foreach ((string bankName, var bindable) in SelectionBankStates)
             {
-                bindable.Value = GetStateFromSelection(SelectedItems, h => h.SampleControlPoint.SampleBank == bankName);
+                bindable.Value = GetStateFromSelection(SelectedItems, h => h.Samples.All(s => s.Bank == bankName));
             }
         }
 
@@ -183,25 +183,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             EditorBeatmap.PerformOnSelection(h =>
             {
-                if (h.SampleControlPoint.SampleBank == bankName)
+                if (h.Samples.All(s => s.Bank == bankName))
                     return;
 
-                h.SampleControlPoint.SampleBank = bankName;
-                EditorBeatmap.Update(h);
-            });
-        }
-
-        /// <summary>
-        /// Removes a sample bank from all selected <see cref="HitObject"/>s.
-        /// </summary>
-        /// <param name="bankName">The name of the sample bank.</param>
-        public void RemoveSampleBank(string bankName)
-        {
-            EditorBeatmap.PerformOnSelection(h =>
-            {
-                if (h.SampleControlPoint.SampleBank == bankName)
-                    h.SampleControlPoint.SampleBankBindable.SetDefault();
-
+                h.Samples = h.Samples.Select(s => s.With(newBank: bankName)).ToList();
                 EditorBeatmap.Update(h);
             });
         }

From a22ad98cb79567018833c14e9cc845e02bf564cb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 May 2023 14:56:11 +0900
Subject: [PATCH 0575/1604] Fix hotkeys not actually working

---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 62c3211e85..106ffc8ee7 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -288,7 +288,7 @@ namespace osu.Game.Rulesets.Edit
 
         protected override bool OnKeyDown(KeyDownEvent e)
         {
-            if (e.ControlPressed || e.AltPressed || e.SuperPressed || e.ShiftPressed)
+            if (e.ControlPressed || e.AltPressed || e.SuperPressed)
                 return false;
 
             if (checkLeftToggleFromKey(e.Key, out int leftIndex))

From fc22c754641b2b11c4f4ecaf714df70cf1fd6b0c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 May 2023 16:14:05 +0900
Subject: [PATCH 0576/1604] Don't use `switch` for single `case` statement

---
 .../Edit/Compose/Components/ComposeBlueprintContainer.cs  | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 3f3b4ad327..d2dd83eb1a 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -201,12 +201,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             if (CurrentPlacement == null) return;
 
-            switch (state)
-            {
-                case TernaryState.True:
-                    CurrentPlacement.HitObject.Samples = CurrentPlacement.HitObject.Samples.Select(s => s.With(newBank: bankName)).ToList();
-                    break;
-            }
+            if (state == TernaryState.True)
+                CurrentPlacement.HitObject.Samples = CurrentPlacement.HitObject.Samples.Select(s => s.With(newBank: bankName)).ToList();
         }
 
         public readonly Bindable<TernaryState> NewCombo = new Bindable<TernaryState> { Description = "New Combo" };

From 3a05dffa506aa0babb6dec23356a8cc21c763d10 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 May 2023 17:11:12 +0900
Subject: [PATCH 0577/1604] Add "auto" bank selection during placement

---
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs   | 18 +++++++++++++-----
 .../Components/ComposeBlueprintContainer.cs    |  2 ++
 .../Components/EditorSelectionHandler.cs       | 16 +++++++++++++++-
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index 551e557599..a0a04c13d0 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -32,6 +32,11 @@ namespace osu.Game.Rulesets.Edit
         /// </summary>
         public PlacementState PlacementActive { get; private set; }
 
+        /// <summary>
+        /// Whether the sample bank should be taken from the previous hit object.
+        /// </summary>
+        public bool AutomaticBankAssignment;
+
         /// <summary>
         /// The <see cref="HitObject"/> that is being placed.
         /// </summary>
@@ -86,11 +91,6 @@ namespace osu.Game.Rulesets.Edit
         /// <param name="commitStart">Whether this call is committing a value for HitObject.StartTime and continuing with further adjustments.</param>
         protected void BeginPlacement(bool commitStart = false)
         {
-            // Take the hitnormal sample of the last hit object
-            var lastHitNormal = getPreviousHitObject()?.Samples?.FirstOrDefault(o => o.Name == HitSampleInfo.HIT_NORMAL);
-            if (lastHitNormal != null)
-                HitObject.Samples[0] = lastHitNormal;
-
             placementHandler.BeginPlacement(HitObject);
             if (commitStart)
                 PlacementActive = PlacementState.Active;
@@ -155,6 +155,14 @@ namespace osu.Game.Rulesets.Edit
                 if (HitObject is IHasComboInformation comboInformation)
                     comboInformation.UpdateComboInformation(getPreviousHitObject() as IHasComboInformation);
             }
+
+            if (AutomaticBankAssignment)
+            {
+                // Take the hitnormal sample of the last hit object
+                var lastHitNormal = getPreviousHitObject()?.Samples?.FirstOrDefault(o => o.Name == HitSampleInfo.HIT_NORMAL);
+                if (lastHitNormal != null)
+                    HitObject.Samples[0] = lastHitNormal;
+            }
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index d2dd83eb1a..25babae6ff 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -201,6 +201,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             if (CurrentPlacement == null) return;
 
+            if (bankName == EditorSelectionHandler.HIT_BANK_AUTO)
+                CurrentPlacement.AutomaticBankAssignment = state == TernaryState.True;
             if (state == TernaryState.True)
                 CurrentPlacement.HitObject.Samples = CurrentPlacement.HitObject.Samples.Select(s => s.With(newBank: bankName)).ToList();
         }
diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
index fa3a4cddaa..dc7e12ea93 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
@@ -21,6 +21,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
 {
     public partial class EditorSelectionHandler : SelectionHandler<HitObject>
     {
+        /// <summary>
+        /// A special bank name that is only used in the editor UI.
+        /// When selected and in placement mode, the bank of the last hit object will always be used.
+        /// </summary>
+        public const string HIT_BANK_AUTO = "auto";
+
         [Resolved]
         protected EditorBeatmap EditorBeatmap { get; private set; }
 
@@ -59,7 +65,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </summary>
         private void createStateBindables()
         {
-            foreach (string bankName in HitSampleInfo.AllBanks)
+            foreach (string bankName in HitSampleInfo.AllBanks.Prepend(HIT_BANK_AUTO))
             {
                 var bindable = new Bindable<TernaryState>
                 {
@@ -100,6 +106,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
                             }
                             else
                             {
+                                // Auto should just not apply if there's a selection already made.
+                                // Maybe we could make it a disabled button in the future, but right now the editor buttons don't support disabled state.
+                                if (bankName == HIT_BANK_AUTO)
+                                {
+                                    bindable.Value = TernaryState.False;
+                                    break;
+                                }
+
                                 AddSampleBank(bankName);
                             }
 

From 8e5ba2208d29451882378130e2be0854a7b142a6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 May 2023 17:33:48 +0900
Subject: [PATCH 0578/1604] Add test coverage of new hotkeys

---
 .../TestSceneHitObjectSampleAdjustments.cs    | 100 +++++++++++++++++-
 1 file changed, 98 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSampleAdjustments.cs b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSampleAdjustments.cs
index eb39221211..b0b51a5dbd 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSampleAdjustments.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSampleAdjustments.cs
@@ -13,6 +13,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.UI;
@@ -170,7 +171,7 @@ namespace osu.Game.Tests.Visual.Editing
         }
 
         [Test]
-        public void TestMultipleSelectionWithSameSampleBank()
+        public void TestPopoverMultipleSelectionWithSameSampleBank()
         {
             AddStep("unify sample bank", () =>
             {
@@ -204,7 +205,7 @@ namespace osu.Game.Tests.Visual.Editing
         }
 
         [Test]
-        public void TestMultipleSelectionWithDifferentSampleBank()
+        public void TestPopoverMultipleSelectionWithDifferentSampleBank()
         {
             AddStep("select both objects", () => EditorBeatmap.SelectedHitObjects.AddRange(EditorBeatmap.HitObjects));
             clickSamplePiece(0);
@@ -226,6 +227,101 @@ namespace osu.Game.Tests.Visual.Editing
             samplePopoverHasSingleBank(HitSampleInfo.BANK_NORMAL);
         }
 
+        [Test]
+        public void TestHotkeysMultipleSelectionWithSameSampleBank()
+        {
+            AddStep("unify sample bank", () =>
+            {
+                foreach (var h in EditorBeatmap.HitObjects)
+                {
+                    for (int i = 0; i < h.Samples.Count; i++)
+                    {
+                        h.Samples[i] = h.Samples[i].With(newBank: HitSampleInfo.BANK_SOFT);
+                    }
+                }
+            });
+
+            AddStep("select both objects", () => EditorBeatmap.SelectedHitObjects.AddRange(EditorBeatmap.HitObjects));
+
+            hitObjectHasSampleBank(0, HitSampleInfo.BANK_SOFT);
+            hitObjectHasSampleBank(1, HitSampleInfo.BANK_SOFT);
+
+            AddStep("Press normal bank shortcut", () =>
+            {
+                InputManager.PressKey(Key.ShiftLeft);
+                InputManager.Key(Key.W);
+                InputManager.ReleaseKey(Key.ShiftLeft);
+            });
+
+            hitObjectHasSampleBank(0, HitSampleInfo.BANK_NORMAL);
+            hitObjectHasSampleBank(1, HitSampleInfo.BANK_NORMAL);
+
+            AddStep("Press drum bank shortcut", () =>
+            {
+                InputManager.PressKey(Key.ShiftLeft);
+                InputManager.Key(Key.R);
+                InputManager.ReleaseKey(Key.ShiftLeft);
+            });
+
+            hitObjectHasSampleBank(0, HitSampleInfo.BANK_DRUM);
+            hitObjectHasSampleBank(1, HitSampleInfo.BANK_DRUM);
+
+            AddStep("Press auto bank shortcut", () =>
+            {
+                InputManager.PressKey(Key.ShiftLeft);
+                InputManager.Key(Key.Q);
+                InputManager.ReleaseKey(Key.ShiftLeft);
+            });
+
+            // Should be a noop.
+            hitObjectHasSampleBank(0, HitSampleInfo.BANK_DRUM);
+            hitObjectHasSampleBank(1, HitSampleInfo.BANK_DRUM);
+        }
+
+        [Test]
+        public void TestHotkeysDuringPlacement()
+        {
+            AddStep("Enter placement mode", () => InputManager.Key(Key.Number2));
+            AddStep("Move mouse to centre", () => InputManager.MoveMouseTo(Editor.ChildrenOfType<HitObjectComposer>().First().ScreenSpaceDrawQuad.Centre));
+
+            AddStep("Move between two objects", () => EditorClock.Seek(250));
+
+            AddStep("Press normal bank shortcut", () =>
+            {
+                InputManager.PressKey(Key.ShiftLeft);
+                InputManager.Key(Key.W);
+                InputManager.ReleaseKey(Key.ShiftLeft);
+            });
+
+            checkPlacementSample(HitSampleInfo.BANK_NORMAL);
+
+            AddStep("Press drum bank shortcut", () =>
+            {
+                InputManager.PressKey(Key.ShiftLeft);
+                InputManager.Key(Key.R);
+                InputManager.ReleaseKey(Key.ShiftLeft);
+            });
+
+            checkPlacementSample(HitSampleInfo.BANK_DRUM);
+
+            AddStep("Press auto bank shortcut", () =>
+            {
+                InputManager.PressKey(Key.ShiftLeft);
+                InputManager.Key(Key.Q);
+                InputManager.ReleaseKey(Key.ShiftLeft);
+            });
+
+            checkPlacementSample(HitSampleInfo.BANK_NORMAL);
+
+            AddStep("Move after second object", () => EditorClock.Seek(750));
+            checkPlacementSample(HitSampleInfo.BANK_SOFT);
+
+            AddStep("Move to first object", () => EditorClock.Seek(0));
+            checkPlacementSample(HitSampleInfo.BANK_NORMAL);
+
+            void checkPlacementSample(string expected) => AddAssert($"Placement sample is {expected}", () => EditorBeatmap.PlacementObject.Value.Samples.First().Bank, () => Is.EqualTo(expected));
+        }
+
         private void clickSamplePiece(int objectIndex) => AddStep($"click {objectIndex.ToOrdinalWords()} sample piece", () =>
         {
             var samplePiece = this.ChildrenOfType<SamplePointPiece>().Single(piece => piece.HitObject == EditorBeatmap.HitObjects.ElementAt(objectIndex));

From 8ada8b1c8cee225a02b99232b77d4f10f42c6dca Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 May 2023 17:48:34 +0900
Subject: [PATCH 0579/1604] Remove description line from pause/fail screen

These were in the designs but read pretty bad / evil. I can't think of
any text to go in their place that makes sense, so let's just nuke it.
---
 osu.Game/Screens/Play/FailOverlay.cs         |  1 -
 osu.Game/Screens/Play/GameplayMenuOverlay.cs | 10 ----------
 osu.Game/Screens/Play/PauseOverlay.cs        |  1 -
 3 files changed, 12 deletions(-)

diff --git a/osu.Game/Screens/Play/FailOverlay.cs b/osu.Game/Screens/Play/FailOverlay.cs
index 4fbc937b59..f1dd2abc4a 100644
--- a/osu.Game/Screens/Play/FailOverlay.cs
+++ b/osu.Game/Screens/Play/FailOverlay.cs
@@ -23,7 +23,6 @@ namespace osu.Game.Screens.Play
         public Func<Task<ScoreInfo>> SaveReplay;
 
         public override string Header => "failed";
-        public override string Description => "you're dead, try again?";
 
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
diff --git a/osu.Game/Screens/Play/GameplayMenuOverlay.cs b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
index 81146a4ea6..de0c4fe4f1 100644
--- a/osu.Game/Screens/Play/GameplayMenuOverlay.cs
+++ b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
@@ -53,8 +53,6 @@ namespace osu.Game.Screens.Play
 
         public abstract string Header { get; }
 
-        public abstract string Description { get; }
-
         protected SelectionCycleFillFlowContainer<DialogButton> InternalButtons;
         public IReadOnlyList<DialogButton> Buttons => InternalButtons;
 
@@ -107,14 +105,6 @@ namespace osu.Game.Screens.Play
                                     Shadow = true,
                                     ShadowColour = new Color4(0, 0, 0, 0.25f)
                                 },
-                                new OsuSpriteText
-                                {
-                                    Text = Description,
-                                    Origin = Anchor.TopCentre,
-                                    Anchor = Anchor.TopCentre,
-                                    Shadow = true,
-                                    ShadowColour = new Color4(0, 0, 0, 0.25f)
-                                }
                             }
                         },
                         InternalButtons = new SelectionCycleFillFlowContainer<DialogButton>
diff --git a/osu.Game/Screens/Play/PauseOverlay.cs b/osu.Game/Screens/Play/PauseOverlay.cs
index db42998c45..984f43d77a 100644
--- a/osu.Game/Screens/Play/PauseOverlay.cs
+++ b/osu.Game/Screens/Play/PauseOverlay.cs
@@ -24,7 +24,6 @@ namespace osu.Game.Screens.Play
         public override bool IsPresent => base.IsPresent || pauseLoop.IsPlaying;
 
         public override string Header => "paused";
-        public override string Description => "you're not going to do what i think you're going to do, are ya?";
 
         private SkinnableSound pauseLoop;
 

From 456f3005d61292a714d43d4acb82d673a5e30677 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 May 2023 17:58:48 +0900
Subject: [PATCH 0580/1604] Apply nullability to `GameplayMenuOverlay` and use
 `TextFlowContainer` for text

---
 osu.Game/Screens/Play/GameplayMenuOverlay.cs | 76 ++++++--------------
 1 file changed, 20 insertions(+), 56 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayMenuOverlay.cs b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
index de0c4fe4f1..f1e10912ac 100644
--- a/osu.Game/Screens/Play/GameplayMenuOverlay.cs
+++ b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
@@ -1,12 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Humanizer;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -20,6 +17,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
+using osu.Game.Rulesets.UI;
 using osuTK;
 using osuTK.Graphics;
 
@@ -38,8 +36,8 @@ namespace osu.Game.Screens.Play
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
 
-        public Action OnRetry;
-        public Action OnQuit;
+        public Action? OnRetry;
+        public Action? OnQuit;
 
         /// <summary>
         /// Action that is invoked when <see cref="GlobalAction.Back"/> is triggered.
@@ -53,10 +51,13 @@ namespace osu.Game.Screens.Play
 
         public abstract string Header { get; }
 
-        protected SelectionCycleFillFlowContainer<DialogButton> InternalButtons;
+        protected SelectionCycleFillFlowContainer<DialogButton> InternalButtons = null!;
         public IReadOnlyList<DialogButton> Buttons => InternalButtons;
 
-        private FillFlowContainer retryCounterContainer;
+        private TextFlowContainer playInfoText = null!;
+
+        [Resolved]
+        private GlobalActionContainer globalAction { get; set; } = null!;
 
         protected GameplayMenuOverlay()
         {
@@ -84,28 +85,13 @@ namespace osu.Game.Screens.Play
                     Anchor = Anchor.Centre,
                     Children = new Drawable[]
                     {
-                        new FillFlowContainer
+                        new OsuSpriteText
                         {
+                            Text = Header,
+                            Font = OsuFont.GetFont(size: 48),
                             Origin = Anchor.TopCentre,
                             Anchor = Anchor.TopCentre,
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
-                            Direction = FillDirection.Vertical,
-                            Spacing = new Vector2(0, 20),
-                            Children = new Drawable[]
-                            {
-                                new OsuSpriteText
-                                {
-                                    Text = Header,
-                                    Font = OsuFont.GetFont(size: 30),
-                                    Spacing = new Vector2(5, 0),
-                                    Origin = Anchor.TopCentre,
-                                    Anchor = Anchor.TopCentre,
-                                    Colour = colours.Yellow,
-                                    Shadow = true,
-                                    ShadowColour = new Color4(0, 0, 0, 0.25f)
-                                },
-                            }
+                            Colour = colours.Yellow,
                         },
                         InternalButtons = new SelectionCycleFillFlowContainer<DialogButton>
                         {
@@ -122,10 +108,11 @@ namespace osu.Game.Screens.Play
                                 Radius = 50
                             },
                         },
-                        retryCounterContainer = new FillFlowContainer
+                        playInfoText = new OsuTextFlowContainer(cp => cp.Font = OsuFont.GetFont(size: 18))
                         {
                             Origin = Anchor.TopCentre,
                             Anchor = Anchor.TopCentre,
+                            TextAnchor = Anchor.TopCentre,
                             AutoSizeAxes = Axes.Both,
                         }
                     }
@@ -147,7 +134,8 @@ namespace osu.Game.Screens.Play
                     return;
 
                 retries = value;
-                if (retryCounterContainer != null)
+
+                if (IsLoaded)
                     updateRetryCount();
             }
         }
@@ -160,7 +148,7 @@ namespace osu.Game.Screens.Play
 
         protected override bool OnMouseMove(MouseMoveEvent e) => true;
 
-        protected void AddButton(string text, Color4 colour, Action action)
+        protected void AddButton(string text, Color4 colour, Action? action)
         {
             var button = new Button
             {
@@ -212,30 +200,9 @@ namespace osu.Game.Screens.Play
             // "You've retried 1,065 times in this session"
             // "You've retried 1 time in this session"
 
-            retryCounterContainer.Children = new Drawable[]
-            {
-                new OsuSpriteText
-                {
-                    Text = "You've retried ",
-                    Shadow = true,
-                    ShadowColour = new Color4(0, 0, 0, 0.25f),
-                    Font = OsuFont.GetFont(size: 18),
-                },
-                new OsuSpriteText
-                {
-                    Text = "time".ToQuantity(retries),
-                    Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 18),
-                    Shadow = true,
-                    ShadowColour = new Color4(0, 0, 0, 0.25f),
-                },
-                new OsuSpriteText
-                {
-                    Text = " in this session",
-                    Shadow = true,
-                    ShadowColour = new Color4(0, 0, 0, 0.25f),
-                    Font = OsuFont.GetFont(size: 18),
-                }
-            };
+            playInfoText.Clear();
+            playInfoText.AddText("Retry count: ");
+            playInfoText.AddText(retries.ToString(), cp => cp.Font = cp.Font.With(weight: FontWeight.Bold));
         }
 
         private partial class Button : DialogButton
@@ -250,9 +217,6 @@ namespace osu.Game.Screens.Play
             }
         }
 
-        [Resolved]
-        private GlobalActionContainer globalAction { get; set; }
-
         protected override bool Handle(UIEvent e)
         {
             switch (e)

From 79c9a48ff7b7e926b27be6321569b95baee44860 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 May 2023 18:09:19 +0900
Subject: [PATCH 0581/1604] Show song progress at pause/fail screen

---
 osu.Game/Screens/Play/GameplayMenuOverlay.cs | 36 ++++++++++++++++----
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayMenuOverlay.cs b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
index f1e10912ac..4e1913463c 100644
--- a/osu.Game/Screens/Play/GameplayMenuOverlay.cs
+++ b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
@@ -17,6 +17,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI;
 using osuTK;
 using osuTK.Graphics;
@@ -121,7 +122,7 @@ namespace osu.Game.Screens.Play
 
             State.ValueChanged += _ => InternalButtons.Deselect();
 
-            updateRetryCount();
+            updateInfoText();
         }
 
         private int retries;
@@ -136,11 +137,16 @@ namespace osu.Game.Screens.Play
                 retries = value;
 
                 if (IsLoaded)
-                    updateRetryCount();
+                    updateInfoText();
             }
         }
 
-        protected override void PopIn() => this.FadeIn(TRANSITION_DURATION, Easing.In);
+        protected override void PopIn()
+        {
+            this.FadeIn(TRANSITION_DURATION, Easing.In);
+            updateInfoText();
+        }
+
         protected override void PopOut() => this.FadeOut(TRANSITION_DURATION, Easing.In);
 
         // Don't let mouse down events through the overlay or people can click circles while paused.
@@ -195,14 +201,30 @@ namespace osu.Game.Screens.Play
         {
         }
 
-        private void updateRetryCount()
-        {
-            // "You've retried 1,065 times in this session"
-            // "You've retried 1 time in this session"
+        [Resolved]
+        private IGameplayClock? gameplayClock { get; set; }
 
+        [Resolved]
+        private DrawableRuleset? drawableRuleset { get; set; }
+
+        private void updateInfoText()
+        {
             playInfoText.Clear();
             playInfoText.AddText("Retry count: ");
             playInfoText.AddText(retries.ToString(), cp => cp.Font = cp.Font.With(weight: FontWeight.Bold));
+
+            if (gameplayClock != null && drawableRuleset != null)
+            {
+                double firstHitTime = drawableRuleset.Objects.FirstOrDefault()?.StartTime ?? 0;
+                //TODO: this isn't always correct (consider mania where a non-last object may last for longer than the last in the list).
+                double lastHitTime = drawableRuleset.Objects.LastOrDefault()?.GetEndTime() ?? 0;
+
+                double progress = Math.Clamp((gameplayClock.CurrentTime - firstHitTime) / (lastHitTime - firstHitTime), 0, 1);
+
+                playInfoText.NewLine();
+                playInfoText.AddText("Song progress: ");
+                playInfoText.AddText(progress.ToString("0%"), cp => cp.Font = cp.Font.With(weight: FontWeight.Bold));
+            }
         }
 
         private partial class Button : DialogButton

From 3b9e1e8a9491c8db305320951c58360622f57846 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 May 2023 19:16:51 +0900
Subject: [PATCH 0582/1604] Ensure editor selection buttons remain on screen
 when selection is near edge

Addresses https://github.com/ppy/osu/discussions/23599.
---
 .../Edit/Compose/Components/SelectionBox.cs   | 40 +++++++++++++++++--
 1 file changed, 37 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index 17790547ed..677b0cd76e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -22,6 +22,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
     {
         public const float BORDER_RADIUS = 3;
 
+        private const float button_padding = 5;
+
         public Func<float, bool> OnRotation;
         public Func<Vector2, Anchor, bool> OnScale;
         public Func<Direction, bool, bool> OnFlip;
@@ -182,6 +184,13 @@ namespace osu.Game.Screens.Edit.Compose.Components
             return base.OnKeyDown(e);
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            ensureButtonsOnScreen();
+        }
+
         private void recreate()
         {
             if (LoadState < LoadState.Loading)
@@ -234,11 +243,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 },
                 buttons = new FillFlowContainer
                 {
-                    Y = 20,
-                    AutoSizeAxes = Axes.Both,
+                    AutoSizeAxes = Axes.X,
+                    Height = 30,
                     Direction = FillDirection.Horizontal,
+                    Margin = new MarginPadding(button_padding),
                     Anchor = Anchor.BottomCentre,
-                    Origin = Anchor.Centre
+                    Origin = Anchor.TopCentre
                 }
             };
 
@@ -352,5 +362,29 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (activeOperations++ == 0)
                 OperationStarted?.Invoke();
         }
+
+        private void ensureButtonsOnScreen()
+        {
+            buttons.Position = Vector2.Zero;
+
+            var buttonsQuad = buttons.ScreenSpaceDrawQuad;
+            var thisQuad = ScreenSpaceDrawQuad;
+
+            // Shrink the parent quad to give a bit of padding so the buttons don't stick *right* on the border.
+            // AABBFloat assumes no rotation. one would hope the whole editor is not being rotated.
+            var parentQuad = Parent.ScreenSpaceDrawQuad.AABBFloat.Shrink(ToLocalSpace(thisQuad.TopLeft + new Vector2(button_padding * 2)));
+
+            float leftExcess = buttonsQuad.TopLeft.X - parentQuad.TopLeft.X;
+            float rightExcess = parentQuad.TopRight.X - buttonsQuad.TopRight.X;
+            float bottomExcess = thisQuad.BottomLeft.Y + buttonsQuad.Height - parentQuad.BottomLeft.Y;
+
+            if (leftExcess < 0)
+                buttons.X += ToLocalSpace(thisQuad.TopLeft - new Vector2(leftExcess)).X;
+            else if (rightExcess < 0)
+                buttons.X -= ToLocalSpace(thisQuad.TopLeft - new Vector2(rightExcess)).X;
+
+            if (bottomExcess > 0)
+                buttons.Y += ToLocalSpace(thisQuad.TopLeft - new Vector2(bottomExcess)).X;
+        }
     }
 }

From b14b1072c29a039c68d2cbe76d05023cd93b7e70 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 May 2023 19:24:14 +0900
Subject: [PATCH 0583/1604] Allow deselecting any selection in the editor using
 the `Back` binding (escape key)

---
 .../Compose/Components/BlueprintContainer.cs  | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index cb7c083d87..0fcf84ec8e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -16,6 +16,7 @@ using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Input.Bindings;
 using osu.Game.Rulesets.Edit;
 using osuTK;
 using osuTK.Input;
@@ -26,7 +27,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
     /// A container which provides a "blueprint" display of items.
     /// Includes selection and manipulation support via a <see cref="Components.SelectionHandler{T}"/>.
     /// </summary>
-    public abstract partial class BlueprintContainer<T> : CompositeDrawable, IKeyBindingHandler<PlatformAction>
+    public abstract partial class BlueprintContainer<T> : CompositeDrawable, IKeyBindingHandler<PlatformAction>, IKeyBindingHandler<GlobalAction>
         where T : class
     {
         protected DragBox DragBox { get; private set; }
@@ -279,6 +280,30 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
         }
 
+        public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
+        {
+            if (e.Repeat)
+                return false;
+
+            switch (e.Action)
+            {
+                case GlobalAction.Back:
+                    if (SelectedItems.Count > 0)
+                    {
+                        DeselectAll();
+                        return true;
+                    }
+
+                    break;
+            }
+
+            return false;
+        }
+
+        public void OnReleased(KeyBindingReleaseEvent<GlobalAction> e)
+        {
+        }
+
         #region Blueprint Addition/Removal
 
         protected virtual void AddBlueprintFor(T item)

From 663cec1ff6307a87e527b6ac6d76fa57d3d9b1e3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 May 2023 23:51:28 +0900
Subject: [PATCH 0584/1604] Combine editor navigation test scenes

---
 .../Editing/TestSceneEditorNavigation.cs      | 57 -------------------
 .../TestSceneBeatmapEditorNavigation.cs       | 44 ++++++++++++++
 2 files changed, 44 insertions(+), 57 deletions(-)
 delete mode 100644 osu.Game.Tests/Visual/Editing/TestSceneEditorNavigation.cs

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorNavigation.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorNavigation.cs
deleted file mode 100644
index 5914290d40..0000000000
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorNavigation.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System.Linq;
-using NUnit.Framework;
-using osu.Framework.Extensions;
-using osu.Framework.Extensions.IEnumerableExtensions;
-using osu.Framework.Extensions.ObjectExtensions;
-using osu.Game.Beatmaps;
-using osu.Game.Database;
-using osu.Game.Rulesets.Mania;
-using osu.Game.Rulesets.Osu;
-using osu.Game.Screens.Edit;
-using osu.Game.Screens.Edit.GameplayTest;
-using osu.Game.Screens.Select;
-using osu.Game.Tests.Resources;
-
-namespace osu.Game.Tests.Visual.Editing
-{
-    public partial class TestSceneEditorNavigation : OsuGameTestScene
-    {
-        [Test]
-        public void TestEditorGameplayTestAlwaysUsesOriginalRuleset()
-        {
-            BeatmapSetInfo beatmapSet = null!;
-
-            AddStep("import test beatmap", () => Game.BeatmapManager.Import(TestResources.GetTestBeatmapForImport()).WaitSafely());
-            AddStep("retrieve beatmap", () => beatmapSet = Game.BeatmapManager.QueryBeatmapSet(set => !set.Protected).AsNonNull().Value.Detach());
-
-            AddStep("present beatmap", () => Game.PresentBeatmap(beatmapSet));
-            AddUntilStep("wait for song select",
-                () => Game.Beatmap.Value.BeatmapSetInfo.Equals(beatmapSet)
-                      && Game.ScreenStack.CurrentScreen is PlaySongSelect songSelect
-                      && songSelect.IsLoaded);
-            AddStep("switch ruleset", () => Game.Ruleset.Value = new ManiaRuleset().RulesetInfo);
-
-            AddStep("open editor", () => ((PlaySongSelect)Game.ScreenStack.CurrentScreen).Edit(beatmapSet.Beatmaps.First(beatmap => beatmap.Ruleset.OnlineID == 0)));
-            AddUntilStep("wait for editor open", () => Game.ScreenStack.CurrentScreen is Editor editor && editor.ReadyForUse);
-            AddStep("test gameplay", () => ((Editor)Game.ScreenStack.CurrentScreen).TestGameplay());
-
-            AddUntilStep("wait for player", () =>
-            {
-                // notifications may fire at almost any inopportune time and cause annoying test failures.
-                // relentlessly attempt to dismiss any and all interfering overlays, which includes notifications.
-                // this is theoretically not foolproof, but it's the best that can be done here.
-                Game.CloseAllOverlays();
-                return Game.ScreenStack.CurrentScreen is EditorPlayer editorPlayer && editorPlayer.IsLoaded;
-            });
-
-            AddAssert("current ruleset is osu!", () => Game.Ruleset.Value.Equals(new OsuRuleset().RulesetInfo));
-
-            AddStep("exit to song select", () => Game.PerformFromScreen(_ => { }, typeof(PlaySongSelect).Yield()));
-            AddUntilStep("wait for song select", () => Game.ScreenStack.CurrentScreen is PlaySongSelect);
-            AddAssert("previous ruleset restored", () => Game.Ruleset.Value.Equals(new ManiaRuleset().RulesetInfo));
-        }
-    }
-}
diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
index 603573058e..0307bc7ce5 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
@@ -3,15 +3,59 @@
 
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Extensions;
+using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
+using osu.Game.Database;
+using osu.Game.Rulesets.Mania;
+using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Edit;
+using osu.Game.Screens.Edit.GameplayTest;
 using osu.Game.Screens.Menu;
+using osu.Game.Screens.Select;
+using osu.Game.Tests.Resources;
 
 namespace osu.Game.Tests.Visual.Navigation
 {
     public partial class TestSceneBeatmapEditorNavigation : OsuGameTestScene
     {
+        [Test]
+        public void TestEditorGameplayTestAlwaysUsesOriginalRuleset()
+        {
+            BeatmapSetInfo beatmapSet = null!;
+
+            AddStep("import test beatmap", () => Game.BeatmapManager.Import(TestResources.GetTestBeatmapForImport()).WaitSafely());
+            AddStep("retrieve beatmap", () => beatmapSet = Game.BeatmapManager.QueryBeatmapSet(set => !set.Protected).AsNonNull().Value.Detach());
+
+            AddStep("present beatmap", () => Game.PresentBeatmap(beatmapSet));
+            AddUntilStep("wait for song select",
+                () => Game.Beatmap.Value.BeatmapSetInfo.Equals(beatmapSet)
+                      && Game.ScreenStack.CurrentScreen is PlaySongSelect songSelect
+                      && songSelect.IsLoaded);
+            AddStep("switch ruleset", () => Game.Ruleset.Value = new ManiaRuleset().RulesetInfo);
+
+            AddStep("open editor", () => ((PlaySongSelect)Game.ScreenStack.CurrentScreen).Edit(beatmapSet.Beatmaps.First(beatmap => beatmap.Ruleset.OnlineID == 0)));
+            AddUntilStep("wait for editor open", () => Game.ScreenStack.CurrentScreen is Editor editor && editor.ReadyForUse);
+            AddStep("test gameplay", () => ((Editor)Game.ScreenStack.CurrentScreen).TestGameplay());
+
+            AddUntilStep("wait for player", () =>
+            {
+                // notifications may fire at almost any inopportune time and cause annoying test failures.
+                // relentlessly attempt to dismiss any and all interfering overlays, which includes notifications.
+                // this is theoretically not foolproof, but it's the best that can be done here.
+                Game.CloseAllOverlays();
+                return Game.ScreenStack.CurrentScreen is EditorPlayer editorPlayer && editorPlayer.IsLoaded;
+            });
+
+            AddAssert("current ruleset is osu!", () => Game.Ruleset.Value.Equals(new OsuRuleset().RulesetInfo));
+
+            AddStep("exit to song select", () => Game.PerformFromScreen(_ => { }, typeof(PlaySongSelect).Yield()));
+            AddUntilStep("wait for song select", () => Game.ScreenStack.CurrentScreen is PlaySongSelect);
+            AddAssert("previous ruleset restored", () => Game.Ruleset.Value.Equals(new ManiaRuleset().RulesetInfo));
+        }
+
         /// <summary>
         /// When entering the editor, a new beatmap is created as part of the asynchronous load process.
         /// This test ensures that in the case of an early exit from the editor (ie. while it's still loading)

From 604432718116abaadf32778fa47bedc353f504d0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 May 2023 23:57:37 +0900
Subject: [PATCH 0585/1604] Add test coverage for escape deselecting any active
 selection

---
 .../TestSceneBeatmapEditorNavigation.cs       | 60 +++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
index 0307bc7ce5..5f026468c7 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
@@ -7,6 +7,7 @@ using osu.Framework.Extensions;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Screens;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
 using osu.Game.Rulesets.Mania;
@@ -16,6 +17,7 @@ using osu.Game.Screens.Edit.GameplayTest;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.Select;
 using osu.Game.Tests.Resources;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Navigation
 {
@@ -82,5 +84,63 @@ namespace osu.Game.Tests.Visual.Navigation
 
             BeatmapSetInfo[] allBeatmapSets() => Game.Realm.Run(realm => realm.All<BeatmapSetInfo>().Where(x => !x.DeletePending).ToArray());
         }
+
+        [Test]
+        public void TestExitEditorWithoutSelection()
+        {
+            BeatmapSetInfo beatmapSet = null!;
+
+            AddStep("import test beatmap", () => Game.BeatmapManager.Import(TestResources.GetTestBeatmapForImport()).WaitSafely());
+            AddStep("retrieve beatmap", () => beatmapSet = Game.BeatmapManager.QueryBeatmapSet(set => !set.Protected).AsNonNull().Value.Detach());
+
+            AddStep("present beatmap", () => Game.PresentBeatmap(beatmapSet));
+            AddUntilStep("wait for song select",
+                () => Game.Beatmap.Value.BeatmapSetInfo.Equals(beatmapSet)
+                      && Game.ScreenStack.CurrentScreen is PlaySongSelect songSelect
+                      && songSelect.IsLoaded);
+
+            AddStep("open editor", () => ((PlaySongSelect)Game.ScreenStack.CurrentScreen).Edit(beatmapSet.Beatmaps.First(beatmap => beatmap.Ruleset.OnlineID == 0)));
+            AddUntilStep("wait for editor open", () => Game.ScreenStack.CurrentScreen is Editor editor && editor.ReadyForUse);
+
+            AddStep("escape once", () => InputManager.Key(Key.Escape));
+
+            AddUntilStep("wait for editor exit", () => Game.ScreenStack.CurrentScreen is not Editor);
+        }
+
+        [Test]
+        public void TestExitEditorWithSelection()
+        {
+            BeatmapSetInfo beatmapSet = null!;
+
+            AddStep("import test beatmap", () => Game.BeatmapManager.Import(TestResources.GetTestBeatmapForImport()).WaitSafely());
+            AddStep("retrieve beatmap", () => beatmapSet = Game.BeatmapManager.QueryBeatmapSet(set => !set.Protected).AsNonNull().Value.Detach());
+
+            AddStep("present beatmap", () => Game.PresentBeatmap(beatmapSet));
+            AddUntilStep("wait for song select",
+                () => Game.Beatmap.Value.BeatmapSetInfo.Equals(beatmapSet)
+                      && Game.ScreenStack.CurrentScreen is PlaySongSelect songSelect
+                      && songSelect.IsLoaded);
+
+            AddStep("open editor", () => ((PlaySongSelect)Game.ScreenStack.CurrentScreen).Edit(beatmapSet.Beatmaps.First(beatmap => beatmap.Ruleset.OnlineID == 0)));
+            AddUntilStep("wait for editor open", () => Game.ScreenStack.CurrentScreen is Editor editor && editor.ReadyForUse);
+
+            AddStep("make selection", () =>
+            {
+                var beatmap = getEditorBeatmap();
+                beatmap.SelectedHitObjects.AddRange(beatmap.HitObjects.Take(5));
+            });
+
+            AddAssert("selection exists", () => getEditorBeatmap().SelectedHitObjects, () => Has.Count.GreaterThan(0));
+
+            AddStep("escape once", () => InputManager.Key(Key.Escape));
+
+            AddAssert("selection exists", () => getEditorBeatmap().SelectedHitObjects, () => Has.Count.Zero);
+
+            AddStep("escape again", () => InputManager.Key(Key.Escape));
+
+            AddUntilStep("wait for editor exit", () => Game.ScreenStack.CurrentScreen is not Editor);
+        }
+
+        private EditorBeatmap getEditorBeatmap() => ((Editor)Game.ScreenStack.CurrentScreen).ChildrenOfType<EditorBeatmap>().Single();
     }
 }

From cd3602406b5999efe741b4d2fd3a3f97a2cf272c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 24 May 2023 18:54:48 +0200
Subject: [PATCH 0586/1604] Remove unused using directive

---
 osu.Game/Screens/Play/GameplayMenuOverlay.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Play/GameplayMenuOverlay.cs b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
index f1e10912ac..7f4979b840 100644
--- a/osu.Game/Screens/Play/GameplayMenuOverlay.cs
+++ b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
@@ -17,7 +17,6 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
-using osu.Game.Rulesets.UI;
 using osuTK;
 using osuTK.Graphics;
 

From 07b5874eeee3a5854898318eda111bd9a64870da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 24 May 2023 20:18:36 +0200
Subject: [PATCH 0587/1604] Fix test step name

---
 .../Visual/Navigation/TestSceneBeatmapEditorNavigation.cs       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
index 5f026468c7..1b2bb57b84 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
@@ -134,7 +134,7 @@ namespace osu.Game.Tests.Visual.Navigation
 
             AddStep("escape once", () => InputManager.Key(Key.Escape));
 
-            AddAssert("selection exists", () => getEditorBeatmap().SelectedHitObjects, () => Has.Count.Zero);
+            AddAssert("selection empty", () => getEditorBeatmap().SelectedHitObjects, () => Has.Count.Zero);
 
             AddStep("escape again", () => InputManager.Key(Key.Escape));
 

From 6ec4ecfdd734d7db0cd430055e6c01b5753540d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 24 May 2023 22:17:51 +0200
Subject: [PATCH 0588/1604] Mention fallback default in
 `GetDivisorForBeatIndex()`

---
 osu.Game/Screens/Edit/BindableBeatDivisor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/BindableBeatDivisor.cs b/osu.Game/Screens/Edit/BindableBeatDivisor.cs
index f1b97571bd..1da224d850 100644
--- a/osu.Game/Screens/Edit/BindableBeatDivisor.cs
+++ b/osu.Game/Screens/Edit/BindableBeatDivisor.cs
@@ -154,7 +154,7 @@ namespace osu.Game.Screens.Edit
         /// </summary>
         /// <param name="index">The 0-based beat index.</param>
         /// <param name="beatDivisor">The beat divisor.</param>
-        /// <param name="validDivisors">The list of valid divisors which can be chosen from. Assumes ordered from low to high.</param>
+        /// <param name="validDivisors">The list of valid divisors which can be chosen from. Assumes ordered from low to high. Defaults to <see cref="PREDEFINED_DIVISORS"/> if omitted.</param>
         /// <returns>The applicable divisor.</returns>
         public static int GetDivisorForBeatIndex(int index, int beatDivisor, int[] validDivisors = null)
         {

From 6d9ba9248dd2dd01a75c988fceabc44fd716f2ad Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 25 May 2023 16:38:22 +0900
Subject: [PATCH 0589/1604] Massage tests a bit more

---
 osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs        | 4 ++--
 .../Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs      | 4 ++--
 .../Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs          | 4 ++--
 .../Visual/Gameplay/TestSceneSkinnableScoreCounter.cs        | 5 +++--
 .../Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs      | 5 +++--
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index ae46dda750..f97019e466 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -31,8 +31,8 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private HUDOverlay hudOverlay = null!;
 
-        [Cached]
-        private ScoreProcessor scoreProcessor = new ScoreProcessor(new OsuRuleset());
+        [Cached(typeof(ScoreProcessor))]
+        private ScoreProcessor scoreProcessor => gameplayState.ScoreProcessor;
 
         [Cached(typeof(HealthProcessor))]
         private HealthProcessor healthProcessor = new DrainingHealthProcessor(0);
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
index 93fec60de4..4ae115a68d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
@@ -22,8 +22,8 @@ namespace osu.Game.Tests.Visual.Gameplay
 {
     public partial class TestSceneSkinEditorMultipleSkins : SkinnableTestScene
     {
-        [Cached]
-        private readonly ScoreProcessor scoreProcessor = new ScoreProcessor(new OsuRuleset());
+        [Cached(typeof(ScoreProcessor))]
+        private ScoreProcessor scoreProcessor => gameplayState.ScoreProcessor;
 
         [Cached(typeof(HealthProcessor))]
         private HealthProcessor healthProcessor = new DrainingHealthProcessor(0);
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
index 0439656aae..89432940ba 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
@@ -28,8 +28,8 @@ namespace osu.Game.Tests.Visual.Gameplay
     {
         private HUDOverlay hudOverlay;
 
-        [Cached]
-        private ScoreProcessor scoreProcessor = new ScoreProcessor(new OsuRuleset());
+        [Cached(typeof(ScoreProcessor))]
+        private ScoreProcessor scoreProcessor => gameplayState.ScoreProcessor;
 
         [Cached(typeof(HealthProcessor))]
         private HealthProcessor healthProcessor = new DrainingHealthProcessor(0);
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs
index c95e8ee5b2..2cb3303dd6 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs
@@ -10,13 +10,14 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Skinning;
+using osu.Game.Tests.Gameplay;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
     public partial class TestSceneSkinnableScoreCounter : SkinnableHUDComponentTestScene
     {
-        [Cached]
-        private ScoreProcessor scoreProcessor = new ScoreProcessor(new OsuRuleset());
+        [Cached(typeof(ScoreProcessor))]
+        private ScoreProcessor scoreProcessor = TestGameplayState.Create(new OsuRuleset()).ScoreProcessor;
 
         protected override Drawable CreateDefaultImplementation() => new DefaultScoreCounter();
         protected override Drawable CreateLegacyImplementation() => new LegacyScoreCounter();
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs
index 8ae6a2a5fc..dbd14db818 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs
@@ -16,13 +16,14 @@ using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Select;
+using osu.Game.Tests.Gameplay;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
     public partial class TestSceneSoloGameplayLeaderboard : OsuTestScene
     {
-        [Cached]
-        private readonly ScoreProcessor scoreProcessor = new ScoreProcessor(new OsuRuleset());
+        [Cached(typeof(ScoreProcessor))]
+        private readonly ScoreProcessor scoreProcessor = TestGameplayState.Create(new OsuRuleset()).ScoreProcessor;
 
         private readonly BindableList<ScoreInfo> scores = new BindableList<ScoreInfo>();
 

From 058edb5d5fe4e5003b045f4aeeabb187a977661f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 May 2023 17:15:31 +0900
Subject: [PATCH 0590/1604] Centralise beatmap playable duration and bounds
 lookups

---
 .../UserInterface/TestSceneSegmentedGraph.cs  |  4 +-
 osu.Game/Beatmaps/BeatmapUpdater.cs           | 18 +-------
 osu.Game/Beatmaps/IBeatmap.cs                 | 44 +++++++++++++++++++
 .../Play/HUD/ArgonSongProgressGraph.cs        |  4 +-
 .../Play/HUD/DefaultSongProgressGraph.cs      |  4 +-
 osu.Game/Screens/Play/HUD/SongProgress.cs     |  8 ++--
 6 files changed, 55 insertions(+), 27 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneSegmentedGraph.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneSegmentedGraph.cs
index 1144b9053d..320ec48e07 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneSegmentedGraph.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneSegmentedGraph.cs
@@ -7,6 +7,7 @@ using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu;
@@ -137,8 +138,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             if (!objects.Any())
                 return;
 
-            double firstHit = objects.First().StartTime;
-            double lastHit = objects.Max(o => o.GetEndTime());
+            (double firstHit, double lastHit) = BeatmapExtensions.CalculatePlayableBounds(objects);
 
             if (lastHit == 0)
                 lastHit = objects.Last().StartTime;
diff --git a/osu.Game/Beatmaps/BeatmapUpdater.cs b/osu.Game/Beatmaps/BeatmapUpdater.cs
index af9f32f834..046adb8327 100644
--- a/osu.Game/Beatmaps/BeatmapUpdater.cs
+++ b/osu.Game/Beatmaps/BeatmapUpdater.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Diagnostics;
-using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Logging;
@@ -11,7 +10,6 @@ using osu.Framework.Platform;
 using osu.Framework.Threading;
 using osu.Game.Database;
 using osu.Game.Online.API;
-using osu.Game.Rulesets.Objects;
 
 namespace osu.Game.Beatmaps
 {
@@ -74,7 +72,7 @@ namespace osu.Game.Beatmaps
                 var calculator = ruleset.CreateDifficultyCalculator(working);
 
                 beatmap.StarRating = calculator.Calculate().StarRating;
-                beatmap.Length = calculateLength(working.Beatmap);
+                beatmap.Length = working.Beatmap.CalculatePlayableLength();
                 beatmap.BPM = 60000 / working.Beatmap.GetMostCommonBeatLength();
             }
 
@@ -82,20 +80,6 @@ namespace osu.Game.Beatmaps
             workingBeatmapCache.Invalidate(beatmapSet);
         });
 
-        private double calculateLength(IBeatmap b)
-        {
-            if (!b.HitObjects.Any())
-                return 0;
-
-            var lastObject = b.HitObjects.Last();
-
-            //TODO: this isn't always correct (consider mania where a non-last object may last for longer than the last in the list).
-            double endTime = lastObject.GetEndTime();
-            double startTime = b.HitObjects.First().StartTime;
-
-            return endTime - startTime;
-        }
-
         #region Implementation of IDisposable
 
         public void Dispose()
diff --git a/osu.Game/Beatmaps/IBeatmap.cs b/osu.Game/Beatmaps/IBeatmap.cs
index f6771f7adf..671f5ce8db 100644
--- a/osu.Game/Beatmaps/IBeatmap.cs
+++ b/osu.Game/Beatmaps/IBeatmap.cs
@@ -104,6 +104,19 @@ namespace osu.Game.Beatmaps
             }
         }
 
+        /// <summary>
+        /// Find the total milliseconds between the first and last hittable objects.
+        /// </summary>
+        /// <remarks>
+        /// This is cached to <see cref="BeatmapInfo.Length"/>, so using that is preferrable when available.
+        /// </remarks>
+        public static double CalculatePlayableLength(this IBeatmap beatmap) => CalculatePlayableLength(beatmap.HitObjects);
+
+        /// <summary>
+        /// Find the timestamps in milliseconds of the start and end of the playable region.
+        /// </summary>
+        public static (double start, double end) CalculatePlayableBounds(this IBeatmap beatmap) => CalculatePlayableBounds(beatmap.HitObjects);
+
         /// <summary>
         /// Find the absolute end time of the latest <see cref="HitObject"/> in a beatmap. Will throw if beatmap contains no objects.
         /// </summary>
@@ -114,5 +127,36 @@ namespace osu.Game.Beatmaps
         /// It's not super efficient so calls should be kept to a minimum.
         /// </remarks>
         public static double GetLastObjectTime(this IBeatmap beatmap) => beatmap.HitObjects.Max(h => h.GetEndTime());
+
+        #region Helper methods
+
+        /// <summary>
+        /// Find the total milliseconds between the first and last hittable objects.
+        /// </summary>
+        /// <remarks>
+        /// This is cached to <see cref="BeatmapInfo.Length"/>, so using that is preferrable when available.
+        /// </remarks>
+        public static double CalculatePlayableLength(IEnumerable<HitObject> objects)
+        {
+            (double start, double end) = CalculatePlayableBounds(objects);
+
+            return end - start;
+        }
+
+        /// <summary>
+        /// Find the timestamps in milliseconds of the start and end of the playable region.
+        /// </summary>
+        public static (double start, double end) CalculatePlayableBounds(IEnumerable<HitObject> objects)
+        {
+            if (!objects.Any())
+                return (0, 0);
+
+            double lastObjectTime = objects.Max(o => o.GetEndTime());
+            double firstObjectTime = objects.First().StartTime;
+
+            return (firstObjectTime, lastObjectTime);
+        }
+
+        #endregion
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/ArgonSongProgressGraph.cs b/osu.Game/Screens/Play/HUD/ArgonSongProgressGraph.cs
index 0899476ed4..63ab9d15e0 100644
--- a/osu.Game/Screens/Play/HUD/ArgonSongProgressGraph.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonSongProgressGraph.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Graphics;
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Graphics.UserInterface;
 
@@ -26,8 +27,7 @@ namespace osu.Game.Screens.Play.HUD
                 if (!objects.Any())
                     return;
 
-                double firstHit = objects.First().StartTime;
-                double lastHit = objects.Max(o => o.GetEndTime());
+                (double firstHit, double lastHit) = BeatmapExtensions.CalculatePlayableBounds(objects);
 
                 if (lastHit == 0)
                     lastHit = objects.Last().StartTime;
diff --git a/osu.Game/Screens/Play/HUD/DefaultSongProgressGraph.cs b/osu.Game/Screens/Play/HUD/DefaultSongProgressGraph.cs
index bee5978817..047c64a4a4 100644
--- a/osu.Game/Screens/Play/HUD/DefaultSongProgressGraph.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultSongProgressGraph.cs
@@ -6,6 +6,7 @@
 using System.Linq;
 using System.Collections.Generic;
 using System.Diagnostics;
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Objects;
 
 namespace osu.Game.Screens.Play.HUD
@@ -26,8 +27,7 @@ namespace osu.Game.Screens.Play.HUD
                 if (!objects.Any())
                     return;
 
-                double firstHit = objects.First().StartTime;
-                double lastHit = objects.Max(o => o.GetEndTime());
+                (double firstHit, double lastHit) = BeatmapExtensions.CalculatePlayableBounds(objects);
 
                 if (lastHit == 0)
                     lastHit = objects.Last().StartTime;
diff --git a/osu.Game/Screens/Play/HUD/SongProgress.cs b/osu.Game/Screens/Play/HUD/SongProgress.cs
index ebe2fb83e6..4391193df8 100644
--- a/osu.Game/Screens/Play/HUD/SongProgress.cs
+++ b/osu.Game/Screens/Play/HUD/SongProgress.cs
@@ -2,12 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Timing;
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI;
 using osu.Game.Skinning;
@@ -52,9 +52,9 @@ namespace osu.Game.Screens.Play.HUD
             set
             {
                 objects = value;
-                FirstHitTime = objects.FirstOrDefault()?.StartTime ?? 0;
-                //TODO: this isn't always correct (consider mania where a non-last object may last for longer than the last in the list).
-                LastHitTime = objects.LastOrDefault()?.GetEndTime() ?? 0;
+
+                (FirstHitTime, LastHitTime) = BeatmapExtensions.CalculatePlayableBounds(objects);
+
                 UpdateObjects(objects);
             }
         }

From 37c6e632d0f325b36368e91ba749bde0634bdf46 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 May 2023 17:38:35 +0900
Subject: [PATCH 0591/1604] Switch to using new extension method for length
 calculations

---
 osu.Game/Screens/Play/GameplayMenuOverlay.cs | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayMenuOverlay.cs b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
index 4e1913463c..52251db898 100644
--- a/osu.Game/Screens/Play/GameplayMenuOverlay.cs
+++ b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
@@ -12,13 +12,12 @@ using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
-using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.UI;
 using osuTK;
 using osuTK.Graphics;
 
@@ -205,7 +204,7 @@ namespace osu.Game.Screens.Play
         private IGameplayClock? gameplayClock { get; set; }
 
         [Resolved]
-        private DrawableRuleset? drawableRuleset { get; set; }
+        private GameplayState? gameplayState { get; set; }
 
         private void updateInfoText()
         {
@@ -213,11 +212,9 @@ namespace osu.Game.Screens.Play
             playInfoText.AddText("Retry count: ");
             playInfoText.AddText(retries.ToString(), cp => cp.Font = cp.Font.With(weight: FontWeight.Bold));
 
-            if (gameplayClock != null && drawableRuleset != null)
+            if (gameplayState != null && gameplayClock != null)
             {
-                double firstHitTime = drawableRuleset.Objects.FirstOrDefault()?.StartTime ?? 0;
-                //TODO: this isn't always correct (consider mania where a non-last object may last for longer than the last in the list).
-                double lastHitTime = drawableRuleset.Objects.LastOrDefault()?.GetEndTime() ?? 0;
+                (double firstHitTime, double lastHitTime) = gameplayState.Beatmap.CalculatePlayableBounds();
 
                 double progress = Math.Clamp((gameplayClock.CurrentTime - firstHitTime) / (lastHitTime - firstHitTime), 0, 1);
 

From 1e14b024938a584dc61725e4ed5d423459a8f29c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 May 2023 17:57:37 +0900
Subject: [PATCH 0592/1604] Fix bindable feedback loop

---
 .../Edit/Compose/Components/EditorSelectionHandler.cs        | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
index dc7e12ea93..d618541685 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
@@ -85,6 +85,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
                             }
                             else
                             {
+                                // Auto should never apply when there is a selection made.
+                                // This is also required to stop a bindable feedback loop when a HitObject has zero samples (and LINQ `All` below becomes true).
+                                if (bankName == HIT_BANK_AUTO)
+                                    break;
+
                                 // Never remove a sample bank.
                                 // These are basically radio buttons, not toggles.
                                 if (SelectedItems.All(h => h.Samples.All(s => s.Bank == bankName)))

From 1049257b56b5dc0e2d71dc2db7d5a31c1062de78 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 May 2023 18:46:31 +0900
Subject: [PATCH 0593/1604] Simplify `SelectionHandler`'s `DeselectAll`
 implementation

We are already doing other operations in this class directly on `SelectedItems`, so might as well change this one to match
---
 .../Screens/Edit/Compose/Components/BlueprintContainer.cs   | 1 -
 .../Screens/Edit/Compose/Components/SelectionHandler.cs     | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 0fcf84ec8e..56a6b18433 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -92,7 +92,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
             };
 
             SelectionHandler = CreateSelectionHandler();
-            SelectionHandler.DeselectAll = DeselectAll;
             SelectionHandler.SelectedItems.BindTo(SelectedItems);
 
             AddRangeInternal(new[]
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 9e4fb26688..f73a25c339 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -197,9 +197,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
         #region Selection Handling
 
         /// <summary>
-        /// Bind an action to deselect all selected blueprints.
+        /// Deselect all selected items.
         /// </summary>
-        internal Action DeselectAll { private get; set; }
+        protected void DeselectAll() => SelectedItems.Clear();
 
         /// <summary>
         /// Handle a blueprint becoming selected.
@@ -303,7 +303,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (blueprint.IsSelected)
                 return false;
 
-            DeselectAll?.Invoke();
+            DeselectAll();
             blueprint.Select();
             return true;
         }

From 57c63dbb290a32faa39e9a68af10dc032bfeeb23 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 May 2023 19:24:15 +0900
Subject: [PATCH 0594/1604] Add xmldoc for `GetDisplayScore`

---
 osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 74a3925435..b7247ed8cc 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -57,6 +57,10 @@ namespace osu.Game.Screens.Play.HUD
         public BindableInt Combo { get; } = new BindableInt();
         public BindableBool HasQuit { get; } = new BindableBool();
         public Bindable<long> DisplayOrder { get; } = new Bindable<long>();
+
+        /// <summary>
+        /// A function providing a display score. If a custom function is not provided, this defaults to using <see cref="TotalScore"/>.
+        /// </summary>
         public Func<ScoringMode, long> GetDisplayScore { get; set; }
 
         public Color4? BackgroundColour { get; set; }

From 609c7227eee913dbb602b5eefdd628bb5c9c216d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 May 2023 19:55:11 +0900
Subject: [PATCH 0595/1604] Fix changes to font weight in a couple of combined
 implementations

---
 .../Screens/OnlinePlay/Lounge/Components/OnlinePlayPill.cs    | 4 +++-
 .../OnlinePlay/Lounge/Components/RoomSpecialCategoryPill.cs   | 3 +++
 .../Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs    | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/OnlinePlayPill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/OnlinePlayPill.cs
index 983fab8525..3e6d7a2e54 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/OnlinePlayPill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/OnlinePlayPill.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 
@@ -12,6 +13,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
     {
         protected PillContainer Pill { get; private set; } = null!;
         protected OsuTextFlowContainer TextFlow { get; private set; } = null!;
+        protected virtual FontUsage Font => OsuFont.GetFont(size: 12);
 
         protected OnlinePlayPill()
         {
@@ -23,7 +25,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
         {
             InternalChild = Pill = new PillContainer
             {
-                Child = TextFlow = new OsuTextFlowContainer(s => s.Font = OsuFont.GetFont(size: 12))
+                Child = TextFlow = new OsuTextFlowContainer(s => s.Font = Font)
                 {
                     AutoSizeAxes = Axes.Both,
                     Anchor = Anchor.CentreLeft,
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomSpecialCategoryPill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomSpecialCategoryPill.cs
index e88624f877..10f6e59260 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomSpecialCategoryPill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomSpecialCategoryPill.cs
@@ -5,6 +5,7 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Extensions;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osuTK.Graphics;
 
@@ -15,6 +16,8 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
         [Resolved]
         private OsuColour colours { get; set; }
 
+        protected override FontUsage Font => base.Font.With(weight: FontWeight.SemiBold);
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs
index ab3d293db8..ca9917ad00 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs
@@ -6,6 +6,7 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Online.Rooms;
 using osu.Game.Online.Rooms.RoomStatuses;
@@ -20,6 +21,8 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
         [Resolved]
         private OsuColour colours { get; set; }
 
+        protected override FontUsage Font => base.Font.With(weight: FontWeight.SemiBold);
+
         protected override void LoadComplete()
         {
             base.LoadComplete();

From 7a5349d747862fc4ad165b82f6b54035ced4156c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 May 2023 20:09:40 +0900
Subject: [PATCH 0596/1604] Remove constructor from `MultiplayerPlaylistItem`
 which is only used in tests

---
 .../Multiplayer/TestSceneMatchStartControl.cs |  2 +-
 .../Multiplayer/TestSceneMultiplayer.cs       |  4 ++--
 .../TestSceneMultiplayerPlaylist.cs           |  2 +-
 .../TestSceneMultiplayerQueueList.cs          |  2 +-
 .../Online/Rooms/MultiplayerPlaylistItem.cs   | 19 +-----------------
 .../Multiplayer/TestMultiplayerClient.cs      | 20 +++++++++++++++++--
 6 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchStartControl.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchStartControl.cs
index 3efc7fbd30..6d309078e6 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchStartControl.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchStartControl.cs
@@ -129,7 +129,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 {
                     Playlist =
                     {
-                        new MultiplayerPlaylistItem(playlistItem),
+                        TestMultiplayerClient.CreateMultiplayerPlaylistItem(playlistItem),
                     },
                     Users = { localUser },
                     Host = localUser,
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
index d747d23229..09624f63b7 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
@@ -906,7 +906,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             enterGameplay();
             AddStep("join other user", () => multiplayerClient.AddUser(new APIUser { Id = 1234 }));
-            AddStep("add item as other user", () => multiplayerClient.AddUserPlaylistItem(1234, new MultiplayerPlaylistItem(
+            AddStep("add item as other user", () => multiplayerClient.AddUserPlaylistItem(1234, TestMultiplayerClient.CreateMultiplayerPlaylistItem(
                 new PlaylistItem(beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First(b => b.Ruleset.OnlineID == 0)).BeatmapInfo)
                 {
                     RulesetID = new OsuRuleset().RulesetInfo.OnlineID,
@@ -938,7 +938,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             enterGameplay();
 
             AddStep("join other user", () => multiplayerClient.AddUser(new APIUser { Id = 1234 }));
-            AddStep("add item as other user", () => multiplayerClient.AddUserPlaylistItem(1234, new MultiplayerPlaylistItem(
+            AddStep("add item as other user", () => multiplayerClient.AddUserPlaylistItem(1234, TestMultiplayerClient.CreateMultiplayerPlaylistItem(
                 new PlaylistItem(beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First(b => b.Ruleset.OnlineID == 0)).BeatmapInfo)
                 {
                     RulesetID = new OsuRuleset().RulesetInfo.OnlineID,
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerPlaylist.cs
index d7578b4114..2100f82886 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerPlaylist.cs
@@ -215,7 +215,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         /// </summary>
         private void addItemStep(bool expired = false, int? userId = null) => AddStep("add item", () =>
         {
-            MultiplayerClient.AddUserPlaylistItem(userId ?? API.LocalUser.Value.OnlineID, new MultiplayerPlaylistItem(new PlaylistItem(importedBeatmap)
+            MultiplayerClient.AddUserPlaylistItem(userId ?? API.LocalUser.Value.OnlineID, TestMultiplayerClient.CreateMultiplayerPlaylistItem(new PlaylistItem(importedBeatmap)
             {
                 Expired = expired,
                 PlayedAt = DateTimeOffset.Now
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerQueueList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerQueueList.cs
index bb37f1a5a7..47fb4e06ea 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerQueueList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerQueueList.cs
@@ -130,7 +130,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             AddStep("add playlist item", () =>
             {
-                MultiplayerPlaylistItem item = new MultiplayerPlaylistItem(new PlaylistItem(importedBeatmap));
+                MultiplayerPlaylistItem item = TestMultiplayerClient.CreateMultiplayerPlaylistItem(new PlaylistItem(importedBeatmap));
 
                 MultiplayerClient.AddUserPlaylistItem(userId(), item).WaitSafely();
 
diff --git a/osu.Game/Online/Rooms/MultiplayerPlaylistItem.cs b/osu.Game/Online/Rooms/MultiplayerPlaylistItem.cs
index daf45c5aee..8be703e620 100644
--- a/osu.Game/Online/Rooms/MultiplayerPlaylistItem.cs
+++ b/osu.Game/Online/Rooms/MultiplayerPlaylistItem.cs
@@ -56,26 +56,9 @@ namespace osu.Game.Online.Rooms
         [Key(10)]
         public double StarRating { get; set; }
 
+        [SerializationConstructor]
         public MultiplayerPlaylistItem()
         {
         }
-
-        /// <summary>
-        /// This constructor should only be used for test purposes.
-        /// </summary>
-        public MultiplayerPlaylistItem(PlaylistItem item)
-        {
-            ID = item.ID;
-            OwnerID = item.OwnerID;
-            BeatmapID = item.Beatmap.OnlineID;
-            BeatmapChecksum = item.Beatmap.MD5Hash;
-            RulesetID = item.RulesetID;
-            RequiredMods = item.RequiredMods.ToArray();
-            AllowedMods = item.AllowedMods.ToArray();
-            Expired = item.Expired;
-            PlaylistOrder = item.PlaylistOrder ?? 0;
-            PlayedAt = item.PlayedAt;
-            StarRating = item.Beatmap.StarRating;
-        }
     }
 }
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index ad5e3f6c4d..0d9f91caa1 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -108,7 +108,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     // simulate the server's automatic assignment of users to teams on join.
                     // the "best" team is the one with the least users on it.
                     int bestTeam = teamVersus.Teams
-                                             .Select(team => (teamID: team.ID, userCount: ServerRoom.Users.Count(u => (u.MatchState as TeamVersusUserState)?.TeamID == team.ID))).MinBy(pair => pair.userCount).teamID;
+                                             .Select(team => (teamID: team.ID, userCount: ServerRoom.Users.Count(u => (u.MatchState as TeamVersusUserState)?.TeamID == team.ID)))
+                                             .MinBy(pair => pair.userCount).teamID;
 
                     user.MatchState = new TeamVersusUserState { TeamID = bestTeam };
                     ((IMultiplayerClient)this).MatchUserStateChanged(clone(user.UserID), clone(user.MatchState)).WaitSafely();
@@ -232,7 +233,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     QueueMode = ServerAPIRoom.QueueMode.Value,
                     AutoStartDuration = ServerAPIRoom.AutoStartDuration.Value
                 },
-                Playlist = ServerAPIRoom.Playlist.Select(item => new MultiplayerPlaylistItem(item)).ToList(),
+                Playlist = ServerAPIRoom.Playlist.Select(item => TestMultiplayerClient.CreateMultiplayerPlaylistItem(item)).ToList(),
                 Users = { localUser },
                 Host = localUser
             };
@@ -637,5 +638,20 @@ namespace osu.Game.Tests.Visual.Multiplayer
             byte[]? serialized = MessagePackSerializer.Serialize(typeof(T), incoming, SignalRUnionWorkaroundResolver.OPTIONS);
             return MessagePackSerializer.Deserialize<T>(serialized, SignalRUnionWorkaroundResolver.OPTIONS);
         }
+
+        public static MultiplayerPlaylistItem CreateMultiplayerPlaylistItem(PlaylistItem item) => new MultiplayerPlaylistItem
+        {
+            ID = item.ID,
+            OwnerID = item.OwnerID,
+            BeatmapID = item.Beatmap.OnlineID,
+            BeatmapChecksum = item.Beatmap.MD5Hash,
+            RulesetID = item.RulesetID,
+            RequiredMods = item.RequiredMods.ToArray(),
+            AllowedMods = item.AllowedMods.ToArray(),
+            Expired = item.Expired,
+            PlaylistOrder = item.PlaylistOrder ?? 0,
+            PlayedAt = item.PlayedAt,
+            StarRating = item.Beatmap.StarRating,
+        };
     }
 }

From b3c2d120bf8e8d6e60e6a618f1df976d82b6d406 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 May 2023 20:39:11 +0900
Subject: [PATCH 0597/1604] Fix `OnResume` / `OnSuspending` potentially getting
 called before `OnEntering` on a sub screen

---
 osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
index 3d80248306..cfaae56d0f 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
@@ -132,7 +132,9 @@ namespace osu.Game.Screens.OnlinePlay
             this.ScaleTo(1, 250, Easing.OutSine);
 
             Debug.Assert(screenStack.CurrentScreen != null);
-            screenStack.CurrentScreen.OnResuming(e);
+
+            if (screenStack.CurrentScreen.IsCurrentScreen())
+                screenStack.CurrentScreen.OnResuming(e);
 
             base.OnResuming(e);
         }
@@ -143,7 +145,9 @@ namespace osu.Game.Screens.OnlinePlay
             this.FadeOut(250);
 
             Debug.Assert(screenStack.CurrentScreen != null);
-            screenStack.CurrentScreen.OnSuspending(e);
+
+            if (screenStack.CurrentScreen.IsCurrentScreen())
+                screenStack.CurrentScreen.OnSuspending(e);
         }
 
         public override bool OnExiting(ScreenExitEvent e)

From 804671ca74995c1be6f429523b1b673dc00df184 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 May 2023 21:41:19 +0900
Subject: [PATCH 0598/1604] Split out grid snapping modes into "relative" and
 "global" types

---
 .../Edit/CatchHitObjectComposer.cs            |  2 +-
 .../Edit/OsuHitObjectComposer.cs              |  7 +++++--
 .../Editing/TestSceneDistanceSnapGrid.cs      |  2 +-
 osu.Game/Rulesets/Edit/HitObjectComposer.cs   |  2 +-
 osu.Game/Rulesets/Edit/SnapType.cs            | 20 +++++++++++++++++--
 5 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
index cd8894753f..611e69d614 100644
--- a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
@@ -132,7 +132,7 @@ namespace osu.Game.Rulesets.Catch.Edit
 
             result.ScreenSpacePosition.X = screenSpacePosition.X;
 
-            if (snapType.HasFlagFast(SnapType.Grids))
+            if (snapType.HasFlagFast(SnapType.GlobalGrids))
             {
                 if (distanceSnapGrid.IsPresent && distanceSnapGrid.GetSnappedPosition(result.ScreenSpacePosition) is SnapResult snapResult &&
                     Vector2.Distance(snapResult.ScreenSpacePosition, result.ScreenSpacePosition) < distance_snap_radius)
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index ff1e208186..ad6af6d74e 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -143,7 +143,7 @@ namespace osu.Game.Rulesets.Osu.Edit
                 // We want to ensure that in this particular case, the time-snapping component of distance snap is still applied.
                 // The easiest way to ensure this is to attempt application of distance snap after a nearby object is found, and copy over
                 // the time value if the proposed positions are roughly the same.
-                if (snapType.HasFlagFast(SnapType.Grids) && DistanceSnapToggle.Value == TernaryState.True && distanceSnapGrid != null)
+                if (snapType.HasFlagFast(SnapType.RelativeGrids) && DistanceSnapToggle.Value == TernaryState.True && distanceSnapGrid != null)
                 {
                     (Vector2 distanceSnappedPosition, double distanceSnappedTime) = distanceSnapGrid.GetSnappedPosition(distanceSnapGrid.ToLocalSpace(snapResult.ScreenSpacePosition));
                     if (Precision.AlmostEquals(distanceSnapGrid.ToScreenSpace(distanceSnappedPosition), snapResult.ScreenSpacePosition, 1))
@@ -155,7 +155,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 
             SnapResult result = base.FindSnappedPositionAndTime(screenSpacePosition, snapType);
 
-            if (snapType.HasFlagFast(SnapType.Grids))
+            if (snapType.HasFlagFast(SnapType.RelativeGrids))
             {
                 if (DistanceSnapToggle.Value == TernaryState.True && distanceSnapGrid != null)
                 {
@@ -164,7 +164,10 @@ namespace osu.Game.Rulesets.Osu.Edit
                     result.ScreenSpacePosition = distanceSnapGrid.ToScreenSpace(pos);
                     result.Time = time;
                 }
+            }
 
+            if (snapType.HasFlagFast(SnapType.GlobalGrids))
+            {
                 if (rectangularGridSnapToggle.Value == TernaryState.True)
                 {
                     Vector2 pos = rectangularPositionSnapGrid.GetSnappedPosition(rectangularPositionSnapGrid.ToLocalSpace(result.ScreenSpacePosition));
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs b/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs
index 21b925a257..70e4420a45 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs
@@ -187,7 +187,7 @@ namespace osu.Game.Tests.Visual.Editing
 
         private class SnapProvider : IDistanceSnapProvider
         {
-            public SnapResult FindSnappedPositionAndTime(Vector2 screenSpacePosition, SnapType snapType = SnapType.Grids) => new SnapResult(screenSpacePosition, 0);
+            public SnapResult FindSnappedPositionAndTime(Vector2 screenSpacePosition, SnapType snapType = SnapType.AllGrids) => new SnapResult(screenSpacePosition, 0);
 
             public Bindable<double> DistanceSpacingMultiplier { get; } = new BindableDouble(1);
 
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index e2dbd2acdc..9ce6d957fc 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -428,7 +428,7 @@ namespace osu.Game.Rulesets.Edit
             var playfield = PlayfieldAtScreenSpacePosition(screenSpacePosition);
             double? targetTime = null;
 
-            if (snapType.HasFlagFast(SnapType.Grids))
+            if (snapType.HasFlagFast(SnapType.GlobalGrids))
             {
                 if (playfield is ScrollingPlayfield scrollingPlayfield)
                 {
diff --git a/osu.Game/Rulesets/Edit/SnapType.cs b/osu.Game/Rulesets/Edit/SnapType.cs
index 6eb46457c8..f5f9ab0437 100644
--- a/osu.Game/Rulesets/Edit/SnapType.cs
+++ b/osu.Game/Rulesets/Edit/SnapType.cs
@@ -11,8 +11,24 @@ namespace osu.Game.Rulesets.Edit
     public enum SnapType
     {
         None = 0,
+
+        /// <summary>
+        /// Snapping to visible nearby objects.
+        /// </summary>
         NearbyObjects = 1 << 0,
-        Grids = 1 << 1,
-        All = NearbyObjects | Grids,
+
+        /// <summary>
+        /// Grids which are global to the playfield.
+        /// </summary>
+        GlobalGrids = 1 << 1,
+
+        /// <summary>
+        /// Grids which are relative to other nearby hit objects.
+        /// </summary>
+        RelativeGrids = 1 << 2,
+
+        AllGrids = RelativeGrids | GlobalGrids,
+
+        All = NearbyObjects | GlobalGrids | RelativeGrids,
     }
 }

From 1cd69220ef640424b79f19784c557ac183333c2d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 May 2023 21:41:42 +0900
Subject: [PATCH 0599/1604] Fix slider path placement snapping non-head nodes
 to distanced snapping grid

As discussed at https://github.com/ppy/osu/discussions/23531.
---
 .../Blueprints/Sliders/Components/PathControlPointVisualiser.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
index 17d0fc457a..c56ffcb140 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -309,7 +309,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             }
             else
             {
-                var result = snapProvider?.FindSnappedPositionAndTime(Parent.ToScreenSpace(e.MousePosition));
+                var result = snapProvider?.FindSnappedPositionAndTime(Parent.ToScreenSpace(e.MousePosition), SnapType.GlobalGrids);
 
                 Vector2 movementDelta = Parent.ToLocalSpace(result?.ScreenSpacePosition ?? Parent.ToScreenSpace(e.MousePosition)) - dragStartPositions[draggedControlPointIndex] - hitObject.Position;
 

From beeca5a8dd1bc84f036f25caa5f4e00d4204d417 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 25 May 2023 16:17:44 +0200
Subject: [PATCH 0600/1604] Use alternative layouting implementation

---
 .../Edit/Compose/Components/SelectionBox.cs   | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index 677b0cd76e..fc57cbf17f 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -247,8 +247,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
                     Height = 30,
                     Direction = FillDirection.Horizontal,
                     Margin = new MarginPadding(button_padding),
-                    Anchor = Anchor.BottomCentre,
-                    Origin = Anchor.TopCentre
                 }
             };
 
@@ -367,24 +365,30 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             buttons.Position = Vector2.Zero;
 
-            var buttonsQuad = buttons.ScreenSpaceDrawQuad;
             var thisQuad = ScreenSpaceDrawQuad;
 
             // Shrink the parent quad to give a bit of padding so the buttons don't stick *right* on the border.
             // AABBFloat assumes no rotation. one would hope the whole editor is not being rotated.
             var parentQuad = Parent.ScreenSpaceDrawQuad.AABBFloat.Shrink(ToLocalSpace(thisQuad.TopLeft + new Vector2(button_padding * 2)));
 
-            float leftExcess = buttonsQuad.TopLeft.X - parentQuad.TopLeft.X;
-            float rightExcess = parentQuad.TopRight.X - buttonsQuad.TopRight.X;
-            float bottomExcess = thisQuad.BottomLeft.Y + buttonsQuad.Height - parentQuad.BottomLeft.Y;
+            float topExcess = thisQuad.TopLeft.Y - parentQuad.TopLeft.Y;
+            float bottomExcess = parentQuad.BottomLeft.Y - thisQuad.BottomLeft.Y;
+            float leftExcess = thisQuad.TopLeft.X - parentQuad.TopLeft.X;
+            float rightExcess = parentQuad.TopRight.X - thisQuad.TopRight.X;
 
-            if (leftExcess < 0)
-                buttons.X += ToLocalSpace(thisQuad.TopLeft - new Vector2(leftExcess)).X;
-            else if (rightExcess < 0)
-                buttons.X -= ToLocalSpace(thisQuad.TopLeft - new Vector2(rightExcess)).X;
+            if (topExcess > bottomExcess)
+            {
+                buttons.Anchor = Anchor.TopCentre;
+                buttons.Origin = Anchor.BottomCentre;
+            }
+            else
+            {
+                buttons.Anchor = Anchor.BottomCentre;
+                buttons.Origin = Anchor.TopCentre;
+            }
 
-            if (bottomExcess > 0)
-                buttons.Y += ToLocalSpace(thisQuad.TopLeft - new Vector2(bottomExcess)).X;
+            if (leftExcess < 0) buttons.X += ToLocalSpace(thisQuad.TopLeft - new Vector2(leftExcess)).X;
+            if (rightExcess < 0) buttons.X += ToLocalSpace(thisQuad.TopLeft + new Vector2(rightExcess)).X;
         }
     }
 }

From 949de35664fa32e6abe115a1c7bea1d30843e1b4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 May 2023 23:19:55 +0900
Subject: [PATCH 0601/1604] Ensure selection is reset after immediately
 deleting objects

Closes https://github.com/ppy/osu/issues/23518.
---
 osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index f73a25c339..5cedf1ca42 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -311,6 +311,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         protected void DeleteSelected()
         {
             DeleteItems(SelectedItems.ToArray());
+            DeselectAll();
         }
 
         #endregion

From 3ad5f8b9c9973788780e540cb98e5b260367df98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 25 May 2023 16:39:54 +0200
Subject: [PATCH 0602/1604] Polish a few extreme edge cases

---
 .../Screens/Edit/Compose/Components/SelectionBox.cs    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index fc57cbf17f..1c5faed0e5 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -376,7 +376,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
             float leftExcess = thisQuad.TopLeft.X - parentQuad.TopLeft.X;
             float rightExcess = parentQuad.TopRight.X - thisQuad.TopRight.X;
 
-            if (topExcess > bottomExcess)
+            if (topExcess + bottomExcess < buttons.Height + button_padding)
+            {
+                buttons.Anchor = Anchor.BottomCentre;
+                buttons.Origin = Anchor.BottomCentre;
+            }
+            else if (topExcess > bottomExcess)
             {
                 buttons.Anchor = Anchor.TopCentre;
                 buttons.Origin = Anchor.BottomCentre;
@@ -387,8 +392,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 buttons.Origin = Anchor.TopCentre;
             }
 
-            if (leftExcess < 0) buttons.X += ToLocalSpace(thisQuad.TopLeft - new Vector2(leftExcess)).X;
-            if (rightExcess < 0) buttons.X += ToLocalSpace(thisQuad.TopLeft + new Vector2(rightExcess)).X;
+            buttons.X += ToLocalSpace(thisQuad.TopLeft - new Vector2(Math.Min(0, leftExcess)) + new Vector2(Math.Min(0, rightExcess))).X;
         }
     }
 }

From 78f41f71095b25dd01a490aeddb3eb8e83aa47c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 25 May 2023 17:33:41 +0200
Subject: [PATCH 0603/1604] Fix spelling

---
 osu.Game/Beatmaps/IBeatmap.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/IBeatmap.cs b/osu.Game/Beatmaps/IBeatmap.cs
index 671f5ce8db..9dc3084cb5 100644
--- a/osu.Game/Beatmaps/IBeatmap.cs
+++ b/osu.Game/Beatmaps/IBeatmap.cs
@@ -108,7 +108,7 @@ namespace osu.Game.Beatmaps
         /// Find the total milliseconds between the first and last hittable objects.
         /// </summary>
         /// <remarks>
-        /// This is cached to <see cref="BeatmapInfo.Length"/>, so using that is preferrable when available.
+        /// This is cached to <see cref="BeatmapInfo.Length"/>, so using that is preferable when available.
         /// </remarks>
         public static double CalculatePlayableLength(this IBeatmap beatmap) => CalculatePlayableLength(beatmap.HitObjects);
 
@@ -134,7 +134,7 @@ namespace osu.Game.Beatmaps
         /// Find the total milliseconds between the first and last hittable objects.
         /// </summary>
         /// <remarks>
-        /// This is cached to <see cref="BeatmapInfo.Length"/>, so using that is preferrable when available.
+        /// This is cached to <see cref="BeatmapInfo.Length"/>, so using that is preferable when available.
         /// </remarks>
         public static double CalculatePlayableLength(IEnumerable<HitObject> objects)
         {

From adee624a8fe86da21a3f1377aae10aa96eec9007 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 25 May 2023 21:32:19 +0200
Subject: [PATCH 0604/1604] Change `PlacementBlueprint.AutomaticBankAssignment`
 to property

Mostly for consistency.
---
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index a0a04c13d0..717c026ded 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Edit
         /// <summary>
         /// Whether the sample bank should be taken from the previous hit object.
         /// </summary>
-        public bool AutomaticBankAssignment;
+        public bool AutomaticBankAssignment { get; set; }
 
         /// <summary>
         /// The <see cref="HitObject"/> that is being placed.

From 7d8f08c0ea0e2e1f6d2952926f85557ff9447350 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 25 May 2023 21:49:29 +0200
Subject: [PATCH 0605/1604] Fix `ComposeBlueprintContainer` briefly assigning
 `auto` bank

Seems to have had no consequence due to the way
`AutomaticBankAssignment` works (that flag is checked in
`PlacementBlueprint.UpdateTimeAndPosition()`, which runs essentially
every frame), but let's avoid putting it there at all ever.
---
 .../Edit/Compose/Components/ComposeBlueprintContainer.cs        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 25babae6ff..c8cfac454a 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -203,7 +203,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             if (bankName == EditorSelectionHandler.HIT_BANK_AUTO)
                 CurrentPlacement.AutomaticBankAssignment = state == TernaryState.True;
-            if (state == TernaryState.True)
+            else if (state == TernaryState.True)
                 CurrentPlacement.HitObject.Samples = CurrentPlacement.HitObject.Samples.Select(s => s.With(newBank: bankName)).ToList();
         }
 

From 3c69956b55e29484888e9ec3564d1df30267aae4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 26 May 2023 10:41:29 +0900
Subject: [PATCH 0606/1604] Fix incorrect catch grid specification

---
 osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
index 611e69d614..8afeca3e51 100644
--- a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
@@ -132,7 +132,7 @@ namespace osu.Game.Rulesets.Catch.Edit
 
             result.ScreenSpacePosition.X = screenSpacePosition.X;
 
-            if (snapType.HasFlagFast(SnapType.GlobalGrids))
+            if (snapType.HasFlagFast(SnapType.RelativeGrids))
             {
                 if (distanceSnapGrid.IsPresent && distanceSnapGrid.GetSnappedPosition(result.ScreenSpacePosition) is SnapResult snapResult &&
                     Vector2.Distance(snapResult.ScreenSpacePosition, result.ScreenSpacePosition) < distance_snap_radius)

From cb468fa4eca95567cbbbad4c19ba2b507792182b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 26 May 2023 19:59:19 +0900
Subject: [PATCH 0607/1604] Fix `OverlappingScrollAlgorithm` returning
 incorrect results for `TimeAt` before first control point

---
 .../Algorithms/OverlappingScrollAlgorithm.cs  | 29 +++++--------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/osu.Game/Rulesets/UI/Scrolling/Algorithms/OverlappingScrollAlgorithm.cs b/osu.Game/Rulesets/UI/Scrolling/Algorithms/OverlappingScrollAlgorithm.cs
index 54079c7895..ead893c0af 100644
--- a/osu.Game/Rulesets/UI/Scrolling/Algorithms/OverlappingScrollAlgorithm.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/Algorithms/OverlappingScrollAlgorithm.cs
@@ -1,9 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
-using System;
+using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Lists;
 using osu.Game.Beatmaps.ControlPoints;
@@ -40,29 +38,16 @@ namespace osu.Game.Rulesets.UI.Scrolling.Algorithms
 
         public double TimeAt(float position, double currentTime, double timeRange, float scrollLength)
         {
-            // Find the control point relating to the position.
+            Debug.Assert(controlPoints.Count > 0);
+
+            // Iterate over control points and find the most relevant for the provided position.
             // Note: Due to velocity adjustments, overlapping control points will provide multiple valid time values for a single position
             // As such, this operation provides unexpected results by using the latter of the control points.
+            var relevantControlPoint = controlPoints.LastOrDefault(cp => PositionAt(cp.Time, currentTime, timeRange, scrollLength) <= position) ?? controlPoints.First();
 
-            int i = 0;
-            float pos = 0;
+            float positionAtControlPoint = PositionAt(relevantControlPoint.Time, currentTime, timeRange, scrollLength);
 
-            for (; i < controlPoints.Count; i++)
-            {
-                float lastPos = pos;
-                pos = PositionAt(controlPoints[i].Time, currentTime, timeRange, scrollLength);
-
-                if (pos > position)
-                {
-                    i--;
-                    pos = lastPos;
-                    break;
-                }
-            }
-
-            i = Math.Clamp(i, 0, controlPoints.Count - 1);
-
-            return controlPoints[i].Time + (position - pos) * timeRange / controlPoints[i].Multiplier / scrollLength;
+            return relevantControlPoint.Time + (position - positionAtControlPoint) * timeRange / relevantControlPoint.Multiplier / scrollLength;
         }
 
         public void Reset()

From 6b0e215246021777389876701ef7114c64bb4e89 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 26 May 2023 20:39:22 +0900
Subject: [PATCH 0608/1604] Add `(int)` flooring and handle potential `NaN`
 value

---
 osu.Game/Screens/Play/GameplayMenuOverlay.cs  | 23 ++++++++++++++-----
 osu.Game/Screens/Play/HUD/SongProgressInfo.cs |  4 ++--
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayMenuOverlay.cs b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
index 52251db898..3a2e381f97 100644
--- a/osu.Game/Screens/Play/GameplayMenuOverlay.cs
+++ b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
@@ -212,18 +212,29 @@ namespace osu.Game.Screens.Play
             playInfoText.AddText("Retry count: ");
             playInfoText.AddText(retries.ToString(), cp => cp.Font = cp.Font.With(weight: FontWeight.Bold));
 
-            if (gameplayState != null && gameplayClock != null)
+            if (getSongProgress() is int progress)
             {
-                (double firstHitTime, double lastHitTime) = gameplayState.Beatmap.CalculatePlayableBounds();
-
-                double progress = Math.Clamp((gameplayClock.CurrentTime - firstHitTime) / (lastHitTime - firstHitTime), 0, 1);
-
                 playInfoText.NewLine();
                 playInfoText.AddText("Song progress: ");
-                playInfoText.AddText(progress.ToString("0%"), cp => cp.Font = cp.Font.With(weight: FontWeight.Bold));
+                playInfoText.AddText($"{progress}%", cp => cp.Font = cp.Font.With(weight: FontWeight.Bold));
             }
         }
 
+        private int? getSongProgress()
+        {
+            if (gameplayClock == null || gameplayState == null)
+                return null;
+
+            (double firstHitTime, double lastHitTime) = gameplayState.Beatmap.CalculatePlayableBounds();
+
+            double playableLength = (lastHitTime - firstHitTime);
+
+            if (playableLength == 0)
+                return 0;
+
+            return (int)Math.Clamp(((gameplayClock.CurrentTime - firstHitTime) / playableLength) * 100, 0, 100);
+        }
+
         private partial class Button : DialogButton
         {
             // required to ensure keyboard navigation always starts from an extremity (unless the cursor is moved)
diff --git a/osu.Game/Screens/Play/HUD/SongProgressInfo.cs b/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
index c04ecd671f..2f137f7e78 100644
--- a/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
+++ b/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
@@ -145,12 +145,12 @@ namespace osu.Game.Screens.Play.HUD
             double time = gameplayClock?.CurrentTime ?? Time.Current;
 
             double songCurrentTime = time - startTime;
-            int currentPercent = Math.Max(0, Math.Min(100, (int)(songCurrentTime / songLength * 100)));
+            int currentPercent = songLength == 0 ? 0 : Math.Max(0, Math.Min(100, (int)(songCurrentTime / songLength * 100)));
             int currentSecond = (int)Math.Floor(songCurrentTime / 1000.0);
 
             if (currentPercent != previousPercent)
             {
-                progress.Text = currentPercent + @"%";
+                progress.Text = $@"{currentPercent}%";
                 previousPercent = currentPercent;
             }
 

From e35201cb991aac8b27d68cb3dd49eb431d68d844 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 26 May 2023 19:51:20 +0200
Subject: [PATCH 0609/1604] Don't snap non-head slider nodes to distance grid
 during placement either

1cd69220ef640424b79f19784c557ac183333c2d only disabled snapping the
aforementioned nodes to distance grid for already-placed sliders.
`SliderPlacementBlueprint` has its own logic for placement, so the fix
needs to be mirrored there too.
---
 .../Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 28ceb80627..966092c6fe 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -198,7 +198,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                 }
 
                 // Update the cursor position.
-                var result = snapProvider?.FindSnappedPositionAndTime(inputManager.CurrentState.Mouse.Position);
+                var result = snapProvider?.FindSnappedPositionAndTime(inputManager.CurrentState.Mouse.Position, state == SliderPlacementState.Body ? SnapType.GlobalGrids : SnapType.All);
                 cursor.Position = ToLocalSpace(result?.ScreenSpacePosition ?? inputManager.CurrentState.Mouse.Position) - HitObject.Position;
             }
             else if (cursor != null)

From a01577cba528089335d6e52eb07d9f33357bd0d2 Mon Sep 17 00:00:00 2001
From: Robin Oger <roger@qcify.com>
Date: Sat, 27 May 2023 12:29:14 +0200
Subject: [PATCH 0610/1604] Adapt changes to fit master

---
 osu.Game/Localisation/GameplayMenuOverlayStrings.cs | 10 ----------
 osu.Game/Screens/Play/FailOverlay.cs                |  8 +++++---
 osu.Game/Screens/Play/GameplayMenuOverlay.cs        |  5 +++--
 osu.Game/Screens/Play/PauseOverlay.cs               | 10 ++++++----
 4 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Localisation/GameplayMenuOverlayStrings.cs b/osu.Game/Localisation/GameplayMenuOverlayStrings.cs
index c89c35775b..597ee64347 100644
--- a/osu.Game/Localisation/GameplayMenuOverlayStrings.cs
+++ b/osu.Game/Localisation/GameplayMenuOverlayStrings.cs
@@ -34,16 +34,6 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString PausedHeader => new TranslatableString(getKey(@"paused_header"), @"paused");
 
-        /// <summary>
-        /// "You're dead, try again?"
-        /// </summary>
-        public static LocalisableString FailedDescription => new TranslatableString(getKey(@"failed_description"), @"You're dead, try again?");
-
-        /// <summary>
-        /// "You're not going to do what i think you're going to do, are ya?"
-        /// </summary>
-        public static LocalisableString PausedDescription => new TranslatableString(getKey(@"paused_description"), @"You're not going to do what i think you're going to do, are ya?");
-
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
 }
diff --git a/osu.Game/Screens/Play/FailOverlay.cs b/osu.Game/Screens/Play/FailOverlay.cs
index f1dd2abc4a..abfc401998 100644
--- a/osu.Game/Screens/Play/FailOverlay.cs
+++ b/osu.Game/Screens/Play/FailOverlay.cs
@@ -15,6 +15,8 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Localisation;
+using osu.Game.Localisation;
 
 namespace osu.Game.Screens.Play
 {
@@ -22,13 +24,13 @@ namespace osu.Game.Screens.Play
     {
         public Func<Task<ScoreInfo>> SaveReplay;
 
-        public override string Header => "failed";
+        public override LocalisableString Header => GameplayMenuOverlayStrings.FailedHeader;
 
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            AddButton("Retry", colours.YellowDark, () => OnRetry?.Invoke());
-            AddButton("Quit", new Color4(170, 27, 39, 255), () => OnQuit?.Invoke());
+            AddButton(GameplayMenuOverlayStrings.Retry, colours.YellowDark, () => OnRetry?.Invoke());
+            AddButton(GameplayMenuOverlayStrings.Quit, new Color4(170, 27, 39, 255), () => OnQuit?.Invoke());
             // from #10339 maybe this is a better visual effect
             Add(new Container
             {
diff --git a/osu.Game/Screens/Play/GameplayMenuOverlay.cs b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
index 3a2e381f97..a061b03e7e 100644
--- a/osu.Game/Screens/Play/GameplayMenuOverlay.cs
+++ b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
@@ -12,6 +12,7 @@ using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -49,7 +50,7 @@ namespace osu.Game.Screens.Play
         /// </summary>
         protected virtual Action SelectAction => () => InternalButtons.Selected?.TriggerClick();
 
-        public abstract string Header { get; }
+        public abstract LocalisableString Header { get; }
 
         protected SelectionCycleFillFlowContainer<DialogButton> InternalButtons = null!;
         public IReadOnlyList<DialogButton> Buttons => InternalButtons;
@@ -153,7 +154,7 @@ namespace osu.Game.Screens.Play
 
         protected override bool OnMouseMove(MouseMoveEvent e) => true;
 
-        protected void AddButton(string text, Color4 colour, Action? action)
+        protected void AddButton(LocalisableString text, Color4 colour, Action? action)
         {
             var button = new Button
             {
diff --git a/osu.Game/Screens/Play/PauseOverlay.cs b/osu.Game/Screens/Play/PauseOverlay.cs
index 984f43d77a..2fbb4b3239 100644
--- a/osu.Game/Screens/Play/PauseOverlay.cs
+++ b/osu.Game/Screens/Play/PauseOverlay.cs
@@ -9,9 +9,11 @@ using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 using osu.Game.Audio;
 using osu.Game.Graphics;
 using osu.Game.Input.Bindings;
+using osu.Game.Localisation;
 using osu.Game.Skinning;
 using osuTK.Graphics;
 
@@ -23,7 +25,7 @@ namespace osu.Game.Screens.Play
 
         public override bool IsPresent => base.IsPresent || pauseLoop.IsPlaying;
 
-        public override string Header => "paused";
+        public override LocalisableString Header => "paused";
 
         private SkinnableSound pauseLoop;
 
@@ -32,9 +34,9 @@ namespace osu.Game.Screens.Play
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            AddButton("Continue", colours.Green, () => OnResume?.Invoke());
-            AddButton("Retry", colours.YellowDark, () => OnRetry?.Invoke());
-            AddButton("Quit", new Color4(170, 27, 39, 255), () => OnQuit?.Invoke());
+            AddButton(GameplayMenuOverlayStrings.Continue, colours.Green, () => OnResume?.Invoke());
+            AddButton(GameplayMenuOverlayStrings.Retry, colours.YellowDark, () => OnRetry?.Invoke());
+            AddButton(GameplayMenuOverlayStrings.Quit, new Color4(170, 27, 39, 255), () => OnQuit?.Invoke());
 
             AddInternal(pauseLoop = new SkinnableSound(new SampleInfo("Gameplay/pause-loop"))
             {

From cfa128002873f19df493a114971e7bd312aa1fed Mon Sep 17 00:00:00 2001
From: Robin Oger <roger@qcify.com>
Date: Sat, 27 May 2023 12:47:05 +0200
Subject: [PATCH 0611/1604] GameplayMenuOverlay.cs: add translatable strings
 for `Retry count: ` and `Song progress: `

This makes the assumption that languages will prefer having the number on the right
---
 .../Localisation/GameplayMenuOverlayStrings.cs     | 14 ++++++++++++--
 osu.Game/Screens/Play/GameplayMenuOverlay.cs       |  5 +++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Localisation/GameplayMenuOverlayStrings.cs b/osu.Game/Localisation/GameplayMenuOverlayStrings.cs
index 597ee64347..f1a65ab430 100644
--- a/osu.Game/Localisation/GameplayMenuOverlayStrings.cs
+++ b/osu.Game/Localisation/GameplayMenuOverlayStrings.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Localisation;
@@ -34,6 +34,16 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString PausedHeader => new TranslatableString(getKey(@"paused_header"), @"paused");
 
+        /// <summary>
+        /// "Retry count: "
+        /// </summary>
+        public static LocalisableString RetryCount => new TranslatableString(getKey(@"retry_count"), @"Retry count: ");
+
+        /// <summary>
+        /// "Song progress: "
+        /// </summary>
+        public static LocalisableString SongProgress => new TranslatableString(getKey(@"song_progress"), @"Song progress: ");
+
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
-}
+}
\ No newline at end of file
diff --git a/osu.Game/Screens/Play/GameplayMenuOverlay.cs b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
index a061b03e7e..0680842891 100644
--- a/osu.Game/Screens/Play/GameplayMenuOverlay.cs
+++ b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
@@ -21,6 +21,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
 using osuTK;
 using osuTK.Graphics;
+using osu.Game.Localisation;
 
 namespace osu.Game.Screens.Play
 {
@@ -210,13 +211,13 @@ namespace osu.Game.Screens.Play
         private void updateInfoText()
         {
             playInfoText.Clear();
-            playInfoText.AddText("Retry count: ");
+            playInfoText.AddText(GameplayMenuOverlayStrings.RetryCount);
             playInfoText.AddText(retries.ToString(), cp => cp.Font = cp.Font.With(weight: FontWeight.Bold));
 
             if (getSongProgress() is int progress)
             {
                 playInfoText.NewLine();
-                playInfoText.AddText("Song progress: ");
+                playInfoText.AddText(GameplayMenuOverlayStrings.SongProgress);
                 playInfoText.AddText($"{progress}%", cp => cp.Font = cp.Font.With(weight: FontWeight.Bold));
             }
         }

From 318431a1b7550c1269ebf72c2033b9a793a69677 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sat, 27 May 2023 21:27:32 +0900
Subject: [PATCH 0612/1604] make `MaximumAchievable` to default

---
 osu.Game/Rulesets/Mods/ModAccuracyChallenge.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModAccuracyChallenge.cs b/osu.Game/Rulesets/Mods/ModAccuracyChallenge.cs
index 03149fd8c8..c951551af5 100644
--- a/osu.Game/Rulesets/Mods/ModAccuracyChallenge.cs
+++ b/osu.Game/Rulesets/Mods/ModAccuracyChallenge.cs
@@ -76,11 +76,11 @@ namespace osu.Game.Rulesets.Mods
 
         public enum AccuracyMode
         {
-            [LocalisableDescription(typeof(GameplayAccuracyCounterStrings), nameof(GameplayAccuracyCounterStrings.AccuracyDisplayModeStandard))]
-            Standard,
-
             [LocalisableDescription(typeof(GameplayAccuracyCounterStrings), nameof(GameplayAccuracyCounterStrings.AccuracyDisplayModeMax))]
             MaximumAchievable,
+
+            [LocalisableDescription(typeof(GameplayAccuracyCounterStrings), nameof(GameplayAccuracyCounterStrings.AccuracyDisplayModeStandard))]
+            Standard,
         }
     }
 }

From ec61840e7d0d9ed5a60f246c44379542d07cb2bd Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sat, 27 May 2023 23:25:01 +0900
Subject: [PATCH 0613/1604] Provides higher precision settings

---
 osu.Game/Rulesets/Mods/ModAccuracyChallenge.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModAccuracyChallenge.cs b/osu.Game/Rulesets/Mods/ModAccuracyChallenge.cs
index c951551af5..5c0aa2ad00 100644
--- a/osu.Game/Rulesets/Mods/ModAccuracyChallenge.cs
+++ b/osu.Game/Rulesets/Mods/ModAccuracyChallenge.cs
@@ -37,8 +37,8 @@ namespace osu.Game.Rulesets.Mods
         public BindableNumber<double> MinimumAccuracy { get; } = new BindableDouble
         {
             MinValue = 0.60,
-            MaxValue = 0.99,
-            Precision = 0.01,
+            MaxValue = 0.9999,
+            Precision = 0.0001,
             Default = 0.9,
             Value = 0.9,
         };

From 89c8ef3c9b28b6761a1ce2e4f3eceb1d74a9b07b Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sat, 27 May 2023 23:35:09 +0900
Subject: [PATCH 0614/1604] Format percentage based on significant decimal
 digits

---
 osu.Game/Graphics/UserInterface/OsuSliderBar.cs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
index 0e26029ffa..688a8ce8e6 100644
--- a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
+++ b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
@@ -89,14 +89,20 @@ namespace osu.Game.Graphics.UserInterface
 
             double floatValue = value.ToDouble(NumberFormatInfo.InvariantInfo);
 
-            if (DisplayAsPercentage)
-                return floatValue.ToString("0%");
-
             decimal decimalPrecision = normalise(CurrentNumber.Precision.ToDecimal(NumberFormatInfo.InvariantInfo), max_decimal_digits);
 
             // Find the number of significant digits (we could have less than 5 after normalize())
             int significantDigits = FormatUtils.FindPrecision(decimalPrecision);
 
+            if (DisplayAsPercentage)
+            {
+                if (significantDigits <= 2)
+                    return floatValue.ToString("0%");
+
+                string format = "0." + new string('0', significantDigits - 2) + "%";
+                return floatValue.ToString(format);
+            }
+
             string negativeSign = Math.Round(floatValue, significantDigits) < 0 ? "-" : string.Empty;
 
             return $"{negativeSign}{Math.Abs(floatValue).ToString($"N{significantDigits}")}";

From a05312c9a26b3f2178779e6220aa4f82ffc65137 Mon Sep 17 00:00:00 2001
From: cdwcgt <loginchen@outlook.com>
Date: Sat, 27 May 2023 23:44:50 +0900
Subject: [PATCH 0615/1604] simplify format method
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 osu.Game/Graphics/UserInterface/OsuSliderBar.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
index 688a8ce8e6..e5f5f97eb7 100644
--- a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
+++ b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
@@ -96,11 +96,7 @@ namespace osu.Game.Graphics.UserInterface
 
             if (DisplayAsPercentage)
             {
-                if (significantDigits <= 2)
-                    return floatValue.ToString("0%");
-
-                string format = "0." + new string('0', significantDigits - 2) + "%";
-                return floatValue.ToString(format);
+                return floatValue.ToString($@"P{Math.Max(0, significantDigits - 2)}");
             }
 
             string negativeSign = Math.Round(floatValue, significantDigits) < 0 ? "-" : string.Empty;

From 333e785f8bcebe7ca98712f70dfd27ec759a9f25 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 28 May 2023 09:50:11 +0900
Subject: [PATCH 0616/1604] Revert "Provides higher precision settings"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ec61840e7d0d9ed5a60f246c44379542d07cb2bd.

😐
---
 osu.Game/Rulesets/Mods/ModAccuracyChallenge.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModAccuracyChallenge.cs b/osu.Game/Rulesets/Mods/ModAccuracyChallenge.cs
index 5c0aa2ad00..c951551af5 100644
--- a/osu.Game/Rulesets/Mods/ModAccuracyChallenge.cs
+++ b/osu.Game/Rulesets/Mods/ModAccuracyChallenge.cs
@@ -37,8 +37,8 @@ namespace osu.Game.Rulesets.Mods
         public BindableNumber<double> MinimumAccuracy { get; } = new BindableDouble
         {
             MinValue = 0.60,
-            MaxValue = 0.9999,
-            Precision = 0.0001,
+            MaxValue = 0.99,
+            Precision = 0.01,
             Default = 0.9,
             Value = 0.9,
         };

From 5ff023113fed2c6ef46454e62e9db2f5e8afcc3d Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Sun, 28 May 2023 10:04:26 +0300
Subject: [PATCH 0617/1604] Update xmldoc for `ForcedSearchTerm`

---
 osu.Game/Overlays/Mods/ModSearchContainer.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Overlays/Mods/ModSearchContainer.cs b/osu.Game/Overlays/Mods/ModSearchContainer.cs
index f9bf11d1f1..b959274391 100644
--- a/osu.Game/Overlays/Mods/ModSearchContainer.cs
+++ b/osu.Game/Overlays/Mods/ModSearchContainer.cs
@@ -10,6 +10,9 @@ namespace osu.Game.Overlays.Mods
         /// <summary>
         /// A string that should match the <see cref="IFilterable"/> children
         /// </summary>
+        /// <remarks>
+        /// Same as <see cref="SearchContainer{T}.SearchTerm"/> except the filtering is guarantied to be performed even when <see cref="SearchContainer{T}.Update"/> can't be run.
+        /// </remarks>
         public string ForcedSearchTerm
         {
             get => SearchTerm;

From 0e5c99b760a8e3e2298f5bfb1ac2fb8d82ee83d2 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Sun, 28 May 2023 13:12:57 +0300
Subject: [PATCH 0618/1604] Fix search bar showing incorrectly

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index d3a2e001e7..3d42059540 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -185,7 +185,7 @@ namespace osu.Game.Overlays.Mods
                     {
                         Padding = new MarginPadding
                         {
-                            Top = (ShowTotalMultiplier ? ModsEffectDisplay.HEIGHT : 0) + PADDING,
+                            Top = ModsEffectDisplay.HEIGHT + PADDING,
                             Bottom = PADDING
                         },
                         RelativeSizeAxes = Axes.Both,

From e43c233b4879006e3cbd36eb77eaade7b23a183c Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Sun, 28 May 2023 13:21:41 +0300
Subject: [PATCH 0619/1604] Reword `ForcedSearchTerm` xmldoc

---
 osu.Game/Overlays/Mods/ModSearchContainer.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSearchContainer.cs b/osu.Game/Overlays/Mods/ModSearchContainer.cs
index b959274391..132c02db1e 100644
--- a/osu.Game/Overlays/Mods/ModSearchContainer.cs
+++ b/osu.Game/Overlays/Mods/ModSearchContainer.cs
@@ -8,10 +8,11 @@ namespace osu.Game.Overlays.Mods
     public partial class ModSearchContainer : SearchContainer
     {
         /// <summary>
-        /// A string that should match the <see cref="IFilterable"/> children
+        /// Same as <see cref="SearchContainer{T}.SearchTerm"/> except the filtering is guarantied to be performed
         /// </summary>
         /// <remarks>
-        /// Same as <see cref="SearchContainer{T}.SearchTerm"/> except the filtering is guarantied to be performed even when <see cref="SearchContainer{T}.Update"/> can't be run.
+        /// This is required because <see cref="ModColumn"/> can be hidden when search term applied
+        /// therefore <see cref="SearchContainer{T}.Update"/> cannot be reached and filter cannot automatically re-validate itself.
         /// </remarks>
         public string ForcedSearchTerm
         {

From b0501c4e5cbca682254fff771ce7c6128e6f672e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 29 May 2023 10:24:59 +0900
Subject: [PATCH 0620/1604] Actually use paused header

---
 osu.Game/Screens/Play/PauseOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/PauseOverlay.cs b/osu.Game/Screens/Play/PauseOverlay.cs
index 2fbb4b3239..88561ada71 100644
--- a/osu.Game/Screens/Play/PauseOverlay.cs
+++ b/osu.Game/Screens/Play/PauseOverlay.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Screens.Play
 
         public override bool IsPresent => base.IsPresent || pauseLoop.IsPlaying;
 
-        public override LocalisableString Header => "paused";
+        public override LocalisableString Header => GameplayMenuOverlayStrings.PausedHeader;
 
         private SkinnableSound pauseLoop;
 

From a789d1e49c85687e120e42f83a7dbc4a6980c0eb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 29 May 2023 18:38:16 +0900
Subject: [PATCH 0621/1604] Add xmldoc and change naming around
 `ScoreProcessorStatistics` a bit

---
 .../Gameplay/TestSceneScoreProcessor.cs       |  4 +--
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs   | 36 +++++++++++++++----
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneScoreProcessor.cs b/osu.Game.Tests/Gameplay/TestSceneScoreProcessor.cs
index fbe4dba8ed..a261185473 100644
--- a/osu.Game.Tests/Gameplay/TestSceneScoreProcessor.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneScoreProcessor.cs
@@ -80,7 +80,7 @@ namespace osu.Game.Tests.Gameplay
                 {
                     MaximumBaseScore = 300,
                     BaseScore = 0,
-                    CountAccuracyJudgements = 1,
+                    AccuracyJudgementCount = 1,
                     ComboPortion = 0,
                     BonusPortion = 0
                 }, DateTimeOffset.Now)
@@ -98,7 +98,7 @@ namespace osu.Game.Tests.Gameplay
                 {
                     MaximumBaseScore = 0,
                     BaseScore = 0,
-                    CountAccuracyJudgements = 0,
+                    AccuracyJudgementCount = 0,
                     ComboPortion = 0,
                     BonusPortion = 0
                 }, DateTimeOffset.Now)
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index b470c09859..a0d8187642 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -407,7 +407,7 @@ namespace osu.Game.Rulesets.Scoring
         {
             MaximumBaseScore = currentMaximumBaseScore,
             BaseScore = currentBaseScore,
-            CountAccuracyJudgements = currentCountAccuracyJudgements,
+            AccuracyJudgementCount = currentCountAccuracyJudgements,
             ComboPortion = currentComboPortion,
             BonusPortion = currentBonusPortion
         };
@@ -416,7 +416,7 @@ namespace osu.Game.Rulesets.Scoring
         {
             currentMaximumBaseScore = statistics.MaximumBaseScore;
             currentBaseScore = statistics.BaseScore;
-            currentCountAccuracyJudgements = statistics.CountAccuracyJudgements;
+            currentCountAccuracyJudgements = statistics.AccuracyJudgementCount;
             currentComboPortion = statistics.ComboPortion;
             currentBonusPortion = statistics.BonusPortion;
         }
@@ -497,18 +497,40 @@ namespace osu.Game.Rulesets.Scoring
     [MessagePackObject]
     public class ScoreProcessorStatistics
     {
+        /// <summary>
+        /// The sum of all accuracy-affecting judgements at the current point in time.
+        /// </summary>
+        /// <remarks>
+        /// Used to compute accuracy.
+        /// See: <see cref="HitResultExtensions.IsBasic"/> and <see cref="Judgement.ToNumericResult"/>.
+        /// </remarks>
         [Key(0)]
-        public double MaximumBaseScore { get; set; }
-
-        [Key(1)]
         public double BaseScore { get; set; }
 
-        [Key(2)]
-        public int CountAccuracyJudgements { get; set; }
+        /// <summary>
+        /// The maximum sum of accuracy-affecting judgements at the current point in time.
+        /// </summary>
+        /// <remarks>
+        /// Used to compute accuracy.
+        /// </remarks>
+        [Key(1)]
+        public double MaximumBaseScore { get; set; }
 
+        /// <summary>
+        /// The count of accuracy-affecting judgements at the current point in time.
+        /// </summary>
+        [Key(2)]
+        public int AccuracyJudgementCount { get; set; }
+
+        /// <summary>
+        /// The combo score at the current point in time.
+        /// </summary>
         [Key(3)]
         public double ComboPortion { get; set; }
 
+        /// <summary>
+        /// The bonus score at the current point in time.
+        /// </summary>
         [Key(4)]
         public double BonusPortion { get; set; }
     }

From 22be045de3bd788529e1dd52eabf41597350abd3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 29 May 2023 18:48:17 +0900
Subject: [PATCH 0622/1604] Apply NRT to `GameplayScoreCounter`

---
 osu.Game/Screens/Play/HUD/GameplayScoreCounter.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayScoreCounter.cs b/osu.Game/Screens/Play/HUD/GameplayScoreCounter.cs
index a696d2cad7..bc953e05d2 100644
--- a/osu.Game/Screens/Play/HUD/GameplayScoreCounter.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayScoreCounter.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -15,8 +13,9 @@ namespace osu.Game.Screens.Play.HUD
 {
     public abstract partial class GameplayScoreCounter : ScoreCounter
     {
-        private Bindable<ScoringMode> scoreDisplayMode;
-        private Bindable<long> totalScoreBindable;
+        private Bindable<ScoringMode> scoreDisplayMode = null!;
+
+        private Bindable<long> totalScoreBindable = null!;
 
         protected GameplayScoreCounter()
             : base(6)

From 9a886125ad973f7af619c7f284e340e26855ec79 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 29 May 2023 19:00:01 +0900
Subject: [PATCH 0623/1604] Ensure `GameplayScoreCounter`'s display score is
 updated on `ScoringMode` change

This isn't strictly required, but only because of a kind of hacky
behaviour where `HUDOverlay` will recreate all components on a scoring
mode change currently (see
https://github.com/ppy/osu/blob/8f6df5ea0f7f721c630fc8cad93bb3eef869d1d9/osu.Game/Screens/Play/HUDOverlay.cs#L410-L418).

Best we do this just in case that happens to go away in the future.
---
 osu.Game/Screens/Play/HUD/GameplayScoreCounter.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayScoreCounter.cs b/osu.Game/Screens/Play/HUD/GameplayScoreCounter.cs
index bc953e05d2..a086aa6d72 100644
--- a/osu.Game/Screens/Play/HUD/GameplayScoreCounter.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayScoreCounter.cs
@@ -25,6 +25,9 @@ namespace osu.Game.Screens.Play.HUD
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config, ScoreProcessor scoreProcessor)
         {
+            totalScoreBindable = scoreProcessor.TotalScore.GetBoundCopy();
+            totalScoreBindable.BindValueChanged(_ => updateDisplayScore());
+
             scoreDisplayMode = config.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode);
             scoreDisplayMode.BindValueChanged(scoreMode =>
             {
@@ -41,10 +44,11 @@ namespace osu.Game.Screens.Play.HUD
                     default:
                         throw new ArgumentOutOfRangeException(nameof(scoreMode));
                 }
+
+                updateDisplayScore();
             }, true);
 
-            totalScoreBindable = scoreProcessor.TotalScore.GetBoundCopy();
-            totalScoreBindable.BindValueChanged(_ => Current.Value = scoreProcessor.GetDisplayScore(scoreDisplayMode.Value), true);
+            void updateDisplayScore() => Current.Value = scoreProcessor.GetDisplayScore(scoreDisplayMode.Value);
         }
     }
 }

From fcd7a1d51a915d289e14a69d6b29a8294f59bfb1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 29 May 2023 19:41:53 +0900
Subject: [PATCH 0624/1604] Move `GetDisplayScore` xmldoc to interface and
 remove getter

---
 osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs | 3 ---
 osu.Game/Screens/Play/HUD/ILeaderboardScore.cs        | 5 ++++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index b7247ed8cc..496fc82019 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -58,9 +58,6 @@ namespace osu.Game.Screens.Play.HUD
         public BindableBool HasQuit { get; } = new BindableBool();
         public Bindable<long> DisplayOrder { get; } = new Bindable<long>();
 
-        /// <summary>
-        /// A function providing a display score. If a custom function is not provided, this defaults to using <see cref="TotalScore"/>.
-        /// </summary>
         public Func<ScoringMode, long> GetDisplayScore { get; set; }
 
         public Color4? BackgroundColour { get; set; }
diff --git a/osu.Game/Screens/Play/HUD/ILeaderboardScore.cs b/osu.Game/Screens/Play/HUD/ILeaderboardScore.cs
index cc1d83e0c7..5de38396fb 100644
--- a/osu.Game/Screens/Play/HUD/ILeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/ILeaderboardScore.cs
@@ -23,6 +23,9 @@ namespace osu.Game.Screens.Play.HUD
         /// </summary>
         Bindable<long> DisplayOrder { get; }
 
-        Func<ScoringMode, long> GetDisplayScore { get; set; }
+        /// <summary>
+        /// A function providing a display score. If a custom function is not provided, this defaults to using <see cref="TotalScore"/>.
+        /// </summary>
+        Func<ScoringMode, long> GetDisplayScore { set; }
     }
 }

From 1a6d9e9ff0dded325167a333eed03f1e8e85f928 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 29 May 2023 19:46:50 +0900
Subject: [PATCH 0625/1604] Apply NRT to `GameplayLeaderboardScore` and change
 `GetDisplayedScore` handling

I don't feel too confident with the default scoring function being
assigned in the constructor to a publicly settable delegate. This just
feels a bit more elegant, and handles the (likely-never-used) case where
we need to restore the default function.

An alternative would be to provide the function as a `ctor` argument,
but I believe that wasn't done here to allow using the
`ILeaderboardScore` interface.
---
 .../Play/HUD/GameplayLeaderboardScore.cs      | 38 +++++++++----------
 .../Screens/Play/HUD/ILeaderboardScore.cs     |  6 +--
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 496fc82019..4ac2f1afda 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -1,10 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
@@ -50,7 +47,7 @@ namespace osu.Game.Screens.Play.HUD
 
         public Bindable<bool> Expanded = new Bindable<bool>();
 
-        private OsuSpriteText positionText, scoreText, accuracyText, comboText, usernameText;
+        private OsuSpriteText positionText = null!, scoreText = null!, accuracyText = null!, comboText = null!, usernameText = null!;
 
         public BindableLong TotalScore { get; } = new BindableLong();
         public BindableDouble Accuracy { get; } = new BindableDouble(1);
@@ -58,7 +55,12 @@ namespace osu.Game.Screens.Play.HUD
         public BindableBool HasQuit { get; } = new BindableBool();
         public Bindable<long> DisplayOrder { get; } = new Bindable<long>();
 
-        public Func<ScoringMode, long> GetDisplayScore { get; set; }
+        private Func<ScoringMode, long>? getDisplayScoreFunction;
+
+        public Func<ScoringMode, long> GetDisplayScore
+        {
+            set => getDisplayScoreFunction = value;
+        }
 
         public Color4? BackgroundColour { get; set; }
 
@@ -86,32 +88,31 @@ namespace osu.Game.Screens.Play.HUD
             }
         }
 
-        [CanBeNull]
-        public IUser User { get; }
+        public IUser? User { get; }
 
         /// <summary>
         /// Whether this score is the local user or a replay player (and should be focused / always visible).
         /// </summary>
         public readonly bool Tracked;
 
-        private Container mainFillContainer;
+        private Container mainFillContainer = null!;
 
-        private Box centralFill;
+        private Box centralFill = null!;
 
-        private Container backgroundPaddingAdjustContainer;
+        private Container backgroundPaddingAdjustContainer = null!;
 
-        private GridContainer gridContainer;
+        private GridContainer gridContainer = null!;
 
-        private Container scoreComponents;
+        private Container scoreComponents = null!;
 
-        private IBindable<ScoringMode> scoreDisplayMode;
+        private IBindable<ScoringMode> scoreDisplayMode = null!;
 
         /// <summary>
         /// Creates a new <see cref="GameplayLeaderboardScore"/>.
         /// </summary>
         /// <param name="user">The score's player.</param>
         /// <param name="tracked">Whether the player is the local user or a replay player.</param>
-        public GameplayLeaderboardScore([CanBeNull] IUser user, bool tracked)
+        public GameplayLeaderboardScore(IUser? user, bool tracked)
         {
             User = user;
             Tracked = tracked;
@@ -242,7 +243,7 @@ namespace osu.Game.Screens.Play.HUD
                                                         Origin = Anchor.CentreLeft,
                                                         Colour = Color4.White,
                                                         Font = OsuFont.Torus.With(size: 14, weight: FontWeight.SemiBold),
-                                                        Text = User?.Username,
+                                                        Text = User?.Username ?? string.Empty,
                                                         Truncate = true,
                                                         Shadow = false,
                                                     }
@@ -313,11 +314,6 @@ namespace osu.Game.Screens.Play.HUD
             HasQuit.BindValueChanged(_ => updateState());
         }
 
-        private void updateScore()
-        {
-            scoreText.Text = GetDisplayScore(scoreDisplayMode.Value).ToString("N0");
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -328,6 +324,8 @@ namespace osu.Game.Screens.Play.HUD
             FinishTransforms(true);
         }
 
+        private void updateScore() => scoreText.Text = (getDisplayScoreFunction?.Invoke(scoreDisplayMode.Value) ?? TotalScore.Value).ToString("N0");
+
         private void changeExpandedState(ValueChangedEvent<bool> expanded)
         {
             if (expanded.NewValue)
diff --git a/osu.Game/Screens/Play/HUD/ILeaderboardScore.cs b/osu.Game/Screens/Play/HUD/ILeaderboardScore.cs
index 5de38396fb..1a5d7fd9a8 100644
--- a/osu.Game/Screens/Play/HUD/ILeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/ILeaderboardScore.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Bindables;
 using osu.Game.Rulesets.Scoring;
@@ -24,8 +22,10 @@ namespace osu.Game.Screens.Play.HUD
         Bindable<long> DisplayOrder { get; }
 
         /// <summary>
-        /// A function providing a display score. If a custom function is not provided, this defaults to using <see cref="TotalScore"/>.
+        /// A custom function which handles converting a score to a display score using a provide <see cref="ScoringMode"/>.
         /// </summary>
+        /// <remarks>
+        /// If no function is provided, <see cref="TotalScore"/> will be used verbatim.</remarks>
         Func<ScoringMode, long> GetDisplayScore { set; }
     }
 }

From df662afbd56a9f2e7042eb4f1900ac6a1647c5f4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 29 May 2023 20:00:42 +0900
Subject: [PATCH 0626/1604] Pass `ScoreProcessorStatistics` to `FrameHeader`,
 rather than the full processor

---
 osu.Game/Online/Spectator/FrameDataBundle.cs | 2 +-
 osu.Game/Online/Spectator/FrameHeader.cs     | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Online/Spectator/FrameDataBundle.cs b/osu.Game/Online/Spectator/FrameDataBundle.cs
index b936847434..d58ddd5310 100644
--- a/osu.Game/Online/Spectator/FrameDataBundle.cs
+++ b/osu.Game/Online/Spectator/FrameDataBundle.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Online.Spectator
         public FrameDataBundle(ScoreInfo score, ScoreProcessor scoreProcessor, IList<LegacyReplayFrame> frames)
         {
             Frames = frames;
-            Header = new FrameHeader(score, scoreProcessor);
+            Header = new FrameHeader(score, scoreProcessor.GetScoreProcessorStatistics());
         }
 
         [JsonConstructor]
diff --git a/osu.Game/Online/Spectator/FrameHeader.cs b/osu.Game/Online/Spectator/FrameHeader.cs
index 4d1c2c2cff..45f920e65b 100644
--- a/osu.Game/Online/Spectator/FrameHeader.cs
+++ b/osu.Game/Online/Spectator/FrameHeader.cs
@@ -60,18 +60,17 @@ namespace osu.Game.Online.Spectator
         /// Construct header summary information from a point-in-time reference to a score which is actively being played.
         /// </summary>
         /// <param name="score">The score for reference.</param>
-        /// <param name="scoreProcessor">The score processor for reference.</param>
-        public FrameHeader(ScoreInfo score, ScoreProcessor scoreProcessor)
+        /// <param name="statistics">The score processor statistics for the current point in time.</param>
+        public FrameHeader(ScoreInfo score, ScoreProcessorStatistics statistics)
         {
             TotalScore = score.TotalScore;
             Accuracy = score.Accuracy;
             Combo = score.Combo;
             MaxCombo = score.MaxCombo;
-
             // copy for safety
             Statistics = new Dictionary<HitResult, int>(score.Statistics);
 
-            ScoreProcessorStatistics = scoreProcessor.GetScoreProcessorStatistics();
+            ScoreProcessorStatistics = statistics;
         }
 
         [JsonConstructor]

From b3ca409339fd15fa7f06608b584f614847d58885 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 29 May 2023 20:08:22 +0900
Subject: [PATCH 0627/1604] Rename a few remaining `CountAccuracyJudgement`
 variable

---
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index a0d8187642..ac17de32d8 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -117,12 +117,12 @@ namespace osu.Game.Rulesets.Scoring
         /// <summary>
         /// The count of all accuracy-affecting judgements in the beatmap.
         /// </summary>
-        private int maximumCountAccuracyJudgements;
+        private int maximumAccuracyJudgementCount;
 
         /// <summary>
         /// The count of accuracy-affecting judgements at the current point in time.
         /// </summary>
-        private int currentCountAccuracyJudgements;
+        private int currentAccuracyJudgementCount;
 
         /// <summary>
         /// The maximum combo score in the beatmap.
@@ -216,7 +216,7 @@ namespace osu.Game.Rulesets.Scoring
             {
                 currentMaximumBaseScore += Judgement.ToNumericResult(result.Judgement.MaxResult);
                 currentBaseScore += Judgement.ToNumericResult(result.Type);
-                currentCountAccuracyJudgements++;
+                currentAccuracyJudgementCount++;
             }
 
             if (result.Type.IsBonus())
@@ -257,7 +257,7 @@ namespace osu.Game.Rulesets.Scoring
             {
                 currentMaximumBaseScore -= Judgement.ToNumericResult(result.Judgement.MaxResult);
                 currentBaseScore -= Judgement.ToNumericResult(result.Type);
-                currentCountAccuracyJudgements--;
+                currentAccuracyJudgementCount--;
             }
 
             if (result.Type.IsBonus())
@@ -293,7 +293,7 @@ namespace osu.Game.Rulesets.Scoring
             MaximumAccuracy.Value = maximumBaseScore > 0 ? (currentBaseScore + (maximumBaseScore - currentMaximumBaseScore)) / maximumBaseScore : 1;
 
             double comboProgress = maximumComboPortion > 0 ? currentComboPortion / maximumComboPortion : 1;
-            double accuracyProcess = maximumCountAccuracyJudgements > 0 ? (double)currentCountAccuracyJudgements / maximumCountAccuracyJudgements : 1;
+            double accuracyProcess = maximumAccuracyJudgementCount > 0 ? (double)currentAccuracyJudgementCount / maximumAccuracyJudgementCount : 1;
 
             TotalScore.Value = (long)Math.Round(ComputeTotalScore(comboProgress, accuracyProcess, currentBonusPortion) * scoreMultiplier);
         }
@@ -321,7 +321,7 @@ namespace osu.Game.Rulesets.Scoring
                 maximumBaseScore = currentBaseScore;
 
                 maximumComboPortion = currentComboPortion;
-                maximumCountAccuracyJudgements = currentCountAccuracyJudgements;
+                maximumAccuracyJudgementCount = currentAccuracyJudgementCount;
 
                 maximumResultCounts.Clear();
                 maximumResultCounts.AddRange(scoreResultCounts);
@@ -333,7 +333,7 @@ namespace osu.Game.Rulesets.Scoring
 
             currentBaseScore = 0;
             currentMaximumBaseScore = 0;
-            currentCountAccuracyJudgements = 0;
+            currentAccuracyJudgementCount = 0;
             currentComboPortion = 0;
             currentBonusPortion = 0;
 
@@ -407,7 +407,7 @@ namespace osu.Game.Rulesets.Scoring
         {
             MaximumBaseScore = currentMaximumBaseScore,
             BaseScore = currentBaseScore,
-            AccuracyJudgementCount = currentCountAccuracyJudgements,
+            AccuracyJudgementCount = currentAccuracyJudgementCount,
             ComboPortion = currentComboPortion,
             BonusPortion = currentBonusPortion
         };
@@ -416,7 +416,7 @@ namespace osu.Game.Rulesets.Scoring
         {
             currentMaximumBaseScore = statistics.MaximumBaseScore;
             currentBaseScore = statistics.BaseScore;
-            currentCountAccuracyJudgements = statistics.AccuracyJudgementCount;
+            currentAccuracyJudgementCount = statistics.AccuracyJudgementCount;
             currentComboPortion = statistics.ComboPortion;
             currentBonusPortion = statistics.BonusPortion;
         }

From 22c6d6c5262a97af2f1a129c2a6a6292ed76bad2 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Mon, 29 May 2023 14:22:40 +0300
Subject: [PATCH 0628/1604] Prevent checkbox from toggle on when column have no
 valid panels

---
 osu.Game/Overlays/Mods/ModColumn.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/ModColumn.cs b/osu.Game/Overlays/Mods/ModColumn.cs
index 71d964c618..f7d7d4db73 100644
--- a/osu.Game/Overlays/Mods/ModColumn.cs
+++ b/osu.Game/Overlays/Mods/ModColumn.cs
@@ -151,7 +151,10 @@ namespace osu.Game.Overlays.Mods
             if (toggleAllCheckbox != null && !SelectionAnimationRunning)
             {
                 toggleAllCheckbox.Alpha = availableMods.Any(panel => panel.IsValid) ? 1 : 0;
-                toggleAllCheckbox.Current.Value = availableMods.Where(panel => panel.IsValid).All(panel => panel.Active.Value);
+
+                //Prevent checkbox from checking when column have on valid panels
+                if (availableMods.Any(panel => panel.IsValid))
+                    toggleAllCheckbox.Current.Value = availableMods.Where(panel => panel.IsValid).All(panel => panel.Active.Value);
             }
         }
 

From 1c199b83e3453678888cfbe03b73cb123e43cfdb Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 29 May 2023 21:14:03 +0900
Subject: [PATCH 0629/1604] Replace mania scroll "time" with scroll "speed"

---
 .../ManiaRulesetConfigManager.cs              | 29 +++++++++++---
 .../ManiaSettingsSubsection.cs                |  9 ++---
 .../UI/DrawableManiaRuleset.cs                | 38 ++++++++++---------
 .../Localisation/RulesetSettingsStrings.cs    |  2 +-
 4 files changed, 49 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
index 99a80ef28d..5ba5125c2d 100644
--- a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
+++ b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
@@ -15,24 +15,41 @@ namespace osu.Game.Rulesets.Mania.Configuration
         public ManiaRulesetConfigManager(SettingsStore? settings, RulesetInfo ruleset, int? variant = null)
             : base(settings, ruleset, variant)
         {
+            migrate();
         }
 
         protected override void InitialiseDefaults()
         {
             base.InitialiseDefaults();
 
-            SetDefault(ManiaRulesetSetting.ScrollTime, 1500.0, DrawableManiaRuleset.MIN_TIME_RANGE, DrawableManiaRuleset.MAX_TIME_RANGE, 5);
+#pragma warning disable CS0618
+            // Although obsolete, this is still required to populate the bindable from the database in case migration is required.
+            SetDefault<double?>(ManiaRulesetSetting.ScrollTime, null);
+#pragma warning restore CS0618
+
+            SetDefault(ManiaRulesetSetting.ScrollSpeed, 8, 1, 40);
             SetDefault(ManiaRulesetSetting.ScrollDirection, ManiaScrollingDirection.Down);
             SetDefault(ManiaRulesetSetting.TimingBasedNoteColouring, false);
         }
 
+#pragma warning disable CS0618
+        private void migrate()
+        {
+            if (Get<double?>(ManiaRulesetSetting.ScrollTime) is double scrollTime)
+            {
+                SetValue(ManiaRulesetSetting.ScrollSpeed, (int)Math.Round(DrawableManiaRuleset.MAX_TIME_RANGE / scrollTime));
+                SetValue<double?>(ManiaRulesetSetting.ScrollTime, null);
+            }
+        }
+#pragma warning restore CS0618
+
         public override TrackedSettings CreateTrackedSettings() => new TrackedSettings
         {
-            new TrackedSetting<double>(ManiaRulesetSetting.ScrollTime,
-                scrollTime => new SettingDescription(
-                    rawValue: scrollTime,
+            new TrackedSetting<int>(ManiaRulesetSetting.ScrollSpeed,
+                speed => new SettingDescription(
+                    rawValue: speed,
                     name: RulesetSettingsStrings.ScrollSpeed,
-                    value: RulesetSettingsStrings.ScrollSpeedTooltip(scrollTime, (int)Math.Round(DrawableManiaRuleset.MAX_TIME_RANGE / scrollTime))
+                    value: RulesetSettingsStrings.ScrollSpeedTooltip(DrawableManiaRuleset.ComputeScrollTime(speed), speed)
                 )
             )
         };
@@ -40,7 +57,9 @@ namespace osu.Game.Rulesets.Mania.Configuration
 
     public enum ManiaRulesetSetting
     {
+        [Obsolete("Use ScrollSpeed instead.")] // Can be removed 2023-11-30
         ScrollTime,
+        ScrollSpeed,
         ScrollDirection,
         TimingBasedNoteColouring
     }
diff --git a/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs b/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
index fc0b4a9ed9..a5434a36ab 100644
--- a/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
@@ -34,10 +33,10 @@ namespace osu.Game.Rulesets.Mania
                     LabelText = RulesetSettingsStrings.ScrollingDirection,
                     Current = config.GetBindable<ManiaScrollingDirection>(ManiaRulesetSetting.ScrollDirection)
                 },
-                new SettingsSlider<double, ManiaScrollSlider>
+                new SettingsSlider<int, ManiaScrollSlider>
                 {
                     LabelText = RulesetSettingsStrings.ScrollSpeed,
-                    Current = config.GetBindable<double>(ManiaRulesetSetting.ScrollTime),
+                    Current = config.GetBindable<int>(ManiaRulesetSetting.ScrollSpeed),
                     KeyboardStep = 5
                 },
                 new SettingsCheckbox
@@ -48,9 +47,9 @@ namespace osu.Game.Rulesets.Mania
             };
         }
 
-        private partial class ManiaScrollSlider : RoundedSliderBar<double>
+        private partial class ManiaScrollSlider : RoundedSliderBar<int>
         {
-            public override LocalisableString TooltipText => RulesetSettingsStrings.ScrollSpeedTooltip(Current.Value, (int)Math.Round(DrawableManiaRuleset.MAX_TIME_RANGE / Current.Value));
+            public override LocalisableString TooltipText => RulesetSettingsStrings.ScrollSpeedTooltip(DrawableManiaRuleset.ComputeScrollTime(Current.Value), Current.Value);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index af8758fb5e..2d373c0471 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -33,12 +33,12 @@ namespace osu.Game.Rulesets.Mania.UI
     public partial class DrawableManiaRuleset : DrawableScrollingRuleset<ManiaHitObject>
     {
         /// <summary>
-        /// The minimum time range. This occurs at a <see cref="relativeTimeRange"/> of 40.
+        /// The minimum time range. This occurs at a <see cref="ManiaRulesetSetting.ScrollSpeed"/> of 40.
         /// </summary>
         public const double MIN_TIME_RANGE = 290;
 
         /// <summary>
-        /// The maximum time range. This occurs at a <see cref="relativeTimeRange"/> of 1.
+        /// The maximum time range. This occurs with a <see cref="ManiaRulesetSetting.ScrollSpeed"/> of 1.
         /// </summary>
         public const double MAX_TIME_RANGE = 11485;
 
@@ -69,7 +69,8 @@ namespace osu.Game.Rulesets.Mania.UI
         protected override ScrollVisualisationMethod VisualisationMethod => scrollMethod;
 
         private readonly Bindable<ManiaScrollingDirection> configDirection = new Bindable<ManiaScrollingDirection>();
-        private readonly BindableDouble configTimeRange = new BindableDouble();
+        private readonly BindableInt configScrollSpeed = new BindableInt();
+        private double smoothTimeRange;
 
         // Stores the current speed adjustment active in gameplay.
         private readonly Track speedAdjustmentTrack = new TrackVirtual(0);
@@ -78,6 +79,9 @@ namespace osu.Game.Rulesets.Mania.UI
             : base(ruleset, beatmap, mods)
         {
             BarLines = new BarLineGenerator<BarLine>(Beatmap).BarLines;
+
+            TimeRange.MinValue = 1;
+            TimeRange.MaxValue = MAX_TIME_RANGE;
         }
 
         [BackgroundDependencyLoader]
@@ -104,30 +108,28 @@ namespace osu.Game.Rulesets.Mania.UI
             Config.BindWith(ManiaRulesetSetting.ScrollDirection, configDirection);
             configDirection.BindValueChanged(direction => Direction.Value = (ScrollingDirection)direction.NewValue, true);
 
-            Config.BindWith(ManiaRulesetSetting.ScrollTime, configTimeRange);
-            TimeRange.MinValue = configTimeRange.MinValue;
-            TimeRange.MaxValue = configTimeRange.MaxValue;
+            Config.BindWith(ManiaRulesetSetting.ScrollSpeed, configScrollSpeed);
+            configScrollSpeed.BindValueChanged(speed => this.TransformTo(nameof(smoothTimeRange), ComputeScrollTime(speed.NewValue), 200, Easing.OutQuint));
+
+            TimeRange.Value = smoothTimeRange = ComputeScrollTime(configScrollSpeed.Value);
         }
 
-        protected override void AdjustScrollSpeed(int amount)
-        {
-            this.TransformTo(nameof(relativeTimeRange), relativeTimeRange + amount, 200, Easing.OutQuint);
-        }
-
-        private double relativeTimeRange
-        {
-            get => MAX_TIME_RANGE / configTimeRange.Value;
-            set => configTimeRange.Value = MAX_TIME_RANGE / value;
-        }
+        protected override void AdjustScrollSpeed(int amount) => configScrollSpeed.Value += amount;
 
         protected override void Update()
         {
             base.Update();
-
             updateTimeRange();
         }
 
-        private void updateTimeRange() => TimeRange.Value = configTimeRange.Value * speedAdjustmentTrack.AggregateTempo.Value * speedAdjustmentTrack.AggregateFrequency.Value;
+        private void updateTimeRange() => TimeRange.Value = smoothTimeRange * speedAdjustmentTrack.AggregateTempo.Value * speedAdjustmentTrack.AggregateFrequency.Value;
+
+        /// <summary>
+        /// Computes a scroll time (in milliseconds) from a scroll speed in the range of 1-40.
+        /// </summary>
+        /// <param name="scrollSpeed">The scroll speed.</param>
+        /// <returns>The scroll time.</returns>
+        public static double ComputeScrollTime(int scrollSpeed) => MAX_TIME_RANGE / scrollSpeed;
 
         public override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new ManiaPlayfieldAdjustmentContainer();
 
diff --git a/osu.Game/Localisation/RulesetSettingsStrings.cs b/osu.Game/Localisation/RulesetSettingsStrings.cs
index 52e6a5eaac..91bbece004 100644
--- a/osu.Game/Localisation/RulesetSettingsStrings.cs
+++ b/osu.Game/Localisation/RulesetSettingsStrings.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Localisation
         /// <summary>
         /// "{0}ms (speed {1})"
         /// </summary>
-        public static LocalisableString ScrollSpeedTooltip(double arg0, int arg1) => new TranslatableString(getKey(@"ruleset"), @"{0}ms (speed {1})", arg0, arg1);
+        public static LocalisableString ScrollSpeedTooltip(double scrollTime, int scrollSpeed) => new TranslatableString(getKey(@"ruleset"), @"{0:0}ms (speed {1})", scrollTime, scrollSpeed);
 
         private static string getKey(string key) => $@"{prefix}:{key}";
     }

From 314a0f80f319a05b97d3e2f5787c3ef3177b79a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 29 May 2023 22:12:37 +0200
Subject: [PATCH 0630/1604] Reword setting name & description

---
 osu.Game/Rulesets/Mods/ModAccuracyChallenge.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Mods/ModAccuracyChallenge.cs b/osu.Game/Rulesets/Mods/ModAccuracyChallenge.cs
index c951551af5..0072c21053 100644
--- a/osu.Game/Rulesets/Mods/ModAccuracyChallenge.cs
+++ b/osu.Game/Rulesets/Mods/ModAccuracyChallenge.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Rulesets.Mods
             Value = 0.9,
         };
 
-        [SettingSource("Accuracy Mode", "The Accuracy mode that will be used to Judge.")]
+        [SettingSource("Accuracy mode", "The mode of accuracy that will trigger failure.")]
         public Bindable<AccuracyMode> AccuracyJudgeMode { get; } = new Bindable<AccuracyMode>();
 
         private readonly Bindable<double> currentAccuracy = new Bindable<double>();

From 1b57b0d31c71aaf1578d83293be11a665fc2cdd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 29 May 2023 22:33:46 +0200
Subject: [PATCH 0631/1604] Add testing

---
 .../Mods/TestSceneModAccuracyChallenge.cs     | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Mods/TestSceneModAccuracyChallenge.cs

diff --git a/osu.Game.Tests/Visual/Mods/TestSceneModAccuracyChallenge.cs b/osu.Game.Tests/Visual/Mods/TestSceneModAccuracyChallenge.cs
new file mode 100644
index 0000000000..6bdb9132e1
--- /dev/null
+++ b/osu.Game.Tests/Visual/Mods/TestSceneModAccuracyChallenge.cs
@@ -0,0 +1,69 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Linq;
+using NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Osu.Objects;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Mods
+{
+    public partial class TestSceneModAccuracyChallenge : ModTestScene
+    {
+        protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
+
+        protected override TestPlayer CreateModPlayer(Ruleset ruleset)
+        {
+            var player = base.CreateModPlayer(ruleset);
+            return player;
+        }
+
+        protected override bool AllowFail => true;
+
+        [Test]
+        public void TestMaximumAchievableAccuracy() =>
+            CreateModTest(new ModTestData
+            {
+                Mod = new ModAccuracyChallenge
+                {
+                    MinimumAccuracy = { Value = 0.6 }
+                },
+                Autoplay = false,
+                Beatmap = new Beatmap
+                {
+                    HitObjects = Enumerable.Range(0, 5).Select(i => new HitCircle
+                    {
+                        StartTime = i * 250,
+                        Position = new Vector2(i * 50)
+                    }).Cast<HitObject>().ToList()
+                },
+                PassCondition = () => Player.GameplayState.HasFailed && Player.ScoreProcessor.JudgedHits >= 3
+            });
+
+        [Test]
+        public void TestStandardAccuracy() =>
+            CreateModTest(new ModTestData
+            {
+                Mod = new ModAccuracyChallenge
+                {
+                    MinimumAccuracy = { Value = 0.6 },
+                    AccuracyJudgeMode = { Value = ModAccuracyChallenge.AccuracyMode.Standard }
+                },
+                Autoplay = false,
+                Beatmap = new Beatmap
+                {
+                    HitObjects = Enumerable.Range(0, 5).Select(i => new HitCircle
+                    {
+                        StartTime = i * 250,
+                        Position = new Vector2(i * 50)
+                    }).Cast<HitObject>().ToList()
+                },
+                PassCondition = () => Player.GameplayState.HasFailed && Player.ScoreProcessor.JudgedHits >= 1
+            });
+    }
+}

From 79694897bef29810846bc156455880b19658723f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 May 2023 12:58:22 +0900
Subject: [PATCH 0632/1604] Ensure a potential exception from
 `cleanupPendingDeletions` doesn't mark realm corrupt

The whole restructure here is to move the nested call out of the
`try-catch`. I noticed this while looking at a corrupt database issue a
user reported (https://github.com/ppy/osu/discussions/23694).

It's not the first time we've seen a corrupt database error where the
"corrupt" version works just fine on a second attempt.

Maybe this isn't the issue and it's just a transitive file access violation
but it definitely feels like this should be fixed regardless.
---
 osu.Game/Database/RealmAccess.cs | 79 +++++++++++++++++---------------
 1 file changed, 41 insertions(+), 38 deletions(-)

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index 831e328439..55b5e0114d 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -179,43 +179,9 @@ namespace osu.Game.Database
                 applyFilenameSchemaSuffix(ref Filename);
 #endif
 
-            string newerVersionFilename = $"{Filename.Replace(realm_extension, string.Empty)}_newer_version{realm_extension}";
-
-            // Attempt to recover a newer database version if available.
-            if (storage.Exists(newerVersionFilename))
-            {
-                Logger.Log(@"A newer realm database has been found, attempting recovery...", LoggingTarget.Database);
-                attemptRecoverFromFile(newerVersionFilename);
-            }
-
-            try
-            {
+            using (var realm = prepareFirstRealmAccess())
                 // This method triggers the first `getRealmInstance` call, which will implicitly run realm migrations and bring the schema up-to-date.
-                cleanupPendingDeletions();
-            }
-            catch (Exception e)
-            {
-                // See https://github.com/realm/realm-core/blob/master/src%2Frealm%2Fobject-store%2Fobject_store.cpp#L1016-L1022
-                // This is the best way we can detect a schema version downgrade.
-                if (e.Message.StartsWith(@"Provided schema version", StringComparison.Ordinal))
-                {
-                    Logger.Error(e, "Your local database is too new to work with this version of osu!. Please close osu! and install the latest release to recover your data.");
-
-                    // If a newer version database already exists, don't backup again. We can presume that the first backup is the one we care about.
-                    if (!storage.Exists(newerVersionFilename))
-                        createBackup(newerVersionFilename);
-
-                    storage.Delete(Filename);
-                }
-                else
-                {
-                    Logger.Error(e, "Realm startup failed with unrecoverable error; starting with a fresh database. A backup of your database has been made.");
-                    createBackup($"{Filename.Replace(realm_extension, string.Empty)}_{DateTimeOffset.UtcNow.ToUnixTimeSeconds()}_corrupt{realm_extension}");
-                    storage.Delete(Filename);
-                }
-
-                cleanupPendingDeletions();
-            }
+                cleanupPendingDeletions(realm);
         }
 
         /// <summary>
@@ -312,9 +278,46 @@ namespace osu.Game.Database
             Logger.Log(@"Recovery complete!", LoggingTarget.Database);
         }
 
-        private void cleanupPendingDeletions()
+        private Realm prepareFirstRealmAccess()
+        {
+            string newerVersionFilename = $"{Filename.Replace(realm_extension, string.Empty)}_newer_version{realm_extension}";
+
+            // Attempt to recover a newer database version if available.
+            if (storage.Exists(newerVersionFilename))
+            {
+                Logger.Log(@"A newer realm database has been found, attempting recovery...", LoggingTarget.Database);
+                attemptRecoverFromFile(newerVersionFilename);
+            }
+
+            try
+            {
+                return getRealmInstance();
+            }
+            catch (Exception e)
+            {
+                // See https://github.com/realm/realm-core/blob/master/src%2Frealm%2Fobject-store%2Fobject_store.cpp#L1016-L1022
+                // This is the best way we can detect a schema version downgrade.
+                if (e.Message.StartsWith(@"Provided schema version", StringComparison.Ordinal))
+                {
+                    Logger.Error(e, "Your local database is too new to work with this version of osu!. Please close osu! and install the latest release to recover your data.");
+
+                    // If a newer version database already exists, don't backup again. We can presume that the first backup is the one we care about.
+                    if (!storage.Exists(newerVersionFilename))
+                        createBackup(newerVersionFilename);
+                }
+                else
+                {
+                    Logger.Error(e, "Realm startup failed with unrecoverable error; starting with a fresh database. A backup of your database has been made.");
+                    createBackup($"{Filename.Replace(realm_extension, string.Empty)}_{DateTimeOffset.UtcNow.ToUnixTimeSeconds()}_corrupt{realm_extension}");
+                }
+
+                storage.Delete(Filename);
+                return getRealmInstance();
+            }
+        }
+
+        private void cleanupPendingDeletions(Realm realm)
         {
-            using (var realm = getRealmInstance())
             using (var transaction = realm.BeginWrite())
             {
                 var pendingDeleteScores = realm.All<ScoreInfo>().Where(s => s.DeletePending);

From a0be52626639b8cbe2e6db7280fc3c106bdb9cd6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 May 2023 13:04:32 +0900
Subject: [PATCH 0633/1604] Adjust realm backup procedure to hard fail if
 running out of attempts

Previously, if the backup procedure failed, startup would continue and
the user's realm database may be deleted. I think in such a fail case
I'd rather the game didn't startup so the user gets in touch (or reads
the log files themselves) rather than potentially losing data.
---
 osu.Game/Database/RealmAccess.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index 55b5e0114d..2e66ad8b02 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -912,7 +912,7 @@ namespace osu.Game.Database
 
             int attempts = 10;
 
-            while (attempts-- > 0)
+            while (true)
             {
                 try
                 {
@@ -930,6 +930,9 @@ namespace osu.Game.Database
                 }
                 catch (IOException)
                 {
+                    if (attempts-- <= 0)
+                        throw;
+
                     // file may be locked during use.
                     Thread.Sleep(500);
                 }

From e35623df22874e4dfc3c9f9ad721bebb422aa570 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 May 2023 13:38:39 +0900
Subject: [PATCH 0634/1604] Update to use new `Filter` method and remove silly
 `ForcedSearchTerm`

---
 osu.Game/Overlays/Mods/ModSearchContainer.cs | 17 +++++++----------
 osu.Game/Overlays/Mods/ModSelectColumn.cs    |  2 +-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSearchContainer.cs b/osu.Game/Overlays/Mods/ModSearchContainer.cs
index 132c02db1e..784322b892 100644
--- a/osu.Game/Overlays/Mods/ModSearchContainer.cs
+++ b/osu.Game/Overlays/Mods/ModSearchContainer.cs
@@ -7,23 +7,20 @@ namespace osu.Game.Overlays.Mods
 {
     public partial class ModSearchContainer : SearchContainer
     {
-        /// <summary>
-        /// Same as <see cref="SearchContainer{T}.SearchTerm"/> except the filtering is guarantied to be performed
-        /// </summary>
-        /// <remarks>
-        /// This is required because <see cref="ModColumn"/> can be hidden when search term applied
-        /// therefore <see cref="SearchContainer{T}.Update"/> cannot be reached and filter cannot automatically re-validate itself.
-        /// </remarks>
-        public string ForcedSearchTerm
+        public new string SearchTerm
         {
-            get => SearchTerm;
+            get => base.SearchTerm;
             set
             {
                 if (value == SearchTerm)
                     return;
 
                 SearchTerm = value;
-                Update();
+
+                // Manual filtering here is required because ModColumn can be hidden when search term applied,
+                // causing the whole SearchContainer to become non-present and never actually perform a subsequent
+                // filter.
+                Filter();
             }
         }
     }
diff --git a/osu.Game/Overlays/Mods/ModSelectColumn.cs b/osu.Game/Overlays/Mods/ModSelectColumn.cs
index c80eb8c09c..338ebdaef4 100644
--- a/osu.Game/Overlays/Mods/ModSelectColumn.cs
+++ b/osu.Game/Overlays/Mods/ModSelectColumn.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Overlays.Mods
 
         public string SearchTerm
         {
-            set => ItemsFlow.ForcedSearchTerm = value;
+            set => ItemsFlow.SearchTerm = value;
         }
 
         protected override bool ReceivePositionalInputAtSubTree(Vector2 screenSpacePos) => base.ReceivePositionalInputAtSubTree(screenSpacePos) && Active.Value;

From 4e0f40bee5f31dc15b6165d2d65ef7a283048ffc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 May 2023 14:20:26 +0900
Subject: [PATCH 0635/1604] Split out multiplier retrieval into a function and
 use a default multiplier for all rulesets

---
 .../Scoring/Legacy/ScoreInfoExtensions.cs     | 32 +++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs b/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
index af991c7ea3..84bf6d15f6 100644
--- a/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
+++ b/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
@@ -23,10 +23,32 @@ namespace osu.Game.Scoring.Legacy
             if (mode == ScoringMode.Standardised)
                 return score;
 
+            int maxBasicJudgements = maximumStatistics
+                                     .Where(k => k.Key.IsBasic())
+                                     .Select(k => k.Value)
+                                     .DefaultIfEmpty(0)
+                                     .Sum();
+
+            // This gives a similar feeling to osu!stable scoring (ScoreV1) while keeping classic scoring as only a constant multiple of standardised scoring.
+            // The invariant is important to ensure that scores don't get re-ordered on leaderboards between the two scoring modes.
+            double scaledRawScore = score / ScoreProcessor.MAX_SCORE;
+
+            return (long)Math.Round(Math.Pow(scaledRawScore * Math.Max(1, maxBasicJudgements), 2) * getStandardisedToClassicMultiplier(rulesetId));
+        }
+
+        /// <summary>
+        /// Returns a ballpark multiplier which gives a similar "feel" for how large scores should get when displayed in "classic" mode.
+        /// This is different per ruleset to match the different algorithms used in the scoring implementation.
+        /// </summary>
+        private static double getStandardisedToClassicMultiplier(int rulesetId)
+        {
             double multiplier;
 
             switch (rulesetId)
             {
+                // For non-legacy rulesets, just go with the same as the osu! ruleset.
+                // This is arbitrary, but at least allows the setting to do something to the score.
+                default:
                 case 0:
                     multiplier = 36;
                     break;
@@ -42,17 +64,9 @@ namespace osu.Game.Scoring.Legacy
                 case 3:
                     multiplier = 16;
                     break;
-
-                default:
-                    return score;
             }
 
-            int maxBasicJudgements = maximumStatistics.Where(k => k.Key.IsBasic()).Select(k => k.Value).DefaultIfEmpty(0).Sum();
-
-            // This gives a similar feeling to osu!stable scoring (ScoreV1) while keeping classic scoring as only a constant multiple of standardised scoring.
-            // The invariant is important to ensure that scores don't get re-ordered on leaderboards between the two scoring modes.
-            double scaledRawScore = score / ScoreProcessor.MAX_SCORE;
-            return (long)Math.Round(Math.Pow(scaledRawScore * Math.Max(1, maxBasicJudgements), 2) * multiplier);
+            return multiplier;
         }
 
         public static int? GetCountGeki(this ScoreInfo scoreInfo)

From 3e94d4bb5ad417c2df44cff2a9818ce0b0ebdf8f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 May 2023 15:18:22 +0900
Subject: [PATCH 0636/1604] Fix cursor ripples appearing in a weird place when
 "autopilot" mod is enabled

---
 osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs b/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
index 4782a0e49c..3841c9c716 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
@@ -24,7 +24,17 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override ModType Type => ModType.Automation;
         public override LocalisableString Description => @"Automatic cursor movement - just follow the rhythm.";
         public override double ScoreMultiplier => 0.1;
-        public override Type[] IncompatibleMods => new[] { typeof(OsuModSpunOut), typeof(ModRelax), typeof(ModFailCondition), typeof(ModNoFail), typeof(ModAutoplay), typeof(OsuModMagnetised), typeof(OsuModRepel) };
+
+        public override Type[] IncompatibleMods => new[]
+        {
+            typeof(OsuModSpunOut),
+            typeof(ModRelax),
+            typeof(ModFailCondition),
+            typeof(ModNoFail),
+            typeof(ModAutoplay),
+            typeof(OsuModMagnetised),
+            typeof(OsuModRepel)
+        };
 
         public bool PerformFail() => false;
 
@@ -34,7 +44,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         private List<OsuReplayFrame> replayFrames = null!;
 
-        private int currentFrame;
+        private int currentFrame = -1;
 
         public void Update(Playfield playfield)
         {
@@ -43,8 +53,9 @@ namespace osu.Game.Rulesets.Osu.Mods
             double time = playfield.Clock.CurrentTime;
 
             // Very naive implementation of autopilot based on proximity to replay frames.
+            // Special case for the first frame is required to ensure the mouse is in a sane position until the actual time of the first frame is hit.
             // TODO: this needs to be based on user interactions to better match stable (pausing until judgement is registered).
-            if (Math.Abs(replayFrames[currentFrame + 1].Time - time) <= Math.Abs(replayFrames[currentFrame].Time - time))
+            if (currentFrame < 0 || Math.Abs(replayFrames[currentFrame + 1].Time - time) <= Math.Abs(replayFrames[currentFrame].Time - time))
             {
                 currentFrame++;
                 new MousePositionAbsoluteInput { Position = playfield.ToScreenSpace(replayFrames[currentFrame].Position) }.Apply(inputManager.CurrentState, inputManager);

From 1bde35c61b30a1bda2e5f468b40fdbc9a441e917 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 May 2023 15:24:06 +0900
Subject: [PATCH 0637/1604] Remove link to very dated blog post

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index eb2fe6d0eb..91f1746183 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,6 @@ We are accepting bug reports (please report with as much detail as possible and
 
 - Detailed release changelogs are available on the [official osu! site](https://osu.ppy.sh/home/changelog/lazer).
 - You can learn more about our approach to [project management](https://github.com/ppy/osu/wiki/Project-management).
-- Read peppy's [blog post](https://blog.ppy.sh/a-definitive-lazer-faq/) exploring where the project is currently and the roadmap going forward.
 
 ## Running osu!
 

From 654940afb0256cff12aef9f90737b25b135a1fed Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 May 2023 15:28:41 +0900
Subject: [PATCH 0638/1604] Update various text

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 91f1746183..d4b401e528 100644
--- a/README.md
+++ b/README.md
@@ -16,9 +16,9 @@ The future of [osu!](https://osu.ppy.sh) and the beginning of an open era! Curre
 
 ## Status
 
-This project is under heavy development, but is in a stable state. Users are encouraged to try it out and keep it installed alongside the stable *osu!* client. It will continue to evolve to the point of eventually replacing the existing stable client as an update.
+This project is under constant development, but we aim to keep things in a stable state. Users are encouraged to try it out and keep it installed alongside the stable *osu!* client. It will continue to evolve to the point of eventually replacing the existing stable client as an update.
 
-**IMPORTANT:** Gameplay mechanics (and other features which you may have come to know and love) are in a constant state of flux. Game balance and final quality-of-life passes come at the end of development, preceded by experimentation and changes which may potentially **reduce playability or usability**. This is done in order to allow us to move forward as developers and designers more efficiently. If this offends you, please consider sticking to the stable releases of osu! (found on the website). We are not yet open to heated discussion over game mechanics and will not be using github as a forum for such discussions just yet.
+**IMPORTANT:** Gameplay mechanics (and other features which you may have come to know and love) are in a constant state of flux. Game balance and final quality-of-life passes come at the end of development, preceded by experimentation and changes which may potentially **reduce playability or usability**. This is done in order to allow us to move forward as developers and designers more efficiently. If this offends you, please consider sticking to a [stable release](https://osu.ppy.sh/home/download) of osu!. We are not yet open to heated discussion over game mechanics and will not be using github as a forum for such discussions just yet.
 
 We are accepting bug reports (please report with as much detail as possible and follow the existing issue templates). Feature requests are also welcome, but understand that our focus is on completing the game to feature parity before adding new features. A few resources are available as starting points to getting involved and understanding the project:
 
@@ -27,9 +27,9 @@ We are accepting bug reports (please report with as much detail as possible and
 
 ## Running osu!
 
-If you are looking to install or test osu! without setting up a development environment, you can consume our [binary releases](https://github.com/ppy/osu/releases). Handy links below will download the latest version for your operating system of choice:
+If you are looking to install or test osu! without setting up a development environment, you can consume our [releases](https://github.com/ppy/osu/releases). You can also generally download a version for your current device from the [osu! site](https://osu.ppy.sh/home/download). Failing that, you may use the links below to download the latest version for your operating system of choice:
 
-**Latest build:**
+**Latest release:**
 
 | [Windows 8.1+ (x64)](https://github.com/ppy/osu/releases/latest/download/install.exe) | macOS 10.15+ ([Intel](https://github.com/ppy/osu/releases/latest/download/osu.app.Intel.zip), [Apple Silicon](https://github.com/ppy/osu/releases/latest/download/osu.app.Apple.Silicon.zip)) | [Linux (x64)](https://github.com/ppy/osu/releases/latest/download/osu.AppImage) | [iOS 13.4+](https://osu.ppy.sh/home/testflight) | [Android 5+](https://github.com/ppy/osu/releases/latest/download/sh.ppy.osulazer.apk) |
 | ------------- | ------------- | ------------- | ------------- | ------------- |

From 4d2c3f17e828ab991344c866d897051d65184f6a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 May 2023 15:30:29 +0900
Subject: [PATCH 0639/1604] Remove outdated prerequisites

---
 README.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index d4b401e528..e4b8e1fc97 100644
--- a/README.md
+++ b/README.md
@@ -49,9 +49,8 @@ You can see some examples of custom rulesets by visiting the [custom ruleset dir
 Please make sure you have the following prerequisites:
 
 - A desktop platform with the [.NET 6.0 SDK](https://dotnet.microsoft.com/download) installed.
-- When developing with mobile, [Xamarin](https://docs.microsoft.com/en-us/xamarin/) is required, which is shipped together with Visual Studio or [Visual Studio for Mac](https://visualstudio.microsoft.com/vs/mac/).
-- When working with the codebase, we recommend using an IDE with intelligent code completion and syntax highlighting, such as the latest version of [Visual Studio](https://visualstudio.microsoft.com/vs/), [JetBrains Rider](https://www.jetbrains.com/rider/) or [Visual Studio Code](https://code.visualstudio.com/).
-- When running on Linux, please have a system-wide FFmpeg installation available to support video decoding.
+
+When working with the codebase, we recommend using an IDE with intelligent code completion and syntax highlighting, such as the latest version of [Visual Studio](https://visualstudio.microsoft.com/vs/), [JetBrains Rider](https://www.jetbrains.com/rider/) or [Visual Studio Code](https://code.visualstudio.com/).
 
 ### Downloading the source code
 

From 9d844f2381ba0b81c7312f9e2779ed131176d39b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 May 2023 15:37:12 +0900
Subject: [PATCH 0640/1604] Update documentation for local framework /
 resources

---
 README.md | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e4b8e1fc97..cf7ce35791 100644
--- a/README.md
+++ b/README.md
@@ -87,7 +87,29 @@ _Due to a historical feature gap between .NET Core and Xamarin, running `dotnet`
 
 ### Testing with resource/framework modifications
 
-Sometimes it may be necessary to cross-test changes in [osu-resources](https://github.com/ppy/osu-resources) or [osu-framework](https://github.com/ppy/osu-framework). This can be achieved by running some commands as documented on the [osu-resources](https://github.com/ppy/osu-resources/wiki/Testing-local-resources-checkout-with-other-projects) and [osu-framework](https://github.com/ppy/osu-framework/wiki/Testing-local-framework-checkout-with-other-projects) wiki pages.
+Sometimes it may be necessary to cross-test changes in [osu-resources](https://github.com/ppy/osu-resources) or [osu-framework](https://github.com/ppy/osu-framework). This can be quickly achieved using included commands:
+
+Windows:
+
+```ps
+UseLocalFramework.ps1
+UseLocalResources.ps1
+```
+
+macOS / Linux:
+
+```ps
+UseLocalFramework.sh
+UseLocalResources.sh
+```
+
+Note that these commands assume you have the relevant project(s) checked out in adjacent directories:
+
+```
+|- osu            // this repository
+|- osu-framework
+|- osu-resources
+```
 
 ### Code analysis
 

From b456c36f6453309ad902c8a488696dd6798ed86f Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 30 May 2023 17:27:48 +0900
Subject: [PATCH 0641/1604] Migrate in InitialiseDefaults()

---
 .../Configuration/ManiaRulesetConfigManager.cs     | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
index 5ba5125c2d..b2155968ea 100644
--- a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
+++ b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
@@ -15,33 +15,27 @@ namespace osu.Game.Rulesets.Mania.Configuration
         public ManiaRulesetConfigManager(SettingsStore? settings, RulesetInfo ruleset, int? variant = null)
             : base(settings, ruleset, variant)
         {
-            migrate();
         }
 
         protected override void InitialiseDefaults()
         {
             base.InitialiseDefaults();
 
-#pragma warning disable CS0618
-            // Although obsolete, this is still required to populate the bindable from the database in case migration is required.
-            SetDefault<double?>(ManiaRulesetSetting.ScrollTime, null);
-#pragma warning restore CS0618
-
             SetDefault(ManiaRulesetSetting.ScrollSpeed, 8, 1, 40);
             SetDefault(ManiaRulesetSetting.ScrollDirection, ManiaScrollingDirection.Down);
             SetDefault(ManiaRulesetSetting.TimingBasedNoteColouring, false);
-        }
 
 #pragma warning disable CS0618
-        private void migrate()
-        {
+            // Although obsolete, this is still required to populate the bindable from the database in case migration is required.
+            SetDefault<double?>(ManiaRulesetSetting.ScrollTime, null);
+
             if (Get<double?>(ManiaRulesetSetting.ScrollTime) is double scrollTime)
             {
                 SetValue(ManiaRulesetSetting.ScrollSpeed, (int)Math.Round(DrawableManiaRuleset.MAX_TIME_RANGE / scrollTime));
                 SetValue<double?>(ManiaRulesetSetting.ScrollTime, null);
             }
-        }
 #pragma warning restore CS0618
+        }
 
         public override TrackedSettings CreateTrackedSettings() => new TrackedSettings
         {

From ed850196d9b780b4cd30511f8b0c37750a0c30ab Mon Sep 17 00:00:00 2001
From: John <johntbiddle@gmail.com>
Date: Tue, 30 May 2023 01:43:08 -0700
Subject: [PATCH 0642/1604] Reverted to applying the color change in OnUpdate,
 removed EnableComboColour flag from DrawableHitObject.cs

---
 osu.Game.Rulesets.Osu/Mods/OsuModSnapColour.cs        | 11 ++++-------
 .../Rulesets/Objects/Drawables/DrawableHitObject.cs   |  6 ------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModSnapColour.cs b/osu.Game.Rulesets.Osu/Mods/OsuModSnapColour.cs
index 4fda6130c0..f6fffaf736 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModSnapColour.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModSnapColour.cs
@@ -31,13 +31,10 @@ namespace osu.Game.Rulesets.Osu.Mods
         {
             if (currentBeatmap.IsNull() || drawable.IsNull()) return;
 
-            drawable.ApplyCustomUpdateState += (drawableObject, state) =>
-            {
-                int snapDivisor = currentBeatmap.ControlPointInfo.GetClosestBeatDivisor(drawableObject.HitObject.StartTime);
-
-                drawableObject.EnableComboColour = false;
-                drawableObject.AccentColour.Value = BindableBeatDivisor.GetColourFor(snapDivisor, colours);
-            };
+            drawable.OnUpdate += _ =>
+                drawable.AccentColour.Value = BindableBeatDivisor.GetColourFor(
+                    currentBeatmap.ControlPointInfo.GetClosestBeatDivisor(drawable.HitObject.StartTime),
+                    colours);
         }
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index cbaa07bebc..07c0d1f8a1 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -74,11 +74,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
         public override bool PropagateNonPositionalInputSubTree => HandleUserInput;
 
-        /// <summary>
-        /// Whether this object should be coloured using its combo position
-        /// </summary>
-        public bool EnableComboColour { get; set; } = true;
-
         /// <summary>
         /// Invoked by this or a nested <see cref="DrawableHitObject"/> after a <see cref="JudgementResult"/> has been applied.
         /// </summary>
@@ -533,7 +528,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
         protected void UpdateComboColour()
         {
             if (!(HitObject is IHasComboInformation combo)) return;
-            if (!EnableComboColour) return;
 
             Color4 colour = combo.GetComboColour(CurrentSkin);
 

From 741ee84ed6f14bc8b4e0bf7f073698d4319399c6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 May 2023 18:38:28 +0900
Subject: [PATCH 0643/1604] Add comment and use full conditional similar to
 extension method
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
index cfaae56d0f..50d1d1addd 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
@@ -133,7 +133,10 @@ namespace osu.Game.Screens.OnlinePlay
 
             Debug.Assert(screenStack.CurrentScreen != null);
 
-            if (screenStack.CurrentScreen.IsCurrentScreen())
+            // if a subscreen was pushed to the nested stack while this screen was not present, this path will proxy `OnResuming()`
+            // to the subscreen before `OnEntering()` can even be called for the subscreen, breaking ordering expectations.
+            // to work around this, do not proxy resume to screens that haven't loaded yet.
+            if ((screenStack.CurrentScreen as Drawable)?.IsLoaded == true)
                 screenStack.CurrentScreen.OnResuming(e);
 
             base.OnResuming(e);

From d119447a10a1ac0312a6aa9691348cbabed8c6ba Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 30 May 2023 16:41:42 +0300
Subject: [PATCH 0644/1604] Fix editor timeline hitobjects popping in

---
 .../Compose/Components/Timeline/TimelineHitObjectBlueprint.cs   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index ea063e9216..900f0ff4a2 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -244,6 +244,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         public override Vector2 ScreenSpaceSelectionPoint => ScreenSpaceDrawQuad.TopLeft;
 
+        protected override bool ComputeIsMaskedAway(RectangleF maskingBounds) => false;
+
         private partial class Tick : Circle
         {
             public Tick()

From 62d177440730e507ff3b080dd8c1c1eca66ea6bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 30 May 2023 21:54:56 +0200
Subject: [PATCH 0645/1604] Apply same comment & reworded condition to suspend
 too

---
 osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
index 50d1d1addd..37b50b4863 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
@@ -133,7 +133,7 @@ namespace osu.Game.Screens.OnlinePlay
 
             Debug.Assert(screenStack.CurrentScreen != null);
 
-            // if a subscreen was pushed to the nested stack while this screen was not present, this path will proxy `OnResuming()`
+            // if a subscreen was pushed to the nested stack while the stack was not present, this path will proxy `OnResuming()`
             // to the subscreen before `OnEntering()` can even be called for the subscreen, breaking ordering expectations.
             // to work around this, do not proxy resume to screens that haven't loaded yet.
             if ((screenStack.CurrentScreen as Drawable)?.IsLoaded == true)
@@ -149,7 +149,10 @@ namespace osu.Game.Screens.OnlinePlay
 
             Debug.Assert(screenStack.CurrentScreen != null);
 
-            if (screenStack.CurrentScreen.IsCurrentScreen())
+            // if a subscreen was pushed to the nested stack while the stack was not present, this path will proxy `OnSuspending()`
+            // to the subscreen before `OnEntering()` can even be called for the subscreen, breaking ordering expectations.
+            // to work around this, do not proxy suspend to screens that haven't loaded yet.
+            if ((screenStack.CurrentScreen as Drawable)?.IsLoaded == true)
                 screenStack.CurrentScreen.OnSuspending(e);
         }
 

From 2e81cae201e77229445b97923aaa62be739ac47a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 30 May 2023 23:17:07 +0200
Subject: [PATCH 0646/1604] Move comment to more correct place

---
 osu.Game/Database/RealmAccess.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index 2e66ad8b02..1aef8f1c67 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -179,8 +179,8 @@ namespace osu.Game.Database
                 applyFilenameSchemaSuffix(ref Filename);
 #endif
 
+            // `prepareFirstRealmAccess()` triggers the first `getRealmInstance` call, which will implicitly run realm migrations and bring the schema up-to-date.
             using (var realm = prepareFirstRealmAccess())
-                // This method triggers the first `getRealmInstance` call, which will implicitly run realm migrations and bring the schema up-to-date.
                 cleanupPendingDeletions(realm);
         }
 

From 18eb15bfa5af004fc2e35f2ec6c017b0cf4a44f4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 31 May 2023 19:39:43 +0900
Subject: [PATCH 0647/1604] Gracefully handle failures in cleaning up pending
 file deletions

---
 osu.Game/Database/RealmAccess.cs | 71 ++++++++++++++++++--------------
 1 file changed, 39 insertions(+), 32 deletions(-)

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index 1aef8f1c67..94108531e8 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -318,46 +318,53 @@ namespace osu.Game.Database
 
         private void cleanupPendingDeletions(Realm realm)
         {
-            using (var transaction = realm.BeginWrite())
+            try
             {
-                var pendingDeleteScores = realm.All<ScoreInfo>().Where(s => s.DeletePending);
-
-                foreach (var score in pendingDeleteScores)
-                    realm.Remove(score);
-
-                var pendingDeleteSets = realm.All<BeatmapSetInfo>().Where(s => s.DeletePending);
-
-                foreach (var beatmapSet in pendingDeleteSets)
+                using (var transaction = realm.BeginWrite())
                 {
-                    foreach (var beatmap in beatmapSet.Beatmaps)
-                    {
-                        // Cascade delete related scores, else they will have a null beatmap against the model's spec.
-                        foreach (var score in beatmap.Scores)
-                            realm.Remove(score);
+                    var pendingDeleteScores = realm.All<ScoreInfo>().Where(s => s.DeletePending);
 
-                        realm.Remove(beatmap.Metadata);
-                        realm.Remove(beatmap);
+                    foreach (var score in pendingDeleteScores)
+                        realm.Remove(score);
+
+                    var pendingDeleteSets = realm.All<BeatmapSetInfo>().Where(s => s.DeletePending);
+
+                    foreach (var beatmapSet in pendingDeleteSets)
+                    {
+                        foreach (var beatmap in beatmapSet.Beatmaps)
+                        {
+                            // Cascade delete related scores, else they will have a null beatmap against the model's spec.
+                            foreach (var score in beatmap.Scores)
+                                realm.Remove(score);
+
+                            realm.Remove(beatmap.Metadata);
+                            realm.Remove(beatmap);
+                        }
+
+                        realm.Remove(beatmapSet);
                     }
 
-                    realm.Remove(beatmapSet);
+                    var pendingDeleteSkins = realm.All<SkinInfo>().Where(s => s.DeletePending);
+
+                    foreach (var s in pendingDeleteSkins)
+                        realm.Remove(s);
+
+                    var pendingDeletePresets = realm.All<ModPreset>().Where(s => s.DeletePending);
+
+                    foreach (var s in pendingDeletePresets)
+                        realm.Remove(s);
+
+                    transaction.Commit();
                 }
 
-                var pendingDeleteSkins = realm.All<SkinInfo>().Where(s => s.DeletePending);
-
-                foreach (var s in pendingDeleteSkins)
-                    realm.Remove(s);
-
-                var pendingDeletePresets = realm.All<ModPreset>().Where(s => s.DeletePending);
-
-                foreach (var s in pendingDeletePresets)
-                    realm.Remove(s);
-
-                transaction.Commit();
+                // clean up files after dropping any pending deletions.
+                // in the future we may want to only do this when the game is idle, rather than on every startup.
+                new RealmFileStore(this, storage).Cleanup();
+            }
+            catch (Exception e)
+            {
+                Logger.Error(e, "Failed to clean up unused files. This is not critical but please report if it happens regularly.");
             }
-
-            // clean up files after dropping any pending deletions.
-            // in the future we may want to only do this when the game is idle, rather than on every startup.
-            new RealmFileStore(this, storage).Cleanup();
         }
 
         /// <summary>

From 20439e80f6658937a940b3d603582212acb605c2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 31 May 2023 23:24:15 +0900
Subject: [PATCH 0648/1604] Adjust background colour used in
 `LabelledDrawable`s to allow visibility of sliders

---
 osu.Game/Graphics/UserInterfaceV2/LabelledDrawable.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/UserInterfaceV2/LabelledDrawable.cs b/osu.Game/Graphics/UserInterfaceV2/LabelledDrawable.cs
index 9b7087ce6d..16bad5785f 100644
--- a/osu.Game/Graphics/UserInterfaceV2/LabelledDrawable.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/LabelledDrawable.cs
@@ -152,7 +152,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
         [BackgroundDependencyLoader(true)]
         private void load(OverlayColourProvider? colourProvider, OsuColour osuColour)
         {
-            background.Colour = colourProvider?.Background5 ?? Color4Extensions.FromHex(@"1c2125");
+            background.Colour = colourProvider?.Background4 ?? Color4Extensions.FromHex(@"1c2125");
             descriptionText.Colour = osuColour.Yellow;
         }
 

From 7bc3b2072caed1124ddc3b722957a08e0084fd44 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Jun 2023 00:44:13 +0900
Subject: [PATCH 0649/1604] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 6aebae665d..c88bea8265 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -11,7 +11,7 @@
     <AndroidManifestMerger>manifestmerger.jar</AndroidManifestMerger>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.521.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.531.0" />
   </ItemGroup>
   <ItemGroup>
     <AndroidManifestOverlay Include="$(MSBuildThisFileDirectory)osu.Android\Properties\AndroidManifestOverlay.xml" />
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 0fd2b0c2c5..8a941ca6c1 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,7 +36,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="10.20.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.521.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.531.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.510.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index e4a169f8e5..1dcece7741 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -16,6 +16,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.521.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.531.0" />
   </ItemGroup>
 </Project>

From 6e00b21a3200ceb5f416d19ecc6cb41fd62e7b6d Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Wed, 31 May 2023 19:16:16 +0300
Subject: [PATCH 0650/1604] Update framework version

---
 osu.Game/osu.Game.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 0fd2b0c2c5..db6d9b07cd 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup Label="Project">
     <TargetFramework>net6.0</TargetFramework>
     <OutputType>Library</OutputType>
@@ -36,7 +36,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="10.20.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.521.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.531.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.510.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />

From 5a1c3aeb7e7ef0b735ef8f6fa071afd216f192ca Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Wed, 31 May 2023 19:36:42 +0300
Subject: [PATCH 0651/1604] Fix `SearchTerm` set causing infinite loop

---
 osu.Game/Overlays/Mods/ModSearchContainer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/ModSearchContainer.cs b/osu.Game/Overlays/Mods/ModSearchContainer.cs
index 784322b892..8787530d5c 100644
--- a/osu.Game/Overlays/Mods/ModSearchContainer.cs
+++ b/osu.Game/Overlays/Mods/ModSearchContainer.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Overlays.Mods
                 if (value == SearchTerm)
                     return;
 
-                SearchTerm = value;
+                base.SearchTerm = value;
 
                 // Manual filtering here is required because ModColumn can be hidden when search term applied,
                 // causing the whole SearchContainer to become non-present and never actually perform a subsequent

From 659fb80c16ce124dfd66ac1c4d3ea864e376ec0c Mon Sep 17 00:00:00 2001
From: timiimit <timi.korda@gmail.com>
Date: Wed, 31 May 2023 19:06:41 +0200
Subject: [PATCH 0652/1604] Add `BeatmapInfo.LastEditTime` property

---
 osu.Game/Beatmaps/BeatmapInfo.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Beatmaps/BeatmapInfo.cs b/osu.Game/Beatmaps/BeatmapInfo.cs
index 393feff087..7ca0e24913 100644
--- a/osu.Game/Beatmaps/BeatmapInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapInfo.cs
@@ -171,6 +171,8 @@ namespace osu.Game.Beatmaps
 
         public double TimelineZoom { get; set; } = 1.0;
 
+        public double? LastEditTime { get; set; }
+
         [Ignored]
         public CountdownType Countdown { get; set; } = CountdownType.Normal;
 

From a58426dab6ef91c11db45400ed16a6acfc2f6563 Mon Sep 17 00:00:00 2001
From: timiimit <timi.korda@gmail.com>
Date: Wed, 31 May 2023 19:07:04 +0200
Subject: [PATCH 0653/1604] Use `LastEditTime` in `Editor`

---
 osu.Game/Screens/Edit/Editor.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index b8fa7f6579..c3d72c7aec 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -441,6 +441,8 @@ namespace osu.Game.Screens.Edit
 
             try
             {
+                editorBeatmap.BeatmapInfo.LastEditTime = clock.CurrentTime;
+
                 // save the loaded beatmap's data stream.
                 beatmapManager.Save(editorBeatmap.BeatmapInfo, editorBeatmap.PlayableBeatmap, editorBeatmap.BeatmapSkin);
             }
@@ -833,7 +835,11 @@ namespace osu.Game.Screens.Edit
             {
                 double targetTime = 0;
 
-                if (Beatmap.Value.Beatmap.HitObjects.Count > 0)
+                if (editorBeatmap.BeatmapInfo.LastEditTime != null)
+                {
+                    targetTime = editorBeatmap.BeatmapInfo.LastEditTime.Value;
+                }
+                else if (Beatmap.Value.Beatmap.HitObjects.Count > 0)
                 {
                     // seek to one beat length before the first hitobject
                     targetTime = Beatmap.Value.Beatmap.HitObjects[0].StartTime;

From 310c54fe28ed32af6ac804c084c5c1de18d38651 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Jun 2023 13:26:46 +0900
Subject: [PATCH 0654/1604] Add test coverage ensuring positional data is
 present in hit events

---
 .../Mods/TestSceneOsuModAutoplay.cs                  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs
index 8fdab9f1f9..616a9c362d 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs
@@ -17,6 +17,18 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
 {
     public partial class TestSceneOsuModAutoplay : OsuModTestScene
     {
+        [Test]
+        public void TestCursorPositionStoredToJudgement()
+        {
+            CreateModTest(new ModTestData
+            {
+                Autoplay = true,
+                PassCondition = () =>
+                    Player.ScoreProcessor.JudgedHits >= 1
+                    && Player.ScoreProcessor.HitEvents.Any(e => e.Position != null)
+            });
+        }
+
         [Test]
         public void TestSpmUnaffectedByRateAdjust()
             => runSpmTest(new OsuModDaycore

From e830b96e6182308093e0ab61afcb6f3bf01db9cd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Jun 2023 13:09:47 +0900
Subject: [PATCH 0655/1604] Add back required override to make
 `AccuracyHeatmap` work

---
 osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
index ab07ac3e9d..f97be0d7ff 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
@@ -2,6 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Scoring
@@ -13,6 +15,9 @@ namespace osu.Game.Rulesets.Osu.Scoring
         {
         }
 
+        protected override HitEvent CreateHitEvent(JudgementResult result)
+            => base.CreateHitEvent(result).With((result as OsuHitCircleJudgementResult)?.CursorPositionAtHit);
+
         protected override double ComputeTotalScore(double comboProgress, double accuracyProgress, double bonusPortion)
         {
             return 700000 * comboProgress

From dc595b83f12761a410240e404dc965a27258a37f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Jun 2023 14:25:18 +0900
Subject: [PATCH 0656/1604] Remove unused `Dimension` specification from
 `StatisticItem`

---
 osu.Game/Screens/Ranking/Statistics/StatisticItem.cs   | 10 +---------
 osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticItem.cs b/osu.Game/Screens/Ranking/Statistics/StatisticItem.cs
index 5bbd260d3f..77a40959ae 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticItem.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticItem.cs
@@ -6,7 +6,6 @@
 using System;
 using JetBrains.Annotations;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Localisation;
 
 namespace osu.Game.Screens.Ranking.Statistics
@@ -26,11 +25,6 @@ namespace osu.Game.Screens.Ranking.Statistics
         /// </summary>
         public readonly Func<Drawable> CreateContent;
 
-        /// <summary>
-        /// The <see cref="Dimension"/> of this row. This can be thought of as the column dimension of an encompassing <see cref="GridContainer"/>.
-        /// </summary>
-        public readonly Dimension Dimension;
-
         /// <summary>
         /// Whether this item requires hit events. If true, <see cref="CreateContent"/> will not be called if no hit events are available.
         /// </summary>
@@ -42,13 +36,11 @@ namespace osu.Game.Screens.Ranking.Statistics
         /// <param name="name">The name of the item. Can be <see langword="null"/> to hide the item header.</param>
         /// <param name="createContent">A function returning the <see cref="Drawable"/> content to be displayed.</param>
         /// <param name="requiresHitEvents">Whether this item requires hit events. If true, <see cref="CreateContent"/> will not be called if no hit events are available.</param>
-        /// <param name="dimension">The <see cref="Dimension"/> of this item. This can be thought of as the column dimension of an encompassing <see cref="GridContainer"/>.</param>
-        public StatisticItem(LocalisableString name, [NotNull] Func<Drawable> createContent, bool requiresHitEvents = false, [CanBeNull] Dimension dimension = null)
+        public StatisticItem(LocalisableString name, [NotNull] Func<Drawable> createContent, bool requiresHitEvents = false)
         {
             Name = name;
             RequiresHitEvents = requiresHitEvents;
             CreateContent = createContent;
-            Dimension = dimension;
         }
     }
 }
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
index 4c22afd8f7..c11c42e290 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
@@ -168,7 +168,7 @@ namespace osu.Game.Screens.Ranking.Statistics
                                 Origin = Anchor.Centre,
                             });
 
-                            dimensions.Add(col.Dimension ?? new Dimension());
+                            dimensions.Add(new Dimension());
                         }
 
                         rows.Add(new GridContainer

From 985604fab5bb4a74ef7eacdcd842e8190c74047b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Jun 2023 14:35:14 +0900
Subject: [PATCH 0657/1604] Return `StatisticItem`s rather than `StatisticRow`s
 from ruleset

There were no usages of more than one column being provided per row, so
it seemed like unnecessarily complexity. I'm currently trying to reduce
complexity so we can improve the layout of the results screen, which
currently has up to three levels of nested `GridContainer`s.

Of note, I can't add backwards compatibility because the method
signature has not changed in `Ruleset` (only the return type). If we do
want to keep compatibility with other rulesets, we could designate a new
name for the updated method.
---
 osu.Game.Rulesets.Mania/ManiaRuleset.cs       | 44 ++++---------
 osu.Game.Rulesets.Osu/OsuRuleset.cs           | 58 +++++------------
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs       | 44 ++++---------
 .../Ranking/TestSceneStatisticsPanel.cs       | 65 +++----------------
 osu.Game/Rulesets/Ruleset.cs                  |  4 +-
 .../Statistics/SimpleStatisticTable.cs        |  2 +-
 .../Ranking/Statistics/SoloStatisticsPanel.cs | 26 +++-----
 .../Ranking/Statistics/StatisticItem.cs       |  2 +-
 .../Ranking/Statistics/StatisticRow.cs        | 21 ------
 .../Ranking/Statistics/StatisticsPanel.cs     | 40 +++++-------
 10 files changed, 83 insertions(+), 223 deletions(-)
 delete mode 100644 osu.Game/Screens/Ranking/Statistics/StatisticRow.cs

diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index d324682989..e8fda3ec80 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -389,41 +389,23 @@ namespace osu.Game.Rulesets.Mania
             return base.GetDisplayNameForHitResult(result);
         }
 
-        public override StatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap) => new[]
+        public override StatisticItem[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap) => new[]
         {
-            new StatisticRow
+            new StatisticItem("Performance Breakdown", () => new PerformanceBreakdownChart(score, playableBeatmap)
             {
-                Columns = new[]
-                {
-                    new StatisticItem("Performance Breakdown", () => new PerformanceBreakdownChart(score, playableBeatmap)
-                    {
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y
-                    }),
-                }
-            },
-            new StatisticRow
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y
+            }),
+            new StatisticItem("Timing Distribution", () => new HitEventTimingDistributionGraph(score.HitEvents)
             {
-                Columns = new[]
-                {
-                    new StatisticItem("Timing Distribution", () => new HitEventTimingDistributionGraph(score.HitEvents)
-                    {
-                        RelativeSizeAxes = Axes.X,
-                        Height = 250
-                    }, true),
-                }
-            },
-            new StatisticRow
+                RelativeSizeAxes = Axes.X,
+                Height = 250
+            }, true),
+            new StatisticItem(string.Empty, () => new SimpleStatisticTable(3, new SimpleStatisticItem[]
             {
-                Columns = new[]
-                {
-                    new StatisticItem(string.Empty, () => new SimpleStatisticTable(3, new SimpleStatisticItem[]
-                    {
-                        new AverageHitError(score.HitEvents),
-                        new UnstableRate(score.HitEvents)
-                    }), true)
-                }
-            }
+                new AverageHitError(score.HitEvents),
+                new UnstableRate(score.HitEvents)
+            }), true)
         };
 
         public override IRulesetFilterCriteria CreateRulesetFilterCriteria()
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 922594a93a..8ce55d78dd 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -291,56 +291,32 @@ namespace osu.Game.Rulesets.Osu
             return base.GetDisplayNameForHitResult(result);
         }
 
-        public override StatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap)
+        public override StatisticItem[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap)
         {
             var timedHitEvents = score.HitEvents.Where(e => e.HitObject is HitCircle && !(e.HitObject is SliderTailCircle)).ToList();
 
             return new[]
             {
-                new StatisticRow
+                new StatisticItem("Performance Breakdown", () => new PerformanceBreakdownChart(score, playableBeatmap)
                 {
-                    Columns = new[]
-                    {
-                        new StatisticItem("Performance Breakdown", () => new PerformanceBreakdownChart(score, playableBeatmap)
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y
-                        }),
-                    }
-                },
-                new StatisticRow
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y
+                }),
+                new StatisticItem("Timing Distribution", () => new HitEventTimingDistributionGraph(timedHitEvents)
                 {
-                    Columns = new[]
-                    {
-                        new StatisticItem("Timing Distribution", () => new HitEventTimingDistributionGraph(timedHitEvents)
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            Height = 250
-                        }, true),
-                    }
-                },
-                new StatisticRow
+                    RelativeSizeAxes = Axes.X,
+                    Height = 250
+                }, true),
+                new StatisticItem("Accuracy Heatmap", () => new AccuracyHeatmap(score, playableBeatmap)
                 {
-                    Columns = new[]
-                    {
-                        new StatisticItem("Accuracy Heatmap", () => new AccuracyHeatmap(score, playableBeatmap)
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            Height = 250
-                        }, true),
-                    }
-                },
-                new StatisticRow
+                    RelativeSizeAxes = Axes.X,
+                    Height = 250
+                }, true),
+                new StatisticItem(string.Empty, () => new SimpleStatisticTable(3, new SimpleStatisticItem[]
                 {
-                    Columns = new[]
-                    {
-                        new StatisticItem(string.Empty, () => new SimpleStatisticTable(3, new SimpleStatisticItem[]
-                        {
-                            new AverageHitError(timedHitEvents),
-                            new UnstableRate(timedHitEvents)
-                        }), true)
-                    }
-                }
+                    new AverageHitError(timedHitEvents),
+                    new UnstableRate(timedHitEvents)
+                }), true)
             };
         }
 
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index a35fdb890d..d6824109b3 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -229,45 +229,27 @@ namespace osu.Game.Rulesets.Taiko
             return base.GetDisplayNameForHitResult(result);
         }
 
-        public override StatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap)
+        public override StatisticItem[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap)
         {
             var timedHitEvents = score.HitEvents.Where(e => e.HitObject is Hit).ToList();
 
             return new[]
             {
-                new StatisticRow
+                new StatisticItem("Performance Breakdown", () => new PerformanceBreakdownChart(score, playableBeatmap)
                 {
-                    Columns = new[]
-                    {
-                        new StatisticItem("Performance Breakdown", () => new PerformanceBreakdownChart(score, playableBeatmap)
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y
-                        }),
-                    }
-                },
-                new StatisticRow
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y
+                }),
+                new StatisticItem("Timing Distribution", () => new HitEventTimingDistributionGraph(timedHitEvents)
                 {
-                    Columns = new[]
-                    {
-                        new StatisticItem("Timing Distribution", () => new HitEventTimingDistributionGraph(timedHitEvents)
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            Height = 250
-                        }, true),
-                    }
-                },
-                new StatisticRow
+                    RelativeSizeAxes = Axes.X,
+                    Height = 250
+                }, true),
+                new StatisticItem(string.Empty, () => new SimpleStatisticTable(3, new SimpleStatisticItem[]
                 {
-                    Columns = new[]
-                    {
-                        new StatisticItem(string.Empty, () => new SimpleStatisticTable(3, new SimpleStatisticItem[]
-                        {
-                            new AverageHitError(timedHitEvents),
-                            new UnstableRate(timedHitEvents)
-                        }), true)
-                    }
-                }
+                    new AverageHitError(timedHitEvents),
+                    new UnstableRate(timedHitEvents)
+                }), true)
             };
         }
     }
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
index fcd5f97fcc..67211a3b72 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
@@ -174,78 +174,33 @@ namespace osu.Game.Tests.Visual.Ranking
 
         private class TestRulesetAllStatsRequireHitEvents : TestRuleset
         {
-            public override StatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap)
+            public override StatisticItem[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap) => new[]
             {
-                return new[]
-                {
-                    new StatisticRow
-                    {
-                        Columns = new[]
-                        {
-                            new StatisticItem("Statistic Requiring Hit Events 1",
-                                () => CreatePlaceholderStatistic("Placeholder statistic. Requires hit events"), true)
-                        }
-                    },
-                    new StatisticRow
-                    {
-                        Columns = new[]
-                        {
-                            new StatisticItem("Statistic Requiring Hit Events 2",
-                                () => CreatePlaceholderStatistic("Placeholder statistic. Requires hit events"), true)
-                        }
-                    }
-                };
-            }
+                new StatisticItem("Statistic Requiring Hit Events 1", () => CreatePlaceholderStatistic("Placeholder statistic. Requires hit events"), true),
+                new StatisticItem("Statistic Requiring Hit Events 2", () => CreatePlaceholderStatistic("Placeholder statistic. Requires hit events"), true)
+            };
         }
 
         private class TestRulesetNoStatsRequireHitEvents : TestRuleset
         {
-            public override StatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap)
+            public override StatisticItem[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap)
             {
                 return new[]
                 {
-                    new StatisticRow
-                    {
-                        Columns = new[]
-                        {
-                            new StatisticItem("Statistic Not Requiring Hit Events 1",
-                                () => CreatePlaceholderStatistic("Placeholder statistic. Does not require hit events"))
-                        }
-                    },
-                    new StatisticRow
-                    {
-                        Columns = new[]
-                        {
-                            new StatisticItem("Statistic Not Requiring Hit Events 2",
-                                () => CreatePlaceholderStatistic("Placeholder statistic. Does not require hit events"))
-                        }
-                    }
+                    new StatisticItem("Statistic Not Requiring Hit Events 1", () => CreatePlaceholderStatistic("Placeholder statistic. Does not require hit events")),
+                    new StatisticItem("Statistic Not Requiring Hit Events 2", () => CreatePlaceholderStatistic("Placeholder statistic. Does not require hit events"))
                 };
             }
         }
 
         private class TestRulesetMixed : TestRuleset
         {
-            public override StatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap)
+            public override StatisticItem[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap)
             {
                 return new[]
                 {
-                    new StatisticRow
-                    {
-                        Columns = new[]
-                        {
-                            new StatisticItem("Statistic Requiring Hit Events",
-                                () => CreatePlaceholderStatistic("Placeholder statistic. Requires hit events"), true)
-                        }
-                    },
-                    new StatisticRow
-                    {
-                        Columns = new[]
-                        {
-                            new StatisticItem("Statistic Not Requiring Hit Events",
-                                () => CreatePlaceholderStatistic("Placeholder statistic. Does not require hit events"))
-                        }
-                    }
+                    new StatisticItem("Statistic Requiring Hit Events", () => CreatePlaceholderStatistic("Placeholder statistic. Requires hit events"), true),
+                    new StatisticItem("Statistic Not Requiring Hit Events", () => CreatePlaceholderStatistic("Placeholder statistic. Does not require hit events"))
                 };
             }
         }
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index a77068eb14..490ec1475c 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -321,8 +321,8 @@ namespace osu.Game.Rulesets
         /// </summary>
         /// <param name="score">The <see cref="ScoreInfo"/> to create the statistics for. The score is guaranteed to have <see cref="ScoreInfo.HitEvents"/> populated.</param>
         /// <param name="playableBeatmap">The <see cref="IBeatmap"/>, converted for this <see cref="Ruleset"/> with all relevant <see cref="Mod"/>s applied.</param>
-        /// <returns>The <see cref="StatisticRow"/>s to display. Each <see cref="StatisticRow"/> may contain 0 or more <see cref="StatisticItem"/>.</returns>
-        public virtual StatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap) => Array.Empty<StatisticRow>();
+        /// <returns>The <see cref="StatisticItem"/>s to display.</returns>
+        public virtual StatisticItem[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap) => Array.Empty<StatisticItem>();
 
         /// <summary>
         /// Get all valid <see cref="HitResult"/>s for this ruleset.
diff --git a/osu.Game/Screens/Ranking/Statistics/SimpleStatisticTable.cs b/osu.Game/Screens/Ranking/Statistics/SimpleStatisticTable.cs
index d10888be43..d68df4558a 100644
--- a/osu.Game/Screens/Ranking/Statistics/SimpleStatisticTable.cs
+++ b/osu.Game/Screens/Ranking/Statistics/SimpleStatisticTable.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Screens.Ranking.Statistics
 {
     /// <summary>
     /// Represents a table with simple statistics (ones that only need textual display).
-    /// Richer visualisations should be done with <see cref="StatisticRow"/>s and <see cref="StatisticItem"/>s.
+    /// Richer visualisations should be done with <see cref="StatisticItem"/>s.
     /// </summary>
     public partial class SimpleStatisticTable : CompositeDrawable
     {
diff --git a/osu.Game/Screens/Ranking/Statistics/SoloStatisticsPanel.cs b/osu.Game/Screens/Ranking/Statistics/SoloStatisticsPanel.cs
index 57d072b7de..73b9897096 100644
--- a/osu.Game/Screens/Ranking/Statistics/SoloStatisticsPanel.cs
+++ b/osu.Game/Screens/Ranking/Statistics/SoloStatisticsPanel.cs
@@ -23,32 +23,26 @@ namespace osu.Game.Screens.Ranking.Statistics
 
         public Bindable<SoloStatisticsUpdate?> StatisticsUpdate { get; } = new Bindable<SoloStatisticsUpdate?>();
 
-        protected override ICollection<StatisticRow> CreateStatisticRows(ScoreInfo newScore, IBeatmap playableBeatmap)
+        protected override ICollection<StatisticItem> CreateStatisticItems(ScoreInfo newScore, IBeatmap playableBeatmap)
         {
-            var rows = base.CreateStatisticRows(newScore, playableBeatmap);
+            var items = base.CreateStatisticItems(newScore, playableBeatmap);
 
             if (newScore.UserID > 1
                 && newScore.UserID == achievedScore.UserID
                 && newScore.OnlineID > 0
                 && newScore.OnlineID == achievedScore.OnlineID)
             {
-                rows = rows.Append(new StatisticRow
+                items = items.Append(new StatisticItem("Overall Ranking", () => new OverallRanking
                 {
-                    Columns = new[]
-                    {
-                        new StatisticItem("Overall Ranking", () => new OverallRanking
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Width = 0.5f,
-                            StatisticsUpdate = { BindTarget = StatisticsUpdate }
-                        })
-                    }
-                }).ToArray();
+                    RelativeSizeAxes = Axes.X,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Width = 0.5f,
+                    StatisticsUpdate = { BindTarget = StatisticsUpdate }
+                })).ToArray();
             }
 
-            return rows;
+            return items;
         }
     }
 }
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticItem.cs b/osu.Game/Screens/Ranking/Statistics/StatisticItem.cs
index 77a40959ae..c5bdc6f6f5 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticItem.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticItem.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Screens.Ranking.Statistics
         public readonly bool RequiresHitEvents;
 
         /// <summary>
-        /// Creates a new <see cref="StatisticItem"/>, to be displayed inside a <see cref="StatisticRow"/> in the results screen.
+        /// Creates a new <see cref="StatisticItem"/>, to be displayed in the results screen.
         /// </summary>
         /// <param name="name">The name of the item. Can be <see langword="null"/> to hide the item header.</param>
         /// <param name="createContent">A function returning the <see cref="Drawable"/> content to be displayed.</param>
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticRow.cs b/osu.Game/Screens/Ranking/Statistics/StatisticRow.cs
deleted file mode 100644
index 9f5f44918e..0000000000
--- a/osu.Game/Screens/Ranking/Statistics/StatisticRow.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-#nullable disable
-
-using JetBrains.Annotations;
-
-namespace osu.Game.Screens.Ranking.Statistics
-{
-    /// <summary>
-    /// A row of statistics to be displayed in the results screen.
-    /// </summary>
-    public class StatisticRow
-    {
-        /// <summary>
-        /// The columns of this <see cref="StatisticRow"/>.
-        /// </summary>
-        [ItemNotNull]
-        public StatisticItem[] Columns;
-    }
-}
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
index c11c42e290..31dd5df27a 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
@@ -100,9 +100,9 @@ namespace osu.Game.Screens.Ranking.Statistics
                 bool hitEventsAvailable = newScore.HitEvents.Count != 0;
                 Container<Drawable> container;
 
-                var statisticRows = CreateStatisticRows(newScore, task.GetResultSafely());
+                var statisticItems = CreateStatisticItems(newScore, task.GetResultSafely());
 
-                if (!hitEventsAvailable && statisticRows.SelectMany(r => r.Columns).All(c => c.RequiresHitEvents))
+                if (!hitEventsAvailable && statisticItems.All(c => c.RequiresHitEvents))
                 {
                     container = new FillFlowContainer
                     {
@@ -144,33 +144,25 @@ namespace osu.Game.Screens.Ranking.Statistics
 
                     bool anyRequiredHitEvents = false;
 
-                    foreach (var row in statisticRows)
+                    foreach (var item in statisticItems)
                     {
-                        var columns = row.Columns;
-
-                        if (columns.Length == 0)
-                            continue;
-
                         var columnContent = new List<Drawable>();
                         var dimensions = new List<Dimension>();
 
-                        foreach (var col in columns)
+                        if (!hitEventsAvailable && item.RequiresHitEvents)
                         {
-                            if (!hitEventsAvailable && col.RequiresHitEvents)
-                            {
-                                anyRequiredHitEvents = true;
-                                continue;
-                            }
-
-                            columnContent.Add(new StatisticContainer(col)
-                            {
-                                Anchor = Anchor.Centre,
-                                Origin = Anchor.Centre,
-                            });
-
-                            dimensions.Add(new Dimension());
+                            anyRequiredHitEvents = true;
+                            continue;
                         }
 
+                        columnContent.Add(new StatisticContainer(item)
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                        });
+
+                        dimensions.Add(new Dimension());
+
                         rows.Add(new GridContainer
                         {
                             Anchor = Anchor.TopCentre,
@@ -219,11 +211,11 @@ namespace osu.Game.Screens.Ranking.Statistics
         }
 
         /// <summary>
-        /// Creates the <see cref="StatisticRow"/>s to be displayed in this panel for a given <paramref name="newScore"/>.
+        /// Creates the <see cref="StatisticItem"/>s to be displayed in this panel for a given <paramref name="newScore"/>.
         /// </summary>
         /// <param name="newScore">The score to create the rows for.</param>
         /// <param name="playableBeatmap">The beatmap on which the score was set.</param>
-        protected virtual ICollection<StatisticRow> CreateStatisticRows(ScoreInfo newScore, IBeatmap playableBeatmap)
+        protected virtual ICollection<StatisticItem> CreateStatisticItems(ScoreInfo newScore, IBeatmap playableBeatmap)
             => newScore.Ruleset.CreateInstance().CreateStatisticsForScore(newScore, playableBeatmap);
 
         protected override bool OnClick(ClickEvent e)

From 9f8a13480bcf6d760b11e92381b51d59d53a3e4a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Jun 2023 15:16:47 +0900
Subject: [PATCH 0658/1604] Automatically disable tablet support on error

Closes #23710.
---
 osu.Game/OsuGame.cs | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index fe6e479d19..33ac8cc101 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -1136,12 +1136,19 @@ namespace osu.Game
 
                 if (entry.Level == LogLevel.Error)
                 {
-                    Schedule(() => Notifications.Post(new SimpleNotification
+                    Schedule(() =>
                     {
-                        Text = $"Encountered tablet error: \"{message}\"",
-                        Icon = FontAwesome.Solid.PenSquare,
-                        IconColour = Colours.RedDark,
-                    }));
+                        Notifications.Post(new SimpleNotification
+                        {
+                            Text = $"Disabling tablet support due to error: \"{message}\"",
+                            Icon = FontAwesome.Solid.PenSquare,
+                            IconColour = Colours.RedDark,
+                        });
+
+                        var tabletHandler = Host.AvailableInputHandlers.OfType<ITabletHandler>().FirstOrDefault();
+                        if (tabletHandler != null)
+                            tabletHandler.Enabled.Value = false;
+                    });
                 }
                 else if (notifyOnWarning)
                 {

From 0a7d5a51d419055990d9da48345de1284408639f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Jun 2023 15:50:10 +0900
Subject: [PATCH 0659/1604] Fix mouse cursor potentially disappearing for good
 if screenshot capture fails

---
 osu.Game/Graphics/ScreenshotManager.cs | 115 +++++++++++++------------
 1 file changed, 60 insertions(+), 55 deletions(-)

diff --git a/osu.Game/Graphics/ScreenshotManager.cs b/osu.Game/Graphics/ScreenshotManager.cs
index d799e82bc9..dd90cbc074 100644
--- a/osu.Game/Graphics/ScreenshotManager.cs
+++ b/osu.Game/Graphics/ScreenshotManager.cs
@@ -86,70 +86,75 @@ namespace osu.Game.Graphics
         {
             Interlocked.Increment(ref screenShotTasks);
 
-            if (!captureMenuCursor.Value)
+            try
             {
-                cursorVisibility.Value = false;
-
-                // We need to wait for at most 3 draw nodes to be drawn, following which we can be assured at least one DrawNode has been generated/drawn with the set value
-                const int frames_to_wait = 3;
-
-                int framesWaited = 0;
-
-                using (var framesWaitedEvent = new ManualResetEventSlim(false))
+                if (!captureMenuCursor.Value)
                 {
-                    ScheduledDelegate waitDelegate = host.DrawThread.Scheduler.AddDelayed(() =>
+                    cursorVisibility.Value = false;
+
+                    // We need to wait for at most 3 draw nodes to be drawn, following which we can be assured at least one DrawNode has been generated/drawn with the set value
+                    const int frames_to_wait = 3;
+
+                    int framesWaited = 0;
+
+                    using (var framesWaitedEvent = new ManualResetEventSlim(false))
                     {
-                        if (framesWaited++ >= frames_to_wait)
-                            // ReSharper disable once AccessToDisposedClosure
-                            framesWaitedEvent.Set();
-                    }, 10, true);
+                        ScheduledDelegate waitDelegate = host.DrawThread.Scheduler.AddDelayed(() =>
+                        {
+                            if (framesWaited++ >= frames_to_wait)
+                                // ReSharper disable once AccessToDisposedClosure
+                                framesWaitedEvent.Set();
+                        }, 10, true);
 
-                    if (!framesWaitedEvent.Wait(1000))
-                        throw new TimeoutException("Screenshot data did not arrive in a timely fashion");
+                        if (!framesWaitedEvent.Wait(1000))
+                            throw new TimeoutException("Screenshot data did not arrive in a timely fashion");
 
-                    waitDelegate.Cancel();
+                        waitDelegate.Cancel();
+                    }
+                }
+
+                using (var image = await host.TakeScreenshotAsync().ConfigureAwait(false))
+                {
+                    host.GetClipboard()?.SetImage(image);
+
+                    (string filename, var stream) = getWritableStream();
+
+                    if (filename == null) return;
+
+                    using (stream)
+                    {
+                        switch (screenshotFormat.Value)
+                        {
+                            case ScreenshotFormat.Png:
+                                await image.SaveAsPngAsync(stream).ConfigureAwait(false);
+                                break;
+
+                            case ScreenshotFormat.Jpg:
+                                const int jpeg_quality = 92;
+
+                                await image.SaveAsJpegAsync(stream, new JpegEncoder { Quality = jpeg_quality }).ConfigureAwait(false);
+                                break;
+
+                            default:
+                                throw new InvalidOperationException($"Unknown enum member {nameof(ScreenshotFormat)} {screenshotFormat.Value}.");
+                        }
+                    }
+
+                    notificationOverlay.Post(new SimpleNotification
+                    {
+                        Text = $"Screenshot {filename} saved!",
+                        Activated = () =>
+                        {
+                            storage.PresentFileExternally(filename);
+                            return true;
+                        }
+                    });
                 }
             }
-
-            using (var image = await host.TakeScreenshotAsync().ConfigureAwait(false))
+            finally
             {
-                if (Interlocked.Decrement(ref screenShotTasks) == 0 && cursorVisibility.Value == false)
+                if (Interlocked.Decrement(ref screenShotTasks) == 0)
                     cursorVisibility.Value = true;
-
-                host.GetClipboard()?.SetImage(image);
-
-                (string filename, var stream) = getWritableStream();
-
-                if (filename == null) return;
-
-                using (stream)
-                {
-                    switch (screenshotFormat.Value)
-                    {
-                        case ScreenshotFormat.Png:
-                            await image.SaveAsPngAsync(stream).ConfigureAwait(false);
-                            break;
-
-                        case ScreenshotFormat.Jpg:
-                            const int jpeg_quality = 92;
-
-                            await image.SaveAsJpegAsync(stream, new JpegEncoder { Quality = jpeg_quality }).ConfigureAwait(false);
-                            break;
-
-                        default:
-                            throw new InvalidOperationException($"Unknown enum member {nameof(ScreenshotFormat)} {screenshotFormat.Value}.");
-                    }
-                }
-
-                notificationOverlay.Post(new SimpleNotification
-                {
-                    Text = $"Screenshot {filename} saved!",
-                    Activated = () =>
-                    {
-                        storage.PresentFileExternally(filename);
-                        return true;
-                    }
-                });
             }
         });
 

From 289f0e9862d690cf40e7fcd081cd962a1791fb39 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Jun 2023 15:50:37 +0900
Subject: [PATCH 0660/1604] Use `FireAndForget` to avoid unobserved exception

---
 osu.Game/Graphics/ScreenshotManager.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/ScreenshotManager.cs b/osu.Game/Graphics/ScreenshotManager.cs
index dd90cbc074..82f89d6889 100644
--- a/osu.Game/Graphics/ScreenshotManager.cs
+++ b/osu.Game/Graphics/ScreenshotManager.cs
@@ -19,6 +19,7 @@ using osu.Framework.Platform;
 using osu.Framework.Threading;
 using osu.Game.Configuration;
 using osu.Game.Input.Bindings;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
 using SixLabors.ImageSharp;
@@ -69,7 +70,7 @@ namespace osu.Game.Graphics
             {
                 case GlobalAction.TakeScreenshot:
                     shutter.Play();
-                    TakeScreenshotAsync();
+                    TakeScreenshotAsync().FireAndForget();
                     return true;
             }
 

From 98f35f74811329500e558943464d003b3543f276 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Jun 2023 16:06:34 +0900
Subject: [PATCH 0661/1604] Fix osu!mania hold notes snapping to judgement area
 too early on early hits

Closes https://github.com/ppy/osu/issues/23515.
---
 .../Objects/Drawables/DrawableHoldNote.cs                    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index ce34addeff..3f91328128 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -245,7 +245,10 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             // As the note is being held, adjust the size of the sizing container. This has two effects:
             // 1. The contained masking container will mask the body and ticks.
             // 2. The head note will move along with the new "head position" in the container.
-            if (Head.IsHit && releaseTime == null && DrawHeight > 0)
+            //
+            // As per stable, this should not apply for early hits, waiting until the object starts to touch the
+            // judgement area first.
+            if (Head.IsHit && releaseTime == null && DrawHeight > 0 && Time.Current >= HitObject.StartTime)
             {
                 // How far past the hit target this hold note is.
                 float yOffset = Direction.Value == ScrollingDirection.Up ? -Y : Y;

From f52ed41f107fe79db605fc35acab62faa9f9d9c7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Jun 2023 16:28:03 +0900
Subject: [PATCH 0662/1604] Use better defaults of 1/4 and 1/6 when cycling
 types

---
 .../Screens/Edit/Compose/Components/BeatDivisorControl.cs     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
index 432c5ea280..e510d1aac8 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
@@ -196,11 +196,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
             switch ((BeatDivisorType)nextDivisorType)
             {
                 case BeatDivisorType.Common:
-                    beatDivisor.ValidDivisors.Value = BeatDivisorPresetCollection.COMMON;
+                    beatDivisor.SetArbitraryDivisor(4);
                     break;
 
                 case BeatDivisorType.Triplets:
-                    beatDivisor.ValidDivisors.Value = BeatDivisorPresetCollection.TRIPLETS;
+                    beatDivisor.SetArbitraryDivisor(6);
                     break;
 
                 case BeatDivisorType.Custom:

From bcde2cbc73bf31ed0d32cfe7a49e87b6afa174fd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Jun 2023 16:28:47 +0900
Subject: [PATCH 0663/1604] Apply NRT to `BeatDivisorControl`

---
 .../Visual/Editing/TestSceneBeatDivisorControl.cs         | 8 +++-----
 .../Screens/Edit/Compose/Components/BeatDivisorControl.cs | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs b/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
index 353acfa4ba..3ee5ea79db 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Diagnostics;
 using System.Linq;
@@ -23,8 +21,8 @@ namespace osu.Game.Tests.Visual.Editing
 {
     public partial class TestSceneBeatDivisorControl : OsuManualInputManagerTestScene
     {
-        private BeatDivisorControl beatDivisorControl;
-        private BindableBeatDivisor bindableBeatDivisor;
+        private BeatDivisorControl beatDivisorControl = null!;
+        private BindableBeatDivisor bindableBeatDivisor = null!;
 
         private SliderBar<int> tickSliderBar => beatDivisorControl.ChildrenOfType<SliderBar<int>>().Single();
         private Triangle tickMarkerHead => tickSliderBar.ChildrenOfType<Triangle>().Single();
@@ -237,7 +235,7 @@ namespace osu.Game.Tests.Visual.Editing
                 InputManager.Click(MouseButton.Left);
             });
 
-            BeatDivisorControl.CustomDivisorPopover popover = null;
+            BeatDivisorControl.CustomDivisorPopover? popover = null;
             AddUntilStep("wait for popover", () => (popover = this.ChildrenOfType<BeatDivisorControl.CustomDivisorPopover>().SingleOrDefault()) != null && popover.IsLoaded);
             AddStep($"set divisor to {divisor}", () =>
             {
diff --git a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
index e510d1aac8..213246d516 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Diagnostics;
 using System.Linq;
@@ -372,10 +370,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private partial class TickSliderBar : SliderBar<int>
         {
-            private Marker marker;
+            private Marker marker = null!;
 
             [Resolved]
-            private OsuColour colours { get; set; }
+            private OsuColour colours { get; set; } = null!;
 
             private readonly BindableBeatDivisor beatDivisor;
 
@@ -517,7 +515,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             private partial class Marker : CompositeDrawable
             {
                 [Resolved]
-                private OverlayColourProvider colourProvider { get; set; }
+                private OverlayColourProvider colourProvider { get; set; } = null!;
 
                 [BackgroundDependencyLoader]
                 private void load()

From 32207d411222f1328466a6e9c40a261ebb042c16 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Jun 2023 16:40:33 +0900
Subject: [PATCH 0664/1604] Remember the last used custom divisor when cycling
 divisor types

---
 .../Compose/Components/BeatDivisorControl.cs  | 39 ++++++++++++++-----
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
index 213246d516..dce9e01192 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
@@ -29,6 +29,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
 {
     public partial class BeatDivisorControl : CompositeDrawable
     {
+        private int? lastCustomDivisor;
+
         private readonly BindableBeatDivisor beatDivisor = new BindableBeatDivisor();
 
         public BeatDivisorControl(BindableBeatDivisor beatDivisor)
@@ -182,16 +184,30 @@ namespace osu.Game.Screens.Edit.Compose.Components
             };
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            beatDivisor.ValidDivisors.BindValueChanged(valid =>
+            {
+                if (valid.NewValue.Type == BeatDivisorType.Custom)
+                    lastCustomDivisor = valid.NewValue.Presets.Last();
+            }, true);
+        }
+
         private void cycleDivisorType(int direction)
         {
-            Debug.Assert(Math.Abs(direction) == 1);
-            int nextDivisorType = (int)beatDivisor.ValidDivisors.Value.Type + direction;
-            if (nextDivisorType > (int)BeatDivisorType.Triplets)
-                nextDivisorType = (int)BeatDivisorType.Common;
-            else if (nextDivisorType < (int)BeatDivisorType.Common)
-                nextDivisorType = (int)BeatDivisorType.Triplets;
+            int totalTypes = Enum.GetValues<BeatDivisorType>().Length;
+            BeatDivisorType currentType = beatDivisor.ValidDivisors.Value.Type;
 
-            switch ((BeatDivisorType)nextDivisorType)
+            Debug.Assert(Math.Abs(direction) == 1);
+
+            cycleOnce();
+
+            if (lastCustomDivisor == null && currentType == BeatDivisorType.Custom)
+                cycleOnce();
+
+            switch (currentType)
             {
                 case BeatDivisorType.Common:
                     beatDivisor.SetArbitraryDivisor(4);
@@ -202,9 +218,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
                     break;
 
                 case BeatDivisorType.Custom:
-                    beatDivisor.ValidDivisors.Value = BeatDivisorPresetCollection.Custom(beatDivisor.ValidDivisors.Value.Presets.Max());
+                    Debug.Assert(lastCustomDivisor != null);
+                    beatDivisor.SetArbitraryDivisor(lastCustomDivisor.Value);
                     break;
             }
+
+            void cycleOnce() => currentType = (BeatDivisorType)(((int)currentType + totalTypes + direction) % totalTypes);
         }
 
         protected override bool OnKeyDown(KeyDownEvent e)
@@ -302,12 +321,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
             {
                 base.LoadComplete();
                 BeatDivisor.BindValueChanged(_ => updateState(), true);
-                divisorTextBox.OnCommit += (_, _) => setPresets();
+                divisorTextBox.OnCommit += (_, _) => setPresetsFromTextBoxEntry();
 
                 Schedule(() => GetContainingInputManager().ChangeFocus(divisorTextBox));
             }
 
-            private void setPresets()
+            private void setPresetsFromTextBoxEntry()
             {
                 if (!int.TryParse(divisorTextBox.Text, out int divisor) || divisor < 1 || divisor > 64)
                 {

From 39489358fa5f91d56b54e92b4e8c8b939da5b659 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Thu, 1 Jun 2023 14:07:05 +0300
Subject: [PATCH 0665/1604] Apply appearance animation to `aboveColumnsContent`

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 3d42059540..a491da1f76 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -507,7 +507,7 @@ namespace osu.Game.Overlays.Mods
 
             base.PopIn();
 
-            multiplierDisplay?
+            aboveColumnsContent?
                 .FadeIn(fade_in_duration, Easing.OutQuint)
                 .MoveToY(0, fade_in_duration, Easing.OutQuint);
 
@@ -565,7 +565,7 @@ namespace osu.Game.Overlays.Mods
 
             base.PopOut();
 
-            multiplierDisplay?
+            aboveColumnsContent?
                 .FadeOut(fade_out_duration / 2, Easing.OutQuint)
                 .MoveToY(-distance, fade_out_duration / 2, Easing.OutQuint);
 

From 949fe327402bb9418b2875aba0a0e7658f931b91 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 31 May 2023 01:23:42 +0300
Subject: [PATCH 0666/1604] Use combined area of children as a mask instead

---
 .../Timeline/TimelineHitObjectBlueprint.cs    | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index 900f0ff4a2..31cf6ad766 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -50,6 +50,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private readonly Container colouredComponents;
         private readonly OsuSpriteText comboIndexText;
+        private readonly SamplePointPiece samplePointPiece;
+        private readonly DifficultyPointPiece difficultyPointPiece = null!;
 
         [Resolved]
         private ISkinSource skin { get; set; } = null!;
@@ -101,7 +103,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                         },
                     }
                 },
-                new SamplePointPiece(Item)
+                samplePointPiece = new SamplePointPiece(Item)
                 {
                     Anchor = Anchor.BottomLeft,
                     Origin = Anchor.TopCentre
@@ -118,7 +120,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             if (item is IHasSliderVelocity)
             {
-                AddInternal(new DifficultyPointPiece(Item)
+                AddInternal(difficultyPointPiece = new DifficultyPointPiece(Item)
                 {
                     Anchor = Anchor.TopLeft,
                     Origin = Anchor.BottomCentre
@@ -244,7 +246,23 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         public override Vector2 ScreenSpaceSelectionPoint => ScreenSpaceDrawQuad.TopLeft;
 
-        protected override bool ComputeIsMaskedAway(RectangleF maskingBounds) => false;
+        protected override bool ComputeIsMaskedAway(RectangleF maskingBounds)
+        {
+            // Since children are exceeding the component size, we need to use a custom quad to compute whether it should be masked away.
+
+            // When component isn't masked away there's no need to apply custom logic.
+            if (!base.ComputeIsMaskedAway(maskingBounds))
+                return false;
+
+            // If component is considered masked away we'll use children to create an extended quad.
+            var rect = RectangleF.Union(ScreenSpaceDrawQuad.AABBFloat, circle.ScreenSpaceDrawQuad.AABBFloat);
+            rect = RectangleF.Union(rect, samplePointPiece.ScreenSpaceDrawQuad.AABBFloat);
+
+            if (difficultyPointPiece != null)
+                rect = RectangleF.Union(rect, difficultyPointPiece.ScreenSpaceDrawQuad.AABBFloat);
+
+            return !Precision.AlmostIntersects(maskingBounds, rect);
+        }
 
         private partial class Tick : Circle
         {

From 03eb7c78300cd689d504dd8874b700a67dec1fa3 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 1 Jun 2023 21:21:01 +0300
Subject: [PATCH 0667/1604] Fix nullability

---
 .../Compose/Components/Timeline/TimelineHitObjectBlueprint.cs   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index 31cf6ad766..638e2d43c8 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         private readonly Container colouredComponents;
         private readonly OsuSpriteText comboIndexText;
         private readonly SamplePointPiece samplePointPiece;
-        private readonly DifficultyPointPiece difficultyPointPiece = null!;
+        private readonly DifficultyPointPiece? difficultyPointPiece;
 
         [Resolved]
         private ISkinSource skin { get; set; } = null!;

From c2d89a32a985515edb376b9abd3d23555dda5445 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 1 Jun 2023 21:18:00 +0200
Subject: [PATCH 0668/1604] Adjust inline comment

---
 .../Components/Timeline/TimelineHitObjectBlueprint.cs        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index 638e2d43c8..55f122669d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -250,11 +250,12 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         {
             // Since children are exceeding the component size, we need to use a custom quad to compute whether it should be masked away.
 
-            // When component isn't masked away there's no need to apply custom logic.
+            // If the component isn't considered masked away by itself, there's no need to apply custom logic.
             if (!base.ComputeIsMaskedAway(maskingBounds))
                 return false;
 
-            // If component is considered masked away we'll use children to create an extended quad.
+            // If the component is considered masked away, we'll use children to create an extended quad that encapsulates all parts of this blueprint
+            // to ensure it doesn't pop in and out of existence abruptly when scrolling the timeline.
             var rect = RectangleF.Union(ScreenSpaceDrawQuad.AABBFloat, circle.ScreenSpaceDrawQuad.AABBFloat);
             rect = RectangleF.Union(rect, samplePointPiece.ScreenSpaceDrawQuad.AABBFloat);
 

From c33ddedca0b6cdfaf4054dc80bbdcd2f5f20e842 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Jun 2023 08:48:47 +0900
Subject: [PATCH 0669/1604] Disable all tablet handlers to guard against a grim
 future

---
 osu.Game/OsuGame.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 33ac8cc101..3768dad370 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -1145,8 +1145,11 @@ namespace osu.Game
                             IconColour = Colours.RedDark,
                         });
 
-                        var tabletHandler = Host.AvailableInputHandlers.OfType<ITabletHandler>().FirstOrDefault();
-                        if (tabletHandler != null)
+                        // We only have one tablet handler currently.
+                        // The loop here is weakly guarding against a future where more than one is added.
+                        // If this is ever the case, this logic needs adjustment as it should probably only
+                        // disable the relevant tablet handler rather than all.
+                        foreach (var tabletHandler in Host.AvailableInputHandlers.OfType<ITabletHandler>())
                             tabletHandler.Enabled.Value = false;
                     });
                 }

From a44b20832372c0f509f7fda6bfe4b35e829d649f Mon Sep 17 00:00:00 2001
From: John Biddle <johntbiddle@gmail.com>
Date: Thu, 1 Jun 2023 21:25:49 -0700
Subject: [PATCH 0670/1604] Updated languages in Language.cs to match what is
 in osu-web/resources/lang/. Added Catalan, Persian, Filipino, Hebrew,
 Croatian, Lithuanian, Latvian, Malay, Slovenian, Serbian, Tajik, and Sinhala.

---
 osu.Game/Localisation/Language.cs | 39 +++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/osu.Game/Localisation/Language.cs b/osu.Game/Localisation/Language.cs
index 6a4e5110e6..3f0f24f45f 100644
--- a/osu.Game/Localisation/Language.cs
+++ b/osu.Game/Localisation/Language.cs
@@ -22,6 +22,9 @@ namespace osu.Game.Localisation
         [Description(@"Български")]
         bg,
 
+        [Description(@"Català")]
+        ca,
+
         [Description(@"Česky")]
         cs,
 
@@ -37,12 +40,24 @@ namespace osu.Game.Localisation
         [Description(@"español")]
         es,
 
+        [Description(@"فارسی")]
+        fa_ir,
+
         [Description(@"Suomi")]
         fi,
 
+        [Description(@"Filipino")]
+        fil,
+
         [Description(@"français")]
         fr,
 
+        [Description(@"עברית")]
+        he,
+
+        [Description(@"Hrvatski")]
+        hr_hr,
+
         [Description(@"Magyar")]
         hu,
 
@@ -58,6 +73,15 @@ namespace osu.Game.Localisation
         [Description(@"한국어")]
         ko,
 
+        [Description(@"Lietuvių")]
+        lt,
+
+        [Description(@"Latviešu")]
+        lv_lv,
+
+        [Description(@"Melayu")]
+        ms_my,
+
         [Description(@"Nederlands")]
         nl,
 
@@ -79,12 +103,24 @@ namespace osu.Game.Localisation
         [Description(@"Русский")]
         ru,
 
+        [Description(@"සිංහල")]
+        si_lk,
+
         [Description(@"Slovenčina")]
         sk,
 
+        [Description(@"Slovenščina")]
+        sl,
+
+        [Description(@"Српски")]
+        sr,
+
         [Description(@"Svenska")]
         sv,
 
+        [Description(@"Тоҷикӣ")]
+        tg_tj,
+
         [Description(@"ไทย")]
         th,
 
@@ -105,6 +141,9 @@ namespace osu.Game.Localisation
         [Description(@"简体中文")]
         zh,
 
+        [Description(@"繁體中文")]
+        zh_tw,
+
         // Traditional Chinese (Hong Kong) is listed in web sources but has no associated localisations,
         // and was wrongly falling back to Simplified Chinese.
         // Can be revisited if localisations ever arrive.

From 325c114c1c9ba4b7f1bfa0630c2d1ab0885d1cf1 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Fri, 2 Jun 2023 10:39:27 +0300
Subject: [PATCH 0671/1604] Remove redundant xmldocs

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index a491da1f76..af8a7bd810 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -64,9 +64,6 @@ namespace osu.Game.Overlays.Mods
             }
         }
 
-        /// <summary>
-        /// Search term applied on mod overlay
-        /// </summary>
         public string SearchTerm
         {
             get => SearchTextBox.Current.Value;
@@ -79,9 +76,6 @@ namespace osu.Game.Overlays.Mods
             }
         }
 
-        /// <summary>
-        /// Search box applied on mod overlay
-        /// </summary>
         public ShearedSearchTextBox SearchTextBox { get; private set; } = null!;
 
         /// <summary>

From d400387329e9c255e39a8229697ef47aeeb639cf Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Fri, 2 Jun 2023 10:51:33 +0300
Subject: [PATCH 0672/1604] Replace `IConditionalFilterable` with `IFilterable`

---
 osu.Game/Overlays/Mods/ModPanel.cs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModPanel.cs b/osu.Game/Overlays/Mods/ModPanel.cs
index cd94226d8f..e3bd3ad370 100644
--- a/osu.Game/Overlays/Mods/ModPanel.cs
+++ b/osu.Game/Overlays/Mods/ModPanel.cs
@@ -14,7 +14,7 @@ using osuTK;
 
 namespace osu.Game.Overlays.Mods
 {
-    public partial class ModPanel : ModSelectPanel, IConditionalFilterable
+    public partial class ModPanel : ModSelectPanel, IFilterable
     {
         public Mod Mod => modState.Mod;
         public override BindableBool Active => modState.Active;
@@ -110,13 +110,6 @@ namespace osu.Game.Overlays.Mods
             }
         }
 
-        /// <summary>
-        /// This property is always <see langword="true"/> because it affects search result
-        /// </summary>
-        private readonly BindableBool canBeShown = new BindableBool(true);
-
-        IBindable<bool> IConditionalFilterable.CanBeShown => canBeShown;
-
         private void updateFilterState()
         {
             this.FadeTo(IsValid ? 1 : 0);

From 4c7cca101eab9879a7605c604be75c43516f26bf Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Fri, 2 Jun 2023 11:33:38 +0300
Subject: [PATCH 0673/1604] Rename `IsValid` to `Visible`

---
 .../TestSceneMultiplayerMatchSubScreen.cs        |  2 +-
 .../Visual/UserInterface/TestSceneModColumn.cs   | 16 ++++++++--------
 .../UserInterface/TestSceneModSelectOverlay.cs   | 16 ++++++++--------
 .../Mods/Input/ClassicModHotkeyHandler.cs        |  2 +-
 .../Mods/Input/SequentialModHotkeyHandler.cs     |  2 +-
 osu.Game/Overlays/Mods/ModColumn.cs              | 10 +++++-----
 osu.Game/Overlays/Mods/ModPanel.cs               |  6 +++---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs       |  6 +++---
 osu.Game/Overlays/Mods/ModState.cs               |  4 ++--
 osu.Game/Overlays/Mods/SelectAllModsButton.cs    |  2 +-
 10 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
index 40acea475b..a41eff067b 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
@@ -203,7 +203,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddUntilStep("mod select contains only double time mod",
                 () => this.ChildrenOfType<RoomSubScreen>().Single().UserModsSelectOverlay
                           .ChildrenOfType<ModPanel>()
-                          .SingleOrDefault(panel => panel.IsValid)?.Mod is OsuModDoubleTime);
+                          .SingleOrDefault(panel => panel.Visible)?.Mod is OsuModDoubleTime);
         }
 
         [Test]
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs
index 394a38fe5d..255dbfcdd3 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs
@@ -106,26 +106,26 @@ namespace osu.Game.Tests.Visual.UserInterface
             });
 
             AddStep("set filter", () => setFilter(mod => mod.Name.Contains("Wind", StringComparison.CurrentCultureIgnoreCase)));
-            AddUntilStep("two panels visible", () => column.ChildrenOfType<ModPanel>().Count(panel => panel.IsValid) == 2);
+            AddUntilStep("two panels visible", () => column.ChildrenOfType<ModPanel>().Count(panel => panel.Visible) == 2);
 
             clickToggle();
             AddUntilStep("wait for animation", () => !column.SelectionAnimationRunning);
-            AddAssert("only visible items selected", () => column.ChildrenOfType<ModPanel>().Where(panel => panel.Active.Value).All(panel => panel.IsValid));
+            AddAssert("only visible items selected", () => column.ChildrenOfType<ModPanel>().Where(panel => panel.Active.Value).All(panel => panel.Visible));
 
             AddStep("unset filter", () => setFilter(null));
-            AddUntilStep("all panels visible", () => column.ChildrenOfType<ModPanel>().All(panel => panel.IsValid));
+            AddUntilStep("all panels visible", () => column.ChildrenOfType<ModPanel>().All(panel => panel.Visible));
             AddAssert("checkbox not selected", () => !column.ChildrenOfType<OsuCheckbox>().Single().Current.Value);
 
             AddStep("set filter", () => setFilter(mod => mod.Name.Contains("Wind", StringComparison.CurrentCultureIgnoreCase)));
-            AddUntilStep("two panels visible", () => column.ChildrenOfType<ModPanel>().Count(panel => panel.IsValid) == 2);
+            AddUntilStep("two panels visible", () => column.ChildrenOfType<ModPanel>().Count(panel => panel.Visible) == 2);
             AddAssert("checkbox selected", () => column.ChildrenOfType<OsuCheckbox>().Single().Current.Value);
 
             AddStep("filter out everything", () => setFilter(_ => false));
-            AddUntilStep("no panels visible", () => column.ChildrenOfType<ModPanel>().All(panel => !panel.IsValid));
+            AddUntilStep("no panels visible", () => column.ChildrenOfType<ModPanel>().All(panel => !panel.Visible));
             AddUntilStep("checkbox hidden", () => !column.ChildrenOfType<OsuCheckbox>().Single().IsPresent);
 
             AddStep("inset filter", () => setFilter(null));
-            AddUntilStep("all panels visible", () => column.ChildrenOfType<ModPanel>().All(panel => panel.IsValid));
+            AddUntilStep("all panels visible", () => column.ChildrenOfType<ModPanel>().All(panel => panel.Visible));
             AddUntilStep("checkbox visible", () => column.ChildrenOfType<OsuCheckbox>().Single().IsPresent);
 
             void clickToggle() => AddStep("click toggle", () =>
@@ -320,14 +320,14 @@ namespace osu.Game.Tests.Visual.UserInterface
             {
                 AddStep("search by mod name", () => column.SearchTerm = searchTerm);
 
-                AddAssert("only hidden is visible", () => column.ChildrenOfType<ModPanel>().Where(panel => panel.IsValid).All(panel => panel.Mod is ModHidden));
+                AddAssert("only hidden is visible", () => column.ChildrenOfType<ModPanel>().Where(panel => panel.Visible).All(panel => panel.Mod is ModHidden));
             }
 
             void clearSearch()
             {
                 AddStep("clear search", () => column.SearchTerm = string.Empty);
 
-                AddAssert("all mods are visible", () => column.ChildrenOfType<ModPanel>().All(panel => panel.IsValid));
+                AddAssert("all mods are visible", () => column.ChildrenOfType<ModPanel>().All(panel => panel.Visible));
             }
         }
 
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 22baea2581..c42f9af6df 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -490,15 +490,15 @@ namespace osu.Game.Tests.Visual.UserInterface
             createScreen();
             changeRuleset(0);
 
-            AddAssert("double time visible", () => modSelectOverlay.ChildrenOfType<ModPanel>().Where(panel => panel.Mod is OsuModDoubleTime).Any(panel => panel.IsValid));
+            AddAssert("double time visible", () => modSelectOverlay.ChildrenOfType<ModPanel>().Where(panel => panel.Mod is OsuModDoubleTime).Any(panel => panel.Visible));
 
             AddStep("make double time invalid", () => modSelectOverlay.IsValidMod = m => !(m is OsuModDoubleTime));
-            AddUntilStep("double time not visible", () => modSelectOverlay.ChildrenOfType<ModPanel>().Where(panel => panel.Mod is OsuModDoubleTime).All(panel => !panel.IsValid));
-            AddAssert("nightcore still visible", () => modSelectOverlay.ChildrenOfType<ModPanel>().Where(panel => panel.Mod is OsuModNightcore).Any(panel => panel.IsValid));
+            AddUntilStep("double time not visible", () => modSelectOverlay.ChildrenOfType<ModPanel>().Where(panel => panel.Mod is OsuModDoubleTime).All(panel => !panel.Visible));
+            AddAssert("nightcore still visible", () => modSelectOverlay.ChildrenOfType<ModPanel>().Where(panel => panel.Mod is OsuModNightcore).Any(panel => panel.Visible));
 
             AddStep("make double time valid again", () => modSelectOverlay.IsValidMod = _ => true);
-            AddUntilStep("double time visible", () => modSelectOverlay.ChildrenOfType<ModPanel>().Where(panel => panel.Mod is OsuModDoubleTime).Any(panel => panel.IsValid));
-            AddAssert("nightcore still visible", () => modSelectOverlay.ChildrenOfType<ModPanel>().Where(b => b.Mod is OsuModNightcore).Any(panel => panel.IsValid));
+            AddUntilStep("double time visible", () => modSelectOverlay.ChildrenOfType<ModPanel>().Where(panel => panel.Mod is OsuModDoubleTime).Any(panel => panel.Visible));
+            AddAssert("nightcore still visible", () => modSelectOverlay.ChildrenOfType<ModPanel>().Where(b => b.Mod is OsuModNightcore).Any(panel => panel.Visible));
         }
 
         [Test]
@@ -524,7 +524,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("set ruleset", () => Ruleset.Value = testRuleset.RulesetInfo);
             waitForColumnLoad();
 
-            AddAssert("unimplemented mod panel is filtered", () => !getPanelForMod(typeof(TestUnimplementedMod)).IsValid);
+            AddAssert("unimplemented mod panel is filtered", () => !getPanelForMod(typeof(TestUnimplementedMod)).Visible);
         }
 
         [Test]
@@ -585,7 +585,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("select DT + HD", () => SelectedMods.Value = new Mod[] { new OsuModDoubleTime(), new OsuModHidden() });
             AddStep("focus on search", () => modSelectOverlay.SearchTextBox.TakeFocus());
             AddStep("apply search", () => modSelectOverlay.SearchTerm = "Easy");
-            AddAssert("DT + HD selected and hidden", () => modSelectOverlay.ChildrenOfType<ModPanel>().Count(panel => !panel.IsValid && panel.Active.Value) == 2);
+            AddAssert("DT + HD selected and hidden", () => modSelectOverlay.ChildrenOfType<ModPanel>().Count(panel => !panel.Visible && panel.Active.Value) == 2);
 
             AddStep("press backspace", () => InputManager.Key(Key.BackSpace));
             AddAssert("DT + HD still selected", () => modSelectOverlay.ChildrenOfType<ModPanel>().Count(panel => panel.Active.Value) == 2);
@@ -630,7 +630,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("deselect all button enabled", () => this.ChildrenOfType<DeselectAllModsButton>().Single().Enabled.Value);
 
             AddStep("apply search", () => modSelectOverlay.SearchTerm = "Easy");
-            AddAssert("DT + HD + RD are hidden and selected", () => modSelectOverlay.ChildrenOfType<ModPanel>().Count(panel => !panel.IsValid && panel.Active.Value) == 3);
+            AddAssert("DT + HD + RD are hidden and selected", () => modSelectOverlay.ChildrenOfType<ModPanel>().Count(panel => !panel.Visible && panel.Active.Value) == 3);
             AddAssert("deselect all button enabled", () => this.ChildrenOfType<DeselectAllModsButton>().Single().Enabled.Value);
 
             AddStep("click deselect all button", () =>
diff --git a/osu.Game/Overlays/Mods/Input/ClassicModHotkeyHandler.cs b/osu.Game/Overlays/Mods/Input/ClassicModHotkeyHandler.cs
index 343f7242f1..59a631a7b5 100644
--- a/osu.Game/Overlays/Mods/Input/ClassicModHotkeyHandler.cs
+++ b/osu.Game/Overlays/Mods/Input/ClassicModHotkeyHandler.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Overlays.Mods.Input
             if (!mod_type_lookup.TryGetValue(e.Key, out var typesToMatch))
                 return false;
 
-            var matchingMods = availableMods.Where(modState => matches(modState, typesToMatch) && modState.IsValid).ToArray();
+            var matchingMods = availableMods.Where(modState => matches(modState, typesToMatch) && modState.Visible).ToArray();
 
             if (matchingMods.Length == 0)
                 return false;
diff --git a/osu.Game/Overlays/Mods/Input/SequentialModHotkeyHandler.cs b/osu.Game/Overlays/Mods/Input/SequentialModHotkeyHandler.cs
index cbfa96307d..e638063438 100644
--- a/osu.Game/Overlays/Mods/Input/SequentialModHotkeyHandler.cs
+++ b/osu.Game/Overlays/Mods/Input/SequentialModHotkeyHandler.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Overlays.Mods.Input
             if (index < 0)
                 return false;
 
-            var modState = availableMods.Where(modState => modState.IsValid).ElementAtOrDefault(index);
+            var modState = availableMods.Where(modState => modState.Visible).ElementAtOrDefault(index);
             if (modState == null)
                 return false;
 
diff --git a/osu.Game/Overlays/Mods/ModColumn.cs b/osu.Game/Overlays/Mods/ModColumn.cs
index f7d7d4db73..9146cd7abe 100644
--- a/osu.Game/Overlays/Mods/ModColumn.cs
+++ b/osu.Game/Overlays/Mods/ModColumn.cs
@@ -146,15 +146,15 @@ namespace osu.Game.Overlays.Mods
 
         private void updateState()
         {
-            Alpha = availableMods.All(mod => !mod.IsValid) ? 0 : 1;
+            Alpha = availableMods.All(mod => !mod.Visible) ? 0 : 1;
 
             if (toggleAllCheckbox != null && !SelectionAnimationRunning)
             {
-                toggleAllCheckbox.Alpha = availableMods.Any(panel => panel.IsValid) ? 1 : 0;
+                toggleAllCheckbox.Alpha = availableMods.Any(panel => panel.Visible) ? 1 : 0;
 
                 //Prevent checkbox from checking when column have on valid panels
-                if (availableMods.Any(panel => panel.IsValid))
-                    toggleAllCheckbox.Current.Value = availableMods.Where(panel => panel.IsValid).All(panel => panel.Active.Value);
+                if (availableMods.Any(panel => panel.Visible))
+                    toggleAllCheckbox.Current.Value = availableMods.Where(panel => panel.Visible).All(panel => panel.Active.Value);
             }
         }
 
@@ -199,7 +199,7 @@ namespace osu.Game.Overlays.Mods
         {
             pendingSelectionOperations.Clear();
 
-            foreach (var button in availableMods.Where(b => !b.Active.Value && b.IsValid))
+            foreach (var button in availableMods.Where(b => !b.Active.Value && b.Visible))
                 pendingSelectionOperations.Enqueue(() => button.Active.Value = true);
         }
 
diff --git a/osu.Game/Overlays/Mods/ModPanel.cs b/osu.Game/Overlays/Mods/ModPanel.cs
index e3bd3ad370..86ecdfa31d 100644
--- a/osu.Game/Overlays/Mods/ModPanel.cs
+++ b/osu.Game/Overlays/Mods/ModPanel.cs
@@ -73,9 +73,9 @@ namespace osu.Game.Overlays.Mods
         }
 
         /// <summary>
-        /// Determine if <see cref="ModPanel"/> is valid and can be shown
+        /// Whether the <see cref="ModPanel"/> is passing all filters and visible for user
         /// </summary>
-        public bool IsValid => modState.IsValid;
+        public bool Visible => modState.Visible;
 
         public bool ValidForSelection
         {
@@ -112,7 +112,7 @@ namespace osu.Game.Overlays.Mods
 
         private void updateFilterState()
         {
-            this.FadeTo(IsValid ? 1 : 0);
+            this.FadeTo(Visible ? 1 : 0);
         }
 
         #endregion
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index af8a7bd810..1d5849e3f2 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -511,7 +511,7 @@ namespace osu.Game.Overlays.Mods
             {
                 var column = columnFlow[i].Column;
 
-                bool allFiltered = column is ModColumn modColumn && modColumn.AvailableMods.All(modState => !modState.IsValid);
+                bool allFiltered = column is ModColumn modColumn && modColumn.AvailableMods.All(modState => !modState.Visible);
 
                 double delay = allFiltered ? 0 : nonFilteredColumnCount * 30;
                 double duration = allFiltered ? 0 : fade_in_duration;
@@ -573,7 +573,7 @@ namespace osu.Game.Overlays.Mods
 
                 if (column is ModColumn modColumn)
                 {
-                    allFiltered = modColumn.AvailableMods.All(modState => !modState.IsValid);
+                    allFiltered = modColumn.AvailableMods.All(modState => !modState.Visible);
                     modColumn.FlushPendingSelections();
                 }
 
@@ -623,7 +623,7 @@ namespace osu.Game.Overlays.Mods
                         return true;
                     }
 
-                    ModState? firstMod = columnFlow.Columns.OfType<ModColumn>().FirstOrDefault(m => m.IsPresent)?.AvailableMods.FirstOrDefault(x => x.IsValid);
+                    ModState? firstMod = columnFlow.Columns.OfType<ModColumn>().FirstOrDefault(m => m.IsPresent)?.AvailableMods.FirstOrDefault(x => x.Visible);
 
                     if (firstMod is not null)
                         firstMod.Active.Value = !firstMod.Active.Value;
diff --git a/osu.Game/Overlays/Mods/ModState.cs b/osu.Game/Overlays/Mods/ModState.cs
index be770ec937..5e0d768021 100644
--- a/osu.Game/Overlays/Mods/ModState.cs
+++ b/osu.Game/Overlays/Mods/ModState.cs
@@ -39,9 +39,9 @@ namespace osu.Game.Overlays.Mods
         public BindableBool ValidForSelection { get; } = new BindableBool(true);
 
         /// <summary>
-        /// Determine if <see cref="Mod"/> is valid and can be shown
+        /// Whether the <see cref="Mod"/> is passing all filters and visible for user
         /// </summary>
-        public bool IsValid => MatchingFilter.Value && ValidForSelection.Value;
+        public bool Visible => MatchingFilter.Value && ValidForSelection.Value;
 
         /// <summary>
         /// Whether the mod is matching the current filter, i.e. it is available for user selection.
diff --git a/osu.Game/Overlays/Mods/SelectAllModsButton.cs b/osu.Game/Overlays/Mods/SelectAllModsButton.cs
index dad4f7b629..8a6180a7c8 100644
--- a/osu.Game/Overlays/Mods/SelectAllModsButton.cs
+++ b/osu.Game/Overlays/Mods/SelectAllModsButton.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Overlays.Mods
         {
             Enabled.Value = availableMods.Value
                                          .SelectMany(pair => pair.Value)
-                                         .Any(modState => !modState.Active.Value && modState.IsValid);
+                                         .Any(modState => !modState.Active.Value && modState.Visible);
         }
 
         public bool OnPressed(KeyBindingPressEvent<PlatformAction> e)

From 02111e38542edaa0657c9e1ea7ac48ed4b0d10f0 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 1 Jun 2023 13:22:37 +0900
Subject: [PATCH 0674/1604] Implement ScoreV1 calculation for OsuRuleset

---
 .../Difficulty/OsuDifficultyCalculator.cs     | 149 +++++++++++++++++-
 .../Difficulty/DifficultyAttributes.cs        |  18 ++-
 2 files changed, 162 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
index 1e83d6d820..0e06e1e28f 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
@@ -11,6 +11,8 @@ using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Skills;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Osu.Difficulty.Skills;
 using osu.Game.Rulesets.Osu.Mods;
@@ -26,9 +28,12 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
         public override int Version => 20220902;
 
+        private readonly IWorkingBeatmap workingBeatmap;
+
         public OsuDifficultyCalculator(IRulesetInfo ruleset, IWorkingBeatmap beatmap)
             : base(ruleset, beatmap)
         {
+            workingBeatmap = beatmap;
         }
 
         protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beatmap, Mod[] mods, Skill[] skills, double clockRate)
@@ -71,7 +76,9 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                     Math.Pow(baseFlashlightPerformance, 1.1), 1.0 / 1.1
                 );
 
-            double starRating = basePerformance > 0.00001 ? Math.Cbrt(OsuPerformanceCalculator.PERFORMANCE_BASE_MULTIPLIER) * 0.027 * (Math.Cbrt(100000 / Math.Pow(2, 1 / 1.1) * basePerformance) + 4) : 0;
+            double starRating = basePerformance > 0.00001
+                ? Math.Cbrt(OsuPerformanceCalculator.PERFORMANCE_BASE_MULTIPLIER) * 0.027 * (Math.Cbrt(100000 / Math.Pow(2, 1 / 1.1) * basePerformance) + 4)
+                : 0;
 
             double preempt = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.ApproachRate, 1800, 1200, 450) / clockRate;
             double drainRate = beatmap.Difficulty.DrainRate;
@@ -90,6 +97,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             {
                 StarRating = starRating,
                 Mods = mods,
+                TotalScoreV1 = new OsuScoreV1Processor(workingBeatmap.Beatmap, beatmap, mods).TotalScore,
                 AimDifficulty = aimRating,
                 SpeedDifficulty = speedRating,
                 SpeedNoteCount = speedNotes,
@@ -142,4 +150,143 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             new MultiMod(new OsuModFlashlight(), new OsuModHidden())
         };
     }
+
+    public abstract class ScoreV1Processor
+    {
+        protected readonly int DifficultyPeppyStars;
+        protected readonly double ScoreMultiplier;
+
+        protected readonly IBeatmap PlayableBeatmap;
+
+        protected ScoreV1Processor(IBeatmap baseBeatmap, IBeatmap playableBeatmap, IReadOnlyList<Mod> mods)
+        {
+            PlayableBeatmap = playableBeatmap;
+
+            int countNormal = 0;
+            int countSlider = 0;
+            int countSpinner = 0;
+
+            foreach (HitObject obj in baseBeatmap.HitObjects)
+            {
+                switch (obj)
+                {
+                    case IHasPath:
+                        countSlider++;
+                        break;
+
+                    case IHasDuration:
+                        countSpinner++;
+                        break;
+
+                    default:
+                        countNormal++;
+                        break;
+                }
+            }
+
+            int objectCount = countNormal + countSlider + countSpinner;
+
+            DifficultyPeppyStars = (int)Math.Round(
+                (playableBeatmap.Difficulty.DrainRate
+                 + playableBeatmap.Difficulty.OverallDifficulty
+                 + playableBeatmap.Difficulty.CircleSize
+                 + Math.Clamp(objectCount / playableBeatmap.Difficulty.DrainRate * 8, 0, 16)) / 38 * 5);
+
+            ScoreMultiplier = 1 * DifficultyPeppyStars * mods.Aggregate(1.0, (current, mod) => current * mod.ScoreMultiplier);
+        }
+    }
+
+    public class OsuScoreV1Processor : ScoreV1Processor
+    {
+        public int TotalScore { get; private set; }
+        private int combo;
+
+        public OsuScoreV1Processor(IBeatmap baseBeatmap, IBeatmap playableBeatmap, IReadOnlyList<Mod> mods)
+            : base(baseBeatmap, playableBeatmap, mods)
+        {
+            foreach (var obj in playableBeatmap.HitObjects)
+                increaseScore(obj);
+        }
+
+        private void increaseScore(HitObject hitObject)
+        {
+            bool increaseCombo = true;
+            bool addScoreComboMultiplier = false;
+            int scoreIncrease = 0;
+
+            switch (hitObject)
+            {
+                case SliderHeadCircle:
+                case SliderTailCircle:
+                case SliderRepeat:
+                    scoreIncrease = 30;
+                    break;
+
+                case SliderTick:
+                    scoreIncrease = 10;
+                    break;
+
+                case SpinnerBonusTick:
+                    scoreIncrease = 1100;
+                    increaseCombo = false;
+                    break;
+
+                case SpinnerTick:
+                    scoreIncrease = 100;
+                    increaseCombo = false;
+                    break;
+
+                case HitCircle:
+                    scoreIncrease = 300;
+                    addScoreComboMultiplier = true;
+                    break;
+
+                case Slider:
+                    foreach (var nested in hitObject.NestedHitObjects)
+                        increaseScore(nested);
+
+                    scoreIncrease = 300;
+                    increaseCombo = false;
+                    addScoreComboMultiplier = true;
+                    break;
+
+                case Spinner spinner:
+                    // The spinner object applies a lenience because gameplay mechanics differ from osu-stable.
+                    // We'll redo the calculations to match osu-stable here...
+                    const double maximum_rotations_per_second = 477.0 / 60;
+                    double minimumRotationsPerSecond = IBeatmapDifficultyInfo.DifficultyRange(PlayableBeatmap.Difficulty.OverallDifficulty, 3, 5, 7.5);
+                    double secondsDuration = spinner.Duration / 1000;
+
+                    // The total amount of half spins possible for the entire spinner.
+                    int totalHalfSpinsPossible = (int)(secondsDuration * maximum_rotations_per_second * 2);
+                    // The amount of half spins that are required to successfully complete the spinner (i.e. get a 300).
+                    int halfSpinsRequiredForCompletion = (int)(secondsDuration * minimumRotationsPerSecond);
+                    // To be able to receive bonus points, the spinner must be rotated another 1.5 times.
+                    int halfSpinsRequiredBeforeBonus = halfSpinsRequiredForCompletion + 3;
+
+                    for (int i = 0; i <= totalHalfSpinsPossible; i++)
+                    {
+                        if (i > halfSpinsRequiredBeforeBonus && (i - halfSpinsRequiredBeforeBonus) % 2 == 0)
+                            increaseScore(new SpinnerBonusTick());
+                        else if (i > 1 && i % 2 == 0)
+                            increaseScore(new SpinnerTick());
+                    }
+
+                    scoreIncrease = 300;
+                    addScoreComboMultiplier = true;
+                    break;
+            }
+
+            if (addScoreComboMultiplier)
+            {
+                // ReSharper disable once PossibleLossOfFraction (intentional to match osu-stable...)
+                scoreIncrease += (int)(Math.Max(0, combo - 1) * (scoreIncrease / 25 * ScoreMultiplier));
+            }
+
+            if (increaseCombo)
+                combo++;
+
+            TotalScore += scoreIncrease;
+        }
+    }
 }
diff --git a/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs b/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
index bd45482235..d0fbd0afaf 100644
--- a/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
+++ b/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Newtonsoft.Json;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
@@ -27,6 +26,7 @@ namespace osu.Game.Rulesets.Difficulty
         protected const int ATTRIB_ID_FLASHLIGHT = 17;
         protected const int ATTRIB_ID_SLIDER_FACTOR = 19;
         protected const int ATTRIB_ID_SPEED_NOTE_COUNT = 21;
+        protected const int ATTRIB_ID_TOTAL_SCORE_V1 = 23;
 
         /// <summary>
         /// The mods which were applied to the beatmap.
@@ -36,15 +36,21 @@ namespace osu.Game.Rulesets.Difficulty
         /// <summary>
         /// The combined star rating of all skills.
         /// </summary>
-        [JsonProperty("star_rating", Order = -3)]
+        [JsonProperty("star_rating", Order = -4)]
         public double StarRating { get; set; }
 
         /// <summary>
         /// The maximum achievable combo.
         /// </summary>
-        [JsonProperty("max_combo", Order = -2)]
+        [JsonProperty("max_combo", Order = -3)]
         public int MaxCombo { get; set; }
 
+        /// <summary>
+        /// The total score achievable in ScoreV1.
+        /// </summary>
+        [JsonProperty("total_score_v1", Order = -2)]
+        public int TotalScoreV1 { get; set; }
+
         /// <summary>
         /// Creates new <see cref="DifficultyAttributes"/>.
         /// </summary>
@@ -69,7 +75,10 @@ namespace osu.Game.Rulesets.Difficulty
         /// <remarks>
         /// See: osu_difficulty_attribs table.
         /// </remarks>
-        public virtual IEnumerable<(int attributeId, object value)> ToDatabaseAttributes() => Enumerable.Empty<(int, object)>();
+        public virtual IEnumerable<(int attributeId, object value)> ToDatabaseAttributes()
+        {
+            yield return (ATTRIB_ID_TOTAL_SCORE_V1, TotalScoreV1);
+        }
 
         /// <summary>
         /// Reads osu-web database attribute mappings into this <see cref="DifficultyAttributes"/> object.
@@ -78,6 +87,7 @@ namespace osu.Game.Rulesets.Difficulty
         /// <param name="onlineInfo">The <see cref="IBeatmapOnlineInfo"/> where more information about the beatmap may be extracted from (such as AR/CS/OD/etc).</param>
         public virtual void FromDatabaseAttributes(IReadOnlyDictionary<int, double> values, IBeatmapOnlineInfo onlineInfo)
         {
+            TotalScoreV1 = (int)values[ATTRIB_ID_TOTAL_SCORE_V1];
         }
     }
 }

From bfe80fe143249cefe1798db4675c024075d3db12 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 2 Jun 2023 17:37:43 +0900
Subject: [PATCH 0675/1604] Fix legacy diffcalc creating all mods unnecessarily

---
 osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
index 8dd1b51cae..00c90bd317 100644
--- a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
+++ b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
@@ -137,7 +137,7 @@ namespace osu.Game.Rulesets.Difficulty
 
             foreach (var combination in CreateDifficultyAdjustmentModCombinations())
             {
-                Mod classicMod = rulesetInstance.CreateAllMods().SingleOrDefault(m => m is ModClassic);
+                Mod classicMod = rulesetInstance.CreateMod<ModClassic>();
 
                 var finalCombination = ModUtils.FlattenMod(combination);
                 if (classicMod != null)

From 9d4ba5d64ab354b8163efc73a6287ec610a32fa9 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Fri, 2 Jun 2023 12:00:03 +0300
Subject: [PATCH 0676/1604] Remove unnecessary null checks

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 1d5849e3f2..ad5d571535 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -501,7 +501,7 @@ namespace osu.Game.Overlays.Mods
 
             base.PopIn();
 
-            aboveColumnsContent?
+            aboveColumnsContent
                 .FadeIn(fade_in_duration, Easing.OutQuint)
                 .MoveToY(0, fade_in_duration, Easing.OutQuint);
 
@@ -559,7 +559,7 @@ namespace osu.Game.Overlays.Mods
 
             base.PopOut();
 
-            aboveColumnsContent?
+            aboveColumnsContent
                 .FadeOut(fade_out_duration / 2, Easing.OutQuint)
                 .MoveToY(-distance, fade_out_duration / 2, Easing.OutQuint);
 

From e402c6d2b4275b87468d1280826ae1c96d338c46 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 2 Jun 2023 21:53:25 +0900
Subject: [PATCH 0677/1604] Write max combo attribute from base class

---
 osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyAttributes.cs | 2 --
 osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyAttributes.cs | 2 --
 osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs     | 2 --
 osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyAttributes.cs | 2 --
 osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs            | 2 ++
 5 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyAttributes.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyAttributes.cs
index 2d01153f98..5c64643fd4 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyAttributes.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyAttributes.cs
@@ -27,7 +27,6 @@ namespace osu.Game.Rulesets.Catch.Difficulty
             // Todo: osu!catch should not output star rating in the 'aim' attribute.
             yield return (ATTRIB_ID_AIM, StarRating);
             yield return (ATTRIB_ID_APPROACH_RATE, ApproachRate);
-            yield return (ATTRIB_ID_MAX_COMBO, MaxCombo);
         }
 
         public override void FromDatabaseAttributes(IReadOnlyDictionary<int, double> values, IBeatmapOnlineInfo onlineInfo)
@@ -36,7 +35,6 @@ namespace osu.Game.Rulesets.Catch.Difficulty
 
             StarRating = values[ATTRIB_ID_AIM];
             ApproachRate = values[ATTRIB_ID_APPROACH_RATE];
-            MaxCombo = (int)values[ATTRIB_ID_MAX_COMBO];
         }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyAttributes.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyAttributes.cs
index d259c2af8e..db60e757e1 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyAttributes.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyAttributes.cs
@@ -24,7 +24,6 @@ namespace osu.Game.Rulesets.Mania.Difficulty
             foreach (var v in base.ToDatabaseAttributes())
                 yield return v;
 
-            yield return (ATTRIB_ID_MAX_COMBO, MaxCombo);
             yield return (ATTRIB_ID_DIFFICULTY, StarRating);
             yield return (ATTRIB_ID_GREAT_HIT_WINDOW, GreatHitWindow);
         }
@@ -33,7 +32,6 @@ namespace osu.Game.Rulesets.Mania.Difficulty
         {
             base.FromDatabaseAttributes(values, onlineInfo);
 
-            MaxCombo = (int)values[ATTRIB_ID_MAX_COMBO];
             StarRating = values[ATTRIB_ID_DIFFICULTY];
             GreatHitWindow = values[ATTRIB_ID_GREAT_HIT_WINDOW];
         }
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs
index 03540abddb..24d5635104 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs
@@ -93,7 +93,6 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             yield return (ATTRIB_ID_SPEED, SpeedDifficulty);
             yield return (ATTRIB_ID_OVERALL_DIFFICULTY, OverallDifficulty);
             yield return (ATTRIB_ID_APPROACH_RATE, ApproachRate);
-            yield return (ATTRIB_ID_MAX_COMBO, MaxCombo);
             yield return (ATTRIB_ID_DIFFICULTY, StarRating);
 
             if (ShouldSerializeFlashlightRating())
@@ -111,7 +110,6 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             SpeedDifficulty = values[ATTRIB_ID_SPEED];
             OverallDifficulty = values[ATTRIB_ID_OVERALL_DIFFICULTY];
             ApproachRate = values[ATTRIB_ID_APPROACH_RATE];
-            MaxCombo = (int)values[ATTRIB_ID_MAX_COMBO];
             StarRating = values[ATTRIB_ID_DIFFICULTY];
             FlashlightDifficulty = values.GetValueOrDefault(ATTRIB_ID_FLASHLIGHT);
             SliderFactor = values[ATTRIB_ID_SLIDER_FACTOR];
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyAttributes.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyAttributes.cs
index 72452e27b3..1664c941f8 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyAttributes.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyAttributes.cs
@@ -48,7 +48,6 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
             foreach (var v in base.ToDatabaseAttributes())
                 yield return v;
 
-            yield return (ATTRIB_ID_MAX_COMBO, MaxCombo);
             yield return (ATTRIB_ID_DIFFICULTY, StarRating);
             yield return (ATTRIB_ID_GREAT_HIT_WINDOW, GreatHitWindow);
         }
@@ -57,7 +56,6 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
         {
             base.FromDatabaseAttributes(values, onlineInfo);
 
-            MaxCombo = (int)values[ATTRIB_ID_MAX_COMBO];
             StarRating = values[ATTRIB_ID_DIFFICULTY];
             GreatHitWindow = values[ATTRIB_ID_GREAT_HIT_WINDOW];
         }
diff --git a/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs b/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
index d0fbd0afaf..ee02376939 100644
--- a/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
+++ b/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
@@ -77,6 +77,7 @@ namespace osu.Game.Rulesets.Difficulty
         /// </remarks>
         public virtual IEnumerable<(int attributeId, object value)> ToDatabaseAttributes()
         {
+            yield return (ATTRIB_ID_MAX_COMBO, MaxCombo);
             yield return (ATTRIB_ID_TOTAL_SCORE_V1, TotalScoreV1);
         }
 
@@ -87,6 +88,7 @@ namespace osu.Game.Rulesets.Difficulty
         /// <param name="onlineInfo">The <see cref="IBeatmapOnlineInfo"/> where more information about the beatmap may be extracted from (such as AR/CS/OD/etc).</param>
         public virtual void FromDatabaseAttributes(IReadOnlyDictionary<int, double> values, IBeatmapOnlineInfo onlineInfo)
         {
+            MaxCombo = (int)values[ATTRIB_ID_MAX_COMBO];
             TotalScoreV1 = (int)values[ATTRIB_ID_TOTAL_SCORE_V1];
         }
     }

From a5fd833214566781159fa51ccc57df785c10817b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Jun 2023 23:01:03 +0900
Subject: [PATCH 0678/1604] Fix "bubbles" mod not adding pool to hierarchy (and
 constructing too early)

---
 osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
index 12e2090f89..b74b722bad 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
@@ -42,14 +42,14 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         private PlayfieldAdjustmentContainer bubbleContainer = null!;
 
+        private DrawablePool<BubbleDrawable> bubblePool = null!;
+
         private readonly Bindable<int> currentCombo = new BindableInt();
 
         private float maxSize;
         private float bubbleSize;
         private double bubbleFade;
 
-        private readonly DrawablePool<BubbleDrawable> bubblePool = new DrawablePool<BubbleDrawable>(100);
-
         public ScoreRank AdjustRank(ScoreRank rank, double accuracy) => rank;
 
         public void ApplyToScoreProcessor(ScoreProcessor scoreProcessor)
@@ -72,6 +72,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             bubbleContainer = drawableRuleset.CreatePlayfieldAdjustmentContainer();
 
             drawableRuleset.Overlays.Add(bubbleContainer);
+            drawableRuleset.Overlays.Add(bubblePool = new DrawablePool<BubbleDrawable>(100));
         }
 
         public void ApplyToDrawableHitObject(DrawableHitObject drawableObject)

From 69b640a185a1850159064a2701cba7726c27da44 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Sat, 3 Jun 2023 10:47:48 +0300
Subject: [PATCH 0679/1604] Remove hotkeys handling from
 `DeselectAllModsButton`

---
 osu.Game/Overlays/Mods/DeselectAllModsButton.cs |  5 +----
 osu.Game/Overlays/Mods/ModSelectOverlay.cs      | 16 ++++++++--------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Overlays/Mods/DeselectAllModsButton.cs b/osu.Game/Overlays/Mods/DeselectAllModsButton.cs
index bdb37e3ead..3e5a3b12d1 100644
--- a/osu.Game/Overlays/Mods/DeselectAllModsButton.cs
+++ b/osu.Game/Overlays/Mods/DeselectAllModsButton.cs
@@ -18,7 +18,6 @@ namespace osu.Game.Overlays.Mods
     public partial class DeselectAllModsButton : ShearedButton, IKeyBindingHandler<GlobalAction>
     {
         private readonly Bindable<IReadOnlyList<Mod>> selectedMods = new Bindable<IReadOnlyList<Mod>>();
-        private readonly ShearedSearchTextBox searchTextBox;
 
         public DeselectAllModsButton(ModSelectOverlay modSelectOverlay)
             : base(ModSelectOverlay.BUTTON_WIDTH)
@@ -26,8 +25,6 @@ namespace osu.Game.Overlays.Mods
             Text = CommonStrings.DeselectAll;
             Action = modSelectOverlay.DeselectAll;
 
-            searchTextBox = modSelectOverlay.SearchTextBox;
-
             selectedMods.BindTo(modSelectOverlay.SelectedMods);
         }
 
@@ -45,7 +42,7 @@ namespace osu.Game.Overlays.Mods
 
         public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
         {
-            if (e.Repeat || e.Action != GlobalAction.DeselectAllMods || searchTextBox.HasFocus)
+            if (e.Repeat || e.Action != GlobalAction.DeselectAllMods)
                 return false;
 
             TriggerClick();
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index ad5d571535..e3977f6ecd 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -66,17 +66,17 @@ namespace osu.Game.Overlays.Mods
 
         public string SearchTerm
         {
-            get => SearchTextBox.Current.Value;
+            get => searchTextBox.Current.Value;
             set
             {
-                if (SearchTextBox.Current.Value == value)
+                if (searchTextBox.Current.Value == value)
                     return;
 
-                SearchTextBox.Current.Value = value;
+                searchTextBox.Current.Value = value;
             }
         }
 
-        public ShearedSearchTextBox SearchTextBox { get; private set; } = null!;
+        private ShearedSearchTextBox searchTextBox = null!;
 
         /// <summary>
         /// Whether the total score multiplier calculated from the current selected set of mods should be shown.
@@ -166,7 +166,7 @@ namespace osu.Game.Overlays.Mods
                     RelativeSizeAxes = Axes.X,
                     Height = ModsEffectDisplay.HEIGHT,
                     Padding = new MarginPadding { Horizontal = 100 },
-                    Child = SearchTextBox = new ShearedSearchTextBox
+                    Child = searchTextBox = new ShearedSearchTextBox
                     {
                         HoldFocus = false,
                         Width = 300
@@ -249,7 +249,7 @@ namespace osu.Game.Overlays.Mods
             base.Hide();
 
             //We want to clear search for next user interaction with mod overlay
-            SearchTextBox.Current.Value = string.Empty;
+            searchTextBox.Current.Value = string.Empty;
         }
 
         private ModSettingChangeTracker? modSettingChangeTracker;
@@ -289,7 +289,7 @@ namespace osu.Game.Overlays.Mods
 
             customisationVisible.BindValueChanged(_ => updateCustomisationVisualState(), true);
 
-            SearchTextBox.Current.BindValueChanged(query =>
+            searchTextBox.Current.BindValueChanged(query =>
             {
                 foreach (var column in columnFlow.Columns)
                     column.SearchTerm = query.NewValue;
@@ -789,7 +789,7 @@ namespace osu.Game.Overlays.Mods
                 if (!Active.Value)
                     RequestScroll?.Invoke(this);
 
-                //Kill focus on SearchTextBox
+                //Kill focus on searchTextBox
                 Scheduler.Add(() => GetContainingInputManager().ChangeFocus(null));
 
                 return true;

From 474f7c2bc075202e756aa8fe1141f9fe7faab1f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 3 Jun 2023 16:50:58 +0200
Subject: [PATCH 0680/1604] Fix code quality inspection

---
 osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index 0d9f91caa1..c27e30d5bb 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -233,7 +233,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     QueueMode = ServerAPIRoom.QueueMode.Value,
                     AutoStartDuration = ServerAPIRoom.AutoStartDuration.Value
                 },
-                Playlist = ServerAPIRoom.Playlist.Select(item => TestMultiplayerClient.CreateMultiplayerPlaylistItem(item)).ToList(),
+                Playlist = ServerAPIRoom.Playlist.Select(CreateMultiplayerPlaylistItem).ToList(),
                 Users = { localUser },
                 Host = localUser
             };

From 602d5db3bb66e84b9ade2d99b004fbdd5e130be6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 3 Jun 2023 19:40:01 +0200
Subject: [PATCH 0681/1604] Simplify column dimensions code

`dimensions` would always receive exactly one item, so might as well
inline it.

And yes, at this point the grid container is mostly a glorified
`FillFlowContainer { Direction = FlowDirection.Vertical }`, but I am not
touching that in this pull pending further decisions with respect to
direction.
---
 osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
index 31dd5df27a..c36d7726dc 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
@@ -147,7 +147,6 @@ namespace osu.Game.Screens.Ranking.Statistics
                     foreach (var item in statisticItems)
                     {
                         var columnContent = new List<Drawable>();
-                        var dimensions = new List<Dimension>();
 
                         if (!hitEventsAvailable && item.RequiresHitEvents)
                         {
@@ -161,8 +160,6 @@ namespace osu.Game.Screens.Ranking.Statistics
                             Origin = Anchor.Centre,
                         });
 
-                        dimensions.Add(new Dimension());
-
                         rows.Add(new GridContainer
                         {
                             Anchor = Anchor.TopCentre,
@@ -170,7 +167,7 @@ namespace osu.Game.Screens.Ranking.Statistics
                             RelativeSizeAxes = Axes.X,
                             AutoSizeAxes = Axes.Y,
                             Content = new[] { columnContent.ToArray() },
-                            ColumnDimensions = dimensions.ToArray(),
+                            ColumnDimensions = new[] { new Dimension() },
                             RowDimensions = new[] { new Dimension(GridSizeMode.AutoSize) }
                         });
                     }

From a8b102ef72ef42706d870030b1935c5e3de15a8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 3 Jun 2023 21:32:12 +0200
Subject: [PATCH 0682/1604] Remove duplicated `zh_tw` language

`zh_hant` already covers it.
---
 osu.Game/Localisation/Language.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Localisation/Language.cs b/osu.Game/Localisation/Language.cs
index 3f0f24f45f..14dedf9a2e 100644
--- a/osu.Game/Localisation/Language.cs
+++ b/osu.Game/Localisation/Language.cs
@@ -141,9 +141,6 @@ namespace osu.Game.Localisation
         [Description(@"简体中文")]
         zh,
 
-        [Description(@"繁體中文")]
-        zh_tw,
-
         // Traditional Chinese (Hong Kong) is listed in web sources but has no associated localisations,
         // and was wrongly falling back to Simplified Chinese.
         // Can be revisited if localisations ever arrive.

From a8a4c02bb3ca788580eb770695c76fe13936ef4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 3 Jun 2023 21:48:03 +0200
Subject: [PATCH 0683/1604] Comment out languages with no glyph support

---
 osu.Game/Localisation/Language.cs | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Localisation/Language.cs b/osu.Game/Localisation/Language.cs
index 14dedf9a2e..7104583f95 100644
--- a/osu.Game/Localisation/Language.cs
+++ b/osu.Game/Localisation/Language.cs
@@ -40,8 +40,9 @@ namespace osu.Game.Localisation
         [Description(@"español")]
         es,
 
-        [Description(@"فارسی")]
-        fa_ir,
+        // TODO: Requires Arabic glyphs to be added to resources (and possibly also RTL support).
+        // [Description(@"فارسی")]
+        // fa_ir,
 
         [Description(@"Suomi")]
         fi,
@@ -52,8 +53,9 @@ namespace osu.Game.Localisation
         [Description(@"français")]
         fr,
 
-        [Description(@"עברית")]
-        he,
+        // TODO: Requires Hebrew glyphs to be added to resources (and possibly also RTL support).
+        // [Description(@"עברית")]
+        // he,
 
         [Description(@"Hrvatski")]
         hr_hr,
@@ -103,8 +105,10 @@ namespace osu.Game.Localisation
         [Description(@"Русский")]
         ru,
 
-        [Description(@"සිංහල")]
-        si_lk,
+        // TODO: Requires Sinhala glyphs to be added to resources.
+        // Additionally, no translations available yet.
+        // [Description(@"සිංහල")]
+        // si_lk,
 
         [Description(@"Slovenčina")]
         sk,

From 14309ba951f01fa49a6cfb7e0786da5499279b57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 3 Jun 2023 23:42:08 +0200
Subject: [PATCH 0684/1604] Comment out Tajik due to lack of support on Windows
 ^<10

---
 osu.Game/Localisation/Language.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Localisation/Language.cs b/osu.Game/Localisation/Language.cs
index 7104583f95..962734e67a 100644
--- a/osu.Game/Localisation/Language.cs
+++ b/osu.Game/Localisation/Language.cs
@@ -122,8 +122,10 @@ namespace osu.Game.Localisation
         [Description(@"Svenska")]
         sv,
 
-        [Description(@"Тоҷикӣ")]
-        tg_tj,
+        // Tajik has no associated localisations yet, and is not supported on Windows versions <10.
+        // TODO: update language mapping in osu-resources to redirect tg-TJ to tg-Cyrl-TJ (which is supported on earlier Windows versions)
+        // [Description(@"Тоҷикӣ")]
+        // tg_tj,
 
         [Description(@"ไทย")]
         th,

From 4f5dfecbb850a41b532ce25b0bf24fd1772c2075 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 3 Jun 2023 23:55:05 +0200
Subject: [PATCH 0685/1604] Comment out Filipino due to satellite assembly copy
 failure

---
 osu.Game/Localisation/Language.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Localisation/Language.cs b/osu.Game/Localisation/Language.cs
index 962734e67a..711e95486f 100644
--- a/osu.Game/Localisation/Language.cs
+++ b/osu.Game/Localisation/Language.cs
@@ -47,8 +47,9 @@ namespace osu.Game.Localisation
         [Description(@"Suomi")]
         fi,
 
-        [Description(@"Filipino")]
-        fil,
+        // TODO: Doesn't work as appropriate satellite assemblies aren't copied from resources (see: https://github.com/ppy/osu/discussions/18851#discussioncomment-3042170)
+        // [Description(@"Filipino")]
+        // fil,
 
         [Description(@"français")]
         fr,

From 3e308e4c278a01e94090a4c578fe5cf4970a1f32 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 4 Jun 2023 12:50:30 +0900
Subject: [PATCH 0686/1604] Add test coverage showing commit failure in manage
 collections dialog

---
 .../TestSceneManageCollectionsDialog.cs         | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs b/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
index 1e9982f8d4..cfa45ec6ef 100644
--- a/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
+++ b/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
@@ -264,8 +264,9 @@ namespace osu.Game.Tests.Visual.Collections
             assertCollectionName(1, "First");
         }
 
-        [Test]
-        public void TestCollectionRenamedOnTextChange()
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestCollectionRenamedOnTextChange(bool commitWithEnter)
         {
             BeatmapCollection first = null!;
             DrawableCollectionListItem firstItem = null!;
@@ -293,9 +294,19 @@ namespace osu.Game.Tests.Visual.Collections
             AddStep("change first collection name", () =>
             {
                 firstItem.ChildrenOfType<TextBox>().First().Text = "First";
-                InputManager.Key(Key.Enter);
             });
 
+            if (commitWithEnter)
+                AddStep("commit via enter", () => InputManager.Key(Key.Enter));
+            else
+            {
+                AddStep("commit via click away", () =>
+                {
+                    InputManager.MoveMouseTo(firstItem.ScreenSpaceDrawQuad.TopLeft - new Vector2(10));
+                    InputManager.Click(MouseButton.Left);
+                });
+            }
+
             AddUntilStep("collection has new name", () => first.Name == "First");
         }
 

From eb7586b517dd0f4794f94edd59fcaff7bc8597cd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 4 Jun 2023 12:51:03 +0900
Subject: [PATCH 0687/1604] Ensure collection edit textbox commits on focus
 loss

As discussed in https://github.com/ppy/osu/discussions/23739
---
 osu.Game/Collections/DrawableCollectionListItem.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Collections/DrawableCollectionListItem.cs b/osu.Game/Collections/DrawableCollectionListItem.cs
index 23156b1ad5..0ab0ff520d 100644
--- a/osu.Game/Collections/DrawableCollectionListItem.cs
+++ b/osu.Game/Collections/DrawableCollectionListItem.cs
@@ -86,6 +86,7 @@ namespace osu.Game.Collections
                                 RelativeSizeAxes = Axes.Both,
                                 Size = Vector2.One,
                                 CornerRadius = item_height / 2,
+                                CommitOnFocusLost = true,
                                 PlaceholderText = collection.IsManaged ? string.Empty : "Create a new collection"
                             },
                         }

From 32b9e6ec8f0a5a395d2295e0510fa3c40a058e67 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Sun, 4 Jun 2023 17:02:46 +0300
Subject: [PATCH 0688/1604] Make search bar active by default

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index e3977f6ecd..9d07ee1c93 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -66,17 +66,17 @@ namespace osu.Game.Overlays.Mods
 
         public string SearchTerm
         {
-            get => searchTextBox.Current.Value;
+            get => SearchTextBox.Current.Value;
             set
             {
-                if (searchTextBox.Current.Value == value)
+                if (SearchTextBox.Current.Value == value)
                     return;
 
-                searchTextBox.Current.Value = value;
+                SearchTextBox.Current.Value = value;
             }
         }
 
-        private ShearedSearchTextBox searchTextBox = null!;
+        public ShearedSearchTextBox SearchTextBox { get; private set; } = null!;
 
         /// <summary>
         /// Whether the total score multiplier calculated from the current selected set of mods should be shown.
@@ -166,7 +166,7 @@ namespace osu.Game.Overlays.Mods
                     RelativeSizeAxes = Axes.X,
                     Height = ModsEffectDisplay.HEIGHT,
                     Padding = new MarginPadding { Horizontal = 100 },
-                    Child = searchTextBox = new ShearedSearchTextBox
+                    Child = SearchTextBox = new ShearedSearchTextBox
                     {
                         HoldFocus = false,
                         Width = 300
@@ -249,7 +249,7 @@ namespace osu.Game.Overlays.Mods
             base.Hide();
 
             //We want to clear search for next user interaction with mod overlay
-            searchTextBox.Current.Value = string.Empty;
+            SearchTextBox.Current.Value = string.Empty;
         }
 
         private ModSettingChangeTracker? modSettingChangeTracker;
@@ -289,12 +289,14 @@ namespace osu.Game.Overlays.Mods
 
             customisationVisible.BindValueChanged(_ => updateCustomisationVisualState(), true);
 
-            searchTextBox.Current.BindValueChanged(query =>
+            SearchTextBox.Current.BindValueChanged(query =>
             {
                 foreach (var column in columnFlow.Columns)
                     column.SearchTerm = query.NewValue;
             }, true);
 
+            SearchTextBox.TakeFocus();
+
             // Start scrolled slightly to the right to give the user a sense that
             // there is more horizontal content available.
             ScheduleAfterChildren(() =>
@@ -789,7 +791,7 @@ namespace osu.Game.Overlays.Mods
                 if (!Active.Value)
                     RequestScroll?.Invoke(this);
 
-                //Kill focus on searchTextBox
+                //Kill focus on SearchTextBox
                 Scheduler.Add(() => GetContainingInputManager().ChangeFocus(null));
 
                 return true;

From fd554033db74781f4a40a25527c91d34d7c79cc3 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Sun, 4 Jun 2023 17:11:04 +0300
Subject: [PATCH 0689/1604] Update tests

---
 .../Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs        | 2 ++
 .../Visual/UserInterface/TestSceneModSelectOverlay.cs          | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs
index 45f671618e..60bd88cc2b 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs
@@ -62,6 +62,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             createFreeModSelect();
 
+            AddStep("kill search bar focus", () => freeModSelectOverlay.SearchTextBox.KillFocus());
+
             AddStep("press ctrl+a", () => InputManager.Keys(PlatformAction.SelectAll));
             AddUntilStep("all mods selected", assertAllAvailableModsSelected);
 
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index c42f9af6df..26369edeb6 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -23,6 +23,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Taiko.Mods;
+using osu.Game.Screens.OnlinePlay;
 using osu.Game.Tests.Mods;
 using osuTK;
 using osuTK.Input;
@@ -569,6 +570,8 @@ namespace osu.Game.Tests.Visual.UserInterface
             createScreen();
             changeRuleset(0);
 
+            AddStep("kill search bar focus", () => modSelectOverlay.SearchTextBox.KillFocus());
+
             AddStep("select DT + HD", () => SelectedMods.Value = new Mod[] { new OsuModDoubleTime(), new OsuModHidden() });
             AddAssert("DT + HD selected", () => modSelectOverlay.ChildrenOfType<ModPanel>().Count(panel => panel.Active.Value) == 2);
 

From a46f5b90d4c4db173675e080f4aef42f508b9e48 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Sun, 4 Jun 2023 18:11:44 +0300
Subject: [PATCH 0690/1604] Move focus handling into `PopIn`

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 9d07ee1c93..7380c53073 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -295,8 +295,6 @@ namespace osu.Game.Overlays.Mods
                     column.SearchTerm = query.NewValue;
             }, true);
 
-            SearchTextBox.TakeFocus();
-
             // Start scrolled slightly to the right to give the user a sense that
             // there is more horizontal content available.
             ScheduleAfterChildren(() =>
@@ -503,6 +501,8 @@ namespace osu.Game.Overlays.Mods
 
             base.PopIn();
 
+            SearchTextBox.TakeFocus();
+
             aboveColumnsContent
                 .FadeIn(fade_in_duration, Easing.OutQuint)
                 .MoveToY(0, fade_in_duration, Easing.OutQuint);

From 4eb0f0261ce153539329360534eda00a551561ea Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sun, 4 Jun 2023 22:52:05 -0700
Subject: [PATCH 0691/1604] Fix song select beatmap panels not displaying
 correct background shown in web

---
 osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 3975bb6bb6..d544db66b1 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -108,7 +108,7 @@ namespace osu.Game.Screens.Select.Carousel
 
             Header.Children = new Drawable[]
             {
-                background = new DelayedLoadWrapper(() => new SetPanelBackground(manager.GetWorkingBeatmap(beatmapSet.Beatmaps.FirstOrDefault()))
+                background = new DelayedLoadWrapper(() => new SetPanelBackground(manager.GetWorkingBeatmap(beatmapSet.Beatmaps.MinBy(b => b.OnlineID)))
                 {
                     RelativeSizeAxes = Axes.Both,
                 }, 300)

From 3ebc8014847ed22b189ab1843ad8ae72bd31e8a3 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Mon, 5 Jun 2023 13:49:07 +0300
Subject: [PATCH 0692/1604] Move (de)select all mods hotkeys handling to
 `ModSelectOverlay`

---
 .../TestSceneModSelectOverlay.cs              |  1 -
 .../Overlays/Mods/DeselectAllModsButton.cs    | 18 +--------
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    | 37 ++++++++++++++++++-
 osu.Game/Overlays/Mods/SelectAllModsButton.cs | 18 +--------
 .../OnlinePlay/FreeModSelectOverlay.cs        | 14 ++++---
 5 files changed, 45 insertions(+), 43 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 26369edeb6..37b6a6d44f 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -23,7 +23,6 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Taiko.Mods;
-using osu.Game.Screens.OnlinePlay;
 using osu.Game.Tests.Mods;
 using osuTK;
 using osuTK.Input;
diff --git a/osu.Game/Overlays/Mods/DeselectAllModsButton.cs b/osu.Game/Overlays/Mods/DeselectAllModsButton.cs
index 3e5a3b12d1..817b6beac3 100644
--- a/osu.Game/Overlays/Mods/DeselectAllModsButton.cs
+++ b/osu.Game/Overlays/Mods/DeselectAllModsButton.cs
@@ -6,16 +6,13 @@
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Bindables;
-using osu.Framework.Input.Bindings;
-using osu.Framework.Input.Events;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Input.Bindings;
 using osu.Game.Localisation;
 using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Overlays.Mods
 {
-    public partial class DeselectAllModsButton : ShearedButton, IKeyBindingHandler<GlobalAction>
+    public partial class DeselectAllModsButton : ShearedButton
     {
         private readonly Bindable<IReadOnlyList<Mod>> selectedMods = new Bindable<IReadOnlyList<Mod>>();
 
@@ -39,18 +36,5 @@ namespace osu.Game.Overlays.Mods
         {
             Enabled.Value = selectedMods.Value.Any();
         }
-
-        public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
-        {
-            if (e.Repeat || e.Action != GlobalAction.DeselectAllMods)
-                return false;
-
-            TriggerClick();
-            return true;
-        }
-
-        public void OnReleased(KeyBindingReleaseEvent<GlobalAction> e)
-        {
-        }
     }
 }
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 7380c53073..51e1c33124 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -12,6 +12,8 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
+using osu.Framework.Input;
+using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Utils;
 using osu.Game.Audio;
@@ -28,7 +30,7 @@ using osuTK;
 
 namespace osu.Game.Overlays.Mods
 {
-    public abstract partial class ModSelectOverlay : ShearedOverlayContainer, ISamplePlaybackDisabler
+    public abstract partial class ModSelectOverlay : ShearedOverlayContainer, ISamplePlaybackDisabler, IKeyBindingHandler<PlatformAction>
     {
         public const int BUTTON_WIDTH = 200;
 
@@ -108,7 +110,7 @@ namespace osu.Game.Overlays.Mods
                 };
             }
 
-            yield return new DeselectAllModsButton(this);
+            yield return deselectAllModsButton = new DeselectAllModsButton(this);
         }
 
         private readonly Bindable<Dictionary<ModType, IReadOnlyList<Mod>>> globalAvailableMods = new Bindable<Dictionary<ModType, IReadOnlyList<Mod>>>();
@@ -121,12 +123,14 @@ namespace osu.Game.Overlays.Mods
         private ColumnScrollContainer columnScroll = null!;
         private ColumnFlowContainer columnFlow = null!;
         private FillFlowContainer<ShearedButton> footerButtonFlow = null!;
+        private DeselectAllModsButton deselectAllModsButton = null!;
 
         private Container aboveColumnsContent = null!;
         private DifficultyMultiplierDisplay? multiplierDisplay;
 
         protected ShearedButton BackButton { get; private set; } = null!;
         protected ShearedToggleButton? CustomisationButton { get; private set; }
+        protected SelectAllModsButton? SelectAllModsButton { get; set; }
 
         private Sample? columnAppearSample;
 
@@ -616,6 +620,18 @@ namespace osu.Game.Overlays.Mods
                     hideOverlay(true);
                     return true;
 
+                //This is handled locally here to prevent search box from coupling in DeselectAllModsButton
+                case GlobalAction.DeselectAllMods:
+                {
+                    if (!SearchTextBox.HasFocus)
+                    {
+                        deselectAllModsButton.TriggerClick();
+                        return true;
+                    }
+
+                    break;
+                }
+
                 case GlobalAction.Select:
                 {
                     // Pressing select should select first filtered mod or completely hide the overlay in one shot if search term is empty.
@@ -651,6 +667,23 @@ namespace osu.Game.Overlays.Mods
             }
         }
 
+        /// <inheritdoc cref="IKeyBindingHandler{PlatformAction}"/>
+        /// <remarks>
+        /// This is handled locally here to allow <see cref="SearchTextBox"/> handle <see cref="PlatformAction"/> first
+        /// </remarks>>
+        public bool OnPressed(KeyBindingPressEvent<PlatformAction> e)
+        {
+            if (e.Repeat || e.Action != PlatformAction.SelectAll || SelectAllModsButton is null)
+                return false;
+
+            SelectAllModsButton.TriggerClick();
+            return true;
+        }
+
+        public void OnReleased(KeyBindingReleaseEvent<PlatformAction> e)
+        {
+        }
+
         #endregion
 
         #region Sample playback control
diff --git a/osu.Game/Overlays/Mods/SelectAllModsButton.cs b/osu.Game/Overlays/Mods/SelectAllModsButton.cs
index 8a6180a7c8..83c46cfc1f 100644
--- a/osu.Game/Overlays/Mods/SelectAllModsButton.cs
+++ b/osu.Game/Overlays/Mods/SelectAllModsButton.cs
@@ -6,9 +6,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Bindables;
-using osu.Framework.Input;
-using osu.Framework.Input.Bindings;
-using osu.Framework.Input.Events;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Localisation;
 using osu.Game.Rulesets.Mods;
@@ -16,7 +13,7 @@ using osu.Game.Screens.OnlinePlay;
 
 namespace osu.Game.Overlays.Mods
 {
-    public partial class SelectAllModsButton : ShearedButton, IKeyBindingHandler<PlatformAction>
+    public partial class SelectAllModsButton : ShearedButton
     {
         private readonly Bindable<IReadOnlyList<Mod>> selectedMods = new Bindable<IReadOnlyList<Mod>>();
         private readonly Bindable<Dictionary<ModType, IReadOnlyList<ModState>>> availableMods = new Bindable<Dictionary<ModType, IReadOnlyList<ModState>>>();
@@ -46,18 +43,5 @@ namespace osu.Game.Overlays.Mods
                                          .SelectMany(pair => pair.Value)
                                          .Any(modState => !modState.Active.Value && modState.Visible);
         }
-
-        public bool OnPressed(KeyBindingPressEvent<PlatformAction> e)
-        {
-            if (e.Repeat || e.Action != PlatformAction.SelectAll)
-                return false;
-
-            TriggerClick();
-            return true;
-        }
-
-        public void OnReleased(KeyBindingReleaseEvent<PlatformAction> e)
-        {
-        }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
index 6313d907a5..d5e57b9ec9 100644
--- a/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
@@ -34,11 +34,13 @@ namespace osu.Game.Screens.OnlinePlay
 
         protected override ModColumn CreateModColumn(ModType modType) => new ModColumn(modType, true);
 
-        protected override IEnumerable<ShearedButton> CreateFooterButtons() => base.CreateFooterButtons().Prepend(
-            new SelectAllModsButton(this)
-            {
-                Anchor = Anchor.BottomLeft,
-                Origin = Anchor.BottomLeft,
-            });
+        protected override IEnumerable<ShearedButton> CreateFooterButtons()
+            => base.CreateFooterButtons()
+                   .Prepend(
+                       SelectAllModsButton = new SelectAllModsButton(this)
+                       {
+                           Anchor = Anchor.BottomLeft,
+                           Origin = Anchor.BottomLeft,
+                       });
     }
 }

From 71e6f80c40e36a3b3f14f8d4ccdb38e707cf6b17 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Mon, 5 Jun 2023 15:54:19 +0300
Subject: [PATCH 0693/1604] Add hotkey for switching search bar focus

---
 .../TestSceneModSelectOverlay.cs              | 22 +++++++++++++++----
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    | 14 ++++++++++++
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 37b6a6d44f..ffc0a0a0ad 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -546,16 +546,16 @@ namespace osu.Game.Tests.Visual.UserInterface
         }
 
         [Test]
-        public void TestSearchFocusChange()
+        public void TestSearchFocusChangeViaClick()
         {
             createScreen();
 
-            AddStep("click on search", navigateAndClick<ShearedSearchTextBox>);
-            AddAssert("focused", () => modSelectOverlay.SearchTextBox.HasFocus);
-
             AddStep("click on mod column", navigateAndClick<ModColumn>);
             AddAssert("lost focus", () => !modSelectOverlay.SearchTextBox.HasFocus);
 
+            AddStep("click on search", navigateAndClick<ShearedSearchTextBox>);
+            AddAssert("focused", () => modSelectOverlay.SearchTextBox.HasFocus);
+
             void navigateAndClick<T>() where T : Drawable
             {
                 InputManager.MoveMouseTo(modSelectOverlay.ChildrenOfType<T>().FirstOrDefault());
@@ -563,6 +563,20 @@ namespace osu.Game.Tests.Visual.UserInterface
             }
         }
 
+        [Test]
+        public void TestSearchFocusChangeViaKey()
+        {
+            createScreen();
+
+            const Key focus_switch_key = Key.Tab;
+
+            AddStep("press tab", () => InputManager.Key(focus_switch_key));
+            AddAssert("lost focus", () => !modSelectOverlay.SearchTextBox.HasFocus);
+
+            AddStep("press tab", () => InputManager.Key(focus_switch_key));
+            AddAssert("focused", () => modSelectOverlay.SearchTextBox.HasFocus);
+        }
+
         [Test]
         public void TestDeselectAllViaKey()
         {
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 51e1c33124..3795ed729d 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -27,6 +27,7 @@ using osu.Game.Localisation;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Utils;
 using osuTK;
+using osuTK.Input;
 
 namespace osu.Game.Overlays.Mods
 {
@@ -684,6 +685,19 @@ namespace osu.Game.Overlays.Mods
         {
         }
 
+        protected override bool OnKeyDown(KeyDownEvent e)
+        {
+            if (e.Repeat || e.Key != Key.Tab)
+                return false;
+
+            if (SearchTextBox.HasFocus)
+                SearchTextBox.KillFocus();
+            else
+                SearchTextBox.TakeFocus();
+
+            return true;
+        }
+
         #endregion
 
         #region Sample playback control

From 5c1abdc7044d57ca24f6f3f8c09ba9ad8874015c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 5 Jun 2023 21:33:08 +0200
Subject: [PATCH 0694/1604] Fix screen navigation test hijacking dummy request
 handler

In an upcoming change, I stumbled upon a test failure mode wherein tests
in `TestSceneScreenNavigation` would die on the following exception:

	2023-05-07 17:58:42 [error]: System.ObjectDisposedException: Cannot access a closed Realm.
	2023-05-07 17:58:42 [error]: Object name: 'Realms.Realm'.
	2023-05-07 17:58:42 [error]: at Realms.Realm.ThrowIfDisposed()
	2023-05-07 17:58:42 [error]: at Realms.Realm.All[T]()
	2023-05-07 17:58:42 [error]: at osu.Game.Beatmaps.BeatmapManager.<>c__DisplayClass25_0.<QueryBeatmap>b__0(Realm r) in D:\a\osu\osu\osu.Game\Beatmaps\BeatmapManager.cs:line 282
	2023-05-07 17:58:42 [error]: at osu.Game.Database.RealmAccess.Run[T](Func`2 action) in D:\a\osu\osu\osu.Game\Database\RealmAccess.cs:line 387
	2023-05-07 17:58:42 [error]: at osu.Game.Beatmaps.BeatmapManager.QueryBeatmap(Expression`1 query) in D:\a\osu\osu\osu.Game\Beatmaps\BeatmapManager.cs:line 282
	2023-05-07 17:58:42 [error]: at osu.Game.Tests.Visual.OnlinePlay.TestRoomRequestsHandler.<HandleRequest>g__createResponseBeatmaps|6_0(Int32[] beatmapIds, <>c__DisplayClass6_0& ) in D:\a\osu\osu\osu.Game\Tests\Visual\OnlinePlay\TestRoomRequestsHandler.cs:line 174
	2023-05-07 17:58:42 [error]: at osu.Game.Tests.Visual.OnlinePlay.TestRoomRequestsHandler.HandleRequest(APIRequest request, APIUser localUser, BeatmapManager beatmapManager) in D:\a\osu\osu\osu.Game\Tests\Visual\OnlinePlay\TestRoomRequestsHandler.cs:line 140
	2023-05-07 17:58:42 [error]: at osu.Game.Tests.Visual.TestMultiplayerComponents.<>c__DisplayClass18_0.<load>b__0(APIRequest request) in D:\a\osu\osu\osu.Game.Tests\Visual\TestMultiplayerComponents.cs:line 80
	2023-05-07 17:58:42 [error]: at osu.Game.Online.API.DummyAPIAccess.<>c__DisplayClass32_0.<Queue>b__0() in D:\a\osu\osu\osu.Game\Online\API\DummyAPIAccess.cs:line 74

Upon closer inspection, one of the tests in the scene instantiates a
`TestMultiplayerComponents` instance. `TestMultiplayerComponents`
registers a custom request handler onto `DummyAPIAccess`. Normally, this
is not an issue; however, because `TestSceneScreenNavigation` is an
`OsuGameTestScene`, and therefore has its storage recycled after every
test, this leads to the error above in the following scenario:

1. `TestPushMatchSubScreenAndPressBackButtonImmediately()` passes.
2. The test is cleaned up, and the test case's storage is recycled,
   including the test case's realm database.
3. In a subsequent test, a web request handled by the dummy API request
   handler is fired. The dummy API request handler subsequently attempts
   to access a realm that does not exist anymore.

As the usage of `TestMultiplayerComponents` is highly unorthodox in this
particular case, I'm opting for a localised fix which ensures that the
request handler is cleaned up appropriately.
---
 .../Visual/Navigation/TestSceneScreenNavigation.cs          | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index 193cec8907..18aef99ccd 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -17,6 +17,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Collections;
 using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.API;
 using osu.Game.Online.Leaderboards;
 using osu.Game.Overlays;
 using osu.Game.Overlays.BeatmapListing;
@@ -539,6 +540,11 @@ namespace osu.Game.Tests.Visual.Navigation
             AddStep("open room", () => multiplayerComponents.ChildrenOfType<LoungeSubScreen>().Single().Open());
             AddStep("press back button", () => Game.ChildrenOfType<BackButton>().First().Action());
             AddWaitStep("wait two frames", 2);
+
+            AddStep("exit lounge", () => Game.ScreenStack.Exit());
+            // `TestMultiplayerComponents` registers a request handler in its BDL, but never unregisters it.
+            // to prevent the handler living for longer than it should be, clean up manually.
+            AddStep("clean up multiplayer request handler", () => ((DummyAPIAccess)API).HandleRequest = null);
         }
 
         [Test]

From 4c397085c5203aae8c70f58a63d5a48787cdbc2f Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Tue, 6 Jun 2023 00:04:29 +0200
Subject: [PATCH 0695/1604] refactor: improve attachement flow

This removes the hard reliance on individual classes and makes its usage easiser to ingreate anywhere
else.
---
 osu.Game/Rulesets/UI/RulesetInputManager.cs   | 52 +++++++++++++++++--
 .../ClicksPerSecondCalculator.cs              |  2 +-
 .../Screens/Play/HUD/KeyCounterDisplay.cs     | 16 +++++-
 3 files changed, 64 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index a24e22f22b..8065087341 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -158,9 +158,41 @@ namespace osu.Game.Rulesets.UI
 
         #endregion
 
+        #region Component attachement
+
+        public void Attach(IAttachableSkinComponent skinComponent)
+        {
+            switch (skinComponent)
+            {
+                case KeyCounterDisplay keyCounterDisplay:
+                    attachKeyCounter(keyCounterDisplay);
+                    break;
+
+                case ClicksPerSecondCalculator clicksPerSecondCalculator:
+                    attachClicksPerSecond(clicksPerSecondCalculator);
+                    break;
+            }
+        }
+
+        public void Detach(IAttachableSkinComponent skinComponent)
+        {
+            switch (skinComponent)
+            {
+                case KeyCounterDisplay keyCounterDisplay:
+                    detachKeyCounter(keyCounterDisplay);
+                    break;
+
+                case ClicksPerSecondCalculator clicksPerSecondCalculator:
+                    detachClicksPerSecond(clicksPerSecondCalculator);
+                    break;
+            }
+        }
+
+        #endregion
+
         #region Key Counter Attachment
 
-        public void Attach(KeyCounterDisplay keyCounter)
+        private void attachKeyCounter(KeyCounterDisplay keyCounter)
         {
             var receptor = new ActionReceptor(keyCounter);
 
@@ -174,6 +206,10 @@ namespace osu.Game.Rulesets.UI
                                                    .Select(action => new KeyCounterActionTrigger<T>(action)));
         }
 
+        private void detachKeyCounter(KeyCounterDisplay keyCounter)
+        {
+        }
+
         private partial class ActionReceptor : KeyCounterDisplay.Receptor, IKeyBindingHandler<T>
         {
             public ActionReceptor(KeyCounterDisplay target)
@@ -197,13 +233,17 @@ namespace osu.Game.Rulesets.UI
 
         #region Keys per second Counter Attachment
 
-        public void Attach(ClicksPerSecondCalculator calculator)
+        private void attachClicksPerSecond(ClicksPerSecondCalculator calculator)
         {
             var listener = new ActionListener(calculator);
 
             KeyBindingContainer.Add(listener);
         }
 
+        private void detachClicksPerSecond(ClicksPerSecondCalculator calculator)
+        {
+        }
+
         private partial class ActionListener : Component, IKeyBindingHandler<T>
         {
             private readonly ClicksPerSecondCalculator calculator;
@@ -266,8 +306,12 @@ namespace osu.Game.Rulesets.UI
     /// </summary>
     public interface ICanAttachHUDPieces
     {
-        void Attach(KeyCounterDisplay keyCounter);
-        void Attach(ClicksPerSecondCalculator calculator);
+        void Attach(IAttachableSkinComponent component);
+        void Detach(IAttachableSkinComponent component);
+    }
+
+    public interface IAttachableSkinComponent
+    {
     }
 
     public class RulesetInputManagerInputState<T> : InputState
diff --git a/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs b/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs
index ba0c47dc8b..3e55e11f1c 100644
--- a/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs
+++ b/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs
@@ -8,7 +8,7 @@ using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Screens.Play.HUD.ClicksPerSecond
 {
-    public partial class ClicksPerSecondCalculator : Component
+    public partial class ClicksPerSecondCalculator : Component, IAttachableSkinComponent
     {
         private readonly List<double> timestamps = new List<double>();
 
diff --git a/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs b/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs
index 05427d3a32..b5c697ef13 100644
--- a/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
 using osu.Game.Configuration;
+using osu.Game.Rulesets.UI;
 using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
@@ -18,7 +19,7 @@ namespace osu.Game.Screens.Play.HUD
     /// <summary>
     /// A flowing display of all gameplay keys. Individual keys can be added using <see cref="InputTrigger"/> implementations.
     /// </summary>
-    public abstract partial class KeyCounterDisplay : CompositeDrawable
+    public abstract partial class KeyCounterDisplay : CompositeDrawable, IAttachableSkinComponent
     {
         /// <summary>
         /// Whether the key counter should be visible regardless of the configuration value.
@@ -44,6 +45,11 @@ namespace osu.Game.Screens.Play.HUD
 
         private Receptor? receptor;
 
+        /// <summary>
+        /// Sets a <see cref="Receptor"/> that will populate keybinding events to this <see cref="KeyCounterDisplay"/>.
+        /// </summary>
+        /// <param name="receptor">The receptor to set</param>
+        /// <exception cref="InvalidOperationException">When a <see cref="Receptor"/> is already active on this <see cref="KeyCounterDisplay"/></exception>
         public void SetReceptor(Receptor receptor)
         {
             if (this.receptor != null)
@@ -52,6 +58,14 @@ namespace osu.Game.Screens.Play.HUD
             this.receptor = receptor;
         }
 
+        /// <summary>
+        /// Clears any <see cref="Receptor"/> active
+        /// </summary>
+        public void ClearReceptor()
+        {
+            receptor = null;
+        }
+
         /// <summary>
         /// Add a <see cref="InputTrigger"/> to this display.
         /// </summary>

From 6fc6729677fb071f35d6ed203283a12f3c6cd600 Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Tue, 6 Jun 2023 00:13:29 +0200
Subject: [PATCH 0696/1604] feat: integrate attachment flow in
 `SkinComponentsContainer`

---
 osu.Game/Rulesets/UI/DrawableRuleset.cs      | 10 +++-----
 osu.Game/Screens/Play/HUDOverlay.cs          |  1 +
 osu.Game/Skinning/SkinComponentsContainer.cs | 26 ++++++++++++++++++++
 3 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index 4f22c0c617..d899b6bad1 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -30,8 +30,6 @@ using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
-using osu.Game.Screens.Play.HUD;
-using osu.Game.Screens.Play.HUD.ClicksPerSecond;
 using osuTK;
 
 namespace osu.Game.Rulesets.UI
@@ -329,11 +327,11 @@ namespace osu.Game.Rulesets.UI
         /// <returns>The representing <see cref="DrawableHitObject{TObject}"/>.</returns>
         public abstract DrawableHitObject<TObject> CreateDrawableRepresentation(TObject h);
 
-        public void Attach(KeyCounterDisplay keyCounter) =>
-            (KeyBindingInputManager as ICanAttachHUDPieces)?.Attach(keyCounter);
+        public void Attach(IAttachableSkinComponent skinComponent) =>
+            (KeyBindingInputManager as ICanAttachHUDPieces)?.Attach(skinComponent);
 
-        public void Attach(ClicksPerSecondCalculator calculator) =>
-            (KeyBindingInputManager as ICanAttachHUDPieces)?.Attach(calculator);
+        public void Detach(IAttachableSkinComponent skinComponent) =>
+            (KeyBindingInputManager as ICanAttachHUDPieces)?.Detach(skinComponent);
 
         /// <summary>
         /// Creates a key conversion input manager. An exception will be thrown if a valid <see cref="RulesetInputManager{T}"/> is not returned.
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 9f050a07bd..ae0e67867b 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -321,6 +321,7 @@ namespace osu.Game.Screens.Play
             {
                 attachTarget.Attach(KeyCounter);
                 attachTarget.Attach(clicksPerSecondCalculator);
+                mainComponents.SetAttachTarget(attachTarget);
             }
 
             replayLoaded.BindTo(drawableRuleset.HasReplayLoaded);
diff --git a/osu.Game/Skinning/SkinComponentsContainer.cs b/osu.Game/Skinning/SkinComponentsContainer.cs
index adf0a288b4..19c16d2177 100644
--- a/osu.Game/Skinning/SkinComponentsContainer.cs
+++ b/osu.Game/Skinning/SkinComponentsContainer.cs
@@ -6,8 +6,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Skinning
 {
@@ -39,6 +41,8 @@ namespace osu.Game.Skinning
 
         private CancellationTokenSource? cancellationSource;
 
+        private ICanAttachHUDPieces? attachTarget;
+
         public SkinComponentsContainer(SkinComponentsContainerLookup lookup)
         {
             Lookup = lookup;
@@ -62,6 +66,10 @@ namespace osu.Game.Skinning
 
         public void Reload(Container? componentsContainer)
         {
+            components
+                .OfType<IAttachableSkinComponent>()
+                .ForEach(c => attachTarget?.Detach(c));
+
             ClearInternal();
             components.Clear();
             ComponentsLoaded = false;
@@ -77,6 +85,7 @@ namespace osu.Game.Skinning
             LoadComponentAsync(content, wrapper =>
             {
                 AddInternal(wrapper);
+                wrapper.Children.OfType<IAttachableSkinComponent>().ForEach(c => attachTarget?.Attach(c));
                 components.AddRange(wrapper.Children.OfType<ISerialisableDrawable>());
                 ComponentsLoaded = true;
             }, (cancellationSource = new CancellationTokenSource()).Token);
@@ -93,6 +102,9 @@ namespace osu.Game.Skinning
             if (!(component is Drawable drawable))
                 throw new ArgumentException($"Provided argument must be of type {nameof(Drawable)}.", nameof(component));
 
+            if (component is IAttachableSkinComponent attachableSkinComponent)
+                attachTarget?.Attach(attachableSkinComponent);
+
             content.Add(drawable);
             components.Add(component);
         }
@@ -108,10 +120,24 @@ namespace osu.Game.Skinning
             if (!(component is Drawable drawable))
                 throw new ArgumentException($"Provided argument must be of type {nameof(Drawable)}.", nameof(component));
 
+            if (component is IAttachableSkinComponent attachableSkinComponent)
+                attachTarget?.Detach(attachableSkinComponent);
+
             content.Remove(drawable, disposeImmediately);
             components.Remove(component);
         }
 
+        public void SetAttachTarget(ICanAttachHUDPieces target)
+        {
+            attachTarget = target;
+
+            foreach (var child in InternalChildren)
+            {
+                if (child is IAttachableSkinComponent attachable)
+                    attachTarget.Attach(attachable);
+            }
+        }
+
         protected override void SkinChanged(ISkinSource skin)
         {
             base.SkinChanged(skin);

From c54670aee1d715c7662517daab78ac591e8dd773 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Jun 2023 13:30:56 +0900
Subject: [PATCH 0697/1604] Add comment explaining implementation

---
 osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index d544db66b1..b97d37c854 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -108,6 +108,7 @@ namespace osu.Game.Screens.Select.Carousel
 
             Header.Children = new Drawable[]
             {
+                // Choice of background image matches BSS implementation (always uses the lowest `beatmap_id` from the set).
                 background = new DelayedLoadWrapper(() => new SetPanelBackground(manager.GetWorkingBeatmap(beatmapSet.Beatmaps.MinBy(b => b.OnlineID)))
                 {
                     RelativeSizeAxes = Axes.Both,

From 2f11bd5473af40d1b53b61de79912b587dd9451f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Jun 2023 14:42:42 +0900
Subject: [PATCH 0698/1604] Adjust animations slightly

---
 osu.Game/Screens/Play/ArgonKeyCounter.cs | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/ArgonKeyCounter.cs b/osu.Game/Screens/Play/ArgonKeyCounter.cs
index 53305901ee..2d725898d8 100644
--- a/osu.Game/Screens/Play/ArgonKeyCounter.cs
+++ b/osu.Game/Screens/Play/ArgonKeyCounter.cs
@@ -25,13 +25,16 @@ namespace osu.Game.Screens.Play
         // Make things look bigger without using Scale
         private const float scale_factor = 1.5f;
 
+        [Resolved]
+        private OsuColour colours { get; set; } = null!;
+
         public ArgonKeyCounter(InputTrigger trigger)
             : base(trigger)
         {
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load()
         {
             Children = new Drawable[]
             {
@@ -76,14 +79,27 @@ namespace osu.Game.Screens.Play
         protected override void Activate(bool forwardPlayback = true)
         {
             base.Activate(forwardPlayback);
-            keyNameText.FlashColour(Colour4.White, 200);
-            inputIndicator.FadeIn().MoveToY(0).Then().MoveToY(3, 100, Easing.OutQuart);
+
+            keyNameText
+                .FadeColour(Colour4.White, 10, Easing.OutQuint);
+
+            inputIndicator
+                .FadeIn(10, Easing.OutQuint)
+                .MoveToY(0)
+                .Then()
+                .MoveToY(4, 60, Easing.OutQuint);
         }
 
         protected override void Deactivate(bool forwardPlayback = true)
         {
             base.Deactivate(forwardPlayback);
-            inputIndicator.MoveToY(0, 200, Easing.OutQuart).FadeTo(0.5f, 200, Easing.OutQuart);
+
+            keyNameText
+                .FadeColour(colours.Blue0, 200, Easing.OutQuart);
+
+            inputIndicator
+                .MoveToY(0, 250, Easing.OutQuart)
+                .FadeTo(0.5f, 250, Easing.OutQuart);
         }
     }
 }

From 22f7fe1d79c325fe0c38418ca31a0dced1a5e1d8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Jun 2023 15:11:31 +0900
Subject: [PATCH 0699/1604] Rename variable and ensure timestamp is updated
 even when not saving

---
 osu.Game/Beatmaps/BeatmapInfo.cs |  5 ++++-
 osu.Game/Screens/Edit/Editor.cs  | 17 +++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapInfo.cs b/osu.Game/Beatmaps/BeatmapInfo.cs
index 7ca0e24913..5019d64276 100644
--- a/osu.Game/Beatmaps/BeatmapInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapInfo.cs
@@ -171,7 +171,10 @@ namespace osu.Game.Beatmaps
 
         public double TimelineZoom { get; set; } = 1.0;
 
-        public double? LastEditTime { get; set; }
+        /// <summary>
+        /// The time in milliseconds when last exiting the editor with this beatmap loaded.
+        /// </summary>
+        public double? EditorTimestamp { get; set; }
 
         [Ignored]
         public CountdownType Countdown { get; set; } = CountdownType.Normal;
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index c3d72c7aec..bb052b1d22 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -28,6 +28,7 @@ using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Configuration;
+using osu.Game.Database;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
@@ -92,6 +93,9 @@ namespace osu.Game.Screens.Edit
         [Resolved(canBeNull: true)]
         private INotificationOverlay notifications { get; set; }
 
+        [Resolved]
+        private RealmAccess realm { get; set; }
+
         public readonly Bindable<EditorScreenMode> Mode = new Bindable<EditorScreenMode>();
 
         public IBindable<bool> SamplePlaybackDisabled => samplePlaybackDisabled;
@@ -441,8 +445,6 @@ namespace osu.Game.Screens.Edit
 
             try
             {
-                editorBeatmap.BeatmapInfo.LastEditTime = clock.CurrentTime;
-
                 // save the loaded beatmap's data stream.
                 beatmapManager.Save(editorBeatmap.BeatmapInfo, editorBeatmap.PlayableBeatmap, editorBeatmap.BeatmapSkin);
             }
@@ -702,6 +704,13 @@ namespace osu.Game.Screens.Edit
                 }
             }
 
+            realm.Write(r =>
+            {
+                var beatmap = r.Find<BeatmapInfo>(editorBeatmap.BeatmapInfo.ID);
+                if (beatmap != null)
+                    beatmap.EditorTimestamp = clock.CurrentTime;
+            });
+
             ApplyToBackground(b =>
             {
                 b.DimWhenUserSettingsIgnored.Value = 0;
@@ -835,9 +844,9 @@ namespace osu.Game.Screens.Edit
             {
                 double targetTime = 0;
 
-                if (editorBeatmap.BeatmapInfo.LastEditTime != null)
+                if (editorBeatmap.BeatmapInfo.EditorTimestamp != null)
                 {
-                    targetTime = editorBeatmap.BeatmapInfo.LastEditTime.Value;
+                    targetTime = editorBeatmap.BeatmapInfo.EditorTimestamp.Value;
                 }
                 else if (Beatmap.Value.Beatmap.HitObjects.Count > 0)
                 {

From 878cdb2ed34655f54dad8d59395202e850e98d30 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Jun 2023 15:11:37 +0900
Subject: [PATCH 0700/1604] Bump schema version

---
 osu.Game/Database/RealmAccess.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index 94108531e8..9e5f41502b 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -71,8 +71,9 @@ namespace osu.Game.Database
         /// 24   2022-08-22    Added MaximumStatistics to ScoreInfo.
         /// 25   2022-09-18    Remove skins to add with new naming.
         /// 26   2023-02-05    Added BeatmapHash to ScoreInfo.
+        /// 27   2023-06-06    Added EditorTimestamp to ScoreInfo.
         /// </summary>
-        private const int schema_version = 26;
+        private const int schema_version = 27;
 
         /// <summary>
         /// Lock object which is held during <see cref="BlockAllOperations"/> sections, blocking realm retrieval during blocking periods.

From 66b8b5192b2d2661bca537bf1e6311b3578bf3f9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Jun 2023 15:23:59 +0900
Subject: [PATCH 0701/1604] Add test coverage of editor timestamp remembering

---
 .../TestSceneBeatmapEditorNavigation.cs       | 35 +++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
index 1b2bb57b84..5483be5676 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Tests.Visual.Navigation
 
             AddStep("open editor", () => ((PlaySongSelect)Game.ScreenStack.CurrentScreen).Edit(beatmapSet.Beatmaps.First(beatmap => beatmap.Ruleset.OnlineID == 0)));
             AddUntilStep("wait for editor open", () => Game.ScreenStack.CurrentScreen is Editor editor && editor.ReadyForUse);
-            AddStep("test gameplay", () => ((Editor)Game.ScreenStack.CurrentScreen).TestGameplay());
+            AddStep("test gameplay", () => getEditor().TestGameplay());
 
             AddUntilStep("wait for player", () =>
             {
@@ -141,6 +141,37 @@ namespace osu.Game.Tests.Visual.Navigation
             AddUntilStep("wait for editor exit", () => Game.ScreenStack.CurrentScreen is not Editor);
         }
 
-        private EditorBeatmap getEditorBeatmap() => ((Editor)Game.ScreenStack.CurrentScreen).ChildrenOfType<EditorBeatmap>().Single();
+        [Test]
+        public void TestLastTimestampRememberedOnExit()
+        {
+            BeatmapSetInfo beatmapSet = null!;
+
+            AddStep("import test beatmap", () => Game.BeatmapManager.Import(TestResources.GetTestBeatmapForImport()).WaitSafely());
+            AddStep("retrieve beatmap", () => beatmapSet = Game.BeatmapManager.QueryBeatmapSet(set => !set.Protected).AsNonNull().Value.Detach());
+
+            AddStep("present beatmap", () => Game.PresentBeatmap(beatmapSet));
+            AddUntilStep("wait for song select",
+                () => Game.Beatmap.Value.BeatmapSetInfo.Equals(beatmapSet)
+                      && Game.ScreenStack.CurrentScreen is PlaySongSelect songSelect
+                      && songSelect.IsLoaded);
+
+            AddStep("open editor", () => ((PlaySongSelect)Game.ScreenStack.CurrentScreen).Edit(beatmapSet.Beatmaps.First(beatmap => beatmap.Ruleset.OnlineID == 0)));
+            AddUntilStep("wait for editor open", () => Game.ScreenStack.CurrentScreen is Editor editor && editor.ReadyForUse);
+
+            AddStep("seek to arbitrary time", () => getEditor().ChildrenOfType<EditorClock>().First().Seek(1234));
+            AddUntilStep("time is correct", () => getEditor().ChildrenOfType<EditorClock>().First().CurrentTime, () => Is.EqualTo(1234));
+
+            AddStep("exit editor", () => InputManager.Key(Key.Escape));
+            AddUntilStep("wait for editor exit", () => Game.ScreenStack.CurrentScreen is not Editor);
+
+            AddStep("open editor", () => ((PlaySongSelect)Game.ScreenStack.CurrentScreen).Edit());
+
+            AddUntilStep("wait for editor open", () => Game.ScreenStack.CurrentScreen is Editor editor && editor.ReadyForUse);
+            AddUntilStep("time is correct", () => getEditor().ChildrenOfType<EditorClock>().First().CurrentTime, () => Is.EqualTo(1234));
+        }
+
+        private EditorBeatmap getEditorBeatmap() => getEditor().ChildrenOfType<EditorBeatmap>().Single();
+
+        private Editor getEditor() => (Editor)Game.ScreenStack.CurrentScreen;
     }
 }

From a18a2e48f75e4aca729abbd34e6a7285ea8804cc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Jun 2023 15:47:30 +0900
Subject: [PATCH 0702/1604] Colour argon osu!taiko explosions based on the
 object hit

---
 .../Skinning/Argon/ArgonHitExplosion.cs       | 26 ++++++++---------
 .../Skinning/Argon/ArgonInputDrum.cs          | 28 ++++++++++++-------
 2 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonHitExplosion.cs b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonHitExplosion.cs
index a47fd7e62e..cddae7f05b 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonHitExplosion.cs
@@ -1,9 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
@@ -18,7 +16,9 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
     public partial class ArgonHitExplosion : CompositeDrawable, IAnimatableHitExplosion
     {
         private readonly TaikoSkinComponents component;
+
         private readonly Circle outer;
+        private readonly Circle inner;
 
         public ArgonHitExplosion(TaikoSkinComponents component)
         {
@@ -34,13 +34,9 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     RelativeSizeAxes = Axes.Both,
-                    Colour = ColourInfo.GradientVertical(
-                        new Color4(255, 227, 236, 255),
-                        new Color4(255, 198, 211, 255)
-                    ),
                     Masking = true,
                 },
-                new Circle
+                inner = new Circle
                 {
                     Name = "Inner circle",
                     Anchor = Anchor.Centre,
@@ -48,12 +44,6 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
                     RelativeSizeAxes = Axes.Both,
                     Colour = Color4.White,
                     Size = new Vector2(0.85f),
-                    EdgeEffect = new EdgeEffectParameters
-                    {
-                        Type = EdgeEffectType.Glow,
-                        Colour = new Color4(255, 132, 191, 255).Opacity(0.5f),
-                        Radius = 45,
-                    },
                     Masking = true,
                 },
             };
@@ -63,6 +53,16 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
         {
             this.FadeOut();
 
+            bool isRim = (drawableHitObject.HitObject as Hit)?.Type == HitType.Rim;
+
+            outer.Colour = isRim ? ArgonInputDrum.RIM_HIT_GRADIENT : ArgonInputDrum.CENTRE_HIT_GRADIENT;
+            inner.EdgeEffect = new EdgeEffectParameters
+            {
+                Type = EdgeEffectType.Glow,
+                Colour = (isRim ? ArgonInputDrum.RIM_HIT_GLOW : ArgonInputDrum.CENTRE_HIT_GLOW).Opacity(0.5f),
+                Radius = 45,
+            };
+
             switch (component)
             {
                 case TaikoSkinComponents.TaikoExplosionGreat:
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonInputDrum.cs b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonInputDrum.cs
index e7b0a5537a..f7b7105bdc 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonInputDrum.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonInputDrum.cs
@@ -19,6 +19,20 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
 {
     public partial class ArgonInputDrum : AspectContainer
     {
+        public static readonly ColourInfo RIM_HIT_GRADIENT = ColourInfo.GradientHorizontal(
+            new Color4(227, 248, 255, 255),
+            new Color4(198, 245, 255, 255)
+        );
+
+        public static readonly Colour4 RIM_HIT_GLOW = new Color4(126, 215, 253, 255);
+
+        public static readonly ColourInfo CENTRE_HIT_GRADIENT = ColourInfo.GradientHorizontal(
+            new Color4(255, 227, 236, 255),
+            new Color4(255, 198, 211, 255)
+        );
+
+        public static readonly Colour4 CENTRE_HIT_GLOW = new Color4(255, 147, 199, 255);
+
         private const float rim_size = 0.3f;
 
         public ArgonInputDrum()
@@ -141,14 +155,11 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
                                 Anchor = anchor,
                                 Origin = Anchor.Centre,
                                 RelativeSizeAxes = Axes.Both,
-                                Colour = ColourInfo.GradientHorizontal(
-                                    new Color4(227, 248, 255, 255),
-                                    new Color4(198, 245, 255, 255)
-                                ),
+                                Colour = RIM_HIT_GRADIENT,
                                 EdgeEffect = new EdgeEffectParameters
                                 {
                                     Type = EdgeEffectType.Glow,
-                                    Colour = new Color4(126, 215, 253, 170),
+                                    Colour = RIM_HIT_GLOW.Opacity(0.66f),
                                     Radius = 50,
                                 },
                                 Alpha = 0,
@@ -166,14 +177,11 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
                                 Anchor = anchor,
                                 Origin = Anchor.Centre,
                                 RelativeSizeAxes = Axes.Both,
-                                Colour = ColourInfo.GradientHorizontal(
-                                    new Color4(255, 227, 236, 255),
-                                    new Color4(255, 198, 211, 255)
-                                ),
+                                Colour = CENTRE_HIT_GRADIENT,
                                 EdgeEffect = new EdgeEffectParameters
                                 {
                                     Type = EdgeEffectType.Glow,
-                                    Colour = new Color4(255, 147, 199, 255),
+                                    Colour = CENTRE_HIT_GLOW,
                                     Radius = 50,
                                 },
                                 Size = new Vector2(1 - rim_size),

From b8d9c9ff93c3b27c6bbe832eb032401144d7c807 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Jun 2023 16:07:00 +0900
Subject: [PATCH 0703/1604] Move `ApplyGameWideClock` to extension method

I don't see an issue with applying this workaround to more places, even
though it is a workaround, because it marks each usage very clearly. If
we design a better solution in the future it should be easy to replace
the usages.
---
 osu.Game.Rulesets.Mania/UI/Column.cs      | 17 +++--------------
 osu.Game/Extensions/DrawableExtensions.cs | 16 ++++++++++++++++
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 6ca830a82f..7033fd6755 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics.Pooling;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Platform;
+using osu.Game.Extensions;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
@@ -97,8 +98,8 @@ namespace osu.Game.Rulesets.Mania.UI
                 new ColumnTouchInputArea(this)
             };
 
-            applyGameWideClock(background);
-            applyGameWideClock(keyArea);
+            background.ApplyGameWideClock(host);
+            keyArea.ApplyGameWideClock(host);
 
             TopLevelContainer.Add(HitObjectArea.Explosions.CreateProxy());
 
@@ -107,18 +108,6 @@ namespace osu.Game.Rulesets.Mania.UI
             RegisterPool<HeadNote, DrawableHoldNoteHead>(10, 50);
             RegisterPool<TailNote, DrawableHoldNoteTail>(10, 50);
             RegisterPool<HoldNoteTick, DrawableHoldNoteTick>(50, 250);
-
-            // Some elements don't handle rewind correctly and fixing them is non-trivial.
-            // In the future we need a better solution to this, but as a temporary work-around, give these components the game-wide
-            // clock so they don't need to worry about rewind.
-            // This only works because they handle OnPressed/OnReleased which results in a correct state while rewinding.
-            //
-            // This is kinda dodgy (and will cause weirdness when pausing gameplay) but is better than completely broken rewind.
-            void applyGameWideClock(Drawable drawable)
-            {
-                drawable.Clock = host.UpdateThread.Clock;
-                drawable.ProcessCustomClock = false;
-            }
         }
 
         private void onSourceChanged()
diff --git a/osu.Game/Extensions/DrawableExtensions.cs b/osu.Game/Extensions/DrawableExtensions.cs
index 915a2292a2..6553ad3886 100644
--- a/osu.Game/Extensions/DrawableExtensions.cs
+++ b/osu.Game/Extensions/DrawableExtensions.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
+using osu.Framework.Platform;
 using osuTK;
 
 namespace osu.Game.Extensions
@@ -43,5 +44,20 @@ namespace osu.Game.Extensions
         /// <returns>The delta vector in Parent's coordinates.</returns>
         public static Vector2 ScreenSpaceDeltaToParentSpace(this Drawable drawable, Vector2 delta) =>
             drawable.Parent.ToLocalSpace(drawable.Parent.ToScreenSpace(Vector2.Zero) + delta);
+
+        /// <summary>
+        /// Some elements don't handle rewind correctly and fixing them is non-trivial.
+        /// In the future we need a better solution to this, but as a temporary work-around, give these components the game-wide
+        /// clock so they don't need to worry about rewind.
+        ///
+        /// This only works if input handling components handle OnPressed/OnReleased which results in a correct state while rewinding.
+        ///
+        /// This is kinda dodgy (and will cause weirdness when pausing gameplay) but is better than completely broken rewind.
+        /// </summary>
+        public static void ApplyGameWideClock(this Drawable drawable, GameHost host)
+        {
+            drawable.Clock = host.UpdateThread.Clock;
+            drawable.ProcessCustomClock = false;
+        }
     }
 }

From c0016fa5d2a837bd02cd29d83a44061f20633b75 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Jun 2023 16:07:34 +0900
Subject: [PATCH 0704/1604] Fix gameplay playfield border being affected by
 beatmap track time

Closes https://github.com/ppy/osu/issues/23470.
---
 osu.Game/Rulesets/UI/PlayfieldBorder.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game/Rulesets/UI/PlayfieldBorder.cs b/osu.Game/Rulesets/UI/PlayfieldBorder.cs
index 211a87de84..18bd5b9b93 100644
--- a/osu.Game/Rulesets/UI/PlayfieldBorder.cs
+++ b/osu.Game/Rulesets/UI/PlayfieldBorder.cs
@@ -4,10 +4,13 @@
 #nullable disable
 
 using System.Linq;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Platform;
+using osu.Game.Extensions;
 using osuTK;
 using osuTK.Graphics;
 
@@ -74,6 +77,12 @@ namespace osu.Game.Rulesets.UI
             };
         }
 
+        [BackgroundDependencyLoader]
+        private void load(GameHost host)
+        {
+            this.ApplyGameWideClock(host);
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();

From b096e03a57d57faf775bf2c846d34f0f9358be77 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Jun 2023 16:31:57 +0900
Subject: [PATCH 0705/1604] Fix ticks being created after the end of drum rolls
 in osu!taiko editor

Closes https://github.com/ppy/osu/issues/23135.
---
 osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
index 2f4a98bd8f..987eb6625a 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
@@ -1,11 +1,10 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Objects.Types;
 using System.Threading;
 using osu.Framework.Bindables;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Formats;
@@ -86,7 +85,10 @@ namespace osu.Game.Rulesets.Taiko.Objects
 
             bool first = true;
 
-            for (double t = StartTime; t < EndTime + tickSpacing / 2; t += tickSpacing)
+            // TODO: this implementation of drum roll tick does not match stable.
+            // Stable uses next-object intrinsics to decide whether the end of a drum roll gets a tick.
+            // It also changes the rate of ticks based on BPM. This is quite important.
+            for (double t = StartTime; Precision.AlmostBigger(EndTime, t, 1); t += tickSpacing)
             {
                 cancellationToken.ThrowIfCancellationRequested();
 

From 7a1766e378ef251e9b30d303843e11c461509568 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Jun 2023 16:42:20 +0900
Subject: [PATCH 0706/1604] Update argon osu!mania column colours in line with
 latest proposal

Matches https://github.com/ppy/osu/discussions/21996#discussioncomment-5516872.
---
 .../Argon/ManiaArgonSkinTransformer.cs        | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
index 007d02400a..3a15cb359f 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
@@ -139,11 +139,11 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                 case 3:
                     switch (columnIndex)
                     {
-                        case 0: return colour_pink;
+                        case 0: return colour_green;
 
-                        case 1: return colour_orange;
+                        case 1: return colour_purple;
 
-                        case 2: return colour_yellow;
+                        case 2: return colour_cyan;
 
                         default: throw new ArgumentOutOfRangeException();
                     }
@@ -185,11 +185,11 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
 
                         case 1: return colour_orange;
 
-                        case 2: return colour_yellow;
+                        case 2: return colour_green;
 
                         case 3: return colour_cyan;
 
-                        case 4: return colour_purple;
+                        case 4: return colour_orange;
 
                         case 5: return colour_pink;
 
@@ -201,17 +201,17 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                     {
                         case 0: return colour_pink;
 
-                        case 1: return colour_cyan;
+                        case 1: return colour_orange;
 
                         case 2: return colour_pink;
 
                         case 3: return colour_special_column;
 
-                        case 4: return colour_green;
+                        case 4: return colour_pink;
 
-                        case 5: return colour_cyan;
+                        case 5: return colour_orange;
 
-                        case 6: return colour_green;
+                        case 6: return colour_pink;
 
                         default: throw new ArgumentOutOfRangeException();
                     }
@@ -225,9 +225,9 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
 
                         case 2: return colour_orange;
 
-                        case 3: return colour_yellow;
+                        case 3: return colour_green;
 
-                        case 4: return colour_yellow;
+                        case 4: return colour_cyan;
 
                         case 5: return colour_orange;
 
@@ -273,9 +273,9 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
 
                         case 3: return colour_yellow;
 
-                        case 4: return colour_cyan;
+                        case 4: return colour_green;
 
-                        case 5: return colour_green;
+                        case 5: return colour_cyan;
 
                         case 6: return colour_yellow;
 

From 3db080fad2d8bd27f335a1a062d78e4956fd3401 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Jun 2023 16:54:33 +0900
Subject: [PATCH 0707/1604] Fix osu!taiko drum rolls not getting correct tick
 rate after placement in the editor

---
 osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs | 1 -
 osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs               | 8 +++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index e298e313df..5226cb0794 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -133,7 +133,6 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
                             StartTime = obj.StartTime,
                             Samples = obj.Samples,
                             Duration = taikoDuration,
-                            TickRate = beatmap.Difficulty.SliderTickRate == 3 ? 3 : 4,
                             SliderVelocity = obj is IHasSliderVelocity velocityData ? velocityData.SliderVelocity : 1
                         };
                     }
diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
index 987eb6625a..5b77ad7f91 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
@@ -4,7 +4,6 @@
 using osu.Game.Rulesets.Objects.Types;
 using System.Threading;
 using osu.Framework.Bindables;
-using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Formats;
@@ -68,6 +67,8 @@ namespace osu.Game.Rulesets.Taiko.Objects
             double scoringDistance = base_distance * difficulty.SliderMultiplier * SliderVelocity;
             Velocity = scoringDistance / timingPoint.BeatLength;
 
+            TickRate = difficulty.SliderTickRate == 3 ? 3 : 4;
+
             tickSpacing = timingPoint.BeatLength / TickRate;
         }
 
@@ -85,10 +86,7 @@ namespace osu.Game.Rulesets.Taiko.Objects
 
             bool first = true;
 
-            // TODO: this implementation of drum roll tick does not match stable.
-            // Stable uses next-object intrinsics to decide whether the end of a drum roll gets a tick.
-            // It also changes the rate of ticks based on BPM. This is quite important.
-            for (double t = StartTime; Precision.AlmostBigger(EndTime, t, 1); t += tickSpacing)
+            for (double t = StartTime; t < EndTime + tickSpacing; t += tickSpacing)
             {
                 cancellationToken.ThrowIfCancellationRequested();
 

From 56758afeed0ff662f107be0584b53261c81a8a52 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Jun 2023 16:59:28 +0900
Subject: [PATCH 0708/1604] Add note about `lastTickHittable` requirement

---
 osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index 5226cb0794..1c2e7abafe 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -92,6 +92,14 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
                 }).ToList();
             }
 
+            // TODO: stable makes the last tick of a drumroll non-required when the next object is too close.
+            // This probably needs to be reimplemented:
+            //
+            // List<HitObject> hitobjects = hitObjectManager.hitObjects;
+            // int ind = hitobjects.IndexOf(this);
+            // if (i < hitobjects.Count - 1 && hitobjects[i + 1].HittableStartTime - (EndTime + (int)TickSpacing) <= (int)TickSpacing)
+            //     lastTickHittable = false;
+
             return converted;
         }
 

From 77c745cc94d26d5998ba121c4b5fbe137a1af09c Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 6 Jun 2023 17:25:28 +0900
Subject: [PATCH 0709/1604] "TotalScoreV1" -> "LegacyTotalScore"

---
 .../Difficulty/OsuDifficultyCalculator.cs            |  2 +-
 osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
index 0e06e1e28f..1011066892 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
@@ -97,7 +97,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             {
                 StarRating = starRating,
                 Mods = mods,
-                TotalScoreV1 = new OsuScoreV1Processor(workingBeatmap.Beatmap, beatmap, mods).TotalScore,
+                LegacyTotalScore = new OsuScoreV1Processor(workingBeatmap.Beatmap, beatmap, mods).TotalScore,
                 AimDifficulty = aimRating,
                 SpeedDifficulty = speedRating,
                 SpeedNoteCount = speedNotes,
diff --git a/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs b/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
index ee02376939..8e30050a7f 100644
--- a/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
+++ b/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Difficulty
         protected const int ATTRIB_ID_FLASHLIGHT = 17;
         protected const int ATTRIB_ID_SLIDER_FACTOR = 19;
         protected const int ATTRIB_ID_SPEED_NOTE_COUNT = 21;
-        protected const int ATTRIB_ID_TOTAL_SCORE_V1 = 23;
+        protected const int ATTRIB_ID_LEGACY_TOTAL_SCORE = 23;
 
         /// <summary>
         /// The mods which were applied to the beatmap.
@@ -46,10 +46,10 @@ namespace osu.Game.Rulesets.Difficulty
         public int MaxCombo { get; set; }
 
         /// <summary>
-        /// The total score achievable in ScoreV1.
+        /// The maximum achievable legacy total score.
         /// </summary>
-        [JsonProperty("total_score_v1", Order = -2)]
-        public int TotalScoreV1 { get; set; }
+        [JsonProperty("legacy_total_score", Order = -2)]
+        public int LegacyTotalScore { get; set; }
 
         /// <summary>
         /// Creates new <see cref="DifficultyAttributes"/>.
@@ -78,7 +78,7 @@ namespace osu.Game.Rulesets.Difficulty
         public virtual IEnumerable<(int attributeId, object value)> ToDatabaseAttributes()
         {
             yield return (ATTRIB_ID_MAX_COMBO, MaxCombo);
-            yield return (ATTRIB_ID_TOTAL_SCORE_V1, TotalScoreV1);
+            yield return (ATTRIB_ID_LEGACY_TOTAL_SCORE, LegacyTotalScore);
         }
 
         /// <summary>
@@ -89,7 +89,7 @@ namespace osu.Game.Rulesets.Difficulty
         public virtual void FromDatabaseAttributes(IReadOnlyDictionary<int, double> values, IBeatmapOnlineInfo onlineInfo)
         {
             MaxCombo = (int)values[ATTRIB_ID_MAX_COMBO];
-            TotalScoreV1 = (int)values[ATTRIB_ID_TOTAL_SCORE_V1];
+            LegacyTotalScore = (int)values[ATTRIB_ID_LEGACY_TOTAL_SCORE];
         }
     }
 }

From c1f23ef2119b613fc018a461f73a73c06f2c72ad Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Jun 2023 17:52:29 +0900
Subject: [PATCH 0710/1604] Add beat snap grid for osu!catch editor

As discussed in https://github.com/ppy/osu/discussions/23462.
---
 .../Edit/CatchBeatSnapGrid.cs                 | 180 ++++++++++++++++++
 .../Edit/CatchHitObjectComposer.cs            |  27 +++
 osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs  |   7 +
 3 files changed, 214 insertions(+)
 create mode 100644 osu.Game.Rulesets.Catch/Edit/CatchBeatSnapGrid.cs

diff --git a/osu.Game.Rulesets.Catch/Edit/CatchBeatSnapGrid.cs b/osu.Game.Rulesets.Catch/Edit/CatchBeatSnapGrid.cs
new file mode 100644
index 0000000000..a2421c2b29
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Edit/CatchBeatSnapGrid.cs
@@ -0,0 +1,180 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Caching;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Catch.UI;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Screens.Edit;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Catch.Edit
+{
+    /// <summary>
+    /// A grid which displays coloured beat divisor lines in proximity to the selection or placement cursor.
+    /// </summary>
+    /// <remarks>
+    /// This class heavily borrows from osu!mania's implementation (ManiaBeatSnapGrid).
+    /// If further changes are to be made, they should also be applied there.
+    /// If the scale of the changes are large enough, abstracting may be a good path.
+    /// </remarks>
+    public partial class CatchBeatSnapGrid : Component
+    {
+        private const double visible_range = 750;
+
+        /// <summary>
+        /// The range of time values of the current selection.
+        /// </summary>
+        public (double start, double end)? SelectionTimeRange
+        {
+            set
+            {
+                if (value == selectionTimeRange)
+                    return;
+
+                selectionTimeRange = value;
+                lineCache.Invalidate();
+            }
+        }
+
+        [Resolved]
+        private EditorBeatmap beatmap { get; set; } = null!;
+
+        [Resolved]
+        private OsuColour colours { get; set; } = null!;
+
+        [Resolved]
+        private BindableBeatDivisor beatDivisor { get; set; } = null!;
+
+        private readonly Cached lineCache = new Cached();
+
+        private (double start, double end)? selectionTimeRange;
+
+        private ScrollingHitObjectContainer lineContainer = null!;
+
+        [BackgroundDependencyLoader]
+        private void load(HitObjectComposer composer)
+        {
+            lineContainer = new ScrollingHitObjectContainer();
+
+            ((CatchPlayfield)composer.Playfield).UnderlayElements.Add(lineContainer);
+
+            beatDivisor.BindValueChanged(_ => createLines(), true);
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            if (!lineCache.IsValid)
+            {
+                lineCache.Validate();
+                createLines();
+            }
+        }
+
+        private readonly Stack<DrawableGridLine> availableLines = new Stack<DrawableGridLine>();
+
+        private void createLines()
+        {
+            foreach (var line in lineContainer.Objects.OfType<DrawableGridLine>())
+                availableLines.Push(line);
+
+            lineContainer.Clear();
+
+            if (selectionTimeRange == null)
+                return;
+
+            var range = selectionTimeRange.Value;
+
+            var timingPoint = beatmap.ControlPointInfo.TimingPointAt(range.start - visible_range);
+
+            double time = timingPoint.Time;
+            int beat = 0;
+
+            // progress time until in the visible range.
+            while (time < range.start - visible_range)
+            {
+                time += timingPoint.BeatLength / beatDivisor.Value;
+                beat++;
+            }
+
+            while (time < range.end + visible_range)
+            {
+                var nextTimingPoint = beatmap.ControlPointInfo.TimingPointAt(time);
+
+                // switch to the next timing point if we have reached it.
+                if (nextTimingPoint.Time > timingPoint.Time)
+                {
+                    beat = 0;
+                    time = nextTimingPoint.Time;
+                    timingPoint = nextTimingPoint;
+                }
+
+                Color4 colour = BindableBeatDivisor.GetColourFor(
+                    BindableBeatDivisor.GetDivisorForBeatIndex(Math.Max(1, beat), beatDivisor.Value), colours);
+
+                if (!availableLines.TryPop(out var line))
+                    line = new DrawableGridLine();
+
+                line.HitObject.StartTime = time;
+                line.Colour = colour;
+
+                lineContainer.Add(line);
+
+                beat++;
+                time += timingPoint.BeatLength / beatDivisor.Value;
+            }
+
+            // required to update ScrollingHitObjectContainer's cache.
+            lineContainer.UpdateSubTree();
+
+            foreach (var line in lineContainer.Objects.OfType<DrawableGridLine>())
+            {
+                time = line.HitObject.StartTime;
+
+                if (time >= range.start && time <= range.end)
+                    line.Alpha = 1;
+                else
+                {
+                    double timeSeparation = time < range.start ? range.start - time : time - range.end;
+                    line.Alpha = (float)Math.Max(0, 1 - timeSeparation / visible_range);
+                }
+            }
+        }
+
+        private partial class DrawableGridLine : DrawableHitObject
+        {
+            public DrawableGridLine()
+                : base(new HitObject())
+            {
+                RelativeSizeAxes = Axes.X;
+                Height = 2;
+
+                AddInternal(new Box { RelativeSizeAxes = Axes.Both });
+            }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                Origin = Anchor.BottomLeft;
+                Anchor = Anchor.BottomLeft;
+            }
+
+            protected override void UpdateInitialTransforms()
+            {
+                // don't perform any fading – we are handling that ourselves.
+                LifetimeEnd = HitObject.StartTime + visible_range;
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
index 8afeca3e51..f2877572e8 100644
--- a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
@@ -33,6 +33,8 @@ namespace osu.Game.Rulesets.Catch.Edit
 
         private InputManager inputManager = null!;
 
+        private CatchBeatSnapGrid beatSnapGrid = null!;
+
         private readonly BindableDouble timeRangeMultiplier = new BindableDouble(1)
         {
             MinValue = 1,
@@ -65,6 +67,8 @@ namespace osu.Game.Rulesets.Catch.Edit
                 Catcher.BASE_DASH_SPEED, -Catcher.BASE_DASH_SPEED,
                 Catcher.BASE_WALK_SPEED, -Catcher.BASE_WALK_SPEED,
             }));
+
+            AddInternal(beatSnapGrid = new CatchBeatSnapGrid());
         }
 
         protected override void LoadComplete()
@@ -74,6 +78,29 @@ namespace osu.Game.Rulesets.Catch.Edit
             inputManager = GetContainingInputManager();
         }
 
+        protected override void UpdateAfterChildren()
+        {
+            base.UpdateAfterChildren();
+
+            if (BlueprintContainer.CurrentTool is SelectTool)
+            {
+                if (EditorBeatmap.SelectedHitObjects.Any())
+                {
+                    beatSnapGrid.SelectionTimeRange = (EditorBeatmap.SelectedHitObjects.Min(h => h.StartTime), EditorBeatmap.SelectedHitObjects.Max(h => h.GetEndTime()));
+                }
+                else
+                    beatSnapGrid.SelectionTimeRange = null;
+            }
+            else
+            {
+                var result = FindSnappedPositionAndTime(inputManager.CurrentState.Mouse.Position);
+                if (result.Time is double time)
+                    beatSnapGrid.SelectionTimeRange = (time, time);
+                else
+                    beatSnapGrid.SelectionTimeRange = null;
+            }
+        }
+
         protected override double ReadCurrentDistanceSnap(HitObject before, HitObject after)
         {
             // osu!catch's distance snap implementation is limited, in that a custom spacing cannot be specified.
diff --git a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
index cf7337fd0d..f091dee845 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
@@ -41,6 +42,8 @@ namespace osu.Game.Rulesets.Catch.UI
 
         internal CatcherArea CatcherArea { get; private set; } = null!;
 
+        public Container UnderlayElements { get; private set; } = null!;
+
         private readonly IBeatmapDifficultyInfo difficulty;
 
         public CatchPlayfield(IBeatmapDifficultyInfo difficulty)
@@ -62,6 +65,10 @@ namespace osu.Game.Rulesets.Catch.UI
 
             AddRangeInternal(new[]
             {
+                UnderlayElements = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                },
                 droppedObjectContainer,
                 Catcher.CreateProxiedContent(),
                 HitObjectContainer.CreateProxy(),

From 6b18f2f2bb7492c0cf0208452e220dcd74d4b866 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Jun 2023 21:40:09 +0900
Subject: [PATCH 0711/1604] Fix osu!mania scroll speed milliseconds having too
 much precision

Closes #23750.
---
 .../Configuration/ManiaRulesetConfigManager.cs                  | 2 +-
 osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs              | 2 +-
 osu.Game/Localisation/RulesetSettingsStrings.cs                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
index b2155968ea..f975c7f1d4 100644
--- a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
+++ b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Rulesets.Mania.Configuration
                 speed => new SettingDescription(
                     rawValue: speed,
                     name: RulesetSettingsStrings.ScrollSpeed,
-                    value: RulesetSettingsStrings.ScrollSpeedTooltip(DrawableManiaRuleset.ComputeScrollTime(speed), speed)
+                    value: RulesetSettingsStrings.ScrollSpeedTooltip((int)DrawableManiaRuleset.ComputeScrollTime(speed), speed)
                 )
             )
         };
diff --git a/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs b/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
index a5434a36ab..065534eec4 100644
--- a/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Mania
 
         private partial class ManiaScrollSlider : RoundedSliderBar<int>
         {
-            public override LocalisableString TooltipText => RulesetSettingsStrings.ScrollSpeedTooltip(DrawableManiaRuleset.ComputeScrollTime(Current.Value), Current.Value);
+            public override LocalisableString TooltipText => RulesetSettingsStrings.ScrollSpeedTooltip((int)DrawableManiaRuleset.ComputeScrollTime(Current.Value), Current.Value);
         }
     }
 }
diff --git a/osu.Game/Localisation/RulesetSettingsStrings.cs b/osu.Game/Localisation/RulesetSettingsStrings.cs
index 91bbece004..3fa7656cbb 100644
--- a/osu.Game/Localisation/RulesetSettingsStrings.cs
+++ b/osu.Game/Localisation/RulesetSettingsStrings.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Localisation
         /// <summary>
         /// "{0}ms (speed {1})"
         /// </summary>
-        public static LocalisableString ScrollSpeedTooltip(double scrollTime, int scrollSpeed) => new TranslatableString(getKey(@"ruleset"), @"{0:0}ms (speed {1})", scrollTime, scrollSpeed);
+        public static LocalisableString ScrollSpeedTooltip(int scrollTime, int scrollSpeed) => new TranslatableString(getKey(@"ruleset"), @"{0}ms (speed {1})", scrollTime, scrollSpeed);
 
         private static string getKey(string key) => $@"{prefix}:{key}";
     }

From ba7069df34b65ee70ecf9962d240c3deb05dc68a Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Tue, 6 Jun 2023 16:12:31 +0300
Subject: [PATCH 0712/1604] =?UTF-8?q?Fix=20`SelectAllModsButton`=20state?=
 =?UTF-8?q?=20doesn=E2=80=99t=20update=20when=20search=20term=20changed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TestSceneFreeModSelectOverlay.cs          | 24 +++++++++++++++++++
 osu.Game/Overlays/Mods/SelectAllModsButton.cs |  3 +++
 2 files changed, 27 insertions(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs
index 60bd88cc2b..66ba908879 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs
@@ -8,6 +8,7 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
 using osu.Framework.Testing;
@@ -57,6 +58,29 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("customisation area not expanded", () => this.ChildrenOfType<ModSettingsArea>().Single().Height == 0);
         }
 
+        [Test]
+        public void TestSelectAllButtonUpdatesStateWhenSearchTermChanged()
+        {
+            createFreeModSelect();
+
+            AddStep("apply search term", () => freeModSelectOverlay.SearchTerm = "ea");
+
+            AddAssert("select all button enabled", () => this.ChildrenOfType<SelectAllModsButton>().Single().Enabled.Value);
+
+            AddStep("click select all button", navigateAndClick<SelectAllModsButton>);
+            AddAssert("select all button disabled", () => !this.ChildrenOfType<SelectAllModsButton>().Single().Enabled.Value);
+
+            AddStep("change search term", () => freeModSelectOverlay.SearchTerm = "e");
+
+            AddAssert("select all button enabled", () => this.ChildrenOfType<SelectAllModsButton>().Single().Enabled.Value);
+
+            void navigateAndClick<T>() where T : Drawable
+            {
+                InputManager.MoveMouseTo(this.ChildrenOfType<T>().Single());
+                InputManager.Click(MouseButton.Left);
+            }
+        }
+
         [Test]
         public void TestSelectDeselectAllViaKeyboard()
         {
diff --git a/osu.Game/Overlays/Mods/SelectAllModsButton.cs b/osu.Game/Overlays/Mods/SelectAllModsButton.cs
index 83c46cfc1f..dd14514a3b 100644
--- a/osu.Game/Overlays/Mods/SelectAllModsButton.cs
+++ b/osu.Game/Overlays/Mods/SelectAllModsButton.cs
@@ -17,6 +17,7 @@ namespace osu.Game.Overlays.Mods
     {
         private readonly Bindable<IReadOnlyList<Mod>> selectedMods = new Bindable<IReadOnlyList<Mod>>();
         private readonly Bindable<Dictionary<ModType, IReadOnlyList<ModState>>> availableMods = new Bindable<Dictionary<ModType, IReadOnlyList<ModState>>>();
+        private readonly Bindable<string> searchTerm = new Bindable<string>();
 
         public SelectAllModsButton(FreeModSelectOverlay modSelectOverlay)
             : base(ModSelectOverlay.BUTTON_WIDTH)
@@ -26,6 +27,7 @@ namespace osu.Game.Overlays.Mods
 
             selectedMods.BindTo(modSelectOverlay.SelectedMods);
             availableMods.BindTo(modSelectOverlay.AvailableMods);
+            searchTerm.BindTo(modSelectOverlay.SearchTextBox.Current);
         }
 
         protected override void LoadComplete()
@@ -34,6 +36,7 @@ namespace osu.Game.Overlays.Mods
 
             selectedMods.BindValueChanged(_ => Scheduler.AddOnce(updateEnabledState));
             availableMods.BindValueChanged(_ => Scheduler.AddOnce(updateEnabledState));
+            searchTerm.BindValueChanged(_ => Scheduler.AddOnce(updateEnabledState));
             updateEnabledState();
         }
 

From e0e013cca10ef665af0647c1d914955dfb45d42e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Jun 2023 22:17:05 +0900
Subject: [PATCH 0713/1604] Fix incorrect realm schema comment

Co-authored-by: timiimit <32331609+timiimit@users.noreply.github.com>
---
 osu.Game/Database/RealmAccess.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index 9e5f41502b..f4c6c802f1 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -71,7 +71,7 @@ namespace osu.Game.Database
         /// 24   2022-08-22    Added MaximumStatistics to ScoreInfo.
         /// 25   2022-09-18    Remove skins to add with new naming.
         /// 26   2023-02-05    Added BeatmapHash to ScoreInfo.
-        /// 27   2023-06-06    Added EditorTimestamp to ScoreInfo.
+        /// 27   2023-06-06    Added EditorTimestamp to BeatmapInfo.
         /// </summary>
         private const int schema_version = 27;
 

From 247fa088dbc947770df1e131aae3e8e6104d3b3f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Jun 2023 22:22:42 +0900
Subject: [PATCH 0714/1604] Add `IHasNoTimedInputs` interface to scope change
 further

---
 osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs         |  2 +-
 osu.Game/Rulesets/Mods/IHasNoTimedInputs.cs       | 15 +++++++++++++++
 .../Play/PlayerSettings/BeatmapOffsetControl.cs   |  2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game/Rulesets/Mods/IHasNoTimedInputs.cs

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs b/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
index 32ffb545e0..aaa7c70a8d 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
@@ -18,7 +18,7 @@ using static osu.Game.Input.Handlers.ReplayInputHandler;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
-    public class OsuModRelax : ModRelax, IUpdatableByPlayfield, IApplicableToDrawableRuleset<OsuHitObject>, IApplicableToPlayer
+    public class OsuModRelax : ModRelax, IUpdatableByPlayfield, IApplicableToDrawableRuleset<OsuHitObject>, IApplicableToPlayer, IHasNoTimedInputs
     {
         public override LocalisableString Description => @"You don't need to click. Give your clicking/tapping fingers a break from the heat of things.";
 
diff --git a/osu.Game/Rulesets/Mods/IHasNoTimedInputs.cs b/osu.Game/Rulesets/Mods/IHasNoTimedInputs.cs
new file mode 100644
index 0000000000..c0d709ad4a
--- /dev/null
+++ b/osu.Game/Rulesets/Mods/IHasNoTimedInputs.cs
@@ -0,0 +1,15 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+namespace osu.Game.Rulesets.Mods
+{
+    /// <summary>
+    /// Denotes a mod which removes timed inputs from a ruleset which would usually have them.
+    /// </summary>
+    /// <remarks>
+    /// This will be used, for instance, to omit showing offset calibration UI post-gameplay.
+    /// </remarks>
+    public interface IHasNoTimedInputs
+    {
+    }
+}
diff --git a/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs b/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
index 8d5459809e..b542707185 100644
--- a/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
@@ -184,7 +184,7 @@ namespace osu.Game.Screens.Play.PlayerSettings
             if (score.NewValue == null)
                 return;
 
-            if (score.NewValue.Mods.Any(m => !m.UserPlayable || m is ModRelax))
+            if (score.NewValue.Mods.Any(m => !m.UserPlayable || m is IHasNoTimedInputs))
                 return;
 
             var hitEvents = score.NewValue.HitEvents;

From be59eb11169324ec3df62629d4d5b0cabf75c775 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 6 Jun 2023 18:01:15 +0200
Subject: [PATCH 0715/1604] Fix triangles song progress bar blinking during
 gameplay

Closes #23760.
---
 osu.Game/Screens/Play/HUD/DefaultSongProgress.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/DefaultSongProgress.cs b/osu.Game/Screens/Play/HUD/DefaultSongProgress.cs
index 6eed563703..202ead2d66 100644
--- a/osu.Game/Screens/Play/HUD/DefaultSongProgress.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultSongProgress.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Utils;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Localisation.HUD;
@@ -101,7 +102,12 @@ namespace osu.Game.Screens.Play.HUD
         protected override void Update()
         {
             base.Update();
-            Height = bottom_bar_height + graph_height + handle_size.Y + info.Height - graph.Y;
+
+            // to prevent unnecessary invalidations of the song progress graph due to changes in size, apply tolerance when updating the height.
+            float newHeight = bottom_bar_height + graph_height + handle_size.Y + info.Height - graph.Y;
+
+            if (!Precision.AlmostEquals(Height, newHeight, 5f))
+                Height = newHeight;
         }
 
         private void updateBarVisibility()

From 46ec250d342721c70e54a20795f6994a31c8a12b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 6 Jun 2023 20:21:55 +0200
Subject: [PATCH 0716/1604] Fix test failures due to cross-test state pollution

`TestSceneEditorTestGameplay` is not isolated from database, and one of
the tests exiting editor when seeked to 60000 milliseconds
(`TestClockTimeTransferIsOneDirectional()`) ended up changing
`EditorTimestamp` to the same value, causing
`TestSaveChangesBeforeGameplayTest()` to fail due to changing initial
state.

To fix, perform a direct deletion of imported beatmaps in realm to avert
this scenario, contrary to the soft-deletion via `BeatmapManager` done
previously.
---
 .../Visual/Editing/TestSceneEditorTestGameplay.cs      | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorTestGameplay.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorTestGameplay.cs
index 2250868a39..007716bd6c 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorTestGameplay.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorTestGameplay.cs
@@ -209,10 +209,14 @@ namespace osu.Game.Tests.Visual.Editing
         public override void TearDownSteps()
         {
             base.TearDownSteps();
-            AddStep("delete imported", () =>
+            AddStep("delete imported", () => Realm.Write(r =>
             {
-                beatmaps.Delete(importedBeatmapSet);
-            });
+                // delete from realm directly rather than via `BeatmapManager` to avoid cross-test pollution
+                // (`BeatmapManager.Delete()` uses soft deletion, which can lead to beatmap reuse between test cases).
+                r.RemoveAll<BeatmapMetadata>();
+                r.RemoveAll<BeatmapInfo>();
+                r.RemoveAll<BeatmapSetInfo>();
+            }));
         }
     }
 }

From 7694aa721978e88a39c8517fb3cfde27d881ca45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 6 Jun 2023 20:36:44 +0200
Subject: [PATCH 0717/1604] Add test coverage

---
 .../Gameplay/TestSceneBeatmapOffsetControl.cs    | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapOffsetControl.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapOffsetControl.cs
index 6eae795630..4b2909739d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapOffsetControl.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapOffsetControl.cs
@@ -8,6 +8,7 @@ using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Game.Overlays.Settings;
+using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play.PlayerSettings;
 using osu.Game.Tests.Visual.Ranking;
@@ -49,6 +50,21 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("No calibration button", () => !offsetControl.ChildrenOfType<SettingsButton>().Any());
         }
 
+        [Test]
+        public void TestModRemovingTimedInputs()
+        {
+            AddStep("Set score with mod removing timed inputs", () =>
+            {
+                offsetControl.ReferenceScore.Value = new ScoreInfo
+                {
+                    HitEvents = TestSceneHitEventTimingDistributionGraph.CreateDistributedHitEvents(10),
+                    Mods = new[] { new OsuModRelax() }
+                };
+            });
+
+            AddAssert("No calibration button", () => !offsetControl.ChildrenOfType<SettingsButton>().Any());
+        }
+
         [Test]
         public void TestCalibrationFromZero()
         {

From f51b8a6a058c53e2be50aaf7255680b7a9dbed15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 6 Jun 2023 21:11:24 +0200
Subject: [PATCH 0718/1604] Fix code quality inspection

---
 .../Visual/Gameplay/TestSceneBeatmapOffsetControl.cs           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapOffsetControl.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapOffsetControl.cs
index 4b2909739d..f3701b664c 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapOffsetControl.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapOffsetControl.cs
@@ -8,6 +8,7 @@ using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Game.Overlays.Settings;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play.PlayerSettings;
@@ -58,7 +59,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 offsetControl.ReferenceScore.Value = new ScoreInfo
                 {
                     HitEvents = TestSceneHitEventTimingDistributionGraph.CreateDistributedHitEvents(10),
-                    Mods = new[] { new OsuModRelax() }
+                    Mods = new Mod[] { new OsuModRelax() }
                 };
             });
 

From cdd931633defa30d99d0fb46bb34c5634b34cc38 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Jun 2023 12:10:30 +0900
Subject: [PATCH 0719/1604] Change 3K middle key to "special" purple colour
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 .../Skinning/Argon/ManiaArgonSkinTransformer.cs                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
index 3a15cb359f..ddd6365c25 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
@@ -141,7 +141,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                     {
                         case 0: return colour_green;
 
-                        case 1: return colour_purple;
+                        case 1: return colour_special_column;
 
                         case 2: return colour_cyan;
 

From 6d446d3e97dd6f936753e8fb0427929ccab541a7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Jun 2023 12:25:34 +0900
Subject: [PATCH 0720/1604] Fix incorrect colouring of beat snap grids (mania
 and catch)

---
 osu.Game.Rulesets.Catch/Edit/CatchBeatSnapGrid.cs | 2 +-
 osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Edit/CatchBeatSnapGrid.cs b/osu.Game.Rulesets.Catch/Edit/CatchBeatSnapGrid.cs
index a2421c2b29..6862696b3a 100644
--- a/osu.Game.Rulesets.Catch/Edit/CatchBeatSnapGrid.cs
+++ b/osu.Game.Rulesets.Catch/Edit/CatchBeatSnapGrid.cs
@@ -121,7 +121,7 @@ namespace osu.Game.Rulesets.Catch.Edit
                 }
 
                 Color4 colour = BindableBeatDivisor.GetColourFor(
-                    BindableBeatDivisor.GetDivisorForBeatIndex(Math.Max(1, beat), beatDivisor.Value), colours);
+                    BindableBeatDivisor.GetDivisorForBeatIndex(beat, beatDivisor.Value), colours);
 
                 if (!availableLines.TryPop(out var line))
                     line = new DrawableGridLine();
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
index d1d5492b7a..2d4b5f718c 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
@@ -129,7 +129,7 @@ namespace osu.Game.Rulesets.Mania.Edit
                 }
 
                 Color4 colour = BindableBeatDivisor.GetColourFor(
-                    BindableBeatDivisor.GetDivisorForBeatIndex(Math.Max(1, beat), beatDivisor.Value), colours);
+                    BindableBeatDivisor.GetDivisorForBeatIndex(beat, beatDivisor.Value), colours);
 
                 foreach (var grid in grids)
                 {

From c276b728ecee7dc7ef471464445c69e4a729d570 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Jun 2023 13:30:04 +0900
Subject: [PATCH 0721/1604] Clean up `TestSceneDrumRollJudgements`

---
 .../Judgements/TestSceneDrumRollJudgements.cs | 67 ++++---------------
 1 file changed, 14 insertions(+), 53 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneDrumRollJudgements.cs b/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneDrumRollJudgements.cs
index a9231b4783..bccede38b3 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneDrumRollJudgements.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneDrumRollJudgements.cs
@@ -15,8 +15,6 @@ namespace osu.Game.Rulesets.Taiko.Tests.Judgements
         [Test]
         public void TestHitAllDrumRoll()
         {
-            const double hit_time = 1000;
-
             PerformTest(new List<ReplayFrame>
             {
                 new TaikoReplayFrame(0),
@@ -24,11 +22,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Judgements
                 new TaikoReplayFrame(1001),
                 new TaikoReplayFrame(2000, TaikoAction.LeftCentre),
                 new TaikoReplayFrame(2001),
-            }, CreateBeatmap(new DrumRoll
-            {
-                StartTime = hit_time,
-                Duration = 1000
-            }));
+            }, CreateBeatmap(createDrumRoll(false)));
 
             AssertJudgementCount(3);
             AssertResult<DrumRollTick>(0, HitResult.SmallBonus);
@@ -39,18 +33,12 @@ namespace osu.Game.Rulesets.Taiko.Tests.Judgements
         [Test]
         public void TestHitSomeDrumRoll()
         {
-            const double hit_time = 1000;
-
             PerformTest(new List<ReplayFrame>
             {
                 new TaikoReplayFrame(0),
                 new TaikoReplayFrame(2000, TaikoAction.LeftCentre),
                 new TaikoReplayFrame(2001),
-            }, CreateBeatmap(new DrumRoll
-            {
-                StartTime = hit_time,
-                Duration = 1000
-            }));
+            }, CreateBeatmap(createDrumRoll(false)));
 
             AssertJudgementCount(3);
             AssertResult<DrumRollTick>(0, HitResult.IgnoreMiss);
@@ -61,16 +49,10 @@ namespace osu.Game.Rulesets.Taiko.Tests.Judgements
         [Test]
         public void TestHitNoneDrumRoll()
         {
-            const double hit_time = 1000;
-
             PerformTest(new List<ReplayFrame>
             {
                 new TaikoReplayFrame(0),
-            }, CreateBeatmap(new DrumRoll
-            {
-                StartTime = hit_time,
-                Duration = 1000
-            }));
+            }, CreateBeatmap(createDrumRoll(false)));
 
             AssertJudgementCount(3);
             AssertResult<DrumRollTick>(0, HitResult.IgnoreMiss);
@@ -81,8 +63,6 @@ namespace osu.Game.Rulesets.Taiko.Tests.Judgements
         [Test]
         public void TestHitAllStrongDrumRollWithOneKey()
         {
-            const double hit_time = 1000;
-
             PerformTest(new List<ReplayFrame>
             {
                 new TaikoReplayFrame(0),
@@ -90,12 +70,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Judgements
                 new TaikoReplayFrame(1001),
                 new TaikoReplayFrame(2000, TaikoAction.LeftCentre),
                 new TaikoReplayFrame(2001),
-            }, CreateBeatmap(new DrumRoll
-            {
-                StartTime = hit_time,
-                Duration = 1000,
-                IsStrong = true
-            }));
+            }, CreateBeatmap(createDrumRoll(true)));
 
             AssertJudgementCount(6);
 
@@ -112,19 +87,12 @@ namespace osu.Game.Rulesets.Taiko.Tests.Judgements
         [Test]
         public void TestHitSomeStrongDrumRollWithOneKey()
         {
-            const double hit_time = 1000;
-
             PerformTest(new List<ReplayFrame>
             {
                 new TaikoReplayFrame(0),
                 new TaikoReplayFrame(2000, TaikoAction.LeftCentre),
                 new TaikoReplayFrame(2001),
-            }, CreateBeatmap(new DrumRoll
-            {
-                StartTime = hit_time,
-                Duration = 1000,
-                IsStrong = true
-            }));
+            }, CreateBeatmap(createDrumRoll(true)));
 
             AssertJudgementCount(6);
 
@@ -141,8 +109,6 @@ namespace osu.Game.Rulesets.Taiko.Tests.Judgements
         [Test]
         public void TestHitAllStrongDrumRollWithBothKeys()
         {
-            const double hit_time = 1000;
-
             PerformTest(new List<ReplayFrame>
             {
                 new TaikoReplayFrame(0),
@@ -150,12 +116,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Judgements
                 new TaikoReplayFrame(1001),
                 new TaikoReplayFrame(2000, TaikoAction.LeftCentre, TaikoAction.RightCentre),
                 new TaikoReplayFrame(2001),
-            }, CreateBeatmap(new DrumRoll
-            {
-                StartTime = hit_time,
-                Duration = 1000,
-                IsStrong = true
-            }));
+            }, CreateBeatmap(createDrumRoll(true)));
 
             AssertJudgementCount(6);
 
@@ -172,19 +133,12 @@ namespace osu.Game.Rulesets.Taiko.Tests.Judgements
         [Test]
         public void TestHitSomeStrongDrumRollWithBothKeys()
         {
-            const double hit_time = 1000;
-
             PerformTest(new List<ReplayFrame>
             {
                 new TaikoReplayFrame(0),
                 new TaikoReplayFrame(2000, TaikoAction.LeftCentre, TaikoAction.RightCentre),
                 new TaikoReplayFrame(2001),
-            }, CreateBeatmap(new DrumRoll
-            {
-                StartTime = hit_time,
-                Duration = 1000,
-                IsStrong = true
-            }));
+            }, CreateBeatmap(createDrumRoll(true)));
 
             AssertJudgementCount(6);
 
@@ -197,5 +151,12 @@ namespace osu.Game.Rulesets.Taiko.Tests.Judgements
             AssertResult<DrumRoll>(0, HitResult.IgnoreHit);
             AssertResult<StrongNestedHitObject>(2, HitResult.IgnoreHit);
         }
+
+        private DrumRoll createDrumRoll(bool strong) => new DrumRoll
+        {
+            StartTime = 1000,
+            Duration = 1000,
+            IsStrong = strong
+        };
     }
 }

From 2fca81492663c57039bad6dab6635a37be0c87b3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Jun 2023 13:44:01 +0900
Subject: [PATCH 0722/1604] Update drum roll judgement tests to work correctly
 with more correct tick rate applied

---
 .../Judgements/TestSceneDrumRollJudgements.cs | 79 +++++++++++++------
 1 file changed, 53 insertions(+), 26 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneDrumRollJudgements.cs b/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneDrumRollJudgements.cs
index bccede38b3..21f2b8f1be 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneDrumRollJudgements.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneDrumRollJudgements.cs
@@ -20,13 +20,22 @@ namespace osu.Game.Rulesets.Taiko.Tests.Judgements
                 new TaikoReplayFrame(0),
                 new TaikoReplayFrame(1000, TaikoAction.LeftCentre),
                 new TaikoReplayFrame(1001),
+                new TaikoReplayFrame(1250, TaikoAction.LeftCentre),
+                new TaikoReplayFrame(1251),
+                new TaikoReplayFrame(1500, TaikoAction.LeftCentre),
+                new TaikoReplayFrame(1501),
+                new TaikoReplayFrame(1750, TaikoAction.LeftCentre),
+                new TaikoReplayFrame(1751),
                 new TaikoReplayFrame(2000, TaikoAction.LeftCentre),
                 new TaikoReplayFrame(2001),
             }, CreateBeatmap(createDrumRoll(false)));
 
-            AssertJudgementCount(3);
+            AssertJudgementCount(6);
             AssertResult<DrumRollTick>(0, HitResult.SmallBonus);
             AssertResult<DrumRollTick>(1, HitResult.SmallBonus);
+            AssertResult<DrumRollTick>(2, HitResult.SmallBonus);
+            AssertResult<DrumRollTick>(3, HitResult.SmallBonus);
+            AssertResult<DrumRollTick>(4, HitResult.SmallBonus);
             AssertResult<DrumRoll>(0, HitResult.IgnoreHit);
         }
 
@@ -40,9 +49,12 @@ namespace osu.Game.Rulesets.Taiko.Tests.Judgements
                 new TaikoReplayFrame(2001),
             }, CreateBeatmap(createDrumRoll(false)));
 
-            AssertJudgementCount(3);
+            AssertJudgementCount(6);
             AssertResult<DrumRollTick>(0, HitResult.IgnoreMiss);
-            AssertResult<DrumRollTick>(1, HitResult.SmallBonus);
+            AssertResult<DrumRollTick>(1, HitResult.IgnoreMiss);
+            AssertResult<DrumRollTick>(2, HitResult.IgnoreMiss);
+            AssertResult<DrumRollTick>(3, HitResult.IgnoreMiss);
+            AssertResult<DrumRollTick>(4, HitResult.SmallBonus);
             AssertResult<DrumRoll>(0, HitResult.IgnoreHit);
         }
 
@@ -54,9 +66,12 @@ namespace osu.Game.Rulesets.Taiko.Tests.Judgements
                 new TaikoReplayFrame(0),
             }, CreateBeatmap(createDrumRoll(false)));
 
-            AssertJudgementCount(3);
+            AssertJudgementCount(6);
             AssertResult<DrumRollTick>(0, HitResult.IgnoreMiss);
             AssertResult<DrumRollTick>(1, HitResult.IgnoreMiss);
+            AssertResult<DrumRollTick>(2, HitResult.IgnoreMiss);
+            AssertResult<DrumRollTick>(3, HitResult.IgnoreMiss);
+            AssertResult<DrumRollTick>(4, HitResult.IgnoreMiss);
             AssertResult<DrumRoll>(0, HitResult.IgnoreHit);
         }
 
@@ -68,20 +83,26 @@ namespace osu.Game.Rulesets.Taiko.Tests.Judgements
                 new TaikoReplayFrame(0),
                 new TaikoReplayFrame(1000, TaikoAction.LeftCentre),
                 new TaikoReplayFrame(1001),
+                new TaikoReplayFrame(1250, TaikoAction.LeftCentre),
+                new TaikoReplayFrame(1251),
+                new TaikoReplayFrame(1500, TaikoAction.LeftCentre),
+                new TaikoReplayFrame(1501),
+                new TaikoReplayFrame(1750, TaikoAction.LeftCentre),
+                new TaikoReplayFrame(1751),
                 new TaikoReplayFrame(2000, TaikoAction.LeftCentre),
                 new TaikoReplayFrame(2001),
             }, CreateBeatmap(createDrumRoll(true)));
 
-            AssertJudgementCount(6);
+            AssertJudgementCount(12);
 
-            AssertResult<DrumRollTick>(0, HitResult.SmallBonus);
-            AssertResult<StrongNestedHitObject>(0, HitResult.LargeBonus);
-
-            AssertResult<DrumRollTick>(1, HitResult.SmallBonus);
-            AssertResult<StrongNestedHitObject>(1, HitResult.LargeBonus);
+            for (int i = 0; i < 5; i++)
+            {
+                AssertResult<DrumRollTick>(i, HitResult.SmallBonus);
+                AssertResult<StrongNestedHitObject>(i, HitResult.LargeBonus);
+            }
 
             AssertResult<DrumRoll>(0, HitResult.IgnoreHit);
-            AssertResult<StrongNestedHitObject>(2, HitResult.IgnoreHit);
+            AssertResult<StrongNestedHitObject>(5, HitResult.IgnoreHit);
         }
 
         [Test]
@@ -94,16 +115,16 @@ namespace osu.Game.Rulesets.Taiko.Tests.Judgements
                 new TaikoReplayFrame(2001),
             }, CreateBeatmap(createDrumRoll(true)));
 
-            AssertJudgementCount(6);
+            AssertJudgementCount(12);
 
             AssertResult<DrumRollTick>(0, HitResult.IgnoreMiss);
             AssertResult<StrongNestedHitObject>(0, HitResult.IgnoreMiss);
 
-            AssertResult<DrumRollTick>(1, HitResult.SmallBonus);
-            AssertResult<StrongNestedHitObject>(1, HitResult.LargeBonus);
+            AssertResult<DrumRollTick>(4, HitResult.SmallBonus);
+            AssertResult<StrongNestedHitObject>(4, HitResult.LargeBonus);
 
             AssertResult<DrumRoll>(0, HitResult.IgnoreHit);
-            AssertResult<StrongNestedHitObject>(2, HitResult.IgnoreHit);
+            AssertResult<StrongNestedHitObject>(5, HitResult.IgnoreHit);
         }
 
         [Test]
@@ -114,20 +135,26 @@ namespace osu.Game.Rulesets.Taiko.Tests.Judgements
                 new TaikoReplayFrame(0),
                 new TaikoReplayFrame(1000, TaikoAction.LeftCentre, TaikoAction.RightCentre),
                 new TaikoReplayFrame(1001),
+                new TaikoReplayFrame(1250, TaikoAction.LeftCentre, TaikoAction.RightCentre),
+                new TaikoReplayFrame(1251),
+                new TaikoReplayFrame(1500, TaikoAction.LeftCentre, TaikoAction.RightCentre),
+                new TaikoReplayFrame(1501),
+                new TaikoReplayFrame(1750, TaikoAction.LeftCentre, TaikoAction.RightCentre),
+                new TaikoReplayFrame(1751),
                 new TaikoReplayFrame(2000, TaikoAction.LeftCentre, TaikoAction.RightCentre),
                 new TaikoReplayFrame(2001),
             }, CreateBeatmap(createDrumRoll(true)));
 
-            AssertJudgementCount(6);
+            AssertJudgementCount(12);
 
-            AssertResult<DrumRollTick>(0, HitResult.SmallBonus);
-            AssertResult<StrongNestedHitObject>(0, HitResult.LargeBonus);
-
-            AssertResult<DrumRollTick>(1, HitResult.SmallBonus);
-            AssertResult<StrongNestedHitObject>(1, HitResult.LargeBonus);
+            for (int i = 0; i < 5; i++)
+            {
+                AssertResult<DrumRollTick>(i, HitResult.SmallBonus);
+                AssertResult<StrongNestedHitObject>(i, HitResult.LargeBonus);
+            }
 
             AssertResult<DrumRoll>(0, HitResult.IgnoreHit);
-            AssertResult<StrongNestedHitObject>(2, HitResult.IgnoreHit);
+            AssertResult<StrongNestedHitObject>(5, HitResult.IgnoreHit);
         }
 
         [Test]
@@ -140,16 +167,16 @@ namespace osu.Game.Rulesets.Taiko.Tests.Judgements
                 new TaikoReplayFrame(2001),
             }, CreateBeatmap(createDrumRoll(true)));
 
-            AssertJudgementCount(6);
+            AssertJudgementCount(12);
 
             AssertResult<DrumRollTick>(0, HitResult.IgnoreMiss);
             AssertResult<StrongNestedHitObject>(0, HitResult.IgnoreMiss);
 
-            AssertResult<DrumRollTick>(1, HitResult.SmallBonus);
-            AssertResult<StrongNestedHitObject>(1, HitResult.LargeBonus);
+            AssertResult<DrumRollTick>(4, HitResult.SmallBonus);
+            AssertResult<StrongNestedHitObject>(4, HitResult.LargeBonus);
 
             AssertResult<DrumRoll>(0, HitResult.IgnoreHit);
-            AssertResult<StrongNestedHitObject>(2, HitResult.IgnoreHit);
+            AssertResult<StrongNestedHitObject>(5, HitResult.IgnoreHit);
         }
 
         private DrumRoll createDrumRoll(bool strong) => new DrumRoll

From 30f17d586986f6dc97a6cd110694272cdea9483b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Jun 2023 14:03:04 +0900
Subject: [PATCH 0723/1604] Disabling reporting users from in-game chat

Addresses #23684.

Safer alternative to #23698.
---
 osu.Game/Overlays/Chat/ChatLine.cs | 33 ++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Overlays/Chat/ChatLine.cs b/osu.Game/Overlays/Chat/ChatLine.cs
index 2f4c175ac4..c85206d5f7 100644
--- a/osu.Game/Overlays/Chat/ChatLine.cs
+++ b/osu.Game/Overlays/Chat/ChatLine.cs
@@ -56,11 +56,11 @@ namespace osu.Game.Overlays.Chat
         [Resolved]
         private OverlayColourProvider? colourProvider { get; set; }
 
-        private readonly OsuSpriteText drawableTimestamp;
+        private OsuSpriteText drawableTimestamp = null!;
 
-        private readonly DrawableChatUsername drawableUsername;
+        private DrawableChatUsername drawableUsername = null!;
 
-        private readonly LinkFlowContainer drawableContentFlow;
+        private LinkFlowContainer drawableContentFlow = null!;
 
         private readonly Bindable<bool> prefer24HourTime = new Bindable<bool>();
 
@@ -69,8 +69,16 @@ namespace osu.Game.Overlays.Chat
         public ChatLine(Message message)
         {
             Message = message;
+
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager configManager)
+        {
+            configManager.BindWith(OsuSetting.Prefer24HourTime, prefer24HourTime);
+            prefer24HourTime.BindValueChanged(_ => updateTimestamp());
 
             InternalChild = new GridContainer
             {
@@ -103,7 +111,6 @@ namespace osu.Game.Overlays.Chat
                             Origin = Anchor.TopRight,
                             Anchor = Anchor.TopRight,
                             Margin = new MarginPadding { Horizontal = Spacing },
-                            ReportRequested = this.ShowPopover,
                         },
                         drawableContentFlow = new LinkFlowContainer(styleMessageContent)
                         {
@@ -115,13 +122,6 @@ namespace osu.Game.Overlays.Chat
             };
         }
 
-        [BackgroundDependencyLoader]
-        private void load(OsuConfigManager configManager)
-        {
-            configManager.BindWith(OsuSetting.Prefer24HourTime, prefer24HourTime);
-            prefer24HourTime.BindValueChanged(_ => updateTimestamp());
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -130,6 +130,17 @@ namespace osu.Game.Overlays.Chat
 
             updateMessageContent();
             FinishTransforms(true);
+
+            if (this.FindClosestParent<PopoverContainer>() != null)
+            {
+                // This guards against cases like in-game chat where there's no available popover container.
+                // There may be a future where a global one becomes available, at which point this code may be unnecessary.
+                //
+                // See:
+                // https://github.com/ppy/osu/pull/23698
+                // https://github.com/ppy/osu/pull/14554
+                drawableUsername.ReportRequested = this.ShowPopover;
+            }
         }
 
         public Popover GetPopover() => new ReportChatPopover(message);

From 62cb6a98cae4856c6a3ef3b75cd5065d4ad173a0 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 7 Jun 2023 08:20:38 +0300
Subject: [PATCH 0724/1604] Remove redundant nullable suppression directives

---
 osu.Game.Rulesets.Mania/Objects/HeadNote.cs                     | 2 --
 osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPosition.cs | 2 --
 osu.Game.Rulesets.Osu/Objects/Drawables/IRequireTracking.cs     | 2 --
 osu.Game.Rulesets.Osu/Objects/ISliderProgress.cs                | 2 --
 osu.Game.Rulesets.Taiko/Objects/HitType.cs                      | 2 --
 osu.Game.Tests/Rulesets/TestSceneBrokenRulesetHandling.cs       | 2 --
 osu.Game.Tournament/IPC/TourneyState.cs                         | 2 --
 .../Screens/Ladder/Components/ConditionalTournamentMatch.cs     | 2 --
 osu.Game/Beatmaps/DifficultyRating.cs                           | 2 --
 osu.Game/Beatmaps/Drawables/Cards/BeatmapCardSize.cs            | 2 --
 osu.Game/Beatmaps/Legacy/LegacyOrigins.cs                       | 2 --
 osu.Game/Configuration/IntroSequence.cs                         | 2 --
 osu.Game/Configuration/ReleaseStream.cs                         | 2 --
 osu.Game/Configuration/ToolbarClockDisplayMode.cs               | 2 --
 osu.Game/Database/ISoftDelete.cs                                | 2 --
 osu.Game/Graphics/UserInterface/MenuItemType.cs                 | 2 --
 osu.Game/Graphics/UserInterface/SelectionState.cs               | 2 --
 osu.Game/Graphics/UserInterface/TernaryState.cs                 | 2 --
 osu.Game/Online/API/APIRequestCompletionState.cs                | 2 --
 osu.Game/Online/Chat/ChannelType.cs                             | 2 --
 osu.Game/Online/Leaderboards/LeaderboardState.cs                | 2 --
 osu.Game/Online/Multiplayer/ForceGameplayStartCountdown.cs      | 2 --
 osu.Game/Online/Multiplayer/IMultiplayerServer.cs               | 2 --
 osu.Game/Online/Multiplayer/MultiplayerUserState.cs             | 2 --
 osu.Game/Online/Spectator/SpectatedUserState.cs                 | 2 --
 osu.Game/Overlays/OverlayActivation.cs                          | 2 --
 osu.Game/Overlays/SortDirection.cs                              | 2 --
 osu.Game/Rulesets/Configuration/IRulesetConfigManager.cs        | 2 --
 osu.Game/Rulesets/Objects/Drawables/ArmedState.cs               | 2 --
 osu.Game/Rulesets/Objects/IBarLine.cs                           | 2 --
 osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs      | 2 --
 osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHit.cs            | 2 --
 osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSlider.cs         | 2 --
 osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHit.cs            | 2 --
 osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSlider.cs         | 2 --
 osu.Game/Rulesets/Objects/Types/IHasColumn.cs                   | 2 --
 osu.Game/Rulesets/Objects/Types/IHasCombo.cs                    | 2 --
 osu.Game/Rulesets/Objects/Types/IHasDistance.cs                 | 2 --
 osu.Game/Rulesets/Objects/Types/IHasDuration.cs                 | 2 --
 osu.Game/Rulesets/Objects/Types/IHasHold.cs                     | 2 --
 osu.Game/Rulesets/Objects/Types/IHasLegacyLastTickOffset.cs     | 2 --
 osu.Game/Rulesets/Objects/Types/IHasXPosition.cs                | 2 --
 osu.Game/Rulesets/Objects/Types/IHasYPosition.cs                | 2 --
 osu.Game/Rulesets/Objects/Types/PathType.cs                     | 2 --
 osu.Game/Rulesets/UI/Scrolling/ScrollingDirection.cs            | 2 --
 osu.Game/Screens/Edit/Compose/Components/BeatDivisorType.cs     | 2 --
 .../Match/Playlist/MultiplayerPlaylistDisplayMode.cs            | 2 --
 .../Screens/OnlinePlay/Multiplayer/Spectate/MasterClockState.cs | 2 --
 osu.Game/Screens/Ranking/PanelState.cs                          | 2 --
 osu.Game/Screens/ScorePresentType.cs                            | 2 --
 osu.Game/Screens/Select/Filter/Operator.cs                      | 2 --
 51 files changed, 102 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/HeadNote.cs b/osu.Game.Rulesets.Mania/Objects/HeadNote.cs
index fb5c7b4ddd..e69cc62aed 100644
--- a/osu.Game.Rulesets.Mania/Objects/HeadNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/HeadNote.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Rulesets.Mania.Objects
 {
     public class HeadNote : Note
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPosition.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPosition.cs
index 92071d4a57..616bb17e05 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPosition.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPosition.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 {
     public enum SliderPosition
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/IRequireTracking.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/IRequireTracking.cs
index 55de5a0e8d..b1815b23c9 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/IRequireTracking.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/IRequireTracking.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
     public interface IRequireTracking
diff --git a/osu.Game.Rulesets.Osu/Objects/ISliderProgress.cs b/osu.Game.Rulesets.Osu/Objects/ISliderProgress.cs
index eddd251bda..7594f7c2e0 100644
--- a/osu.Game.Rulesets.Osu/Objects/ISliderProgress.cs
+++ b/osu.Game.Rulesets.Osu/Objects/ISliderProgress.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Rulesets.Osu.Objects
 {
     public interface ISliderProgress
diff --git a/osu.Game.Rulesets.Taiko/Objects/HitType.cs b/osu.Game.Rulesets.Taiko/Objects/HitType.cs
index eae7fa683a..17b3fdbd04 100644
--- a/osu.Game.Rulesets.Taiko/Objects/HitType.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/HitType.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Rulesets.Taiko.Objects
 {
     /// <summary>
diff --git a/osu.Game.Tests/Rulesets/TestSceneBrokenRulesetHandling.cs b/osu.Game.Tests/Rulesets/TestSceneBrokenRulesetHandling.cs
index c3a6b7c474..dac6beea65 100644
--- a/osu.Game.Tests/Rulesets/TestSceneBrokenRulesetHandling.cs
+++ b/osu.Game.Tests/Rulesets/TestSceneBrokenRulesetHandling.cs
@@ -73,7 +73,5 @@ namespace osu.Game.Tests.Rulesets
             public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => null;
             public override DifficultyCalculator CreateDifficultyCalculator(IWorkingBeatmap beatmap) => null;
         }
-
-#nullable enable
     }
 }
diff --git a/osu.Game.Tournament/IPC/TourneyState.cs b/osu.Game.Tournament/IPC/TourneyState.cs
index 2c7253dc10..ef1c612a53 100644
--- a/osu.Game.Tournament/IPC/TourneyState.cs
+++ b/osu.Game.Tournament/IPC/TourneyState.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Tournament.IPC
 {
     public enum TourneyState
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/ConditionalTournamentMatch.cs b/osu.Game.Tournament/Screens/Ladder/Components/ConditionalTournamentMatch.cs
index 04155fcb89..16224a7fb4 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/ConditionalTournamentMatch.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/ConditionalTournamentMatch.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Tournament.Models;
 
 namespace osu.Game.Tournament.Screens.Ladder.Components
diff --git a/osu.Game/Beatmaps/DifficultyRating.cs b/osu.Game/Beatmaps/DifficultyRating.cs
index 478c0e36df..f0ee0ad705 100644
--- a/osu.Game/Beatmaps/DifficultyRating.cs
+++ b/osu.Game/Beatmaps/DifficultyRating.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Beatmaps
 {
     public enum DifficultyRating
diff --git a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardSize.cs b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardSize.cs
index 1f6538a890..098265506d 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardSize.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardSize.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Beatmaps.Drawables.Cards
 {
     /// <summary>
diff --git a/osu.Game/Beatmaps/Legacy/LegacyOrigins.cs b/osu.Game/Beatmaps/Legacy/LegacyOrigins.cs
index 62b0edc384..31f67d6dfd 100644
--- a/osu.Game/Beatmaps/Legacy/LegacyOrigins.cs
+++ b/osu.Game/Beatmaps/Legacy/LegacyOrigins.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Beatmaps.Legacy
 {
     internal enum LegacyOrigins
diff --git a/osu.Game/Configuration/IntroSequence.cs b/osu.Game/Configuration/IntroSequence.cs
index 8327ea2f57..5672c44bbe 100644
--- a/osu.Game/Configuration/IntroSequence.cs
+++ b/osu.Game/Configuration/IntroSequence.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Configuration
 {
     public enum IntroSequence
diff --git a/osu.Game/Configuration/ReleaseStream.cs b/osu.Game/Configuration/ReleaseStream.cs
index 9cdd91bfd0..ed0bee1dd8 100644
--- a/osu.Game/Configuration/ReleaseStream.cs
+++ b/osu.Game/Configuration/ReleaseStream.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Configuration
 {
     public enum ReleaseStream
diff --git a/osu.Game/Configuration/ToolbarClockDisplayMode.cs b/osu.Game/Configuration/ToolbarClockDisplayMode.cs
index 682e221ef8..2f42f7a9b5 100644
--- a/osu.Game/Configuration/ToolbarClockDisplayMode.cs
+++ b/osu.Game/Configuration/ToolbarClockDisplayMode.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Configuration
 {
     public enum ToolbarClockDisplayMode
diff --git a/osu.Game/Database/ISoftDelete.cs b/osu.Game/Database/ISoftDelete.cs
index b07c8db2de..afa42c2002 100644
--- a/osu.Game/Database/ISoftDelete.cs
+++ b/osu.Game/Database/ISoftDelete.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Database
 {
     /// <summary>
diff --git a/osu.Game/Graphics/UserInterface/MenuItemType.cs b/osu.Game/Graphics/UserInterface/MenuItemType.cs
index 1eb45d6b1c..0269f2cb57 100644
--- a/osu.Game/Graphics/UserInterface/MenuItemType.cs
+++ b/osu.Game/Graphics/UserInterface/MenuItemType.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Graphics.UserInterface
 {
     public enum MenuItemType
diff --git a/osu.Game/Graphics/UserInterface/SelectionState.cs b/osu.Game/Graphics/UserInterface/SelectionState.cs
index edabf0547b..c85b2ad3ab 100644
--- a/osu.Game/Graphics/UserInterface/SelectionState.cs
+++ b/osu.Game/Graphics/UserInterface/SelectionState.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Graphics.UserInterface
 {
     public enum SelectionState
diff --git a/osu.Game/Graphics/UserInterface/TernaryState.cs b/osu.Game/Graphics/UserInterface/TernaryState.cs
index effbe624c3..d4de28044f 100644
--- a/osu.Game/Graphics/UserInterface/TernaryState.cs
+++ b/osu.Game/Graphics/UserInterface/TernaryState.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Graphics.UserInterface
 {
     /// <summary>
diff --git a/osu.Game/Online/API/APIRequestCompletionState.cs b/osu.Game/Online/API/APIRequestCompletionState.cs
index 52eb669a7d..84c9974dd8 100644
--- a/osu.Game/Online/API/APIRequestCompletionState.cs
+++ b/osu.Game/Online/API/APIRequestCompletionState.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Online.API
 {
     public enum APIRequestCompletionState
diff --git a/osu.Game/Online/Chat/ChannelType.cs b/osu.Game/Online/Chat/ChannelType.cs
index a864e20830..bd628e90c4 100644
--- a/osu.Game/Online/Chat/ChannelType.cs
+++ b/osu.Game/Online/Chat/ChannelType.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Online.Chat
 {
     public enum ChannelType
diff --git a/osu.Game/Online/Leaderboards/LeaderboardState.cs b/osu.Game/Online/Leaderboards/LeaderboardState.cs
index abc0ef4f19..6b07500a98 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardState.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardState.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Online.Leaderboards
 {
     public enum LeaderboardState
diff --git a/osu.Game/Online/Multiplayer/ForceGameplayStartCountdown.cs b/osu.Game/Online/Multiplayer/ForceGameplayStartCountdown.cs
index bbfc5a02c6..c497601e37 100644
--- a/osu.Game/Online/Multiplayer/ForceGameplayStartCountdown.cs
+++ b/osu.Game/Online/Multiplayer/ForceGameplayStartCountdown.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using MessagePack;
 
 namespace osu.Game.Online.Multiplayer
diff --git a/osu.Game/Online/Multiplayer/IMultiplayerServer.cs b/osu.Game/Online/Multiplayer/IMultiplayerServer.cs
index cc7a474ce7..d3a070af6d 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerServer.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerServer.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Online.Multiplayer
 {
     /// <summary>
diff --git a/osu.Game/Online/Multiplayer/MultiplayerUserState.cs b/osu.Game/Online/Multiplayer/MultiplayerUserState.cs
index 0f7dc6b8cd..d1369a7970 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerUserState.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerUserState.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Online.Multiplayer
 {
     public enum MultiplayerUserState
diff --git a/osu.Game/Online/Spectator/SpectatedUserState.cs b/osu.Game/Online/Spectator/SpectatedUserState.cs
index edf0859a33..0f0a3068b8 100644
--- a/osu.Game/Online/Spectator/SpectatedUserState.cs
+++ b/osu.Game/Online/Spectator/SpectatedUserState.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Online.Spectator
 {
     public enum SpectatedUserState
diff --git a/osu.Game/Overlays/OverlayActivation.cs b/osu.Game/Overlays/OverlayActivation.cs
index 354153734e..68d7ee8ea9 100644
--- a/osu.Game/Overlays/OverlayActivation.cs
+++ b/osu.Game/Overlays/OverlayActivation.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Overlays
 {
     public enum OverlayActivation
diff --git a/osu.Game/Overlays/SortDirection.cs b/osu.Game/Overlays/SortDirection.cs
index 98ac31103f..3af9614972 100644
--- a/osu.Game/Overlays/SortDirection.cs
+++ b/osu.Game/Overlays/SortDirection.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Overlays
 {
     public enum SortDirection
diff --git a/osu.Game/Rulesets/Configuration/IRulesetConfigManager.cs b/osu.Game/Rulesets/Configuration/IRulesetConfigManager.cs
index af315bfb28..5a3ad5e786 100644
--- a/osu.Game/Rulesets/Configuration/IRulesetConfigManager.cs
+++ b/osu.Game/Rulesets/Configuration/IRulesetConfigManager.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Configuration.Tracking;
 
diff --git a/osu.Game/Rulesets/Objects/Drawables/ArmedState.cs b/osu.Game/Rulesets/Objects/Drawables/ArmedState.cs
index 4faf0920d1..b2d9f50602 100644
--- a/osu.Game/Rulesets/Objects/Drawables/ArmedState.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/ArmedState.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Rulesets.Objects.Drawables
 {
     public enum ArmedState
diff --git a/osu.Game/Rulesets/Objects/IBarLine.cs b/osu.Game/Rulesets/Objects/IBarLine.cs
index 8cdead6776..14df80e3b9 100644
--- a/osu.Game/Rulesets/Objects/IBarLine.cs
+++ b/osu.Game/Rulesets/Objects/IBarLine.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Rulesets.Objects
 {
     /// <summary>
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index d9738ecd0a..8eda2a8f61 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -586,7 +586,5 @@ namespace osu.Game.Rulesets.Objects.Legacy
 
             public override int GetHashCode() => HashCode.Combine(base.GetHashCode(), Filename);
         }
-
-#nullable disable
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHit.cs b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHit.cs
index 639cacb128..0b69817c13 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHit.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHit.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Objects.Types;
 
 namespace osu.Game.Rulesets.Objects.Legacy.Mania
diff --git a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSlider.cs b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSlider.cs
index 330ebf72c7..84cde5fa95 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSlider.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSlider.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Objects.Types;
 
 namespace osu.Game.Rulesets.Objects.Legacy.Mania
diff --git a/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHit.cs b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHit.cs
index 980d37ccd5..cb5178ce48 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHit.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHit.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Rulesets.Objects.Legacy.Taiko
 {
     /// <summary>
diff --git a/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSlider.cs b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSlider.cs
index a391c8cb43..821554f7ee 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSlider.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSlider.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Rulesets.Objects.Legacy.Taiko
 {
     /// <summary>
diff --git a/osu.Game/Rulesets/Objects/Types/IHasColumn.cs b/osu.Game/Rulesets/Objects/Types/IHasColumn.cs
index 3978a7e765..dc07cfbb6a 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasColumn.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasColumn.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Rulesets.Objects.Types
 {
     /// <summary>
diff --git a/osu.Game/Rulesets/Objects/Types/IHasCombo.cs b/osu.Game/Rulesets/Objects/Types/IHasCombo.cs
index d02b97a3e4..d1a4683a1d 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasCombo.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasCombo.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Rulesets.Objects.Types
 {
     /// <summary>
diff --git a/osu.Game/Rulesets/Objects/Types/IHasDistance.cs b/osu.Game/Rulesets/Objects/Types/IHasDistance.cs
index 549abc046a..b497ca5da3 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasDistance.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasDistance.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Rulesets.Objects.Types
 {
     /// <summary>
diff --git a/osu.Game/Rulesets/Objects/Types/IHasDuration.cs b/osu.Game/Rulesets/Objects/Types/IHasDuration.cs
index 06ed8eba76..ca734da5ad 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasDuration.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasDuration.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Rulesets.Objects.Types
 {
     /// <summary>
diff --git a/osu.Game/Rulesets/Objects/Types/IHasHold.cs b/osu.Game/Rulesets/Objects/Types/IHasHold.cs
index 91b05dc3fd..469b8b7892 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasHold.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasHold.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Rulesets.Objects.Types
 {
     /// <summary>
diff --git a/osu.Game/Rulesets/Objects/Types/IHasLegacyLastTickOffset.cs b/osu.Game/Rulesets/Objects/Types/IHasLegacyLastTickOffset.cs
index dfc526383a..caf22c3023 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasLegacyLastTickOffset.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasLegacyLastTickOffset.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Rulesets.Objects.Types
 {
     /// <summary>
diff --git a/osu.Game/Rulesets/Objects/Types/IHasXPosition.cs b/osu.Game/Rulesets/Objects/Types/IHasXPosition.cs
index f688c783e1..7e55b21050 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasXPosition.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasXPosition.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Rulesets.Objects.Types
 {
     /// <summary>
diff --git a/osu.Game/Rulesets/Objects/Types/IHasYPosition.cs b/osu.Game/Rulesets/Objects/Types/IHasYPosition.cs
index 3c0cc595fb..d2561b10a7 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasYPosition.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasYPosition.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Rulesets.Objects.Types
 {
     /// <summary>
diff --git a/osu.Game/Rulesets/Objects/Types/PathType.cs b/osu.Game/Rulesets/Objects/Types/PathType.cs
index 266a3de6ec..923ce9eba4 100644
--- a/osu.Game/Rulesets/Objects/Types/PathType.cs
+++ b/osu.Game/Rulesets/Objects/Types/PathType.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Rulesets.Objects.Types
 {
     public enum PathType
diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingDirection.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingDirection.cs
index 58bb80accd..81e1a6c916 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingDirection.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingDirection.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Rulesets.UI.Scrolling
 {
     public enum ScrollingDirection
diff --git a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorType.cs b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorType.cs
index ebdb030e76..4a25144881 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorType.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorType.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Screens.Edit.Compose.Components
 {
     public enum BeatDivisorType
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/Playlist/MultiplayerPlaylistDisplayMode.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/Playlist/MultiplayerPlaylistDisplayMode.cs
index 1672f98637..cc3dca6a34 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/Playlist/MultiplayerPlaylistDisplayMode.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/Playlist/MultiplayerPlaylistDisplayMode.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match.Playlist
 {
     /// <summary>
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MasterClockState.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MasterClockState.cs
index 92dbde9f08..8982d1669d 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MasterClockState.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MasterClockState.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
     public enum MasterClockState
diff --git a/osu.Game/Screens/Ranking/PanelState.cs b/osu.Game/Screens/Ranking/PanelState.cs
index 3af74fe0f3..94e2c7cef4 100644
--- a/osu.Game/Screens/Ranking/PanelState.cs
+++ b/osu.Game/Screens/Ranking/PanelState.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Screens.Ranking
 {
     public enum PanelState
diff --git a/osu.Game/Screens/ScorePresentType.cs b/osu.Game/Screens/ScorePresentType.cs
index 24105467f1..3216f92091 100644
--- a/osu.Game/Screens/ScorePresentType.cs
+++ b/osu.Game/Screens/ScorePresentType.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Screens
 {
     public enum ScorePresentType
diff --git a/osu.Game/Screens/Select/Filter/Operator.cs b/osu.Game/Screens/Select/Filter/Operator.cs
index a6a53f0c3e..706daf631f 100644
--- a/osu.Game/Screens/Select/Filter/Operator.cs
+++ b/osu.Game/Screens/Select/Filter/Operator.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Screens.Select.Filter
 {
     /// <summary>

From d57c2ab7e48de5cd5cb9486dee2a95b582467a20 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Jun 2023 14:23:23 +0900
Subject: [PATCH 0725/1604] Fix osu!mania barlines showing in front of notes

Closes #23412.
---
 osu.Game.Rulesets.Mania/Objects/BarLine.cs |  2 --
 osu.Game.Rulesets.Mania/UI/Column.cs       | 22 +++++++++++++---------
 osu.Game.Rulesets.Mania/UI/Stage.cs        | 14 ++++++++++++--
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/BarLine.cs b/osu.Game.Rulesets.Mania/Objects/BarLine.cs
index 3f04a4fafe..09a746042b 100644
--- a/osu.Game.Rulesets.Mania/Objects/BarLine.cs
+++ b/osu.Game.Rulesets.Mania/Objects/BarLine.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 7033fd6755..659b63b640 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -40,7 +40,11 @@ namespace osu.Game.Rulesets.Mania.UI
         public readonly Bindable<ManiaAction> Action = new Bindable<ManiaAction>();
 
         public readonly ColumnHitObjectArea HitObjectArea;
+
+        internal readonly Container BackgroundContainer = new Container { RelativeSizeAxes = Axes.Both };
+
         internal readonly Container TopLevelContainer = new Container { RelativeSizeAxes = Axes.Both };
+
         private DrawablePool<PoolableHitExplosion> hitExplosionPool;
         private readonly OrderedHitPolicy hitPolicy;
         public Container UnderlayElements => HitObjectArea.UnderlayElements;
@@ -77,30 +81,30 @@ namespace osu.Game.Rulesets.Mania.UI
             skin.SourceChanged += onSourceChanged;
             onSourceChanged();
 
-            Drawable background = new SkinnableDrawable(new ManiaSkinComponentLookup(ManiaSkinComponents.ColumnBackground), _ => new DefaultColumnBackground())
-            {
-                RelativeSizeAxes = Axes.Both,
-            };
-
-            InternalChildren = new[]
+            InternalChildren = new Drawable[]
             {
                 hitExplosionPool = new DrawablePool<PoolableHitExplosion>(5),
                 sampleTriggerSource = new GameplaySampleTriggerSource(HitObjectContainer),
-                // For input purposes, the background is added at the highest depth, but is then proxied back below all other elements
-                background.CreateProxy(),
                 HitObjectArea,
                 keyArea = new SkinnableDrawable(new ManiaSkinComponentLookup(ManiaSkinComponents.KeyArea), _ => new DefaultKeyArea())
                 {
                     RelativeSizeAxes = Axes.Both,
                 },
-                background,
+                // For input purposes, the background is added at the highest depth, but is then proxied back below all other elements externally.
+                BackgroundContainer,
                 TopLevelContainer,
                 new ColumnTouchInputArea(this)
             };
 
+            var background = new SkinnableDrawable(new ManiaSkinComponentLookup(ManiaSkinComponents.ColumnBackground), _ => new DefaultColumnBackground())
+            {
+                RelativeSizeAxes = Axes.Both,
+            };
+
             background.ApplyGameWideClock(host);
             keyArea.ApplyGameWideClock(host);
 
+            BackgroundContainer.Add(background);
             TopLevelContainer.Add(HitObjectArea.Explosions.CreateProxy());
 
             RegisterPool<Note, DrawableNote>(10, 50);
diff --git a/osu.Game.Rulesets.Mania/UI/Stage.cs b/osu.Game.Rulesets.Mania/UI/Stage.cs
index c1d3e85bf1..215d81b64a 100644
--- a/osu.Game.Rulesets.Mania/UI/Stage.cs
+++ b/osu.Game.Rulesets.Mania/UI/Stage.cs
@@ -60,6 +60,7 @@ namespace osu.Game.Rulesets.Mania.UI
             RelativeSizeAxes = Axes.Y;
             AutoSizeAxes = Axes.X;
 
+            Container columnBackgrounds;
             Container topLevelContainer;
 
             InternalChildren = new Drawable[]
@@ -77,9 +78,13 @@ namespace osu.Game.Rulesets.Mania.UI
                         {
                             RelativeSizeAxes = Axes.Both
                         },
-                        columnFlow = new ColumnFlow<Column>(definition)
+                        columnBackgrounds = new Container
                         {
-                            RelativeSizeAxes = Axes.Y,
+                            Name = "Column backgrounds",
+                            RelativeSizeAxes = Axes.Both,
+                            Children = new Drawable[]
+                            {
+                            }
                         },
                         new Container
                         {
@@ -98,6 +103,10 @@ namespace osu.Game.Rulesets.Mania.UI
                                 RelativeSizeAxes = Axes.Y,
                             }
                         },
+                        columnFlow = new ColumnFlow<Column>(definition)
+                        {
+                            RelativeSizeAxes = Axes.Y,
+                        },
                         new SkinnableDrawable(new ManiaSkinComponentLookup(ManiaSkinComponents.StageForeground), _ => null)
                         {
                             RelativeSizeAxes = Axes.Both
@@ -126,6 +135,7 @@ namespace osu.Game.Rulesets.Mania.UI
                 };
 
                 topLevelContainer.Add(column.TopLevelContainer.CreateProxy());
+                columnBackgrounds.Add(column.BackgroundContainer.CreateProxy());
                 columnFlow.SetContentForColumn(i, column);
                 AddNested(column);
             }

From 7d49f5d7c6b8cd329335e18500c08e6589c979a0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Jun 2023 14:53:37 +0900
Subject: [PATCH 0726/1604] Apply NRT to `SectionsContainer`

---
 .../Graphics/Containers/SectionsContainer.cs  | 62 ++++++++++---------
 osu.Game/Overlays/UserProfileOverlay.cs       |  2 +-
 .../Screens/Edit/Setup/SetupScreenHeader.cs   |  2 +-
 3 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index 8dd6eac7bb..01e1af06c0 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -1,12 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Diagnostics;
 using System.Linq;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -23,11 +20,35 @@ namespace osu.Game.Graphics.Containers
     public partial class SectionsContainer<T> : Container<T>
         where T : Drawable
     {
-        public Bindable<T> SelectedSection { get; } = new Bindable<T>();
+        public Bindable<T?> SelectedSection { get; } = new Bindable<T?>();
 
-        private T lastClickedSection;
+        private T? lastClickedSection;
 
-        public Drawable ExpandableHeader
+        protected override Container<T> Content => scrollContentContainer;
+
+        private readonly UserTrackingScrollContainer scrollContainer;
+        private readonly Container headerBackgroundContainer;
+        private readonly MarginPadding originalSectionsMargin;
+
+        private Drawable? fixedHeader;
+
+        private Drawable? footer;
+        private Drawable? headerBackground;
+
+        private FlowContainer<T> scrollContentContainer = null!;
+
+        private float? headerHeight, footerHeight;
+
+        private float? lastKnownScroll;
+
+        /// <summary>
+        /// The percentage of the container to consider the centre-point for deciding the active section (and scrolling to a requested section).
+        /// </summary>
+        private const float scroll_y_centre = 0.1f;
+
+        private Drawable? expandableHeader;
+
+        public Drawable? ExpandableHeader
         {
             get => expandableHeader;
             set
@@ -42,11 +63,12 @@ namespace osu.Game.Graphics.Containers
                 if (value == null) return;
 
                 AddInternal(expandableHeader);
+
                 lastKnownScroll = null;
             }
         }
 
-        public Drawable FixedHeader
+        public Drawable? FixedHeader
         {
             get => fixedHeader;
             set
@@ -63,7 +85,7 @@ namespace osu.Game.Graphics.Containers
             }
         }
 
-        public Drawable Footer
+        public Drawable? Footer
         {
             get => footer;
             set
@@ -75,16 +97,17 @@ namespace osu.Game.Graphics.Containers
 
                 footer = value;
 
-                if (value == null) return;
+                if (footer == null) return;
 
                 footer.Anchor |= Anchor.y2;
                 footer.Origin |= Anchor.y2;
+
                 scrollContainer.Add(footer);
                 lastKnownScroll = null;
             }
         }
 
-        public Drawable HeaderBackground
+        public Drawable? HeaderBackground
         {
             get => headerBackground;
             set
@@ -102,23 +125,6 @@ namespace osu.Game.Graphics.Containers
             }
         }
 
-        protected override Container<T> Content => scrollContentContainer;
-
-        private readonly UserTrackingScrollContainer scrollContainer;
-        private readonly Container headerBackgroundContainer;
-        private readonly MarginPadding originalSectionsMargin;
-        private Drawable expandableHeader, fixedHeader, footer, headerBackground;
-        private FlowContainer<T> scrollContentContainer;
-
-        private float? headerHeight, footerHeight;
-
-        private float? lastKnownScroll;
-
-        /// <summary>
-        /// The percentage of the container to consider the centre-point for deciding the active section (and scrolling to a requested section).
-        /// </summary>
-        private const float scroll_y_centre = 0.1f;
-
         public SectionsContainer()
         {
             AddRangeInternal(new Drawable[]
@@ -171,10 +177,8 @@ namespace osu.Game.Graphics.Containers
 
         public void ScrollToTop() => scrollContainer.ScrollTo(0);
 
-        [NotNull]
         protected virtual UserTrackingScrollContainer CreateScrollContainer() => new UserTrackingScrollContainer();
 
-        [NotNull]
         protected virtual FlowContainer<T> CreateScrollContentContainer() =>
             new FillFlowContainer<T>
             {
diff --git a/osu.Game/Overlays/UserProfileOverlay.cs b/osu.Game/Overlays/UserProfileOverlay.cs
index ab4f07b982..0ab842c907 100644
--- a/osu.Game/Overlays/UserProfileOverlay.cs
+++ b/osu.Game/Overlays/UserProfileOverlay.cs
@@ -120,7 +120,7 @@ namespace osu.Game.Overlays
                 if (lastSection != section.NewValue)
                 {
                     lastSection = section.NewValue;
-                    tabs.Current.Value = lastSection;
+                    tabs.Current.Value = lastSection!;
                 }
             };
 
diff --git a/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs b/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
index 1d66830adf..788beba9d9 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Screens.Edit.Setup
         {
             base.LoadComplete();
 
-            sections.SelectedSection.BindValueChanged(section => tabControl.Current.Value = section.NewValue);
+            sections.SelectedSection.BindValueChanged(section => tabControl.Current.Value = section.NewValue!);
             tabControl.Current.BindValueChanged(section =>
             {
                 if (section.NewValue != sections.SelectedSection.Value)

From 67e952150f8670888389aba1ec96e3b8e0fb9981 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Jun 2023 15:24:12 +0900
Subject: [PATCH 0727/1604] Fix scroll operations in `SectionsContainer`
 failing if target moves due to loaded content

---
 .../Graphics/Containers/SectionsContainer.cs  | 48 ++++++++++++++++---
 1 file changed, 42 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index 01e1af06c0..27ff6b851d 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -9,6 +9,8 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Layout;
+using osu.Framework.Logging;
+using osu.Framework.Threading;
 using osu.Framework.Utils;
 
 namespace osu.Game.Graphics.Containers
@@ -156,23 +158,57 @@ namespace osu.Game.Graphics.Containers
             footerHeight = null;
         }
 
+        private ScheduledDelegate? scrollToTargetDelegate;
+
         public void ScrollTo(Drawable target)
         {
+            Logger.Log($"Scrolling to {target}..");
+
             lastKnownScroll = null;
 
-            // implementation similar to ScrollIntoView but a bit more nuanced.
-            float top = scrollContainer.GetChildPosInContent(target);
+            float scrollTarget = getScrollTargetForDrawable(target);
 
-            float bottomScrollExtent = scrollContainer.ScrollableExtent;
-            float scrollTarget = top - scrollContainer.DisplayableContent * scroll_y_centre;
-
-            if (scrollTarget > bottomScrollExtent)
+            if (scrollTarget > scrollContainer.ScrollableExtent)
                 scrollContainer.ScrollToEnd();
             else
                 scrollContainer.ScrollTo(scrollTarget);
 
             if (target is T section)
                 lastClickedSection = section;
+
+            // Content may load in as a scroll occurs, changing the scroll target we need to aim for.
+            // This scheduled operation ensures that we keep trying until actually arriving at the target.
+            scrollToTargetDelegate?.Cancel();
+            scrollToTargetDelegate = Scheduler.AddDelayed(() =>
+            {
+                if (scrollContainer.UserScrolling)
+                {
+                    Logger.Log("Scroll operation interrupted by user scroll");
+                    scrollToTargetDelegate?.Cancel();
+                    scrollToTargetDelegate = null;
+                    return;
+                }
+
+                if (Precision.AlmostEquals(scrollContainer.Current, scrollTarget, 1))
+                {
+                    Logger.Log($"Finished scrolling to {target}!");
+                    scrollToTargetDelegate?.Cancel();
+                    scrollToTargetDelegate = null;
+                    return;
+                }
+
+                if (!Precision.AlmostEquals(getScrollTargetForDrawable(target), scrollTarget, 1))
+                {
+                    Logger.Log($"Reattempting scroll to {target} due to change in position");
+                    ScrollTo(target);
+                }
+            }, 50, true);
+        }
+
+        private float getScrollTargetForDrawable(Drawable target)
+        {
+            // implementation similar to ScrollIntoView but a bit more nuanced.
+            return scrollContainer.GetChildPosInContent(target) - scrollContainer.DisplayableContent * scroll_y_centre;
         }
 
         public void ScrollToTop() => scrollContainer.ScrollTo(0);

From 757596fffa5eb98b09dcdaad6245297843b8d50d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Jun 2023 15:48:04 +0900
Subject: [PATCH 0728/1604] Add test coverage of scroll failing

---
 .../TestSceneSectionsContainer.cs             | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneSectionsContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneSectionsContainer.cs
index 05fffc903d..3a1eb554ab 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneSectionsContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneSectionsContainer.cs
@@ -80,6 +80,24 @@ namespace osu.Game.Tests.Visual.UserInterface
                 });
         }
 
+        [Test]
+        public void TestCorrectScrollToWhenContentLoads()
+        {
+            AddRepeatStep("add many sections", () => append(1f), 3);
+
+            AddStep("add section with delayed load content", () =>
+            {
+                container.Add(new TestDelayedLoadSection("delayed"));
+            });
+
+            AddStep("add final section", () => append(0.5f));
+
+            AddStep("scroll to final section", () => container.ScrollTo(container.Children.Last()));
+
+            AddUntilStep("correct section selected", () => container.SelectedSection.Value == container.Children.Last());
+            AddUntilStep("wait for scroll to section", () => container.ScreenSpaceDrawQuad.AABBFloat.Contains(container.Children.Last().ScreenSpaceDrawQuad.AABBFloat));
+        }
+
         [Test]
         public void TestSelection()
         {
@@ -196,6 +214,33 @@ namespace osu.Game.Tests.Visual.UserInterface
             InputManager.ScrollVerticalBy(direction);
         }
 
+        private partial class TestDelayedLoadSection : TestSection
+        {
+            public TestDelayedLoadSection(string label)
+                : base(label)
+            {
+                BackgroundColour = default_colour;
+                Width = 300;
+                AutoSizeAxes = Axes.Y;
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                Box box;
+
+                Add(box = new Box
+                {
+                    Alpha = 0.01f,
+                    RelativeSizeAxes = Axes.X,
+                });
+
+                // Emulate an operation that will be inhibited by IsMaskedAway.
+                box.ResizeHeightTo(2000, 50);
+            }
+        }
+
         private partial class TestSection : TestBox
         {
             public bool Selected

From 2c89af608ac5c136f81ed90a97ccf702a4f0c021 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Jun 2023 17:15:13 +0900
Subject: [PATCH 0729/1604] Add ability to cycle beat snap divisor using
 hotkeys

Defaults to Ctrl+Shift+Wheel (as per stable).

Closes #23785.
---
 .../Input/Bindings/GlobalActionContainer.cs   | 10 +++++-
 .../GlobalActionKeyBindingStrings.cs          | 10 ++++++
 .../Compose/Components/BeatDivisorControl.cs  | 34 ++++++++++++++++++-
 3 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index d580eea248..e84663db5e 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -101,6 +101,8 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.Control, InputKey.J }, GlobalAction.EditorFlipVertically),
             new KeyBinding(new[] { InputKey.Control, InputKey.Alt, InputKey.MouseWheelDown }, GlobalAction.EditorDecreaseDistanceSpacing),
             new KeyBinding(new[] { InputKey.Control, InputKey.Alt, InputKey.MouseWheelUp }, GlobalAction.EditorIncreaseDistanceSpacing),
+            new KeyBinding(new[] { InputKey.Control, InputKey.Shift, InputKey.MouseWheelDown }, GlobalAction.EditorCyclePreviousBeatSnapDivisor),
+            new KeyBinding(new[] { InputKey.Control, InputKey.Shift, InputKey.MouseWheelUp }, GlobalAction.EditorCycleNextBeatSnapDivisor),
         };
 
         public IEnumerable<KeyBinding> InGameKeyBindings => new[]
@@ -355,6 +357,12 @@ namespace osu.Game.Input.Bindings
         ToggleProfile,
 
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.EditorCloneSelection))]
-        EditorCloneSelection
+        EditorCloneSelection,
+
+        [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.EditorCyclePreviousBeatSnapDivisor))]
+        EditorCyclePreviousBeatSnapDivisor,
+
+        [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.EditorCycleNextBeatSnapDivisor))]
+        EditorCycleNextBeatSnapDivisor,
     }
 }
diff --git a/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs b/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
index 303dbb6f46..423fea6793 100644
--- a/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
+++ b/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
@@ -279,6 +279,16 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString EditorDecreaseDistanceSpacing => new TranslatableString(getKey(@"editor_decrease_distance_spacing"), @"Decrease distance spacing");
 
+        /// <summary>
+        /// "Cycle previous beat snap divisor"
+        /// </summary>
+        public static LocalisableString EditorCyclePreviousBeatSnapDivisor => new TranslatableString(getKey(@"editor_decrease_distance_spacing"), @"Cycle previous beat snap divisor");
+
+        /// <summary>
+        /// "Cycle next beat snap divisor"
+        /// </summary>
+        public static LocalisableString EditorCycleNextBeatSnapDivisor => new TranslatableString(getKey(@"editor_increase_distance_spacing"), @"Cycle next beat snap divisor");
+
         /// <summary>
         /// "Toggle skin editor"
         /// </summary>
diff --git a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
index 432c5ea280..e96039ce16 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
@@ -16,12 +16,14 @@ using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Input.Bindings;
 using osu.Game.Overlays;
 using osuTK;
 using osuTK.Graphics;
@@ -29,7 +31,7 @@ using osuTK.Input;
 
 namespace osu.Game.Screens.Edit.Compose.Components
 {
-    public partial class BeatDivisorControl : CompositeDrawable
+    public partial class BeatDivisorControl : CompositeDrawable, IKeyBindingHandler<GlobalAction>
     {
         private readonly BindableBeatDivisor beatDivisor = new BindableBeatDivisor();
 
@@ -220,6 +222,36 @@ namespace osu.Game.Screens.Edit.Compose.Components
             return base.OnKeyDown(e);
         }
 
+        public virtual bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
+        {
+            switch (e.Action)
+            {
+                case GlobalAction.EditorCycleNextBeatSnapDivisor:
+                    cycle(1);
+                    return true;
+
+                case GlobalAction.EditorCyclePreviousBeatSnapDivisor:
+                    cycle(-1);
+                    return true;
+            }
+
+            return false;
+        }
+
+        private void cycle(int direction)
+        {
+            var presets = beatDivisor.ValidDivisors.Value.Presets;
+
+            int selectedIndex = presets.Count(e => e < beatDivisor.Value);
+            int newIndex = Math.Clamp(selectedIndex + direction, 0, presets.Count - 1);
+
+            beatDivisor.Value = presets[newIndex];
+        }
+
+        public void OnReleased(KeyBindingReleaseEvent<GlobalAction> e)
+        {
+        }
+
         internal partial class DivisorDisplay : OsuAnimatedButton, IHasPopover
         {
             public BindableBeatDivisor BeatDivisor { get; } = new BindableBeatDivisor();

From 15725fb18611925b70ed82396675bd419b848d70 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Jun 2023 18:07:56 +0900
Subject: [PATCH 0730/1604] Change default bindings to account for mouse wheel
 rotation

---
 osu.Game/Input/Bindings/GlobalActionContainer.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index e84663db5e..fdd96d3890 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -101,8 +101,10 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.Control, InputKey.J }, GlobalAction.EditorFlipVertically),
             new KeyBinding(new[] { InputKey.Control, InputKey.Alt, InputKey.MouseWheelDown }, GlobalAction.EditorDecreaseDistanceSpacing),
             new KeyBinding(new[] { InputKey.Control, InputKey.Alt, InputKey.MouseWheelUp }, GlobalAction.EditorIncreaseDistanceSpacing),
-            new KeyBinding(new[] { InputKey.Control, InputKey.Shift, InputKey.MouseWheelDown }, GlobalAction.EditorCyclePreviousBeatSnapDivisor),
-            new KeyBinding(new[] { InputKey.Control, InputKey.Shift, InputKey.MouseWheelUp }, GlobalAction.EditorCycleNextBeatSnapDivisor),
+            // Framework automatically converts wheel up/down to left/right when shift is held.
+            // See https://github.com/ppy/osu-framework/blob/master/osu.Framework/Input/StateChanges/MouseScrollRelativeInput.cs#L37-L38.
+            new KeyBinding(new[] { InputKey.Control, InputKey.Shift, InputKey.MouseWheelRight }, GlobalAction.EditorCyclePreviousBeatSnapDivisor),
+            new KeyBinding(new[] { InputKey.Control, InputKey.Shift, InputKey.MouseWheelLeft }, GlobalAction.EditorCycleNextBeatSnapDivisor),
         };
 
         public IEnumerable<KeyBinding> InGameKeyBindings => new[]

From f8a3be24c8f1923671da7159b05a0e88b735d85e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Jun 2023 00:22:06 +0900
Subject: [PATCH 0731/1604] Update config.yml to mention "performance" in the
 discussion link

---
 .github/ISSUE_TEMPLATE/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 47a6a4c3d3..ec57232126 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -2,7 +2,7 @@ blank_issues_enabled: false
 contact_links:
     - name: Help
       url: https://github.com/ppy/osu/discussions/categories/q-a
-      about: osu! not working as you'd expect? Not sure it's a bug? Check the Q&A section!
+      about: osu! not working or performing as you'd expect? Not sure it's a bug? Check the Q&A section!
     - name: Suggestions or feature request
       url: https://github.com/ppy/osu/discussions/categories/ideas
       about: Got something you think should change or be added? Search for or start a new discussion!

From 3a014987895681911b6a7ee8a8f3a3bf2e96e4f6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Jun 2023 00:53:58 +0900
Subject: [PATCH 0732/1604] Use existing next/previous methods (and remove
 looping behaviour)

---
 .../Visual/Editing/TestSceneBeatDivisorControl.cs    | 11 +++++++----
 osu.Game/Screens/Edit/BindableBeatDivisor.cs         | 10 ++++++----
 .../Edit/Compose/Components/BeatDivisorControl.cs    | 12 ++++++------
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs b/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
index 353acfa4ba..59fa331abe 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
@@ -51,9 +51,9 @@ namespace osu.Game.Tests.Visual.Editing
         [Test]
         public void TestBindableBeatDivisor()
         {
-            AddRepeatStep("move previous", () => bindableBeatDivisor.Previous(), 2);
+            AddRepeatStep("move previous", () => bindableBeatDivisor.SelectPrevious(), 2);
             AddAssert("divisor is 4", () => bindableBeatDivisor.Value == 4);
-            AddRepeatStep("move next", () => bindableBeatDivisor.Next(), 1);
+            AddRepeatStep("move next", () => bindableBeatDivisor.SelectNext(), 1);
             AddAssert("divisor is 12", () => bindableBeatDivisor.Value == 8);
         }
 
@@ -101,6 +101,9 @@ namespace osu.Game.Tests.Visual.Editing
         public void TestBeatChevronNavigation()
         {
             switchBeatSnap(1);
+            assertBeatSnap(16);
+
+            switchBeatSnap(-4);
             assertBeatSnap(1);
 
             switchBeatSnap(3);
@@ -110,7 +113,7 @@ namespace osu.Game.Tests.Visual.Editing
             assertBeatSnap(4);
 
             switchBeatSnap(-3);
-            assertBeatSnap(16);
+            assertBeatSnap(1);
         }
 
         [Test]
@@ -207,7 +210,7 @@ namespace osu.Game.Tests.Visual.Editing
         }, Math.Abs(direction));
 
         private void assertBeatSnap(int expected) => AddAssert($"beat snap is {expected}",
-            () => bindableBeatDivisor.Value == expected);
+            () => bindableBeatDivisor.Value, () => Is.EqualTo(expected));
 
         private void switchPresets(int direction) => AddRepeatStep($"move presets {(direction > 0 ? "forward" : "backward")}", () =>
         {
diff --git a/osu.Game/Screens/Edit/BindableBeatDivisor.cs b/osu.Game/Screens/Edit/BindableBeatDivisor.cs
index 1da224d850..ffa4f01e75 100644
--- a/osu.Game/Screens/Edit/BindableBeatDivisor.cs
+++ b/osu.Game/Screens/Edit/BindableBeatDivisor.cs
@@ -59,16 +59,18 @@ namespace osu.Game.Screens.Edit
                 Value = 1;
         }
 
-        public void Next()
+        public void SelectNext()
         {
             var presets = ValidDivisors.Value.Presets;
-            Value = presets.Cast<int?>().SkipWhile(preset => preset != Value).ElementAtOrDefault(1) ?? presets[0];
+            if (presets.Cast<int?>().SkipWhile(preset => preset != Value).ElementAtOrDefault(1) is int newValue)
+                Value = newValue;
         }
 
-        public void Previous()
+        public void SelectPrevious()
         {
             var presets = ValidDivisors.Value.Presets;
-            Value = presets.Cast<int?>().TakeWhile(preset => preset != Value).LastOrDefault() ?? presets[^1];
+            if (presets.Cast<int?>().TakeWhile(preset => preset != Value).LastOrDefault() is int newValue)
+                Value = newValue;
         }
 
         protected override int DefaultPrecision => 1;
diff --git a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
index e96039ce16..9b47990c57 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
@@ -103,13 +103,13 @@ namespace osu.Game.Screens.Edit.Compose.Components
                                                     new ChevronButton
                                                     {
                                                         Icon = FontAwesome.Solid.ChevronLeft,
-                                                        Action = beatDivisor.Previous
+                                                        Action = beatDivisor.SelectPrevious
                                                     },
                                                     new DivisorDisplay { BeatDivisor = { BindTarget = beatDivisor } },
                                                     new ChevronButton
                                                     {
                                                         Icon = FontAwesome.Solid.ChevronRight,
-                                                        Action = beatDivisor.Next
+                                                        Action = beatDivisor.SelectNext
                                                     }
                                                 },
                                             },
@@ -227,11 +227,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
             switch (e.Action)
             {
                 case GlobalAction.EditorCycleNextBeatSnapDivisor:
-                    cycle(1);
+                    beatDivisor.SelectNext();
                     return true;
 
                 case GlobalAction.EditorCyclePreviousBeatSnapDivisor:
-                    cycle(-1);
+                    beatDivisor.SelectPrevious();
                     return true;
             }
 
@@ -474,12 +474,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 switch (e.Key)
                 {
                     case Key.Right:
-                        beatDivisor.Next();
+                        beatDivisor.SelectNext();
                         OnUserChange(Current.Value);
                         return true;
 
                     case Key.Left:
-                        beatDivisor.Previous();
+                        beatDivisor.SelectPrevious();
                         OnUserChange(Current.Value);
                         return true;
 

From 8463f5c7ddab3867818996d22f3a86fd2e08eb10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 7 Jun 2023 21:50:16 +0200
Subject: [PATCH 0733/1604] Spell out location of external proxy explicitly

---
 osu.Game.Rulesets.Mania/UI/Column.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 659b63b640..f38571a6d3 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -90,7 +90,8 @@ namespace osu.Game.Rulesets.Mania.UI
                 {
                     RelativeSizeAxes = Axes.Both,
                 },
-                // For input purposes, the background is added at the highest depth, but is then proxied back below all other elements externally.
+                // For input purposes, the background is added at the highest depth, but is then proxied back below all other elements externally
+                // (see `Stage.columnBackgrounds`).
                 BackgroundContainer,
                 TopLevelContainer,
                 new ColumnTouchInputArea(this)

From c8507837d156c3b6f30506e1382252d215ef484a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 7 Jun 2023 21:51:35 +0200
Subject: [PATCH 0734/1604] Remove redundant initialisation of `Children` to
 empty array

---
 osu.Game.Rulesets.Mania/UI/Stage.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Stage.cs b/osu.Game.Rulesets.Mania/UI/Stage.cs
index 215d81b64a..879c704450 100644
--- a/osu.Game.Rulesets.Mania/UI/Stage.cs
+++ b/osu.Game.Rulesets.Mania/UI/Stage.cs
@@ -82,9 +82,6 @@ namespace osu.Game.Rulesets.Mania.UI
                         {
                             Name = "Column backgrounds",
                             RelativeSizeAxes = Axes.Both,
-                            Children = new Drawable[]
-                            {
-                            }
                         },
                         new Container
                         {

From d9281ac8c75475fb79ff70efc76f0fc6a5924bfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 7 Jun 2023 23:28:27 +0200
Subject: [PATCH 0735/1604] Remove unused `virtual` spec

---
 osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
index 9b47990c57..cbe4830e40 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
@@ -222,7 +222,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             return base.OnKeyDown(e);
         }
 
-        public virtual bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
+        public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
         {
             switch (e.Action)
             {

From 3c8f387a6c9ba41bdf9c87431df33d94626142cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 7 Jun 2023 23:28:36 +0200
Subject: [PATCH 0736/1604] Remove unused method

---
 .../Edit/Compose/Components/BeatDivisorControl.cs      | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
index cbe4830e40..5a1fbbee1e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
@@ -238,16 +238,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
             return false;
         }
 
-        private void cycle(int direction)
-        {
-            var presets = beatDivisor.ValidDivisors.Value.Presets;
-
-            int selectedIndex = presets.Count(e => e < beatDivisor.Value);
-            int newIndex = Math.Clamp(selectedIndex + direction, 0, presets.Count - 1);
-
-            beatDivisor.Value = presets[newIndex];
-        }
-
         public void OnReleased(KeyBindingReleaseEvent<GlobalAction> e)
         {
         }

From 35e41d816ae6750f36555d86f0c7c99119c308cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 7 Jun 2023 23:31:46 +0200
Subject: [PATCH 0737/1604] Cover clamping to max beat divisor in test

---
 osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs b/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
index 59fa331abe..c7b6d984ed 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
@@ -109,7 +109,10 @@ namespace osu.Game.Tests.Visual.Editing
             switchBeatSnap(3);
             assertBeatSnap(8);
 
-            switchBeatSnap(-1);
+            switchBeatSnap(3);
+            assertBeatSnap(16);
+
+            switchBeatSnap(-2);
             assertBeatSnap(4);
 
             switchBeatSnap(-3);

From f416b3a226844e951bbd6b75e7a488927b0a4cfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 7 Jun 2023 23:43:21 +0200
Subject: [PATCH 0738/1604] Fix new localisations using lookup keys of existing
 ones

---
 osu.Game/Localisation/GlobalActionKeyBindingStrings.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs b/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
index 423fea6793..aa608a603b 100644
--- a/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
+++ b/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
@@ -282,12 +282,12 @@ namespace osu.Game.Localisation
         /// <summary>
         /// "Cycle previous beat snap divisor"
         /// </summary>
-        public static LocalisableString EditorCyclePreviousBeatSnapDivisor => new TranslatableString(getKey(@"editor_decrease_distance_spacing"), @"Cycle previous beat snap divisor");
+        public static LocalisableString EditorCyclePreviousBeatSnapDivisor => new TranslatableString(getKey(@"editor_cycle_previous_beat_snap_divisor"), @"Cycle previous beat snap divisor");
 
         /// <summary>
         /// "Cycle next beat snap divisor"
         /// </summary>
-        public static LocalisableString EditorCycleNextBeatSnapDivisor => new TranslatableString(getKey(@"editor_increase_distance_spacing"), @"Cycle next beat snap divisor");
+        public static LocalisableString EditorCycleNextBeatSnapDivisor => new TranslatableString(getKey(@"editor_cycle_next_snap_divisor"), @"Cycle next beat snap divisor");
 
         /// <summary>
         /// "Toggle skin editor"

From 1a90f71540fc4a0bab3ef257cd8b0a6690d0a2eb Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 8 Jun 2023 02:47:07 +0300
Subject: [PATCH 0739/1604] Centralise game language update logic

---
 osu.Game/OsuGameBase.cs                       | 25 +++++++++++++-
 .../Overlays/FirstRunSetup/ScreenWelcome.cs   | 33 +++++++------------
 .../Sections/General/LanguageSettings.cs      | 22 ++-----------
 3 files changed, 39 insertions(+), 41 deletions(-)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index c55b6c249f..ed954f609e 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -14,6 +14,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
+using osu.Framework.Configuration;
 using osu.Framework.Development;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
@@ -27,6 +28,7 @@ using osu.Framework.Input.Handlers.Mouse;
 using osu.Framework.Input.Handlers.Tablet;
 using osu.Framework.Input.Handlers.Touch;
 using osu.Framework.IO.Stores;
+using osu.Framework.Localisation;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Framework.Timing;
@@ -36,11 +38,13 @@ using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.Configuration;
 using osu.Game.Database;
+using osu.Game.Extensions;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Input;
 using osu.Game.Input.Bindings;
 using osu.Game.IO;
+using osu.Game.Localisation;
 using osu.Game.Online;
 using osu.Game.Online.API;
 using osu.Game.Online.Chat;
@@ -157,6 +161,11 @@ namespace osu.Game
 
         protected Storage Storage { get; set; }
 
+        /// <summary>
+        /// The language in which the game is currently displayed in.
+        /// </summary>
+        public Bindable<Language> CurrentLanguage { get; } = new Bindable<Language>();
+
         protected Bindable<WorkingBeatmap> Beatmap { get; private set; } // cached via load() method
 
         /// <summary>
@@ -216,6 +225,10 @@ namespace osu.Game
 
         private readonly BindableNumber<double> globalTrackVolumeAdjust = new BindableNumber<double>(global_track_volume_adjust);
 
+        private Bindable<string> frameworkLocale = null!;
+
+        private IBindable<LocalisationParameters> localisationParameters = null!;
+
         /// <summary>
         /// Number of unhandled exceptions to allow before aborting execution.
         /// </summary>
@@ -238,7 +251,7 @@ namespace osu.Game
         }
 
         [BackgroundDependencyLoader]
-        private void load(ReadableKeyCombinationProvider keyCombinationProvider)
+        private void load(ReadableKeyCombinationProvider keyCombinationProvider, FrameworkConfigManager frameworkConfig)
         {
             try
             {
@@ -284,6 +297,14 @@ namespace osu.Game
             MessageFormatter.WebsiteRootUrl = endpoints.WebsiteRootUrl;
 
             dependencies.CacheAs(API ??= new APIAccess(LocalConfig, endpoints, VersionHash));
+            frameworkLocale = frameworkConfig.GetBindable<string>(FrameworkSetting.Locale);
+            frameworkLocale.BindValueChanged(_ => updateLanguage());
+
+            localisationParameters = Localisation.CurrentParameters.GetBoundCopy();
+            localisationParameters.BindValueChanged(_ => updateLanguage(), true);
+
+            CurrentLanguage.BindValueChanged(val => frameworkLocale.Value = val.NewValue.ToCultureCode());
+
 
             var defaultBeatmap = new DummyWorkingBeatmap(Audio, Textures);
 
@@ -394,6 +415,8 @@ namespace osu.Game
             Beatmap.BindValueChanged(onBeatmapChanged);
         }
 
+        private void updateLanguage() => CurrentLanguage.Value = LanguageExtensions.GetLanguageFor(frameworkLocale.Value, localisationParameters.Value);
+
         private void addFilesWarning()
         {
             var realmStore = new RealmFileStore(realm, Storage);
diff --git a/osu.Game/Overlays/FirstRunSetup/ScreenWelcome.cs b/osu.Game/Overlays/FirstRunSetup/ScreenWelcome.cs
index b8d802ad4b..68c6c78986 100644
--- a/osu.Game/Overlays/FirstRunSetup/ScreenWelcome.cs
+++ b/osu.Game/Overlays/FirstRunSetup/ScreenWelcome.cs
@@ -13,7 +13,6 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
 using osu.Framework.Threading;
-using osu.Game.Extensions;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
@@ -68,13 +67,12 @@ namespace osu.Game.Overlays.FirstRunSetup
 
         private partial class LanguageSelectionFlow : FillFlowContainer
         {
-            private Bindable<string> frameworkLocale = null!;
-            private IBindable<LocalisationParameters> localisationParameters = null!;
+            private Bindable<Language> language = null!;
 
             private ScheduledDelegate? updateSelectedDelegate;
 
             [BackgroundDependencyLoader]
-            private void load(FrameworkConfigManager frameworkConfig, LocalisationManager localisation)
+            private void load(OsuGameBase game)
             {
                 Direction = FillDirection.Full;
                 Spacing = new Vector2(5);
@@ -82,25 +80,18 @@ namespace osu.Game.Overlays.FirstRunSetup
                 ChildrenEnumerable = Enum.GetValues<Language>()
                                          .Select(l => new LanguageButton(l)
                                          {
-                                             Action = () => frameworkLocale.Value = l.ToCultureCode()
+                                             Action = () => language.Value = l,
                                          });
 
-                frameworkLocale = frameworkConfig.GetBindable<string>(FrameworkSetting.Locale);
-                frameworkLocale.BindValueChanged(_ => onLanguageChange());
-
-                localisationParameters = localisation.CurrentParameters.GetBoundCopy();
-                localisationParameters.BindValueChanged(_ => onLanguageChange(), true);
-            }
-
-            private void onLanguageChange()
-            {
-                var language = LanguageExtensions.GetLanguageFor(frameworkLocale.Value, localisationParameters.Value);
-
-                // Changing language may cause a short period of blocking the UI thread while the new glyphs are loaded.
-                // Scheduling ensures the button animation plays smoothly after any blocking operation completes.
-                // Note that a delay is required (the alternative would be a double-schedule; delay feels better).
-                updateSelectedDelegate?.Cancel();
-                updateSelectedDelegate = Scheduler.AddDelayed(() => updateSelectedStates(language), 50);
+                language = game.CurrentLanguage.GetBoundCopy();
+                language.BindValueChanged(v =>
+                {
+                    // Changing language may cause a short period of blocking the UI thread while the new glyphs are loaded.
+                    // Scheduling ensures the button animation plays smoothly after any blocking operation completes.
+                    // Note that a delay is required (the alternative would be a double-schedule; delay feels better).
+                    updateSelectedDelegate?.Cancel();
+                    updateSelectedDelegate = Scheduler.AddDelayed(() => updateSelectedStates(v.NewValue), 50);
+                }, true);
             }
 
             private void updateSelectedStates(Language language)
diff --git a/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs b/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs
index 982cbec376..d3b657b5be 100644
--- a/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs
@@ -2,35 +2,27 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
 using osu.Game.Configuration;
-using osu.Game.Extensions;
 using osu.Game.Localisation;
 
 namespace osu.Game.Overlays.Settings.Sections.General
 {
     public partial class LanguageSettings : SettingsSubsection
     {
-        private SettingsDropdown<Language> languageSelection = null!;
-        private Bindable<string> frameworkLocale = null!;
-        private IBindable<LocalisationParameters> localisationParameters = null!;
-
         protected override LocalisableString Header => GeneralSettingsStrings.LanguageHeader;
 
         [BackgroundDependencyLoader]
-        private void load(FrameworkConfigManager frameworkConfig, OsuConfigManager config, LocalisationManager localisation)
+        private void load(OsuGame game, OsuConfigManager config, FrameworkConfigManager frameworkConfig)
         {
-            frameworkLocale = frameworkConfig.GetBindable<string>(FrameworkSetting.Locale);
-            localisationParameters = localisation.CurrentParameters.GetBoundCopy();
-
             Children = new Drawable[]
             {
-                languageSelection = new SettingsEnumDropdown<Language>
+                new SettingsEnumDropdown<Language>
                 {
                     LabelText = GeneralSettingsStrings.LanguageDropdown,
+                    Current = game.CurrentLanguage,
                 },
                 new SettingsCheckbox
                 {
@@ -43,14 +35,6 @@ namespace osu.Game.Overlays.Settings.Sections.General
                     Current = config.GetBindable<bool>(OsuSetting.Prefer24HourTime)
                 },
             };
-
-            frameworkLocale.BindValueChanged(_ => updateSelection());
-            localisationParameters.BindValueChanged(_ => updateSelection(), true);
-
-            languageSelection.Current.BindValueChanged(val => frameworkLocale.Value = val.NewValue.ToCultureCode());
         }
-
-        private void updateSelection() =>
-            languageSelection.Current.Value = LanguageExtensions.GetLanguageFor(frameworkLocale.Value, localisationParameters.Value);
     }
 }

From ab790ec96a30c296d6ac255b990c7736c27557ee Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 8 Jun 2023 02:50:14 +0300
Subject: [PATCH 0740/1604] Expose currently selected language from
 `IAPIProvider`

---
 osu.Game/Online/API/APIAccess.cs      | 7 ++++++-
 osu.Game/Online/API/DummyAPIAccess.cs | 3 +++
 osu.Game/Online/API/IAPIProvider.cs   | 6 ++++++
 osu.Game/OsuGameBase.cs               | 2 +-
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index 94bb77d6ec..4f586c8fff 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -18,6 +18,7 @@ using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Logging;
 using osu.Game.Configuration;
+using osu.Game.Localisation;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Notifications;
@@ -28,6 +29,7 @@ namespace osu.Game.Online.API
 {
     public partial class APIAccess : Component, IAPIProvider
     {
+        private readonly OsuGameBase game;
         private readonly OsuConfigManager config;
 
         private readonly string versionHash;
@@ -52,6 +54,8 @@ namespace osu.Game.Online.API
         public IBindableList<APIUser> Friends => friends;
         public IBindable<UserActivity> Activity => activity;
 
+        public Language Language => game.CurrentLanguage.Value;
+
         private Bindable<APIUser> localUser { get; } = new Bindable<APIUser>(createGuestUser());
 
         private BindableList<APIUser> friends { get; } = new BindableList<APIUser>();
@@ -64,8 +68,9 @@ namespace osu.Game.Online.API
 
         private readonly Logger log;
 
-        public APIAccess(OsuConfigManager config, EndpointConfiguration endpointConfiguration, string versionHash)
+        public APIAccess(OsuGameBase game, OsuConfigManager config, EndpointConfiguration endpointConfiguration, string versionHash)
         {
+            this.game = game;
             this.config = config;
             this.versionHash = versionHash;
 
diff --git a/osu.Game/Online/API/DummyAPIAccess.cs b/osu.Game/Online/API/DummyAPIAccess.cs
index abe2755654..16afef8e30 100644
--- a/osu.Game/Online/API/DummyAPIAccess.cs
+++ b/osu.Game/Online/API/DummyAPIAccess.cs
@@ -8,6 +8,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Game.Localisation;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Notifications;
 using osu.Game.Tests;
@@ -29,6 +30,8 @@ namespace osu.Game.Online.API
 
         public Bindable<UserActivity> Activity { get; } = new Bindable<UserActivity>();
 
+        public Language Language => Language.en;
+
         public string AccessToken => "token";
 
         public bool IsLoggedIn => State.Value == APIState.Online;
diff --git a/osu.Game/Online/API/IAPIProvider.cs b/osu.Game/Online/API/IAPIProvider.cs
index 6054effaa1..a1d7006c8c 100644
--- a/osu.Game/Online/API/IAPIProvider.cs
+++ b/osu.Game/Online/API/IAPIProvider.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Threading.Tasks;
 using osu.Framework.Bindables;
+using osu.Game.Localisation;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Notifications;
 using osu.Game.Users;
@@ -27,6 +28,11 @@ namespace osu.Game.Online.API
         /// </summary>
         IBindable<UserActivity> Activity { get; }
 
+        /// <summary>
+        /// The language supplied by this provider to API requests.
+        /// </summary>
+        Language Language { get; }
+
         /// <summary>
         /// Retrieve the OAuth access token.
         /// </summary>
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index ed954f609e..63efe0e2c8 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -296,7 +296,6 @@ namespace osu.Game
 
             MessageFormatter.WebsiteRootUrl = endpoints.WebsiteRootUrl;
 
-            dependencies.CacheAs(API ??= new APIAccess(LocalConfig, endpoints, VersionHash));
             frameworkLocale = frameworkConfig.GetBindable<string>(FrameworkSetting.Locale);
             frameworkLocale.BindValueChanged(_ => updateLanguage());
 
@@ -305,6 +304,7 @@ namespace osu.Game
 
             CurrentLanguage.BindValueChanged(val => frameworkLocale.Value = val.NewValue.ToCultureCode());
 
+            dependencies.CacheAs(API ??= new APIAccess(this, LocalConfig, endpoints, VersionHash));
 
             var defaultBeatmap = new DummyWorkingBeatmap(Audio, Textures);
 

From 9f842ccdc057e6c6ec60def1ac607f1ea00f02e1 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 8 Jun 2023 02:50:29 +0300
Subject: [PATCH 0741/1604] Supply `Accept-Language` header in API requests

---
 osu.Game/Online/API/APIRequest.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/API/APIRequest.cs b/osu.Game/Online/API/APIRequest.cs
index dc6a3fe3d5..cd6e8df754 100644
--- a/osu.Game/Online/API/APIRequest.cs
+++ b/osu.Game/Online/API/APIRequest.cs
@@ -9,6 +9,7 @@ using JetBrains.Annotations;
 using Newtonsoft.Json;
 using osu.Framework.IO.Network;
 using osu.Framework.Logging;
+using osu.Game.Extensions;
 using osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Online.API
@@ -116,10 +117,11 @@ namespace osu.Game.Online.API
             WebRequest.Failed += Fail;
             WebRequest.AllowRetryOnTimeout = false;
 
-            WebRequest.AddHeader("x-api-version", API.APIVersion.ToString(CultureInfo.InvariantCulture));
+            WebRequest.AddHeader(@"Accept-Language", API.Language.ToCultureCode());
+            WebRequest.AddHeader(@"x-api-version", API.APIVersion.ToString(CultureInfo.InvariantCulture));
 
             if (!string.IsNullOrEmpty(API.AccessToken))
-                WebRequest.AddHeader("Authorization", $"Bearer {API.AccessToken}");
+                WebRequest.AddHeader(@"Authorization", $@"Bearer {API.AccessToken}");
 
             if (isFailing) return;
 

From 251f23b2c2e85c70d08803c911ec3e4fe4cb0791 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 8 Jun 2023 03:27:03 +0300
Subject: [PATCH 0742/1604] Handle culture code differences of Traditional
 Chinese

---
 osu.Game/Extensions/LanguageExtensions.cs | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Extensions/LanguageExtensions.cs b/osu.Game/Extensions/LanguageExtensions.cs
index 04231c384c..44932cf3c8 100644
--- a/osu.Game/Extensions/LanguageExtensions.cs
+++ b/osu.Game/Extensions/LanguageExtensions.cs
@@ -21,7 +21,12 @@ namespace osu.Game.Extensions
         /// This is required as enum member names are not allowed to contain hyphens.
         /// </remarks>
         public static string ToCultureCode(this Language language)
-            => language.ToString().Replace("_", "-");
+        {
+            if (language == Language.zh_hant)
+                return @"zh-tw";
+
+            return language.ToString().Replace("_", "-");
+        }
 
         /// <summary>
         /// Attempts to parse the supplied <paramref name="cultureCode"/> to a <see cref="Language"/> value.
@@ -30,7 +35,15 @@ namespace osu.Game.Extensions
         /// <param name="language">The parsed <see cref="Language"/>. Valid only if the return value of the method is <see langword="true" />.</param>
         /// <returns>Whether the parsing succeeded.</returns>
         public static bool TryParseCultureCode(string cultureCode, out Language language)
-            => Enum.TryParse(cultureCode.Replace("-", "_"), out language);
+        {
+            if (cultureCode == @"zh-tw")
+            {
+                language = Language.zh_hant;
+                return true;
+            }
+
+            return Enum.TryParse(cultureCode.Replace("-", "_"), out language);
+        }
 
         /// <summary>
         /// Parses the <see cref="Language"/> that is specified in <paramref name="frameworkLocale"/>,

From d523785bfc34192a695ac0b8136272fe50b05ad8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 8 Jun 2023 03:27:23 +0300
Subject: [PATCH 0743/1604] Fix `LanguageSettings` requiring `OsuGame` as
 dependency

---
 osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs b/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs
index d3b657b5be..cf7f63211e 100644
--- a/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
         protected override LocalisableString Header => GeneralSettingsStrings.LanguageHeader;
 
         [BackgroundDependencyLoader]
-        private void load(OsuGame game, OsuConfigManager config, FrameworkConfigManager frameworkConfig)
+        private void load(OsuGameBase game, OsuConfigManager config, FrameworkConfigManager frameworkConfig)
         {
             Children = new Drawable[]
             {

From a842f79ad49cc98afaef897c85f2f5657ca32029 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Jun 2023 16:17:44 +0900
Subject: [PATCH 0744/1604] Refactor `IWorkingBeatmap.Background` to
 `GetBackground()`

---
 osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs  | 2 +-
 osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs  | 2 +-
 .../Visual/Background/TestSceneBackgroundScreenDefault.cs    | 2 +-
 osu.Game.Tests/WaveformTestBeatmap.cs                        | 2 +-
 osu.Game/Beatmaps/Drawables/BeatmapBackgroundSprite.cs       | 5 +++--
 osu.Game/Beatmaps/DummyWorkingBeatmap.cs                     | 2 +-
 osu.Game/Beatmaps/FlatFileWorkingBeatmap.cs                  | 2 +-
 osu.Game/Beatmaps/IWorkingBeatmap.cs                         | 2 +-
 osu.Game/Beatmaps/WorkingBeatmap.cs                          | 4 +---
 osu.Game/Beatmaps/WorkingBeatmapCache.cs                     | 2 +-
 osu.Game/Graphics/Backgrounds/BeatmapBackground.cs           | 2 +-
 osu.Game/Overlays/NowPlayingOverlay.cs                       | 2 +-
 osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs      | 2 +-
 osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs          | 2 +-
 .../Screens/OnlinePlay/Components/PlaylistItemBackground.cs  | 2 +-
 osu.Game/Screens/Play/BeatmapMetadataDisplay.cs              | 2 +-
 osu.Game/Screens/Play/HUD/PerformancePointsCounter.cs        | 2 +-
 osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs             | 2 +-
 osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs                | 2 +-
 19 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
index 09130ac57d..fac5e098b9 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
@@ -231,7 +231,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
 
             protected override IBeatmap GetBeatmap() => beatmap;
 
-            protected override Texture GetBackground() => throw new NotImplementedException();
+            public override Texture GetBackground() => throw new NotImplementedException();
 
             protected override Track GetBeatmapTrack() => throw new NotImplementedException();
 
diff --git a/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs b/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
index 295a10ba5b..3092966a7e 100644
--- a/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
@@ -131,7 +131,7 @@ namespace osu.Game.Tests.Editing.Checks
 
             var mock = new Mock<IWorkingBeatmap>();
             mock.SetupGet(w => w.Beatmap).Returns(beatmap);
-            mock.SetupGet(w => w.Background).Returns(background);
+            mock.SetupGet(w => w.GetBackground()).Returns(background);
             mock.Setup(w => w.GetStream(It.IsAny<string>())).Returns(stream);
 
             return mock;
diff --git a/osu.Game.Tests/Visual/Background/TestSceneBackgroundScreenDefault.cs b/osu.Game.Tests/Visual/Background/TestSceneBackgroundScreenDefault.cs
index 8f4250799e..1523ae7027 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneBackgroundScreenDefault.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneBackgroundScreenDefault.cs
@@ -286,7 +286,7 @@ namespace osu.Game.Tests.Visual.Background
                 this.renderer = renderer;
             }
 
-            protected override Texture GetBackground() => renderer.CreateTexture(1, 1);
+            public override Texture GetBackground() => renderer.CreateTexture(1, 1);
         }
 
         private partial class TestWorkingBeatmapWithStoryboard : TestWorkingBeatmap
diff --git a/osu.Game.Tests/WaveformTestBeatmap.cs b/osu.Game.Tests/WaveformTestBeatmap.cs
index 5e41392560..12660ed2e1 100644
--- a/osu.Game.Tests/WaveformTestBeatmap.cs
+++ b/osu.Game.Tests/WaveformTestBeatmap.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Tests
 
         protected override IBeatmap GetBeatmap() => beatmap;
 
-        protected override Texture GetBackground() => null;
+        public override Texture GetBackground() => null;
 
         protected override Waveform GetWaveform() => new Waveform(trackStore.GetStream(firstAudioFile));
 
diff --git a/osu.Game/Beatmaps/Drawables/BeatmapBackgroundSprite.cs b/osu.Game/Beatmaps/Drawables/BeatmapBackgroundSprite.cs
index 767504fcb1..5b9cf6846c 100644
--- a/osu.Game/Beatmaps/Drawables/BeatmapBackgroundSprite.cs
+++ b/osu.Game/Beatmaps/Drawables/BeatmapBackgroundSprite.cs
@@ -23,8 +23,9 @@ namespace osu.Game.Beatmaps.Drawables
         [BackgroundDependencyLoader]
         private void load()
         {
-            if (working.Background != null)
-                Texture = working.Background;
+            var background = working.GetBackground();
+            if (background != null)
+                Texture = background;
         }
     }
 }
diff --git a/osu.Game/Beatmaps/DummyWorkingBeatmap.cs b/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
index 0b390a2ab5..8089d789c1 100644
--- a/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Beatmaps
 
         protected override IBeatmap GetBeatmap() => new Beatmap();
 
-        protected override Texture GetBackground() => textures?.Get(@"Backgrounds/bg4");
+        public override Texture GetBackground() => textures?.Get(@"Backgrounds/bg4");
 
         protected override Track GetBeatmapTrack() => GetVirtualTrack();
 
diff --git a/osu.Game/Beatmaps/FlatFileWorkingBeatmap.cs b/osu.Game/Beatmaps/FlatFileWorkingBeatmap.cs
index 02fcde5257..0b53278ab3 100644
--- a/osu.Game/Beatmaps/FlatFileWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/FlatFileWorkingBeatmap.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Beatmaps
         }
 
         protected override IBeatmap GetBeatmap() => beatmap;
-        protected override Texture GetBackground() => throw new NotImplementedException();
+        public override Texture GetBackground() => throw new NotImplementedException();
         protected override Track GetBeatmapTrack() => throw new NotImplementedException();
         protected internal override ISkin GetSkin() => throw new NotImplementedException();
         public override Stream GetStream(string storagePath) => throw new NotImplementedException();
diff --git a/osu.Game/Beatmaps/IWorkingBeatmap.cs b/osu.Game/Beatmaps/IWorkingBeatmap.cs
index 0f0e72b0ac..4b0a498a56 100644
--- a/osu.Game/Beatmaps/IWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/IWorkingBeatmap.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Beatmaps
         /// <summary>
         /// Retrieves the background for this <see cref="IWorkingBeatmap"/>.
         /// </summary>
-        Texture Background { get; }
+        Texture GetBackground();
 
         /// <summary>
         /// Retrieves the <see cref="Waveform"/> for the <see cref="Track"/> of this <see cref="IWorkingBeatmap"/>.
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 59a71fd80c..a69859f724 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -34,8 +34,6 @@ namespace osu.Game.Beatmaps
 
         public Storyboard Storyboard => storyboard.Value;
 
-        public Texture Background => GetBackground(); // Texture uses ref counting, so we want to return a new instance every usage.
-
         public ISkin Skin => skin.Value;
 
         private AudioManager audioManager { get; }
@@ -67,7 +65,7 @@ namespace osu.Game.Beatmaps
         protected virtual Storyboard GetStoryboard() => new Storyboard { BeatmapInfo = BeatmapInfo };
 
         protected abstract IBeatmap GetBeatmap();
-        protected abstract Texture GetBackground();
+        public abstract Texture GetBackground();
         protected abstract Track GetBeatmapTrack();
 
         /// <summary>
diff --git a/osu.Game/Beatmaps/WorkingBeatmapCache.cs b/osu.Game/Beatmaps/WorkingBeatmapCache.cs
index ef843909d8..94865ed8d0 100644
--- a/osu.Game/Beatmaps/WorkingBeatmapCache.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmapCache.cs
@@ -160,7 +160,7 @@ namespace osu.Game.Beatmaps
                 }
             }
 
-            protected override Texture GetBackground()
+            public override Texture GetBackground()
             {
                 if (string.IsNullOrEmpty(Metadata?.BackgroundFile))
                     return null;
diff --git a/osu.Game/Graphics/Backgrounds/BeatmapBackground.cs b/osu.Game/Graphics/Backgrounds/BeatmapBackground.cs
index b79eb4927f..3ace67f410 100644
--- a/osu.Game/Graphics/Backgrounds/BeatmapBackground.cs
+++ b/osu.Game/Graphics/Backgrounds/BeatmapBackground.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Graphics.Backgrounds
         [BackgroundDependencyLoader]
         private void load(LargeTextureStore textures)
         {
-            Sprite.Texture = Beatmap?.Background ?? textures.Get(fallbackTextureName);
+            Sprite.Texture = Beatmap?.GetBackground() ?? textures.Get(fallbackTextureName);
         }
 
         public override bool Equals(Background other)
diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index 66fb3571ba..e3e3b4bd80 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -415,7 +415,7 @@ namespace osu.Game.Overlays
             [BackgroundDependencyLoader]
             private void load(LargeTextureStore textures)
             {
-                sprite.Texture = beatmap?.Background ?? textures.Get(@"Backgrounds/bg4");
+                sprite.Texture = beatmap?.GetBackground() ?? textures.Get(@"Backgrounds/bg4");
             }
         }
 
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
index 23fa28e7bc..8c3a5c026d 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             if (backgroundFile == null)
                 yield break;
 
-            var texture = context.WorkingBeatmap.Background;
+            var texture = context.WorkingBeatmap.GetBackground();
             if (texture == null)
                 yield break;
 
diff --git a/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs b/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
index 2cf823ca0c..565379f391 100644
--- a/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
+++ b/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
@@ -204,7 +204,7 @@ namespace osu.Game.Screens.Edit
 
             protected override IBeatmap GetBeatmap() => beatmap;
 
-            protected override Texture GetBackground() => throw new NotImplementedException();
+            public override Texture GetBackground() => throw new NotImplementedException();
 
             protected override Track GetBeatmapTrack() => throw new NotImplementedException();
 
diff --git a/osu.Game/Screens/OnlinePlay/Components/PlaylistItemBackground.cs b/osu.Game/Screens/OnlinePlay/Components/PlaylistItemBackground.cs
index 997ba6b639..6b06eaee1e 100644
--- a/osu.Game/Screens/OnlinePlay/Components/PlaylistItemBackground.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/PlaylistItemBackground.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Screens.OnlinePlay.Components
             if (Beatmap?.BeatmapSet is IBeatmapSetOnlineInfo online)
                 texture = textures.Get(online.Covers.Cover);
 
-            Sprite.Texture = texture ?? beatmaps.DefaultBeatmap.Background;
+            Sprite.Texture = texture ?? beatmaps.DefaultBeatmap.GetBackground();
         }
 
         public override bool Equals(Background? other)
diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index a152f4be19..66aa3d9cc0 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -109,7 +109,7 @@ namespace osu.Game.Screens.Play
                                 new Sprite
                                 {
                                     RelativeSizeAxes = Axes.Both,
-                                    Texture = beatmap.Background,
+                                    Texture = beatmap.GetBackground(),
                                     Origin = Anchor.Centre,
                                     Anchor = Anchor.Centre,
                                     FillMode = FillMode.Fill,
diff --git a/osu.Game/Screens/Play/HUD/PerformancePointsCounter.cs b/osu.Game/Screens/Play/HUD/PerformancePointsCounter.cs
index 4f37c215e9..82f116b4ae 100644
--- a/osu.Game/Screens/Play/HUD/PerformancePointsCounter.cs
+++ b/osu.Game/Screens/Play/HUD/PerformancePointsCounter.cs
@@ -226,7 +226,7 @@ namespace osu.Game.Screens.Play.HUD
 
             protected override IBeatmap GetBeatmap() => gameplayBeatmap;
 
-            protected override Texture GetBackground() => throw new NotImplementedException();
+            public override Texture GetBackground() => throw new NotImplementedException();
 
             protected override Track GetBeatmapTrack() => throw new NotImplementedException();
 
diff --git a/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs b/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
index 79f629ce49..b57b0daa1b 100644
--- a/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
+++ b/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
@@ -232,7 +232,7 @@ namespace osu.Game.Tests.Beatmaps
 
             protected override IBeatmap GetBeatmap() => beatmap;
 
-            protected override Texture GetBackground() => throw new NotImplementedException();
+            public override Texture GetBackground() => throw new NotImplementedException();
 
             protected override Track GetBeatmapTrack() => throw new NotImplementedException();
 
diff --git a/osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs b/osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs
index 7d2aa99dbe..ba6d9ca8b5 100644
--- a/osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs
+++ b/osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Tests.Beatmaps
 
         public override Stream? GetStream(string storagePath) => null;
 
-        protected override Texture? GetBackground() => null;
+        public override Texture? GetBackground() => null;
 
         protected override Track? GetBeatmapTrack() => null;
     }

From 5162f5c3d8d18bee824fddf63ac65fa036d0723e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 8 Jun 2023 09:20:43 +0200
Subject: [PATCH 0745/1604] Fix code quality inspections

---
 osu.Game/Overlays/SettingsPanel.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/SettingsPanel.cs b/osu.Game/Overlays/SettingsPanel.cs
index d571557993..1681187f82 100644
--- a/osu.Game/Overlays/SettingsPanel.cs
+++ b/osu.Game/Overlays/SettingsPanel.cs
@@ -328,7 +328,7 @@ namespace osu.Game.Overlays
                 base.UpdateAfterChildren();
 
                 // no null check because the usage of this class is strict
-                HeaderBackground.Alpha = -ExpandableHeader.Y / ExpandableHeader.LayoutSize.Y;
+                HeaderBackground!.Alpha = -ExpandableHeader!.Y / ExpandableHeader.LayoutSize.Y;
             }
         }
     }

From d10c63ed2de6e0dbacee501d17ff9b8e41cb0b0a Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 8 Jun 2023 16:29:34 +0900
Subject: [PATCH 0746/1604] Fix difficulty calculation when mods are involved

---
 .../Difficulty/OsuDifficultyCalculator.cs              | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
index 1011066892..5292707ac1 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
@@ -187,12 +187,12 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             int objectCount = countNormal + countSlider + countSpinner;
 
             DifficultyPeppyStars = (int)Math.Round(
-                (playableBeatmap.Difficulty.DrainRate
-                 + playableBeatmap.Difficulty.OverallDifficulty
-                 + playableBeatmap.Difficulty.CircleSize
-                 + Math.Clamp(objectCount / playableBeatmap.Difficulty.DrainRate * 8, 0, 16)) / 38 * 5);
+                (baseBeatmap.Difficulty.DrainRate
+                 + baseBeatmap.Difficulty.OverallDifficulty
+                 + baseBeatmap.Difficulty.CircleSize
+                 + Math.Clamp(objectCount / baseBeatmap.Difficulty.DrainRate * 8, 0, 16)) / 38 * 5);
 
-            ScoreMultiplier = 1 * DifficultyPeppyStars * mods.Aggregate(1.0, (current, mod) => current * mod.ScoreMultiplier);
+            ScoreMultiplier = DifficultyPeppyStars * mods.Aggregate(1.0, (current, mod) => current * mod.ScoreMultiplier);
         }
     }
 

From 3978d4babb86917150c7bfb5a19ce3c72830b885 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Jun 2023 16:30:14 +0900
Subject: [PATCH 0747/1604] Crop and disable mipmaps on beatmap panel
 backgrounds

This is an effort to improve general performance at song select. At
least on the metal renderer, I can notice very high draw frame overheads
related to texture uploads.

By reducing the size of the texture uploads to roughly match what is
actually being displayed on screen (using a relatively inexpensive crop
operation), we can bastly reduce stuttering both during initial load and
carousel scroll.

You might ask if it's safe to disable mipmapping, but I've tested with
lower resolutions and bilinear filtering seems to handle just fine.
Bilinear without mipmaps only falls apart when you scale below 50% and
we're not going too far past that at minimum game scale, if at all.
---
 ...eatmapPanelBackgroundTextureLoaderStore.cs | 88 +++++++++++++++++++
 osu.Game/Beatmaps/IBeatmapResourceProvider.cs |  5 ++
 osu.Game/Beatmaps/IWorkingBeatmap.cs          |  5 ++
 osu.Game/Beatmaps/WorkingBeatmap.cs           |  1 +
 osu.Game/Beatmaps/WorkingBeatmapCache.cs      | 11 ++-
 .../Select/Carousel/SetPanelBackground.cs     | 24 ++++-
 6 files changed, 130 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game/Beatmaps/BeatmapPanelBackgroundTextureLoaderStore.cs

diff --git a/osu.Game/Beatmaps/BeatmapPanelBackgroundTextureLoaderStore.cs b/osu.Game/Beatmaps/BeatmapPanelBackgroundTextureLoaderStore.cs
new file mode 100644
index 0000000000..0ee516a912
--- /dev/null
+++ b/osu.Game/Beatmaps/BeatmapPanelBackgroundTextureLoaderStore.cs
@@ -0,0 +1,88 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.IO.Stores;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.Processing;
+
+namespace osu.Game.Beatmaps
+{
+    // Implementation of this class is based off of `MaxDimensionLimitedTextureLoaderStore`.
+    // If issues are found it's worth checking to make sure similar issues exist there.
+    public class BeatmapPanelBackgroundTextureLoaderStore : IResourceStore<TextureUpload>
+    {
+        // These numbers are taken from the draw visualiser size requirements for song select panel textures at extreme aspect ratios.
+        private const int height = 130;
+        private const int max_width = 1280;
+
+        private readonly IResourceStore<TextureUpload>? textureStore;
+
+        public BeatmapPanelBackgroundTextureLoaderStore(IResourceStore<TextureUpload>? textureStore)
+        {
+            this.textureStore = textureStore;
+        }
+
+        public void Dispose()
+        {
+            textureStore?.Dispose();
+        }
+
+        public TextureUpload Get(string name)
+        {
+            var textureUpload = textureStore?.Get(name);
+
+            // NRT not enabled on framework side classes (IResourceStore / TextureLoaderStore), welp.
+            if (textureUpload == null)
+                return null!;
+
+            return limitTextureUploadSize(textureUpload);
+        }
+
+        public async Task<TextureUpload> GetAsync(string name, CancellationToken cancellationToken = new CancellationToken())
+        {
+            // NRT not enabled on framework side classes (IResourceStore / TextureLoaderStore), welp.
+            if (textureStore == null)
+                return null!;
+
+            var textureUpload = await textureStore.GetAsync(name, cancellationToken).ConfigureAwait(false);
+
+            if (textureUpload == null)
+                return null!;
+
+            return await Task.Run(() => limitTextureUploadSize(textureUpload), cancellationToken).ConfigureAwait(false);
+        }
+
+        private TextureUpload limitTextureUploadSize(TextureUpload textureUpload)
+        {
+            var image = Image.LoadPixelData(textureUpload.Data.ToArray(), textureUpload.Width, textureUpload.Height);
+
+            // The original texture upload will no longer be returned or used.
+            textureUpload.Dispose();
+
+            Size size = image.Size();
+            int usableWidth = Math.Min(max_width, size.Width);
+
+            // Crop the centre region of the background for now.
+            Rectangle cropRectangle = new Rectangle(
+                (size.Width - usableWidth) / 2,
+                size.Height / 2 - height / 2,
+                usableWidth,
+                height
+            );
+
+            image.Mutate(i => i.Crop(cropRectangle));
+
+            return new TextureUpload(image);
+        }
+
+        public Stream? GetStream(string name) => textureStore?.GetStream(name);
+
+        public IEnumerable<string> GetAvailableResources() => textureStore?.GetAvailableResources() ?? Array.Empty<string>();
+    }
+}
diff --git a/osu.Game/Beatmaps/IBeatmapResourceProvider.cs b/osu.Game/Beatmaps/IBeatmapResourceProvider.cs
index 22ff7ce8c8..d033608c95 100644
--- a/osu.Game/Beatmaps/IBeatmapResourceProvider.cs
+++ b/osu.Game/Beatmaps/IBeatmapResourceProvider.cs
@@ -16,6 +16,11 @@ namespace osu.Game.Beatmaps
         /// </summary>
         TextureStore LargeTextureStore { get; }
 
+        /// <summary>
+        /// Retrieve a global large texture store, used specifically for retrieving cropped beatmap panel backgrounds.
+        /// </summary>
+        TextureStore BeatmapPanelTextureStore { get; }
+
         /// <summary>
         /// Access a global track store for retrieving beatmap tracks from.
         /// </summary>
diff --git a/osu.Game/Beatmaps/IWorkingBeatmap.cs b/osu.Game/Beatmaps/IWorkingBeatmap.cs
index 4b0a498a56..905bca45b3 100644
--- a/osu.Game/Beatmaps/IWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/IWorkingBeatmap.cs
@@ -49,6 +49,11 @@ namespace osu.Game.Beatmaps
         /// </summary>
         Texture GetBackground();
 
+        /// <summary>
+        /// Retrieves a cropped background for this <see cref="IWorkingBeatmap"/> used for display on panels.
+        /// </summary>
+        Texture GetPanelBackground();
+
         /// <summary>
         /// Retrieves the <see cref="Waveform"/> for the <see cref="Track"/> of this <see cref="IWorkingBeatmap"/>.
         /// </summary>
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index a69859f724..25159996f3 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -66,6 +66,7 @@ namespace osu.Game.Beatmaps
 
         protected abstract IBeatmap GetBeatmap();
         public abstract Texture GetBackground();
+        public virtual Texture GetPanelBackground() => GetBackground();
         protected abstract Track GetBeatmapTrack();
 
         /// <summary>
diff --git a/osu.Game/Beatmaps/WorkingBeatmapCache.cs b/osu.Game/Beatmaps/WorkingBeatmapCache.cs
index 94865ed8d0..0f3d61f527 100644
--- a/osu.Game/Beatmaps/WorkingBeatmapCache.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmapCache.cs
@@ -42,6 +42,7 @@ namespace osu.Game.Beatmaps
         private readonly AudioManager audioManager;
         private readonly IResourceStore<byte[]> resources;
         private readonly LargeTextureStore largeTextureStore;
+        private readonly LargeTextureStore beatmapPanelTextureStore;
         private readonly ITrackStore trackStore;
         private readonly IResourceStore<byte[]> files;
 
@@ -58,6 +59,7 @@ namespace osu.Game.Beatmaps
             this.host = host;
             this.files = files;
             largeTextureStore = new LargeTextureStore(host?.Renderer ?? new DummyRenderer(), host?.CreateTextureLoaderStore(files));
+            beatmapPanelTextureStore = new LargeTextureStore(host?.Renderer ?? new DummyRenderer(), new BeatmapPanelBackgroundTextureLoaderStore(host?.CreateTextureLoaderStore(files)));
             this.trackStore = trackStore;
         }
 
@@ -110,6 +112,7 @@ namespace osu.Game.Beatmaps
         #region IResourceStorageProvider
 
         TextureStore IBeatmapResourceProvider.LargeTextureStore => largeTextureStore;
+        TextureStore IBeatmapResourceProvider.BeatmapPanelTextureStore => beatmapPanelTextureStore;
         ITrackStore IBeatmapResourceProvider.Tracks => trackStore;
         IRenderer IStorageResourceProvider.Renderer => host?.Renderer ?? new DummyRenderer();
         AudioManager IStorageResourceProvider.AudioManager => audioManager;
@@ -160,7 +163,11 @@ namespace osu.Game.Beatmaps
                 }
             }
 
-            public override Texture GetBackground()
+            public override Texture GetPanelBackground() => getBackgroundFromStore(resources.BeatmapPanelTextureStore);
+
+            public override Texture GetBackground() => getBackgroundFromStore(resources.LargeTextureStore);
+
+            private Texture getBackgroundFromStore(TextureStore store)
             {
                 if (string.IsNullOrEmpty(Metadata?.BackgroundFile))
                     return null;
@@ -168,7 +175,7 @@ namespace osu.Game.Beatmaps
                 try
                 {
                     string fileStorePath = BeatmapSetInfo.GetPathForFile(Metadata.BackgroundFile);
-                    var texture = resources.LargeTextureStore.Get(fileStorePath);
+                    var texture = store.Get(fileStorePath);
 
                     if (texture == null)
                     {
diff --git a/osu.Game/Screens/Select/Carousel/SetPanelBackground.cs b/osu.Game/Screens/Select/Carousel/SetPanelBackground.cs
index 6f13a34bfc..b8729b7174 100644
--- a/osu.Game/Screens/Select/Carousel/SetPanelBackground.cs
+++ b/osu.Game/Screens/Select/Carousel/SetPanelBackground.cs
@@ -1,12 +1,14 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.Drawables;
 using osuTK;
 using osuTK.Graphics;
 
@@ -21,7 +23,7 @@ namespace osu.Game.Screens.Select.Carousel
 
             Children = new Drawable[]
             {
-                new BeatmapBackgroundSprite(working)
+                new PanelBeatmapBackground(working)
                 {
                     RelativeSizeAxes = Axes.Both,
                     Anchor = Anchor.Centre,
@@ -68,5 +70,23 @@ namespace osu.Game.Screens.Select.Carousel
                 },
             };
         }
+
+        public partial class PanelBeatmapBackground : Sprite
+        {
+            private readonly IWorkingBeatmap working;
+
+            public PanelBeatmapBackground(IWorkingBeatmap working)
+            {
+                ArgumentNullException.ThrowIfNull(working);
+
+                this.working = working;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                Texture = working.GetPanelBackground();
+            }
+        }
     }
 }

From d07437f81066604178fca0748abd83eb34df2e8e Mon Sep 17 00:00:00 2001
From: John Biddle <johntbiddle@gmail.com>
Date: Thu, 8 Jun 2023 00:52:28 -0700
Subject: [PATCH 0748/1604] Added recommendations from bdach: Fixed null
 checking in ApplyToDrawableHitObject Renamed mod to "Synesthesia" Moved to
 the "Fun" mod category

---
 .../Mods/{OsuModSnapColour.cs => OsuModSynesthesia.cs}    | 5 ++---
 osu.Game.Rulesets.Osu/OsuRuleset.cs                       | 4 ++--
 .../Rulesets/Mods/{ModSnapColour.cs => ModSynesthesia.cs} | 8 ++++----
 3 files changed, 8 insertions(+), 9 deletions(-)
 rename osu.Game.Rulesets.Osu/Mods/{OsuModSnapColour.cs => OsuModSynesthesia.cs} (84%)
 rename osu.Game/Rulesets/Mods/{ModSnapColour.cs => ModSynesthesia.cs} (71%)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModSnapColour.cs b/osu.Game.Rulesets.Osu/Mods/OsuModSynesthesia.cs
similarity index 84%
rename from osu.Game.Rulesets.Osu/Mods/OsuModSnapColour.cs
rename to osu.Game.Rulesets.Osu/Mods/OsuModSynesthesia.cs
index f6fffaf736..2aec416867 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModSnapColour.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModSynesthesia.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Framework.Extensions.ObjectExtensions;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mods;
@@ -14,7 +13,7 @@ namespace osu.Game.Rulesets.Osu.Mods
     /// <summary>
     /// Mod that colours <see cref="HitObject"/>s based on the musical division they are on
     /// </summary>
-    public class OsuModSnapColour : ModSnapColour, IApplicableToBeatmap, IApplicableToDrawableHitObject
+    public class OsuModSynesthesia : ModSynesthesia, IApplicableToBeatmap, IApplicableToDrawableHitObject
     {
         private readonly OsuColour colours = new OsuColour();
 
@@ -29,7 +28,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public void ApplyToDrawableHitObject(DrawableHitObject drawable)
         {
-            if (currentBeatmap.IsNull() || drawable.IsNull()) return;
+            if (currentBeatmap == null) return;
 
             drawable.OnUpdate += _ =>
                 drawable.AccentColour.Value = BindableBeatDivisor.GetColourFor(
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 23eea0e488..c05e640022 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -176,7 +176,6 @@ namespace osu.Game.Rulesets.Osu
                         new OsuModClassic(),
                         new OsuModRandom(),
                         new OsuModMirror(),
-                        new OsuModSnapColour(),
                         new MultiMod(new OsuModAlternate(), new OsuModSingleTap())
                     };
 
@@ -205,7 +204,8 @@ namespace osu.Game.Rulesets.Osu
                         new MultiMod(new OsuModMagnetised(), new OsuModRepel()),
                         new ModAdaptiveSpeed(),
                         new OsuModFreezeFrame(),
-                        new OsuModBubbles()
+                        new OsuModBubbles(),
+                        new OsuModSynesthesia()
                     };
 
                 case ModType.System:
diff --git a/osu.Game/Rulesets/Mods/ModSnapColour.cs b/osu.Game/Rulesets/Mods/ModSynesthesia.cs
similarity index 71%
rename from osu.Game/Rulesets/Mods/ModSnapColour.cs
rename to osu.Game/Rulesets/Mods/ModSynesthesia.cs
index d7e51d8cf6..23cb135c50 100644
--- a/osu.Game/Rulesets/Mods/ModSnapColour.cs
+++ b/osu.Game/Rulesets/Mods/ModSynesthesia.cs
@@ -8,12 +8,12 @@ namespace osu.Game.Rulesets.Mods
     /// <summary>
     /// Mod that colours hitobjects based on the musical division they are on
     /// </summary>
-    public class ModSnapColour : Mod
+    public class ModSynesthesia : Mod
     {
-        public override string Name => "Snap Colour";
-        public override string Acronym => "SC";
+        public override string Name => "Synesthesia";
+        public override string Acronym => "SY";
         public override LocalisableString Description => "Colours hit objects based on the rhythm.";
         public override double ScoreMultiplier => 1;
-        public override ModType Type => ModType.Conversion;
+        public override ModType Type => ModType.Fun;
     }
 }

From 7acd186a3d78a6e2ae99446eaf8d8dd89c2dbb8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 8 Jun 2023 09:56:39 +0200
Subject: [PATCH 0749/1604] Revert to previous bound in drum roll tick
 generation

While `EndTime + tickSpacing` _was_ closer to what stable was using, it
could cause undesirable edge cases wherein a tick would be spawned
outside of the drum roll's duration
(see https://github.com/ppy/osu/pull/23768/files#r1222073027).

For this reason, stick with the old code for now, as it is not as
susceptible to that sort of breakage.
---
 osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
index 5b77ad7f91..79d17b4a1f 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Rulesets.Taiko.Objects
 
             bool first = true;
 
-            for (double t = StartTime; t < EndTime + tickSpacing; t += tickSpacing)
+            for (double t = StartTime; t < EndTime + tickSpacing / 2; t += tickSpacing)
             {
                 cancellationToken.ThrowIfCancellationRequested();
 

From 079e687bee87b39fdd104a78661e893ef2ac6c77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 8 Jun 2023 10:09:27 +0200
Subject: [PATCH 0750/1604] Fix incorrect mock setup after refactor

---
 osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs b/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
index 3092966a7e..3d1f7c5b17 100644
--- a/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
@@ -131,7 +131,7 @@ namespace osu.Game.Tests.Editing.Checks
 
             var mock = new Mock<IWorkingBeatmap>();
             mock.SetupGet(w => w.Beatmap).Returns(beatmap);
-            mock.SetupGet(w => w.GetBackground()).Returns(background);
+            mock.Setup(w => w.GetBackground()).Returns(background);
             mock.Setup(w => w.GetStream(It.IsAny<string>())).Returns(stream);
 
             return mock;

From 10c43d22739b6c83006977c0d9aa92fb98372cb5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Jun 2023 17:27:00 +0900
Subject: [PATCH 0751/1604] Reduce delays and fades for carousel panels to
 improve song select initial display performance

Entering song select has seen a hit since the new renderer
implementations. The underlying cause is large numbers of vertex buffer
uploads (the counter hits >200k for me during the transition).

Song select is in the process of being redesigned, and we are probably
going to make improvements to the renderer to alleviate this, but in the
mean time we can greatly improve the user experience by reducing how
long the initial fade in delays take on panels.

Visually this doesn't look too jarring, and gives a more immediate
feeling when scrolling. It's also more feasible to load elements sooner
with https://github.com/ppy/osu/pull/23809 applied.
---
 .../Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index b97d37c854..4234184ad1 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -112,11 +112,11 @@ namespace osu.Game.Screens.Select.Carousel
                 background = new DelayedLoadWrapper(() => new SetPanelBackground(manager.GetWorkingBeatmap(beatmapSet.Beatmaps.MinBy(b => b.OnlineID)))
                 {
                     RelativeSizeAxes = Axes.Both,
-                }, 300)
+                }, 200)
                 {
                     RelativeSizeAxes = Axes.Both
                 },
-                mainFlow = new DelayedLoadWrapper(() => new SetPanelContent((CarouselBeatmapSet)Item), 100)
+                mainFlow = new DelayedLoadWrapper(() => new SetPanelContent((CarouselBeatmapSet)Item), 50)
                 {
                     RelativeSizeAxes = Axes.Both
                 },
@@ -126,7 +126,7 @@ namespace osu.Game.Screens.Select.Carousel
             mainFlow.DelayedLoadComplete += fadeContentIn;
         }
 
-        private void fadeContentIn(Drawable d) => d.FadeInFromZero(750, Easing.OutQuint);
+        private void fadeContentIn(Drawable d) => d.FadeInFromZero(150);
 
         protected override void Deselected()
         {

From 95ad18ed2ea65cf312ec098c5f79be921beec3bf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Jun 2023 17:44:32 +0900
Subject: [PATCH 0752/1604] Reduce the radius of note-to-note snapping in osu!
 editor

Stable uses `0.15f`, but for whatever reason that feels too large still.

I've ballparked this.

Addresses https://github.com/ppy/osu/discussions/23806.
---
 osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index ad6af6d74e..aac5f6ffb1 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -187,7 +187,7 @@ namespace osu.Game.Rulesets.Osu.Edit
             var playfield = PlayfieldAtScreenSpacePosition(screenSpacePosition);
 
             float snapRadius =
-                playfield.GamefieldToScreenSpace(new Vector2(OsuHitObject.OBJECT_RADIUS / 5)).X -
+                playfield.GamefieldToScreenSpace(new Vector2(OsuHitObject.OBJECT_RADIUS * 0.10f)).X -
                 playfield.GamefieldToScreenSpace(Vector2.Zero).X;
 
             foreach (var b in blueprints)

From 2958ce35be318ddec498e3c430f0725231291985 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 8 Jun 2023 13:19:47 +0200
Subject: [PATCH 0753/1604] Adjust object snapping test cases to pass with new
 radius

---
 .../Editor/TestSceneObjectObjectSnap.cs                   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs
index 3b8a5a90a5..9af1855167 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             AddStep("place first object", () => InputManager.Click(MouseButton.Left));
 
-            AddStep("move mouse slightly", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre + new Vector2(playfield.ScreenSpaceDrawQuad.Width * 0.02f, 0)));
+            AddStep("move mouse slightly", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre + new Vector2(playfield.ScreenSpaceDrawQuad.Width * 0.01f, 0)));
 
             AddStep("place second object", () => InputManager.Click(MouseButton.Left));
 
@@ -75,7 +75,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             AddStep("enter circle placement mode", () => InputManager.Key(Key.Number2));
 
-            AddStep("move mouse slightly", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre + new Vector2(playfield.ScreenSpaceDrawQuad.Width * 0.235f, 0)));
+            AddStep("move mouse slightly", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre + new Vector2(playfield.ScreenSpaceDrawQuad.Width * 0.205f, 0)));
 
             AddStep("place second object", () => InputManager.Click(MouseButton.Left));
 
@@ -122,7 +122,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             AddStep("begin drag", () => InputManager.PressButton(MouseButton.Left));
 
-            AddStep("move mouse slightly off centre", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre + new Vector2(playfield.ScreenSpaceDrawQuad.Width * 0.02f, 0)));
+            AddStep("move mouse slightly off centre", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre + new Vector2(playfield.ScreenSpaceDrawQuad.Width * 0.01f, 0)));
 
             AddAssert("object 3 snapped to 1", () =>
             {
@@ -134,7 +134,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
                 return Precision.AlmostEquals(first.EndPosition, third.Position);
             });
 
-            AddStep("move mouse slightly off centre", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre + new Vector2(playfield.ScreenSpaceDrawQuad.Width * -0.22f, playfield.ScreenSpaceDrawQuad.Width * 0.21f)));
+            AddStep("move mouse slightly off centre", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre + new Vector2(playfield.ScreenSpaceDrawQuad.Width * -0.21f, playfield.ScreenSpaceDrawQuad.Width * 0.205f)));
 
             AddAssert("object 2 snapped to 1", () =>
             {

From dbb7ddac5238e667a1a1ba99268e41b3d80af0e2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Jun 2023 20:55:09 +0900
Subject: [PATCH 0754/1604] Change osu!mania scoring ratio to 99% acc (to match
 previous lazer scoring)

---
 osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
index 3341f834dd..6292ed75cd 100644
--- a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
+++ b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
@@ -18,8 +18,8 @@ namespace osu.Game.Rulesets.Mania.Scoring
 
         protected override double ComputeTotalScore(double comboProgress, double accuracyProgress, double bonusPortion)
         {
-            return 200000 * comboProgress
-                   + 800000 * Math.Pow(Accuracy.Value, 2 + 2 * Accuracy.Value) * accuracyProgress
+            return 10000 * comboProgress
+                   + 990000 * Math.Pow(Accuracy.Value, 2 + 2 * Accuracy.Value) * accuracyProgress
                    + bonusPortion;
         }
 

From ff4d376c84871b7b2307e7fe6d1c40bbbc17acbf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Jun 2023 21:01:05 +0900
Subject: [PATCH 0755/1604] Mark relevant components as `internal`

---
 osu.Game/Beatmaps/IBeatmapResourceProvider.cs |  2 +-
 osu.Game/Beatmaps/IWorkingBeatmap.cs          | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Beatmaps/IBeatmapResourceProvider.cs b/osu.Game/Beatmaps/IBeatmapResourceProvider.cs
index d033608c95..9e79e03785 100644
--- a/osu.Game/Beatmaps/IBeatmapResourceProvider.cs
+++ b/osu.Game/Beatmaps/IBeatmapResourceProvider.cs
@@ -9,7 +9,7 @@ using osu.Game.IO;
 
 namespace osu.Game.Beatmaps
 {
-    public interface IBeatmapResourceProvider : IStorageResourceProvider
+    internal interface IBeatmapResourceProvider : IStorageResourceProvider
     {
         /// <summary>
         /// Retrieve a global large texture store, used for loading beatmap backgrounds.
diff --git a/osu.Game/Beatmaps/IWorkingBeatmap.cs b/osu.Game/Beatmaps/IWorkingBeatmap.cs
index 905bca45b3..dc69a7f776 100644
--- a/osu.Game/Beatmaps/IWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/IWorkingBeatmap.cs
@@ -32,12 +32,12 @@ namespace osu.Game.Beatmaps
         /// <summary>
         /// Whether the Beatmap has finished loading.
         ///</summary>
-        public bool BeatmapLoaded { get; }
+        bool BeatmapLoaded { get; }
 
         /// <summary>
         /// Whether the Track has finished loading.
         ///</summary>
-        public bool TrackLoaded { get; }
+        bool TrackLoaded { get; }
 
         /// <summary>
         /// Retrieves the <see cref="IBeatmap"/> which this <see cref="IWorkingBeatmap"/> represents.
@@ -52,7 +52,7 @@ namespace osu.Game.Beatmaps
         /// <summary>
         /// Retrieves a cropped background for this <see cref="IWorkingBeatmap"/> used for display on panels.
         /// </summary>
-        Texture GetPanelBackground();
+        internal Texture GetPanelBackground();
 
         /// <summary>
         /// Retrieves the <see cref="Waveform"/> for the <see cref="Track"/> of this <see cref="IWorkingBeatmap"/>.
@@ -129,12 +129,12 @@ namespace osu.Game.Beatmaps
         /// <summary>
         /// Beings loading the contents of this <see cref="IWorkingBeatmap"/> asynchronously.
         /// </summary>
-        public void BeginAsyncLoad();
+        void BeginAsyncLoad();
 
         /// <summary>
         /// Cancels the asynchronous loading of the contents of this <see cref="IWorkingBeatmap"/>.
         /// </summary>
-        public void CancelAsyncLoad();
+        void CancelAsyncLoad();
 
         /// <summary>
         /// Reads the correct track restart point from beatmap metadata and sets looping to enabled.

From cccc06de4873afd0522bea33687c259b385cf8d4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Jun 2023 21:10:40 +0900
Subject: [PATCH 0756/1604] Fix potential failure if beatmap background isn't
 tall enough

---
 .../Beatmaps/BeatmapPanelBackgroundTextureLoaderStore.cs   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapPanelBackgroundTextureLoaderStore.cs b/osu.Game/Beatmaps/BeatmapPanelBackgroundTextureLoaderStore.cs
index 0ee516a912..ef5de4d9b2 100644
--- a/osu.Game/Beatmaps/BeatmapPanelBackgroundTextureLoaderStore.cs
+++ b/osu.Game/Beatmaps/BeatmapPanelBackgroundTextureLoaderStore.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Beatmaps
     public class BeatmapPanelBackgroundTextureLoaderStore : IResourceStore<TextureUpload>
     {
         // These numbers are taken from the draw visualiser size requirements for song select panel textures at extreme aspect ratios.
-        private const int height = 130;
+        private const int max_height = 130;
         private const int max_width = 1280;
 
         private readonly IResourceStore<TextureUpload>? textureStore;
@@ -67,13 +67,14 @@ namespace osu.Game.Beatmaps
 
             Size size = image.Size();
             int usableWidth = Math.Min(max_width, size.Width);
+            int usableHeight = Math.Min(max_height, size.Height);
 
             // Crop the centre region of the background for now.
             Rectangle cropRectangle = new Rectangle(
                 (size.Width - usableWidth) / 2,
-                size.Height / 2 - height / 2,
+                (size.Height - usableHeight) / 3,
                 usableWidth,
-                height
+                usableHeight
             );
 
             image.Mutate(i => i.Crop(cropRectangle));

From 6dbf02454f0f7c2dee97aea8c01ea5120e676cff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 8 Jun 2023 14:19:34 +0200
Subject: [PATCH 0757/1604] Fix bad math

---
 osu.Game/Beatmaps/BeatmapPanelBackgroundTextureLoaderStore.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/BeatmapPanelBackgroundTextureLoaderStore.cs b/osu.Game/Beatmaps/BeatmapPanelBackgroundTextureLoaderStore.cs
index ef5de4d9b2..6d5b90521e 100644
--- a/osu.Game/Beatmaps/BeatmapPanelBackgroundTextureLoaderStore.cs
+++ b/osu.Game/Beatmaps/BeatmapPanelBackgroundTextureLoaderStore.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Beatmaps
             // Crop the centre region of the background for now.
             Rectangle cropRectangle = new Rectangle(
                 (size.Width - usableWidth) / 2,
-                (size.Height - usableHeight) / 3,
+                (size.Height - usableHeight) / 2,
                 usableWidth,
                 usableHeight
             );

From facf7de053a63b4155bff561b8ffede50573c561 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 8 Jun 2023 21:24:40 +0900
Subject: [PATCH 0758/1604] Parse ScoreInfo.IsLegacyScore from replays

---
 osu.Game/Database/RealmAccess.cs              | 49 ++++++++++++++++++-
 osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs |  3 ++
 osu.Game/Scoring/ScoreInfo.cs                 |  3 +-
 3 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index f4c6c802f1..21e025c79d 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -22,12 +22,15 @@ using osu.Framework.Statistics;
 using osu.Framework.Threading;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
+using osu.Game.Extensions;
 using osu.Game.Input.Bindings;
+using osu.Game.IO.Legacy;
 using osu.Game.Models;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
+using osu.Game.Scoring.Legacy;
 using osu.Game.Skinning;
 using Realms;
 using Realms.Exceptions;
@@ -72,8 +75,9 @@ namespace osu.Game.Database
         /// 25   2022-09-18    Remove skins to add with new naming.
         /// 26   2023-02-05    Added BeatmapHash to ScoreInfo.
         /// 27   2023-06-06    Added EditorTimestamp to BeatmapInfo.
+        /// 28   2023-06-08    Added IsLegacyScore to ScoreInfo, parsed from replay files.
         /// </summary>
-        private const int schema_version = 27;
+        private const int schema_version = 28;
 
         /// <summary>
         /// Lock object which is held during <see cref="BlockAllOperations"/> sections, blocking realm retrieval during blocking periods.
@@ -880,6 +884,7 @@ namespace osu.Game.Database
                     break;
 
                 case 26:
+                {
                     // Add ScoreInfo.BeatmapHash property to ensure scores correspond to the correct version of beatmap.
                     var scores = migration.NewRealm.All<ScoreInfo>();
 
@@ -887,6 +892,33 @@ namespace osu.Game.Database
                         score.BeatmapHash = score.BeatmapInfo.Hash;
 
                     break;
+                }
+
+                case 28:
+                {
+                    var files = new RealmFileStore(this, storage);
+                    var scores = migration.NewRealm.All<ScoreInfo>();
+
+                    foreach (var score in scores)
+                    {
+                        string? replayFilename = score.Files.FirstOrDefault(f => f.Filename.EndsWith(@".osr", StringComparison.InvariantCultureIgnoreCase))?.File.GetStoragePath();
+
+                        if (replayFilename == null)
+                            continue;
+
+                        using (var stream = files.Store.GetStream(replayFilename))
+                        {
+                            if (stream == null)
+                                continue;
+
+                            int version = new ReplayVersionParser().Parse(stream);
+                            if (version < LegacyScoreEncoder.FIRST_LAZER_VERSION)
+                                score.IsLegacyScore = true;
+                        }
+                    }
+
+                    break;
+                }
             }
         }
 
@@ -1107,5 +1139,20 @@ namespace osu.Game.Database
                 isDisposed = true;
             }
         }
+
+        /// <summary>
+        /// A trimmed down <see cref="LegacyScoreDecoder"/> specialised to extract the version from replays.
+        /// </summary>
+        private class ReplayVersionParser
+        {
+            public int Parse(Stream stream)
+            {
+                using (SerializationReader sr = new SerializationReader(stream))
+                {
+                    sr.ReadByte(); // Ruleset.
+                    return sr.ReadInt32();
+                }
+            }
+        }
     }
 }
diff --git a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
index 9b145ad56e..c6461840aa 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
@@ -46,6 +46,9 @@ namespace osu.Game.Scoring.Legacy
                 score.ScoreInfo = scoreInfo;
 
                 int version = sr.ReadInt32();
+
+                scoreInfo.IsLegacyScore = version < LegacyScoreEncoder.FIRST_LAZER_VERSION;
+
                 string beatmapHash = sr.ReadString();
 
                 workingBeatmap = GetBeatmap(beatmapHash);
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index e084c45de0..d56338c6a4 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -181,8 +181,7 @@ namespace osu.Game.Scoring
         /// <summary>
         /// Whether this <see cref="ScoreInfo"/> represents a legacy (osu!stable) score.
         /// </summary>
-        [Ignored]
-        public bool IsLegacyScore => Mods.OfType<ModClassic>().Any();
+        public bool IsLegacyScore { get; set; }
 
         private Dictionary<HitResult, int>? statistics;
 

From 76df11c39843f92b4bc305b07a8ee77a08b9067a Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 8 Jun 2023 21:26:32 +0900
Subject: [PATCH 0759/1604] Don't scale stable scores with the classic scoring
 mode

---
 osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs b/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
index 84bf6d15f6..52dec20b32 100644
--- a/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
+++ b/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
@@ -16,7 +16,13 @@ namespace osu.Game.Scoring.Legacy
             => getDisplayScore(scoreProcessor.Ruleset.RulesetInfo.OnlineID, scoreProcessor.TotalScore.Value, mode, scoreProcessor.MaximumStatistics);
 
         public static long GetDisplayScore(this ScoreInfo scoreInfo, ScoringMode mode)
-            => getDisplayScore(scoreInfo.Ruleset.OnlineID, scoreInfo.TotalScore, mode, scoreInfo.MaximumStatistics);
+        {
+            // Temporary to not scale stable scores that are already in the XX-millions with the classic scoring mode.
+            if (scoreInfo.IsLegacyScore)
+                return scoreInfo.TotalScore;
+
+            return getDisplayScore(scoreInfo.Ruleset.OnlineID, scoreInfo.TotalScore, mode, scoreInfo.MaximumStatistics);
+        }
 
         private static long getDisplayScore(int rulesetId, long score, ScoringMode mode, IReadOnlyDictionary<HitResult, int> maximumStatistics)
         {

From 05bd912a21c3b18159199fdf0ac5e4038f0f69a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 8 Jun 2023 15:18:31 +0200
Subject: [PATCH 0760/1604] Revert `internal` access modifier application

Unfortunately breaks a few classes (which is fixable), and also breaks
Moq/Castle dynamic proxies (which is unfortunate).

Relevant error:

    System.TypeLoadException : Method 'GetPanelBackground' in type 'Castle.Proxies.IWorkingBeatmapProxy' from assembly 'DynamicProxyGenAssembly2, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null' does not have an implementation.
    Stack Trace:
        at System.Reflection.Emit.TypeBuilder.CreateTypeNoLock()
        at System.Reflection.Emit.TypeBuilder.CreateTypeInfo()
        at Castle.DynamicProxy.Generators.Emitters.AbstractTypeEmitter.BuildType()
        at Castle.DynamicProxy.Generators.BaseInterfaceProxyGenerator.GenerateType(String typeName, INamingScope namingScope)
        at Castle.DynamicProxy.Generators.BaseProxyGenerator.<>c__DisplayClass13_0.<GetProxyType>b__0(CacheKey cacheKey)
        at Castle.Core.Internal.SynchronizedDictionary`2.GetOrAdd(TKey key, Func`2 valueFactory)
        at Castle.DynamicProxy.Generators.BaseProxyGenerator.GetProxyType()
        at Castle.DynamicProxy.DefaultProxyBuilder.CreateInterfaceProxyTypeWithoutTarget(Type interfaceToProxy, Type[] additionalInterfacesToProxy, ProxyGenerationOptions options)
        at Castle.DynamicProxy.ProxyGenerator.CreateInterfaceProxyTypeWithoutTarget(Type interfaceToProxy, Type[] additionalInterfacesToProxy, ProxyGenerationOptions options)
        at Castle.DynamicProxy.ProxyGenerator.CreateInterfaceProxyWithoutTarget(Type interfaceToProxy, Type[] additionalInterfacesToProxy, ProxyGenerationOptions options, IInterceptor[] interceptors)
        at Moq.CastleProxyFactory.CreateProxy(Type mockType, IInterceptor interceptor, Type[] interfaces, Object[] arguments) in C:\projects\moq4\src\Moq\Interception\CastleProxyFactory.cs:line 50

In theory it would be possible to fix this via application of

    [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]

onto the `osu.Game` assembly, but I think this would be bad precedent.
---
 osu.Game/Beatmaps/IWorkingBeatmap.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/IWorkingBeatmap.cs b/osu.Game/Beatmaps/IWorkingBeatmap.cs
index dc69a7f776..bdfa6bdf6d 100644
--- a/osu.Game/Beatmaps/IWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/IWorkingBeatmap.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Beatmaps
         /// <summary>
         /// Retrieves a cropped background for this <see cref="IWorkingBeatmap"/> used for display on panels.
         /// </summary>
-        internal Texture GetPanelBackground();
+        Texture GetPanelBackground();
 
         /// <summary>
         /// Retrieves the <see cref="Waveform"/> for the <see cref="Track"/> of this <see cref="IWorkingBeatmap"/>.

From 46dc47b0b4254a9b90f00ab2b68c540b7ee94685 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Jun 2023 01:22:29 +0900
Subject: [PATCH 0761/1604] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index c88bea8265..f4d08e443c 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -11,7 +11,7 @@
     <AndroidManifestMerger>manifestmerger.jar</AndroidManifestMerger>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.531.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.608.0" />
   </ItemGroup>
   <ItemGroup>
     <AndroidManifestOverlay Include="$(MSBuildThisFileDirectory)osu.Android\Properties\AndroidManifestOverlay.xml" />
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 8a941ca6c1..b2faa7dfc2 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,7 +36,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="10.20.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.531.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.608.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.510.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 1dcece7741..9aafec6c50 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -16,6 +16,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.531.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.608.0" />
   </ItemGroup>
 </Project>

From 0875fc6233475969d1bb72dbc4f3fb5bcfa98be6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Jun 2023 17:12:00 +0900
Subject: [PATCH 0762/1604] Update tests in line with new behaviour

---
 .../Visual/Editing/TestSceneBeatDivisorControl.cs        | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs b/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
index 3ee5ea79db..17cb3c1449 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
@@ -161,9 +161,11 @@ namespace osu.Game.Tests.Visual.Editing
 
             switchPresets(1);
             assertPreset(BeatDivisorType.Triplets);
+            assertBeatSnap(6);
 
             switchPresets(1);
             assertPreset(BeatDivisorType.Common);
+            assertBeatSnap(4);
 
             switchPresets(-1);
             assertPreset(BeatDivisorType.Triplets);
@@ -179,6 +181,7 @@ namespace osu.Game.Tests.Visual.Editing
 
             setDivisorViaInput(15);
             assertPreset(BeatDivisorType.Custom, 15);
+            assertBeatSnap(15);
 
             switchBeatSnap(-1);
             assertBeatSnap(5);
@@ -188,12 +191,14 @@ namespace osu.Game.Tests.Visual.Editing
 
             setDivisorViaInput(5);
             assertPreset(BeatDivisorType.Custom, 15);
+            assertBeatSnap(5);
 
             switchPresets(1);
             assertPreset(BeatDivisorType.Common);
 
             switchPresets(-1);
-            assertPreset(BeatDivisorType.Triplets);
+            assertPreset(BeatDivisorType.Custom, 15);
+            assertBeatSnap(15);
         }
 
         private void switchBeatSnap(int direction) => AddRepeatStep($"move snap {(direction > 0 ? "forward" : "backward")}", () =>
@@ -217,7 +222,7 @@ namespace osu.Game.Tests.Visual.Editing
 
         private void assertPreset(BeatDivisorType type, int? maxDivisor = null)
         {
-            AddAssert($"preset is {type}", () => bindableBeatDivisor.ValidDivisors.Value.Type == type);
+            AddAssert($"preset is {type}", () => bindableBeatDivisor.ValidDivisors.Value.Type, () => Is.EqualTo(type));
 
             if (type == BeatDivisorType.Custom)
             {

From b66d1aa33d08539cdbb0e859d8d2c2d3380be2e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 8 Jun 2023 20:32:16 +0200
Subject: [PATCH 0763/1604] Fix code quality inspection

---
 osu.Game/Screens/Edit/EditorScreenWithTimeline.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
index 84cfac8f65..b8cbff047e 100644
--- a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
+++ b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Screens.Edit
                                                     AutoSizeAxes = Axes.Y,
                                                     Padding = new MarginPadding { Right = 5 },
                                                 },
-                                                new BeatDivisorControl(beatDivisor) { RelativeSizeAxes = Axes.Both }
+                                                new BeatDivisorControl(this.beatDivisor) { RelativeSizeAxes = Axes.Both }
                                             },
                                         },
                                         RowDimensions = new[]

From 519923e843ea2fd2e98a9f2afa88106a48b83568 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Thu, 8 Jun 2023 17:09:20 -0700
Subject: [PATCH 0764/1604] Remove redundant `EllipsisString` assign

---
 osu.Game/Overlays/Chat/DrawableChatUsername.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Overlays/Chat/DrawableChatUsername.cs b/osu.Game/Overlays/Chat/DrawableChatUsername.cs
index 4b4afc204c..46e3ff5b37 100644
--- a/osu.Game/Overlays/Chat/DrawableChatUsername.cs
+++ b/osu.Game/Overlays/Chat/DrawableChatUsername.cs
@@ -87,7 +87,6 @@ namespace osu.Game.Overlays.Chat
             {
                 Shadow = false,
                 Truncate = true,
-                EllipsisString = "…",
                 Anchor = Anchor.TopRight,
                 Origin = Anchor.TopRight,
             };

From 85fedbd02555618be2892688d2b121ae7e0c1843 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Thu, 8 Jun 2023 17:11:17 -0700
Subject: [PATCH 0765/1604] Add tooltips to truncated text

---
 .../Drawables/Cards/BeatmapCardExtra.cs       |  9 +++------
 .../Drawables/Cards/BeatmapCardNormal.cs      |  6 ++----
 .../Graphics/Sprites/TruncatingSpriteText.cs  | 20 +++++++++++++++++++
 .../Graphics/UserInterface/OsuDropdown.cs     |  3 +--
 .../Chat/ChannelList/ChannelListItem.cs       |  3 +--
 osu.Game/Overlays/Chat/ChatTextBar.cs         |  3 +--
 .../Overlays/Chat/DrawableChatUsername.cs     |  3 +--
 .../Dashboard/Home/DashboardBeatmapPanel.cs   |  6 ++----
 .../Play/HUD/GameplayLeaderboardScore.cs      |  3 +--
 .../Expanded/ExpandedPanelMiddleContent.cs    |  9 +++------
 osu.Game/Screens/Select/BeatmapInfoWedge.cs   |  9 +++------
 11 files changed, 38 insertions(+), 36 deletions(-)
 create mode 100644 osu.Game/Graphics/Sprites/TruncatingSpriteText.cs

diff --git a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardExtra.cs b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardExtra.cs
index 5c6f0c4ee1..175c15ea7b 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardExtra.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardExtra.cs
@@ -106,12 +106,11 @@ namespace osu.Game.Beatmaps.Drawables.Cards
                                             {
                                                 new Drawable[]
                                                 {
-                                                    new OsuSpriteText
+                                                    new TruncatingSpriteText
                                                     {
                                                         Text = new RomanisableString(BeatmapSet.TitleUnicode, BeatmapSet.Title),
                                                         Font = OsuFont.Default.With(size: 22.5f, weight: FontWeight.SemiBold),
                                                         RelativeSizeAxes = Axes.X,
-                                                        Truncate = true
                                                     },
                                                     titleBadgeArea = new FillFlowContainer
                                                     {
@@ -140,21 +139,19 @@ namespace osu.Game.Beatmaps.Drawables.Cards
                                             {
                                                 new[]
                                                 {
-                                                    new OsuSpriteText
+                                                    new TruncatingSpriteText
                                                     {
                                                         Text = createArtistText(),
                                                         Font = OsuFont.Default.With(size: 17.5f, weight: FontWeight.SemiBold),
                                                         RelativeSizeAxes = Axes.X,
-                                                        Truncate = true
                                                     },
                                                     Empty()
                                                 },
                                             }
                                         },
-                                        new OsuSpriteText
+                                        new TruncatingSpriteText
                                         {
                                             RelativeSizeAxes = Axes.X,
-                                            Truncate = true,
                                             Text = BeatmapSet.Source,
                                             Shadow = false,
                                             Font = OsuFont.GetFont(size: 14, weight: FontWeight.SemiBold),
diff --git a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNormal.cs b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNormal.cs
index 720d892495..18e1584a98 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNormal.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNormal.cs
@@ -107,12 +107,11 @@ namespace osu.Game.Beatmaps.Drawables.Cards
                                             {
                                                 new Drawable[]
                                                 {
-                                                    new OsuSpriteText
+                                                    new TruncatingSpriteText
                                                     {
                                                         Text = new RomanisableString(BeatmapSet.TitleUnicode, BeatmapSet.Title),
                                                         Font = OsuFont.Default.With(size: 22.5f, weight: FontWeight.SemiBold),
                                                         RelativeSizeAxes = Axes.X,
-                                                        Truncate = true
                                                     },
                                                     titleBadgeArea = new FillFlowContainer
                                                     {
@@ -141,12 +140,11 @@ namespace osu.Game.Beatmaps.Drawables.Cards
                                             {
                                                 new[]
                                                 {
-                                                    new OsuSpriteText
+                                                    new TruncatingSpriteText
                                                     {
                                                         Text = createArtistText(),
                                                         Font = OsuFont.Default.With(size: 17.5f, weight: FontWeight.SemiBold),
                                                         RelativeSizeAxes = Axes.X,
-                                                        Truncate = true
                                                     },
                                                     Empty()
                                                 },
diff --git a/osu.Game/Graphics/Sprites/TruncatingSpriteText.cs b/osu.Game/Graphics/Sprites/TruncatingSpriteText.cs
new file mode 100644
index 0000000000..da0dbd49d2
--- /dev/null
+++ b/osu.Game/Graphics/Sprites/TruncatingSpriteText.cs
@@ -0,0 +1,20 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics.Cursor;
+using osu.Framework.Localisation;
+
+namespace osu.Game.Graphics.Sprites
+{
+    public sealed partial class TruncatingSpriteText : OsuSpriteText, IHasTooltip
+    {
+        public LocalisableString TooltipText => Text;
+
+        public override bool HandlePositionalInput => IsTruncated;
+
+        public TruncatingSpriteText()
+        {
+            Truncate = true;
+        }
+    }
+}
diff --git a/osu.Game/Graphics/UserInterface/OsuDropdown.cs b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
index 3230bb0569..b530172f3e 100644
--- a/osu.Game/Graphics/UserInterface/OsuDropdown.cs
+++ b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
@@ -335,12 +335,11 @@ namespace osu.Game.Graphics.UserInterface
                     {
                         new Drawable[]
                         {
-                            Text = new OsuSpriteText
+                            Text = new TruncatingSpriteText
                             {
                                 Anchor = Anchor.CentreLeft,
                                 Origin = Anchor.CentreLeft,
                                 RelativeSizeAxes = Axes.X,
-                                Truncate = true,
                             },
                             Icon = new SpriteIcon
                             {
diff --git a/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs b/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs
index 57b6f6268c..21b6147113 100644
--- a/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs
+++ b/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs
@@ -85,7 +85,7 @@ namespace osu.Game.Overlays.Chat.ChannelList
                             new Drawable?[]
                             {
                                 createIcon(),
-                                text = new OsuSpriteText
+                                text = new TruncatingSpriteText
                                 {
                                     Anchor = Anchor.CentreLeft,
                                     Origin = Anchor.CentreLeft,
@@ -94,7 +94,6 @@ namespace osu.Game.Overlays.Chat.ChannelList
                                     Colour = colourProvider.Light3,
                                     Margin = new MarginPadding { Bottom = 2 },
                                     RelativeSizeAxes = Axes.X,
-                                    Truncate = true,
                                 },
                                 createMentionPill(),
                                 close = createCloseButton(),
diff --git a/osu.Game/Overlays/Chat/ChatTextBar.cs b/osu.Game/Overlays/Chat/ChatTextBar.cs
index fd5e0e9836..87e787fcb8 100644
--- a/osu.Game/Overlays/Chat/ChatTextBar.cs
+++ b/osu.Game/Overlays/Chat/ChatTextBar.cs
@@ -73,14 +73,13 @@ namespace osu.Game.Overlays.Chat
                                 Width = chatting_text_width,
                                 Masking = true,
                                 Padding = new MarginPadding { Horizontal = padding },
-                                Child = chattingText = new OsuSpriteText
+                                Child = chattingText = new TruncatingSpriteText
                                 {
                                     MaxWidth = chatting_text_width - padding * 2,
                                     Font = OsuFont.Torus.With(size: 20),
                                     Colour = colourProvider.Background1,
                                     Anchor = Anchor.CentreRight,
                                     Origin = Anchor.CentreRight,
-                                    Truncate = true,
                                 },
                             },
                             searchIconContainer = new Container
diff --git a/osu.Game/Overlays/Chat/DrawableChatUsername.cs b/osu.Game/Overlays/Chat/DrawableChatUsername.cs
index 46e3ff5b37..18632aa4af 100644
--- a/osu.Game/Overlays/Chat/DrawableChatUsername.cs
+++ b/osu.Game/Overlays/Chat/DrawableChatUsername.cs
@@ -83,10 +83,9 @@ namespace osu.Game.Overlays.Chat
 
             Action = openUserProfile;
 
-            drawableText = new OsuSpriteText
+            drawableText = new TruncatingSpriteText
             {
                 Shadow = false,
-                Truncate = true,
                 Anchor = Anchor.TopRight,
                 Origin = Anchor.TopRight,
             };
diff --git a/osu.Game/Overlays/Dashboard/Home/DashboardBeatmapPanel.cs b/osu.Game/Overlays/Dashboard/Home/DashboardBeatmapPanel.cs
index 792d6cc785..f36e6b49bb 100644
--- a/osu.Game/Overlays/Dashboard/Home/DashboardBeatmapPanel.cs
+++ b/osu.Game/Overlays/Dashboard/Home/DashboardBeatmapPanel.cs
@@ -100,17 +100,15 @@ namespace osu.Game.Overlays.Dashboard.Home
                                         Direction = FillDirection.Vertical,
                                         Children = new Drawable[]
                                         {
-                                            new OsuSpriteText
+                                            new TruncatingSpriteText
                                             {
                                                 RelativeSizeAxes = Axes.X,
-                                                Truncate = true,
                                                 Font = OsuFont.GetFont(weight: FontWeight.Regular),
                                                 Text = BeatmapSet.Title
                                             },
-                                            new OsuSpriteText
+                                            new TruncatingSpriteText
                                             {
                                                 RelativeSizeAxes = Axes.X,
-                                                Truncate = true,
                                                 Font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular),
                                                 Text = BeatmapSet.Artist
                                             },
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 4ac2f1afda..dcb2c1071e 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -235,7 +235,7 @@ namespace osu.Game.Screens.Play.HUD
                                                             }
                                                         }
                                                     },
-                                                    usernameText = new OsuSpriteText
+                                                    usernameText = new TruncatingSpriteText
                                                     {
                                                         RelativeSizeAxes = Axes.X,
                                                         Width = 0.6f,
@@ -244,7 +244,6 @@ namespace osu.Game.Screens.Play.HUD
                                                         Colour = Color4.White,
                                                         Font = OsuFont.Torus.With(size: 14, weight: FontWeight.SemiBold),
                                                         Text = User?.Username ?? string.Empty,
-                                                        Truncate = true,
                                                         Shadow = false,
                                                     }
                                                 }
diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index f23b469f5c..fe74c1ba0d 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -101,23 +101,21 @@ namespace osu.Game.Screens.Ranking.Expanded
                         Direction = FillDirection.Vertical,
                         Children = new Drawable[]
                         {
-                            new OsuSpriteText
+                            new TruncatingSpriteText
                             {
                                 Anchor = Anchor.TopCentre,
                                 Origin = Anchor.TopCentre,
                                 Text = new RomanisableString(metadata.TitleUnicode, metadata.Title),
                                 Font = OsuFont.Torus.With(size: 20, weight: FontWeight.SemiBold),
                                 MaxWidth = ScorePanel.EXPANDED_WIDTH - padding * 2,
-                                Truncate = true,
                             },
-                            new OsuSpriteText
+                            new TruncatingSpriteText
                             {
                                 Anchor = Anchor.TopCentre,
                                 Origin = Anchor.TopCentre,
                                 Text = new RomanisableString(metadata.ArtistUnicode, metadata.Artist),
                                 Font = OsuFont.Torus.With(size: 14, weight: FontWeight.SemiBold),
                                 MaxWidth = ScorePanel.EXPANDED_WIDTH - padding * 2,
-                                Truncate = true,
                             },
                             new Container
                             {
@@ -156,14 +154,13 @@ namespace osu.Game.Screens.Ranking.Expanded
                                 AutoSizeAxes = Axes.Both,
                                 Children = new Drawable[]
                                 {
-                                    new OsuSpriteText
+                                    new TruncatingSpriteText
                                     {
                                         Anchor = Anchor.TopCentre,
                                         Origin = Anchor.TopCentre,
                                         Text = beatmap.DifficultyName,
                                         Font = OsuFont.Torus.With(size: 16, weight: FontWeight.SemiBold),
                                         MaxWidth = ScorePanel.EXPANDED_WIDTH - padding * 2,
-                                        Truncate = true,
                                     },
                                     new OsuTextFlowContainer(s => s.Font = OsuFont.Torus.With(size: 12))
                                     {
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 2102df1022..961f8684ce 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -233,12 +233,11 @@ namespace osu.Game.Screens.Select
                         RelativeSizeAxes = Axes.X,
                         Children = new Drawable[]
                         {
-                            VersionLabel = new OsuSpriteText
+                            VersionLabel = new TruncatingSpriteText
                             {
                                 Text = beatmapInfo.DifficultyName,
                                 Font = OsuFont.GetFont(size: 24, italics: true),
                                 RelativeSizeAxes = Axes.X,
-                                Truncate = true,
                             },
                         }
                     },
@@ -286,19 +285,17 @@ namespace osu.Game.Screens.Select
                         RelativeSizeAxes = Axes.X,
                         Children = new Drawable[]
                         {
-                            TitleLabel = new OsuSpriteText
+                            TitleLabel = new TruncatingSpriteText
                             {
                                 Current = { BindTarget = titleBinding },
                                 Font = OsuFont.GetFont(size: 28, italics: true),
                                 RelativeSizeAxes = Axes.X,
-                                Truncate = true,
                             },
-                            ArtistLabel = new OsuSpriteText
+                            ArtistLabel = new TruncatingSpriteText
                             {
                                 Current = { BindTarget = artistBinding },
                                 Font = OsuFont.GetFont(size: 17, italics: true),
                                 RelativeSizeAxes = Axes.X,
-                                Truncate = true,
                             },
                             MapperContainer = new FillFlowContainer
                             {

From 67562a38568ff7ded79ec7bacaa4faedea31de97 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 9 Jun 2023 14:35:29 +0900
Subject: [PATCH 0766/1604] Catch errors during score parsing

---
 osu.Game/Database/RealmAccess.cs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index 21e025c79d..493987733b 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -911,9 +911,16 @@ namespace osu.Game.Database
                             if (stream == null)
                                 continue;
 
-                            int version = new ReplayVersionParser().Parse(stream);
-                            if (version < LegacyScoreEncoder.FIRST_LAZER_VERSION)
-                                score.IsLegacyScore = true;
+                            try
+                            {
+                                int version = new ReplayVersionParser().Parse(stream);
+                                if (version < LegacyScoreEncoder.FIRST_LAZER_VERSION)
+                                    score.IsLegacyScore = true;
+                            }
+                            catch (Exception e)
+                            {
+                                Logger.Error(e, $"Failed to read replay {replayFilename}", LoggingTarget.Database);
+                            }
                         }
                     }
 

From 1ab3b43b593fdc06e1d8b987636047824fffa128 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Jun 2023 14:36:17 +0900
Subject: [PATCH 0767/1604] Fix weird right-toolbox distance snapping display
 in osu!catch editor

---
 .../Edit/DistancedHitObjectComposer.cs        | 44 ++++++++++---------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs b/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
index a8972775de..817e8bd5fe 100644
--- a/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
@@ -125,6 +125,7 @@ namespace osu.Game.Rulesets.Edit
             if (currentSnap > DistanceSpacingMultiplier.MinValue)
             {
                 currentDistanceSpacingButton.Enabled.Value = currentDistanceSpacingButton.Expanded.Value
+                                                             && !DistanceSpacingMultiplier.Disabled
                                                              && !Precision.AlmostEquals(currentSnap, DistanceSpacingMultiplier.Value, DistanceSpacingMultiplier.Precision / 2);
                 currentDistanceSpacingButton.ContractedLabelText = $"current {currentSnap:N2}x";
                 currentDistanceSpacingButton.ExpandedLabelText = $"Use current ({currentSnap:N2}x)";
@@ -141,28 +142,31 @@ namespace osu.Game.Rulesets.Edit
         {
             base.LoadComplete();
 
-            if (!DistanceSpacingMultiplier.Disabled)
+            if (DistanceSpacingMultiplier.Disabled)
             {
-                DistanceSpacingMultiplier.Value = EditorBeatmap.BeatmapInfo.DistanceSpacing;
-                DistanceSpacingMultiplier.BindValueChanged(multiplier =>
-                {
-                    distanceSpacingSlider.ContractedLabelText = $"D. S. ({multiplier.NewValue:0.##x})";
-                    distanceSpacingSlider.ExpandedLabelText = $"Distance Spacing ({multiplier.NewValue:0.##x})";
-
-                    if (multiplier.NewValue != multiplier.OldValue)
-                        onScreenDisplay?.Display(new DistanceSpacingToast(multiplier.NewValue.ToLocalisableString(@"0.##x"), multiplier));
-
-                    EditorBeatmap.BeatmapInfo.DistanceSpacing = multiplier.NewValue;
-                }, true);
-
-                // Manual binding to handle enabling distance spacing when the slider is interacted with.
-                distanceSpacingSlider.Current.BindValueChanged(spacing =>
-                {
-                    DistanceSpacingMultiplier.Value = spacing.NewValue;
-                    DistanceSnapToggle.Value = TernaryState.True;
-                });
-                DistanceSpacingMultiplier.BindValueChanged(spacing => distanceSpacingSlider.Current.Value = spacing.NewValue);
+                distanceSpacingSlider.Hide();
+                return;
             }
+
+            DistanceSpacingMultiplier.Value = EditorBeatmap.BeatmapInfo.DistanceSpacing;
+            DistanceSpacingMultiplier.BindValueChanged(multiplier =>
+            {
+                distanceSpacingSlider.ContractedLabelText = $"D. S. ({multiplier.NewValue:0.##x})";
+                distanceSpacingSlider.ExpandedLabelText = $"Distance Spacing ({multiplier.NewValue:0.##x})";
+
+                if (multiplier.NewValue != multiplier.OldValue)
+                    onScreenDisplay?.Display(new DistanceSpacingToast(multiplier.NewValue.ToLocalisableString(@"0.##x"), multiplier));
+
+                EditorBeatmap.BeatmapInfo.DistanceSpacing = multiplier.NewValue;
+            }, true);
+
+            // Manual binding to handle enabling distance spacing when the slider is interacted with.
+            distanceSpacingSlider.Current.BindValueChanged(spacing =>
+            {
+                DistanceSpacingMultiplier.Value = spacing.NewValue;
+                DistanceSnapToggle.Value = TernaryState.True;
+            });
+            DistanceSpacingMultiplier.BindValueChanged(spacing => distanceSpacingSlider.Current.Value = spacing.NewValue);
         }
 
         protected override IEnumerable<TernaryButton> CreateTernaryButtons() => base.CreateTernaryButtons().Concat(new[]

From df874b9ae8445c8daea597918c058e6fc784faa6 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 9 Jun 2023 09:16:05 +0300
Subject: [PATCH 0768/1604] Fix beatmap panel background looking different than
 usual

---
 .../Beatmaps/BeatmapPanelBackgroundTextureLoaderStore.cs     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/BeatmapPanelBackgroundTextureLoaderStore.cs b/osu.Game/Beatmaps/BeatmapPanelBackgroundTextureLoaderStore.cs
index 6d5b90521e..8f70f8a04f 100644
--- a/osu.Game/Beatmaps/BeatmapPanelBackgroundTextureLoaderStore.cs
+++ b/osu.Game/Beatmaps/BeatmapPanelBackgroundTextureLoaderStore.cs
@@ -66,7 +66,10 @@ namespace osu.Game.Beatmaps
             textureUpload.Dispose();
 
             Size size = image.Size();
-            int usableWidth = Math.Min(max_width, size.Width);
+
+            float aspectRatio = (float)size.Width / size.Height;
+
+            int usableWidth = Math.Min((int)(max_width * aspectRatio), size.Width);
             int usableHeight = Math.Min(max_height, size.Height);
 
             // Crop the centre region of the background for now.

From 78b2e6f3df1a95c83e800258594eae71862f1821 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Jun 2023 15:54:22 +0900
Subject: [PATCH 0769/1604] Add setting to limit distance snapping to current
 time

As discussed in https://github.com/ppy/osu/discussions/23815#discussioncomment-6124116.
---
 osu.Game/Configuration/OsuConfigManager.cs          |  2 ++
 osu.Game/Localisation/EditorStrings.cs              |  5 +++++
 .../Compose/Components/CircularDistanceSnapGrid.cs  |  7 +++++++
 .../Edit/Compose/Components/DistanceSnapGrid.cs     | 13 +++++++++++++
 osu.Game/Screens/Edit/Editor.cs                     |  6 ++++++
 5 files changed, 33 insertions(+)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 365ad37f4c..193068193a 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -178,6 +178,7 @@ namespace osu.Game.Configuration
             SetDefault(OsuSetting.EditorWaveformOpacity, 0.25f, 0f, 1f, 0.25f);
             SetDefault(OsuSetting.EditorShowHitMarkers, true);
             SetDefault(OsuSetting.EditorAutoSeekOnPlacement, true);
+            SetDefault(OsuSetting.EditorLimitedDistanceSnap, false);
 
             SetDefault(OsuSetting.LastProcessedMetadataId, -1);
 
@@ -383,5 +384,6 @@ namespace osu.Game.Configuration
         SafeAreaConsiderations,
         ComboColourNormalisationAmount,
         ProfileCoverExpanded,
+        EditorLimitedDistanceSnap
     }
 }
diff --git a/osu.Game/Localisation/EditorStrings.cs b/osu.Game/Localisation/EditorStrings.cs
index 20258b9c35..077bd92d4f 100644
--- a/osu.Game/Localisation/EditorStrings.cs
+++ b/osu.Game/Localisation/EditorStrings.cs
@@ -109,6 +109,11 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString RotationSnapped(float newRotation) => new TranslatableString(getKey(@"rotation_snapped"), @"{0:0}° (snapped)", newRotation);
 
+        /// <summary>
+        /// "Limit distance snap placement to current time"
+        /// </summary>
+        public static LocalisableString LimitedDistanceSnap => new TranslatableString(getKey(@"limited_distance_snap_grid"), @"Limit distance snap placement to current time");
+
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/CircularDistanceSnapGrid.cs b/osu.Game/Screens/Edit/Compose/Components/CircularDistanceSnapGrid.cs
index d6e4e1f030..2eec833832 100644
--- a/osu.Game/Screens/Edit/Compose/Components/CircularDistanceSnapGrid.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/CircularDistanceSnapGrid.cs
@@ -18,6 +18,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
 {
     public abstract partial class CircularDistanceSnapGrid : DistanceSnapGrid
     {
+        [Resolved]
+        private EditorClock editorClock { get; set; }
+
         protected CircularDistanceSnapGrid(HitObject referenceObject, Vector2 startPosition, double startTime, double? endTime = null)
             : base(referenceObject, startPosition, startTime, endTime)
         {
@@ -98,9 +101,13 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (travelLength < DistanceBetweenTicks)
                 travelLength = DistanceBetweenTicks;
 
+            if (LimitedDistanceSnap.Value)
+                travelLength = SnapProvider.DurationToDistance(ReferenceObject, editorClock.CurrentTime - ReferenceObject.GetEndTime());
+
             // When interacting with the resolved snap provider, the distance spacing multiplier should first be removed
             // to allow for snapping at a non-multiplied ratio.
             float snappedDistance = SnapProvider.FindSnappedDistance(ReferenceObject, travelLength / distanceSpacingMultiplier);
+
             double snappedTime = StartTime + SnapProvider.DistanceToDuration(ReferenceObject, snappedDistance);
 
             if (snappedTime > LatestEndTime)
diff --git a/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs b/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs
index 6092ebc08f..9882f6596f 100644
--- a/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs
@@ -10,6 +10,7 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Layout;
+using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
@@ -60,6 +61,18 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [Resolved]
         private BindableBeatDivisor beatDivisor { get; set; }
 
+        /// <summary>
+        /// When enabled, distance snap should only snap to the current time (as per the editor clock).
+        /// This is to emulate stable behaviour.
+        /// </summary>
+        protected Bindable<bool> LimitedDistanceSnap;
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            LimitedDistanceSnap = config.GetBindable<bool>(OsuSetting.EditorLimitedDistanceSnap);
+        }
+
         private readonly LayoutValue gridCache = new LayoutValue(Invalidation.RequiredParentSizeToFit);
 
         protected readonly HitObject ReferenceObject;
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index bb052b1d22..a5097916cc 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -185,6 +185,7 @@ namespace osu.Game.Screens.Edit
         private Bindable<float> editorBackgroundDim;
         private Bindable<bool> editorHitMarkers;
         private Bindable<bool> editorAutoSeekOnPlacement;
+        private Bindable<bool> editorLimitedDistanceSnap;
 
         public Editor(EditorLoader loader = null)
         {
@@ -276,6 +277,7 @@ namespace osu.Game.Screens.Edit
             editorBackgroundDim = config.GetBindable<float>(OsuSetting.EditorDim);
             editorHitMarkers = config.GetBindable<bool>(OsuSetting.EditorShowHitMarkers);
             editorAutoSeekOnPlacement = config.GetBindable<bool>(OsuSetting.EditorAutoSeekOnPlacement);
+            editorLimitedDistanceSnap = config.GetBindable<bool>(OsuSetting.EditorLimitedDistanceSnap);
 
             AddInternal(new OsuContextMenuContainer
             {
@@ -337,6 +339,10 @@ namespace osu.Game.Screens.Edit
                                             new ToggleMenuItem(EditorStrings.AutoSeekOnPlacement)
                                             {
                                                 State = { BindTarget = editorAutoSeekOnPlacement },
+                                            },
+                                            new ToggleMenuItem(EditorStrings.LimitedDistanceSnap)
+                                            {
+                                                State = { BindTarget = editorLimitedDistanceSnap },
                                             }
                                         }
                                     },

From a9071e7afd554c6e1c25fe606277e3f188700b25 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Jun 2023 17:33:59 +0900
Subject: [PATCH 0770/1604] try-catch more

---
 osu.Game/Database/RealmAccess.cs | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index 493987733b..048ff43f0a 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -902,25 +902,24 @@ namespace osu.Game.Database
                     foreach (var score in scores)
                     {
                         string? replayFilename = score.Files.FirstOrDefault(f => f.Filename.EndsWith(@".osr", StringComparison.InvariantCultureIgnoreCase))?.File.GetStoragePath();
-
                         if (replayFilename == null)
                             continue;
 
-                        using (var stream = files.Store.GetStream(replayFilename))
+                        try
                         {
-                            if (stream == null)
-                                continue;
-
-                            try
+                            using (var stream = files.Store.GetStream(replayFilename))
                             {
+                                if (stream == null)
+                                    continue;
+
                                 int version = new ReplayVersionParser().Parse(stream);
                                 if (version < LegacyScoreEncoder.FIRST_LAZER_VERSION)
                                     score.IsLegacyScore = true;
                             }
-                            catch (Exception e)
-                            {
-                                Logger.Error(e, $"Failed to read replay {replayFilename}", LoggingTarget.Database);
-                            }
+                        }
+                        catch (Exception e)
+                        {
+                            Logger.Error(e, $"Failed to read replay {replayFilename}", LoggingTarget.Database);
                         }
                     }
 

From 53f935714ea69df4e9114427939286665b22f1c0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Jun 2023 17:34:27 +0900
Subject: [PATCH 0771/1604] Inline binary reading to avoid polluting
 `RealmAccess` with nested class

---
 osu.Game/Database/RealmAccess.cs | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index 048ff43f0a..50044cb8d9 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -912,9 +912,14 @@ namespace osu.Game.Database
                                 if (stream == null)
                                     continue;
 
-                                int version = new ReplayVersionParser().Parse(stream);
-                                if (version < LegacyScoreEncoder.FIRST_LAZER_VERSION)
-                                    score.IsLegacyScore = true;
+                                // Trimmed down logic from LegacyScoreDecoder to extract the version from replays.
+                                using (SerializationReader sr = new SerializationReader(stream))
+                                {
+                                    sr.ReadByte(); // Ruleset.
+                                    int version = sr.ReadInt32();
+                                    if (version < LegacyScoreEncoder.FIRST_LAZER_VERSION)
+                                        score.IsLegacyScore = true;
+                                }
                             }
                         }
                         catch (Exception e)
@@ -1145,20 +1150,5 @@ namespace osu.Game.Database
                 isDisposed = true;
             }
         }
-
-        /// <summary>
-        /// A trimmed down <see cref="LegacyScoreDecoder"/> specialised to extract the version from replays.
-        /// </summary>
-        private class ReplayVersionParser
-        {
-            public int Parse(Stream stream)
-            {
-                using (SerializationReader sr = new SerializationReader(stream))
-                {
-                    sr.ReadByte(); // Ruleset.
-                    return sr.ReadInt32();
-                }
-            }
-        }
     }
 }

From c2663f27a1bf742ef637a59346c018ace18126d1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Jun 2023 17:58:44 +0900
Subject: [PATCH 0772/1604] Fix audio settings not displaying while watching a
 replay

---
 osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs b/osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs
index 45b2c1b13c..064d2071ce 100644
--- a/osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs
+++ b/osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs
@@ -42,7 +42,8 @@ namespace osu.Game.Screens.Play.HUD
                     //CollectionSettings = new CollectionSettings(),
                     //DiscussionSettings = new DiscussionSettings(),
                     PlaybackSettings = new PlaybackSettings { Expanded = { Value = false } },
-                    VisualSettings = new VisualSettings { Expanded = { Value = false } }
+                    VisualSettings = new VisualSettings { Expanded = { Value = false } },
+                    new AudioSettings { Expanded = { Value = false } }
                 }
             };
         }

From ca25ac446b76d7be944c7815c26ba74994bc5209 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 9 Jun 2023 11:20:12 +0200
Subject: [PATCH 0773/1604] Be slightly more specific with error message

---
 osu.Game/Database/RealmAccess.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index 50044cb8d9..63ab18db8c 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -924,7 +924,7 @@ namespace osu.Game.Database
                         }
                         catch (Exception e)
                         {
-                            Logger.Error(e, $"Failed to read replay {replayFilename}", LoggingTarget.Database);
+                            Logger.Error(e, $"Failed to read replay {replayFilename} during score migration", LoggingTarget.Database);
                         }
                     }
 

From 4685ba83e1da43d2251f0da670f8a9ba85f7a55f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Jun 2023 18:24:38 +0900
Subject: [PATCH 0774/1604] Apply NRT to `MemoryCachingComponent` classes

---
 osu.Game/Database/MemoryCachingComponent.cs   | 17 +++++-----
 osu.Game/Database/OnlineLookupCache.cs        | 31 ++++++++-----------
 osu.Game/Database/UserLookupCache.cs          | 10 ++----
 .../Online/API/Requests/GetUsersRequest.cs    |  2 --
 4 files changed, 24 insertions(+), 36 deletions(-)

diff --git a/osu.Game/Database/MemoryCachingComponent.cs b/osu.Game/Database/MemoryCachingComponent.cs
index 5d1a381f09..e98475efae 100644
--- a/osu.Game/Database/MemoryCachingComponent.cs
+++ b/osu.Game/Database/MemoryCachingComponent.cs
@@ -1,13 +1,11 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Concurrent;
+using System.Diagnostics.CodeAnalysis;
 using System.Threading;
 using System.Threading.Tasks;
-using JetBrains.Annotations;
 using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Statistics;
@@ -19,8 +17,9 @@ namespace osu.Game.Database
     /// Currently not persisted between game sessions.
     /// </summary>
     public abstract partial class MemoryCachingComponent<TLookup, TValue> : Component
+        where TLookup : notnull
     {
-        private readonly ConcurrentDictionary<TLookup, TValue> cache = new ConcurrentDictionary<TLookup, TValue>();
+        private readonly ConcurrentDictionary<TLookup, TValue?> cache = new ConcurrentDictionary<TLookup, TValue?>();
 
         private readonly GlobalStatistic<MemoryCachingStatistics> statistics;
 
@@ -37,12 +36,12 @@ namespace osu.Game.Database
         /// </summary>
         /// <param name="lookup">The lookup to retrieve.</param>
         /// <param name="token">An optional <see cref="CancellationToken"/> to cancel the operation.</param>
-        protected async Task<TValue> GetAsync([NotNull] TLookup lookup, CancellationToken token = default)
+        protected async Task<TValue?> GetAsync(TLookup lookup, CancellationToken token = default)
         {
-            if (CheckExists(lookup, out TValue performance))
+            if (CheckExists(lookup, out TValue? existing))
             {
                 statistics.Value.HitCount++;
-                return performance;
+                return existing;
             }
 
             var computed = await ComputeValueAsync(lookup, token).ConfigureAwait(false);
@@ -73,7 +72,7 @@ namespace osu.Game.Database
             statistics.Value.Usage = cache.Count;
         }
 
-        protected bool CheckExists([NotNull] TLookup lookup, out TValue value) =>
+        protected bool CheckExists(TLookup lookup, [MaybeNullWhen(false)] out TValue value) =>
             cache.TryGetValue(lookup, out value);
 
         /// <summary>
@@ -82,7 +81,7 @@ namespace osu.Game.Database
         /// <param name="lookup">The lookup to retrieve.</param>
         /// <param name="token">An optional <see cref="CancellationToken"/> to cancel the operation.</param>
         /// <returns>The computed value.</returns>
-        protected abstract Task<TValue> ComputeValueAsync(TLookup lookup, CancellationToken token = default);
+        protected abstract Task<TValue?> ComputeValueAsync(TLookup lookup, CancellationToken token = default);
 
         private class MemoryCachingStatistics
         {
diff --git a/osu.Game/Database/OnlineLookupCache.cs b/osu.Game/Database/OnlineLookupCache.cs
index d9b37e2f29..3b54804fec 100644
--- a/osu.Game/Database/OnlineLookupCache.cs
+++ b/osu.Game/Database/OnlineLookupCache.cs
@@ -1,14 +1,11 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions;
 using osu.Game.Online.API;
@@ -21,7 +18,7 @@ namespace osu.Game.Database
         where TRequest : APIRequest
     {
         [Resolved]
-        private IAPIProvider api { get; set; }
+        private IAPIProvider api { get; set; } = null!;
 
         /// <summary>
         /// Creates an <see cref="APIRequest"/> to retrieve the values for a given collection of <typeparamref name="TLookup"/>s.
@@ -32,8 +29,7 @@ namespace osu.Game.Database
         /// <summary>
         /// Retrieves a list of <typeparamref name="TValue"/>s from a successful <typeparamref name="TRequest"/> created by <see cref="CreateRequest"/>.
         /// </summary>
-        [CanBeNull]
-        protected abstract IEnumerable<TValue> RetrieveResults(TRequest request);
+        protected abstract IEnumerable<TValue>? RetrieveResults(TRequest request);
 
         /// <summary>
         /// Perform a lookup using the specified <paramref name="id"/>, populating a <typeparamref name="TValue"/>.
@@ -41,8 +37,7 @@ namespace osu.Game.Database
         /// <param name="id">The ID to lookup.</param>
         /// <param name="token">An optional cancellation token.</param>
         /// <returns>The populated <typeparamref name="TValue"/>, or null if the value does not exist or the request could not be satisfied.</returns>
-        [ItemCanBeNull]
-        protected Task<TValue> LookupAsync(TLookup id, CancellationToken token = default) => GetAsync(id, token);
+        protected Task<TValue?> LookupAsync(TLookup id, CancellationToken token = default) => GetAsync(id, token);
 
         /// <summary>
         /// Perform an API lookup on the specified <paramref name="ids"/>, populating a <typeparamref name="TValue"/>.
@@ -50,9 +45,9 @@ namespace osu.Game.Database
         /// <param name="ids">The IDs to lookup.</param>
         /// <param name="token">An optional cancellation token.</param>
         /// <returns>The populated values. May include null results for failed retrievals.</returns>
-        protected Task<TValue[]> LookupAsync(TLookup[] ids, CancellationToken token = default)
+        protected Task<TValue?[]> LookupAsync(TLookup[] ids, CancellationToken token = default)
         {
-            var lookupTasks = new List<Task<TValue>>();
+            var lookupTasks = new List<Task<TValue?>>();
 
             foreach (var id in ids)
             {
@@ -69,18 +64,18 @@ namespace osu.Game.Database
         }
 
         // cannot be sealed due to test usages (see TestUserLookupCache).
-        protected override async Task<TValue> ComputeValueAsync(TLookup lookup, CancellationToken token = default)
+        protected override async Task<TValue?> ComputeValueAsync(TLookup lookup, CancellationToken token = default)
             => await queryValue(lookup).ConfigureAwait(false);
 
-        private readonly Queue<(TLookup id, TaskCompletionSource<TValue>)> pendingTasks = new Queue<(TLookup, TaskCompletionSource<TValue>)>();
-        private Task pendingRequestTask;
+        private readonly Queue<(TLookup id, TaskCompletionSource<TValue?>)> pendingTasks = new Queue<(TLookup, TaskCompletionSource<TValue?>)>();
+        private Task? pendingRequestTask;
         private readonly object taskAssignmentLock = new object();
 
-        private Task<TValue> queryValue(TLookup id)
+        private Task<TValue?> queryValue(TLookup id)
         {
             lock (taskAssignmentLock)
             {
-                var tcs = new TaskCompletionSource<TValue>();
+                var tcs = new TaskCompletionSource<TValue?>();
 
                 // Add to the queue.
                 pendingTasks.Enqueue((id, tcs));
@@ -96,14 +91,14 @@ namespace osu.Game.Database
         private async Task performLookup()
         {
             // contains at most 50 unique IDs from tasks, which is used to perform the lookup.
-            var nextTaskBatch = new Dictionary<TLookup, List<TaskCompletionSource<TValue>>>();
+            var nextTaskBatch = new Dictionary<TLookup, List<TaskCompletionSource<TValue?>>>();
 
             // Grab at most 50 unique IDs from the queue.
             lock (taskAssignmentLock)
             {
                 while (pendingTasks.Count > 0 && nextTaskBatch.Count < 50)
                 {
-                    (TLookup id, TaskCompletionSource<TValue> task) next = pendingTasks.Dequeue();
+                    (TLookup id, TaskCompletionSource<TValue?> task) next = pendingTasks.Dequeue();
 
                     // Perform a secondary check for existence, in case the value was queried in a previous batch.
                     if (CheckExists(next.id, out var existing))
@@ -113,7 +108,7 @@ namespace osu.Game.Database
                         if (nextTaskBatch.TryGetValue(next.id, out var tasks))
                             tasks.Add(next.task);
                         else
-                            nextTaskBatch[next.id] = new List<TaskCompletionSource<TValue>> { next.task };
+                            nextTaskBatch[next.id] = new List<TaskCompletionSource<TValue?>> { next.task };
                     }
                 }
             }
diff --git a/osu.Game/Database/UserLookupCache.cs b/osu.Game/Database/UserLookupCache.cs
index b1609fbf7b..e581d5ce82 100644
--- a/osu.Game/Database/UserLookupCache.cs
+++ b/osu.Game/Database/UserLookupCache.cs
@@ -1,13 +1,10 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using JetBrains.Annotations;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
 
@@ -21,8 +18,7 @@ namespace osu.Game.Database
         /// <param name="userId">The user to lookup.</param>
         /// <param name="token">An optional cancellation token.</param>
         /// <returns>The populated user, or null if the user does not exist or the request could not be satisfied.</returns>
-        [ItemCanBeNull]
-        public Task<APIUser> GetUserAsync(int userId, CancellationToken token = default) => LookupAsync(userId, token);
+        public Task<APIUser?> GetUserAsync(int userId, CancellationToken token = default) => LookupAsync(userId, token);
 
         /// <summary>
         /// Perform an API lookup on the specified users, populating a <see cref="APIUser"/> model.
@@ -30,10 +26,10 @@ namespace osu.Game.Database
         /// <param name="userIds">The users to lookup.</param>
         /// <param name="token">An optional cancellation token.</param>
         /// <returns>The populated users. May include null results for failed retrievals.</returns>
-        public Task<APIUser[]> GetUsersAsync(int[] userIds, CancellationToken token = default) => LookupAsync(userIds, token);
+        public Task<APIUser?[]> GetUsersAsync(int[] userIds, CancellationToken token = default) => LookupAsync(userIds, token);
 
         protected override GetUsersRequest CreateRequest(IEnumerable<int> ids) => new GetUsersRequest(ids.ToArray());
 
-        protected override IEnumerable<APIUser> RetrieveResults(GetUsersRequest request) => request.Response?.Users;
+        protected override IEnumerable<APIUser>? RetrieveResults(GetUsersRequest request) => request.Response?.Users;
     }
 }
diff --git a/osu.Game/Online/API/Requests/GetUsersRequest.cs b/osu.Game/Online/API/Requests/GetUsersRequest.cs
index b57bb215aa..6f7e9c07d2 100644
--- a/osu.Game/Online/API/Requests/GetUsersRequest.cs
+++ b/osu.Game/Online/API/Requests/GetUsersRequest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 
 namespace osu.Game.Online.API.Requests

From c5e77e13de1c81017459dc3e14306f4fe81bd7f2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Jun 2023 19:03:02 +0900
Subject: [PATCH 0775/1604] Add a very simple user cache to `ScoreImporter`

---
 osu.Game/Scoring/ScoreImporter.cs | 34 ++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index f69c1b9385..1c24cfbc85 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -146,16 +146,48 @@ namespace osu.Game.Scoring
 #pragma warning restore CS0618
         }
 
+        // Very naive local caching to improve performance of large score imports (where the username is usually the same for most or all scores).
+        private readonly Dictionary<string, APIUser> usernameLookupCache = new Dictionary<string, APIUser>();
+
         protected override void PostImport(ScoreInfo model, Realm realm, ImportParameters parameters)
         {
             base.PostImport(model, realm, parameters);
 
-            var userRequest = new GetUserRequest(model.RealmUser.Username);
+            populateUserDetails(model);
+        }
+
+        /// <summary>
+        /// Legacy replays only store a username.
+        /// This will populate a user ID during import.
+        /// </summary>
+        private void populateUserDetails(ScoreInfo model)
+        {
+            string username = model.RealmUser.Username;
+
+            if (usernameLookupCache.TryGetValue(username, out var existing))
+            {
+                model.User = existing;
+                return;
+            }
+
+            var userRequest = new GetUserRequest(username);
 
             api.Perform(userRequest);
 
             if (userRequest.Response is APIUser user)
+            {
+                usernameLookupCache.TryAdd(username, new APIUser
+                {
+                    // Because this is a permanent cache, let's only store the pieces we're interested in,
+                    // rather than the full API response. If we start to store more than these three fields
+                    // in realm, this should be undone.
+                    Id = user.Id,
+                    Username = user.Username,
+                    CountryCode = user.CountryCode,
+                });
+
                 model.User = user;
+            }
         }
     }
 }

From 49c77a64efeb5886abe5de78aa820c7ded8a5558 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Jun 2023 19:30:28 +0900
Subject: [PATCH 0776/1604] Apply more correct fix, factoring in minimum
 display ratio

---
 ...eatmapPanelBackgroundTextureLoaderStore.cs | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapPanelBackgroundTextureLoaderStore.cs b/osu.Game/Beatmaps/BeatmapPanelBackgroundTextureLoaderStore.cs
index 8f70f8a04f..110cebbe0e 100644
--- a/osu.Game/Beatmaps/BeatmapPanelBackgroundTextureLoaderStore.cs
+++ b/osu.Game/Beatmaps/BeatmapPanelBackgroundTextureLoaderStore.cs
@@ -17,9 +17,8 @@ namespace osu.Game.Beatmaps
     // If issues are found it's worth checking to make sure similar issues exist there.
     public class BeatmapPanelBackgroundTextureLoaderStore : IResourceStore<TextureUpload>
     {
-        // These numbers are taken from the draw visualiser size requirements for song select panel textures at extreme aspect ratios.
-        private const int max_height = 130;
-        private const int max_width = 1280;
+        // The aspect ratio of SetPanelBackground at its maximum size (very tall window).
+        private const float minimum_display_ratio = 512 / 80f;
 
         private readonly IResourceStore<TextureUpload>? textureStore;
 
@@ -67,16 +66,18 @@ namespace osu.Game.Beatmaps
 
             Size size = image.Size();
 
-            float aspectRatio = (float)size.Width / size.Height;
-
-            int usableWidth = Math.Min((int)(max_width * aspectRatio), size.Width);
-            int usableHeight = Math.Min(max_height, size.Height);
+            // Assume that panel backgrounds are always displayed using `FillMode.Fill`.
+            // Also assume that all backgrounds are wider than they are tall, so the
+            // fill is always going to be based on width.
+            //
+            // We need to include enough height to make this work for all ratio panels are displayed at.
+            int usableHeight = (int)Math.Ceiling(size.Width * 1 / minimum_display_ratio);
 
             // Crop the centre region of the background for now.
             Rectangle cropRectangle = new Rectangle(
-                (size.Width - usableWidth) / 2,
+                0,
                 (size.Height - usableHeight) / 2,
-                usableWidth,
+                size.Width,
                 usableHeight
             );
 

From 11694f35fe5f475e6321121c1708add60983eb70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 9 Jun 2023 13:47:35 +0200
Subject: [PATCH 0777/1604] Apply NRT in `MemoryCachingComponent` subclasses
 too

---
 osu.Game/Database/BeatmapLookupCache.cs   | 10 +++-------
 osu.Game/Scoring/ScorePerformanceCache.cs |  9 +++------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Database/BeatmapLookupCache.cs b/osu.Game/Database/BeatmapLookupCache.cs
index d9bf0138dc..973c25ec4f 100644
--- a/osu.Game/Database/BeatmapLookupCache.cs
+++ b/osu.Game/Database/BeatmapLookupCache.cs
@@ -1,13 +1,10 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using JetBrains.Annotations;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
 
@@ -21,8 +18,7 @@ namespace osu.Game.Database
         /// <param name="beatmapId">The beatmap to lookup.</param>
         /// <param name="token">An optional cancellation token.</param>
         /// <returns>The populated beatmap, or null if the beatmap does not exist or the request could not be satisfied.</returns>
-        [ItemCanBeNull]
-        public Task<APIBeatmap> GetBeatmapAsync(int beatmapId, CancellationToken token = default) => LookupAsync(beatmapId, token);
+        public Task<APIBeatmap?> GetBeatmapAsync(int beatmapId, CancellationToken token = default) => LookupAsync(beatmapId, token);
 
         /// <summary>
         /// Perform an API lookup on the specified beatmaps, populating a <see cref="APIBeatmap"/> model.
@@ -30,10 +26,10 @@ namespace osu.Game.Database
         /// <param name="beatmapIds">The beatmaps to lookup.</param>
         /// <param name="token">An optional cancellation token.</param>
         /// <returns>The populated beatmaps. May include null results for failed retrievals.</returns>
-        public Task<APIBeatmap[]> GetBeatmapsAsync(int[] beatmapIds, CancellationToken token = default) => LookupAsync(beatmapIds, token);
+        public Task<APIBeatmap?[]> GetBeatmapsAsync(int[] beatmapIds, CancellationToken token = default) => LookupAsync(beatmapIds, token);
 
         protected override GetBeatmapsRequest CreateRequest(IEnumerable<int> ids) => new GetBeatmapsRequest(ids.ToArray());
 
-        protected override IEnumerable<APIBeatmap> RetrieveResults(GetBeatmapsRequest request) => request.Response?.Beatmaps;
+        protected override IEnumerable<APIBeatmap>? RetrieveResults(GetBeatmapsRequest request) => request.Response?.Beatmaps;
     }
 }
diff --git a/osu.Game/Scoring/ScorePerformanceCache.cs b/osu.Game/Scoring/ScorePerformanceCache.cs
index 17a0c0ea6a..bdbcfe4efe 100644
--- a/osu.Game/Scoring/ScorePerformanceCache.cs
+++ b/osu.Game/Scoring/ScorePerformanceCache.cs
@@ -1,12 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
@@ -21,7 +18,7 @@ namespace osu.Game.Scoring
     public partial class ScorePerformanceCache : MemoryCachingComponent<ScorePerformanceCache.PerformanceCacheLookup, PerformanceAttributes>
     {
         [Resolved]
-        private BeatmapDifficultyCache difficultyCache { get; set; }
+        private BeatmapDifficultyCache difficultyCache { get; set; } = null!;
 
         protected override bool CacheNullValues => false;
 
@@ -30,10 +27,10 @@ namespace osu.Game.Scoring
         /// </summary>
         /// <param name="score">The score to do the calculation on. </param>
         /// <param name="token">An optional <see cref="CancellationToken"/> to cancel the operation.</param>
-        public Task<PerformanceAttributes> CalculatePerformanceAsync([NotNull] ScoreInfo score, CancellationToken token = default) =>
+        public Task<PerformanceAttributes?> CalculatePerformanceAsync(ScoreInfo score, CancellationToken token = default) =>
             GetAsync(new PerformanceCacheLookup(score), token);
 
-        protected override async Task<PerformanceAttributes> ComputeValueAsync(PerformanceCacheLookup lookup, CancellationToken token = default)
+        protected override async Task<PerformanceAttributes?> ComputeValueAsync(PerformanceCacheLookup lookup, CancellationToken token = default)
         {
             var score = lookup.ScoreInfo;
 

From 58507291b9c213e94c6ca2337f379ecc01f68899 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 9 Jun 2023 13:47:50 +0200
Subject: [PATCH 0778/1604] Apply NRT in `MemoryCachingComponent` test-only
 subclasses

---
 .../Online/TestSceneCurrentlyPlayingDisplay.cs     | 12 +++++-------
 .../SongSelect/TestSceneBeatmapMetadataDisplay.cs  | 14 ++++++++------
 osu.Game/Tests/Visual/TestUserLookupCache.cs       |  8 +++-----
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
index 4f825e1191..885c00be80 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Linq;
 using System.Threading;
@@ -24,8 +22,8 @@ namespace osu.Game.Tests.Visual.Online
     {
         private readonly APIUser streamingUser = new APIUser { Id = 2, Username = "Test user" };
 
-        private TestSpectatorClient spectatorClient;
-        private CurrentlyPlayingDisplay currentlyPlaying;
+        private TestSpectatorClient spectatorClient = null!;
+        private CurrentlyPlayingDisplay currentlyPlaying = null!;
 
         [SetUpSteps]
         public void SetUpSteps()
@@ -88,13 +86,13 @@ namespace osu.Game.Tests.Visual.Online
                 "pishifat"
             };
 
-            protected override Task<APIUser> ComputeValueAsync(int lookup, CancellationToken token = default)
+            protected override Task<APIUser?> ComputeValueAsync(int lookup, CancellationToken token = default)
             {
                 // tests against failed lookups
                 if (lookup == 13)
-                    return Task.FromResult<APIUser>(null);
+                    return Task.FromResult<APIUser?>(null);
 
-                return Task.FromResult(new APIUser
+                return Task.FromResult<APIUser?>(new APIUser
                 {
                     Id = lookup,
                     Username = usernames[lookup % usernames.Length],
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
index c2537cff79..379bd838cd 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
@@ -1,10 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -24,10 +23,10 @@ namespace osu.Game.Tests.Visual.SongSelect
 {
     public partial class TestSceneBeatmapMetadataDisplay : OsuTestScene
     {
-        private BeatmapMetadataDisplay display;
+        private BeatmapMetadataDisplay display = null!;
 
         [Resolved]
-        private BeatmapManager manager { get; set; }
+        private BeatmapManager manager { get; set; } = null!;
 
         [Cached(typeof(BeatmapDifficultyCache))]
         private readonly TestBeatmapDifficultyCache testDifficultyCache = new TestBeatmapDifficultyCache();
@@ -121,7 +120,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private partial class TestBeatmapDifficultyCache : BeatmapDifficultyCache
         {
-            private TaskCompletionSource<bool> calculationBlocker;
+            private TaskCompletionSource<bool>? calculationBlocker;
 
             private bool blockCalculation;
 
@@ -142,10 +141,13 @@ namespace osu.Game.Tests.Visual.SongSelect
                 }
             }
 
-            public override async Task<StarDifficulty?> GetDifficultyAsync(IBeatmapInfo beatmapInfo, IRulesetInfo rulesetInfo = null, IEnumerable<Mod> mods = null, CancellationToken cancellationToken = default)
+            public override async Task<StarDifficulty?> GetDifficultyAsync(IBeatmapInfo beatmapInfo, IRulesetInfo? rulesetInfo = null, IEnumerable<Mod>? mods = null, CancellationToken cancellationToken = default)
             {
                 if (blockCalculation)
+                {
+                    Debug.Assert(calculationBlocker != null);
                     await calculationBlocker.Task.ConfigureAwait(false);
+                }
 
                 return await base.GetDifficultyAsync(beatmapInfo, rulesetInfo, mods, cancellationToken).ConfigureAwait(false);
             }
diff --git a/osu.Game/Tests/Visual/TestUserLookupCache.cs b/osu.Game/Tests/Visual/TestUserLookupCache.cs
index a3028f1a34..261e0fa75c 100644
--- a/osu.Game/Tests/Visual/TestUserLookupCache.cs
+++ b/osu.Game/Tests/Visual/TestUserLookupCache.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Threading;
 using System.Threading.Tasks;
 using osu.Game.Database;
@@ -18,12 +16,12 @@ namespace osu.Game.Tests.Visual
         /// </summary>
         public const int UNRESOLVED_USER_ID = -1;
 
-        protected override Task<APIUser> ComputeValueAsync(int lookup, CancellationToken token = default)
+        protected override Task<APIUser?> ComputeValueAsync(int lookup, CancellationToken token = default)
         {
             if (lookup == UNRESOLVED_USER_ID)
-                return Task.FromResult((APIUser)null);
+                return Task.FromResult<APIUser?>(null);
 
-            return Task.FromResult(new APIUser
+            return Task.FromResult<APIUser?>(new APIUser
             {
                 Id = lookup,
                 Username = $"User {lookup}"

From 287229efd5f2f0633510daa691b11eb982742124 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 9 Jun 2023 14:25:53 +0200
Subject: [PATCH 0779/1604] Fix code quality inspection

---
 osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs
index 1d496cc636..cce633d46a 100644
--- a/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs
+++ b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Online.Rooms
                 {
                     var beatmap = task.GetResultSafely();
 
-                    if (SelectedItem.Value?.Beatmap.OnlineID == beatmap.OnlineID)
+                    if (beatmap != null && SelectedItem.Value?.Beatmap.OnlineID == beatmap.OnlineID)
                     {
                         selectedBeatmap = beatmap;
                         beginTracking();

From 2823a62b5fe82c2232951198b73ac4253d7835f0 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 9 Jun 2023 15:27:53 +0300
Subject: [PATCH 0780/1604] Avoid potential cropping error on very tall
 backgrounds

---
 osu.Game/Beatmaps/BeatmapPanelBackgroundTextureLoaderStore.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Beatmaps/BeatmapPanelBackgroundTextureLoaderStore.cs b/osu.Game/Beatmaps/BeatmapPanelBackgroundTextureLoaderStore.cs
index 110cebbe0e..acd60b664d 100644
--- a/osu.Game/Beatmaps/BeatmapPanelBackgroundTextureLoaderStore.cs
+++ b/osu.Game/Beatmaps/BeatmapPanelBackgroundTextureLoaderStore.cs
@@ -73,6 +73,8 @@ namespace osu.Game.Beatmaps
             // We need to include enough height to make this work for all ratio panels are displayed at.
             int usableHeight = (int)Math.Ceiling(size.Width * 1 / minimum_display_ratio);
 
+            usableHeight = Math.Min(size.Height, usableHeight);
+
             // Crop the centre region of the background for now.
             Rectangle cropRectangle = new Rectangle(
                 0,

From 52412c673d45eb9bb1cbef5d6e54644082907b16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 9 Jun 2023 14:47:34 +0200
Subject: [PATCH 0781/1604] Bump replay version in encoder after Score V2
 changes

One release too late, but this may help in the future if we need to
discern replays set with Score V2 from older lazer replays.
---
 osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
index a78ae24da2..87e1e79f87 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
@@ -28,9 +28,10 @@ namespace osu.Game.Scoring.Legacy
         /// <remarks>
         /// <list type="bullet">
         /// <item><description>30000001: Appends <see cref="LegacyReplaySoloScoreInfo"/> to the end of scores.</description></item>
+        /// <item><description>30000002: Score stored to replay calculated using the Score V2 algorithm.</description></item>
         /// </list>
         /// </remarks>
-        public const int LATEST_VERSION = 30000001;
+        public const int LATEST_VERSION = 30000002;
 
         /// <summary>
         /// The first stable-compatible YYYYMMDD format version given to lazer usage of replays.

From c3b50e130997cd36fa440e4116c66276b5f2685d Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Fri, 9 Jun 2023 16:25:04 +0300
Subject: [PATCH 0782/1604] Move the multiplier back to `TopRight`

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 3795ed729d..6345916e63 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -219,8 +219,8 @@ namespace osu.Game.Overlays.Mods
             {
                 aboveColumnsContent.Add(multiplierDisplay = new DifficultyMultiplierDisplay
                 {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre
+                    Anchor = Anchor.TopRight,
+                    Origin = Anchor.TopRight
                 });
             }
 

From 7697dbe4b3aec9ebe5788d55e0f4027f3bf4e4af Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Fri, 9 Jun 2023 16:55:19 +0300
Subject: [PATCH 0783/1604] Mod panel don't play sound when hidden

---
 osu.Game/Overlays/Mods/ModColumn.cs      | 4 ++--
 osu.Game/Overlays/Mods/ModSelectPanel.cs | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModColumn.cs b/osu.Game/Overlays/Mods/ModColumn.cs
index 9146cd7abe..363f5c5d0f 100644
--- a/osu.Game/Overlays/Mods/ModColumn.cs
+++ b/osu.Game/Overlays/Mods/ModColumn.cs
@@ -212,8 +212,8 @@ namespace osu.Game.Overlays.Mods
 
             foreach (var button in availableMods.Where(b => b.Active.Value))
             {
-                if (Alpha == 0f)
-                    button.Active.Value = false; //If column is hidden change state manually without any animation
+                if (!button.Visible)
+                    button.Active.Value = false; //If mod panel is hidden change state manually without any animation
                 else
                     pendingSelectionOperations.Enqueue(() => button.Active.Value = false);
             }
diff --git a/osu.Game/Overlays/Mods/ModSelectPanel.cs b/osu.Game/Overlays/Mods/ModSelectPanel.cs
index 90663d083c..9d87e1da90 100644
--- a/osu.Game/Overlays/Mods/ModSelectPanel.cs
+++ b/osu.Game/Overlays/Mods/ModSelectPanel.cs
@@ -193,6 +193,9 @@ namespace osu.Game.Overlays.Mods
             if (samplePlaybackDisabled.Value)
                 return;
 
+            if (!IsPresent)
+                return;
+
             if (Active.Value)
                 sampleOn?.Play();
             else

From d219b5f77f33b443a3a57d91368bae74f658c7a7 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Fri, 9 Jun 2023 17:10:13 +0300
Subject: [PATCH 0784/1604] Reword change focus comment

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 6345916e63..574d18de0e 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -838,7 +838,8 @@ namespace osu.Game.Overlays.Mods
                 if (!Active.Value)
                     RequestScroll?.Invoke(this);
 
-                //Kill focus on SearchTextBox
+                //By doing this we kill the focus on SearchTextBox.
+                //Killing focus is done here because it's the only feasible place on ModSelectOverlay you can click on without triggering any action.
                 Scheduler.Add(() => GetContainingInputManager().ChangeFocus(null));
 
                 return true;

From 4b8c4bd503075fa76a375ee90fc42838338eeb69 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Sat, 10 Jun 2023 01:51:53 +0900
Subject: [PATCH 0785/1604] Fix black jaggies around argon hitcircles

---
 osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs
index 1c5cf49625..83de50184f 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs
@@ -62,7 +62,10 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
             {
                 outerFill = new Circle // renders white outer border and dark fill
                 {
-                    Size = Size,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    // Slightly inset to prevent bleeding outside the ring
+                    Size = Size - new Vector2(0.5f),
                     Alpha = withOuterFill ? 1 : 0,
                 },
                 outerGradient = new Circle // renders the outer bright gradient

From 7bf73463f1ae711066074ec704e25b711738ff4f Mon Sep 17 00:00:00 2001
From: Xinnoh <30382015+Xinnoh@users.noreply.github.com>
Date: Fri, 9 Jun 2023 22:46:07 -0700
Subject: [PATCH 0786/1604] reduce argon kiai flashing

---
 osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonCirclePiece.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonCirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonCirclePiece.cs
index d7e37899ce..e67417c384 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonCirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonCirclePiece.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
 
         private const double pre_beat_transition_time = 80;
 
-        private const float flash_opacity = 0.3f;
+        private const float flash_opacity = 0.15f;
 
         private ColourInfo accentColour;
 

From 0c42aa7f3b19d810d2eac06803697060b179922b Mon Sep 17 00:00:00 2001
From: Xinnoh <30382015+Xinnoh@users.noreply.github.com>
Date: Fri, 9 Jun 2023 22:51:45 -0700
Subject: [PATCH 0787/1604] lower kiai pulse brightness

---
 osu.Game.Rulesets.Taiko/Skinning/Default/CirclePiece.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Default/CirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Default/CirclePiece.cs
index bde502bbed..776996fdd2 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Default/CirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Default/CirclePiece.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Default
 
         private const double pre_beat_transition_time = 80;
 
-        private const float flash_opacity = 0.3f;
+        private const float flash_opacity = 0.15f;
 
         [Resolved]
         private DrawableHitObject drawableHitObject { get; set; } = null!;

From 9224486ec7b5c4f868438b395458b5c5328ca69a Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Sat, 10 Jun 2023 12:38:26 +0300
Subject: [PATCH 0788/1604] Add mod select overlay statics

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    |  2 ++
 .../Overlays/Mods/ModSelectOverlayStatics.cs  | 20 +++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 osu.Game/Overlays/Mods/ModSelectOverlayStatics.cs

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 38ae8c68cb..a46de75273 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -103,6 +103,8 @@ namespace osu.Game.Overlays.Mods
 
         private readonly BindableBool customisationVisible = new BindableBool();
 
+        protected readonly ModSelectOverlayStatics statics = new ModSelectOverlayStatics();
+
         private ModSettingsArea modSettingsArea = null!;
         private ColumnScrollContainer columnScroll = null!;
         private ColumnFlowContainer columnFlow = null!;
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlayStatics.cs b/osu.Game/Overlays/Mods/ModSelectOverlayStatics.cs
new file mode 100644
index 0000000000..91f7f2180d
--- /dev/null
+++ b/osu.Game/Overlays/Mods/ModSelectOverlayStatics.cs
@@ -0,0 +1,20 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Game.Configuration;
+
+namespace osu.Game.Overlays.Mods
+{
+    public class ModSelectOverlayStatics : InMemoryConfigManager<Static>
+    {
+        protected override void InitialiseDefaults()
+        {
+            SetDefault(Static.LastModSelectPanelSoundPlaybackTime, (double?)null);
+        }
+    }
+
+    public enum Static
+    {
+        LastModSelectPanelSoundPlaybackTime
+    }
+}

From 09cd5580e133218739c2dfde63d1871b82e435c8 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Sat, 10 Jun 2023 13:13:34 +0300
Subject: [PATCH 0789/1604] Add sample playback time restrictions

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs        |  3 ++-
 osu.Game/Overlays/Mods/ModSelectOverlayStatics.cs |  4 ++--
 osu.Game/Overlays/Mods/ModSelectPanel.cs          | 11 +++++++++++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index a46de75273..f2b61e3543 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -103,7 +103,8 @@ namespace osu.Game.Overlays.Mods
 
         private readonly BindableBool customisationVisible = new BindableBool();
 
-        protected readonly ModSelectOverlayStatics statics = new ModSelectOverlayStatics();
+        [Cached]
+        protected readonly ModSelectOverlayStatics Statics = new ModSelectOverlayStatics();
 
         private ModSettingsArea modSettingsArea = null!;
         private ColumnScrollContainer columnScroll = null!;
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlayStatics.cs b/osu.Game/Overlays/Mods/ModSelectOverlayStatics.cs
index 91f7f2180d..d9e66d8f4f 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlayStatics.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlayStatics.cs
@@ -9,12 +9,12 @@ namespace osu.Game.Overlays.Mods
     {
         protected override void InitialiseDefaults()
         {
-            SetDefault(Static.LastModSelectPanelSoundPlaybackTime, (double?)null);
+            SetDefault(Static.LastModSelectPanelSamplePlaybackTime, (double?)null);
         }
     }
 
     public enum Static
     {
-        LastModSelectPanelSoundPlaybackTime
+        LastModSelectPanelSamplePlaybackTime
     }
 }
diff --git a/osu.Game/Overlays/Mods/ModSelectPanel.cs b/osu.Game/Overlays/Mods/ModSelectPanel.cs
index 81285833bd..42f72fbdca 100644
--- a/osu.Game/Overlays/Mods/ModSelectPanel.cs
+++ b/osu.Game/Overlays/Mods/ModSelectPanel.cs
@@ -44,6 +44,7 @@ namespace osu.Game.Overlays.Mods
 
         public const float CORNER_RADIUS = 7;
         public const float HEIGHT = 42;
+        public double SAMPLE_PLAYBACK_DELAY = 30;
 
         protected virtual float IdleSwitchWidth => 14;
         protected virtual float ExpandedSwitchWidth => 30;
@@ -62,6 +63,9 @@ namespace osu.Game.Overlays.Mods
         [Resolved]
         protected OverlayColourProvider ColourProvider { get; private set; } = null!;
 
+        [Resolved]
+        protected ModSelectOverlayStatics ModOverlayStatics { get; private set; } = null!;
+
         private readonly OsuSpriteText titleText;
         private readonly OsuSpriteText descriptionText;
 
@@ -192,10 +196,17 @@ namespace osu.Game.Overlays.Mods
             if (samplePlaybackDisabled.Value)
                 return;
 
+            double? lastPlaybackTime = ModOverlayStatics.Get<double?>(Static.LastModSelectPanelSamplePlaybackTime);
+
+            if (lastPlaybackTime is not null && Time.Current - lastPlaybackTime < SAMPLE_PLAYBACK_DELAY)
+                return;
+
             if (Active.Value)
                 sampleOn?.Play();
             else
                 sampleOff?.Play();
+
+            ModOverlayStatics.SetValue<double?>(Static.LastModSelectPanelSamplePlaybackTime, Time.Current);
         }
 
         protected override bool OnHover(HoverEvent e)

From 3bf900a4df9299a3cd9bcae8caa57b42372934a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 10 Jun 2023 10:30:10 +0200
Subject: [PATCH 0790/1604] Add failing test case for slider scenario

---
 .../Mods/TestSceneOsuModAutoplay.cs           | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs
index 616a9c362d..32028823ae 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs
@@ -1,22 +1,29 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Skinning.Default;
 using osu.Game.Rulesets.Osu.UI;
+using osu.Game.Rulesets.Scoring;
+using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests.Mods
 {
     public partial class TestSceneOsuModAutoplay : OsuModTestScene
     {
+        protected override bool AllowFail => true;
+
         [Test]
         public void TestCursorPositionStoredToJudgement()
         {
@@ -44,6 +51,36 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                 FinalRate = { Value = 1.3 }
             });
 
+        [Test]
+        public void TestPerfectScoreOnShortSliderWithRepeat()
+        {
+            AddStep("set score to standardised", () => LocalConfig.SetValue(OsuSetting.ScoreDisplayMode, ScoringMode.Standardised));
+
+            CreateModTest(new ModTestData
+            {
+                Autoplay = true,
+                Beatmap = new Beatmap
+                {
+                    HitObjects = new List<HitObject>
+                    {
+                        new Slider
+                        {
+                            StartTime = 500,
+                            Position = new Vector2(256, 192),
+                            Path = new SliderPath(new[]
+                            {
+                                new PathControlPoint(),
+                                new PathControlPoint(new Vector2(0, 6.25f))
+                            }),
+                            RepeatCount = 1,
+                            SliderVelocity = 10
+                        }
+                    }
+                },
+                PassCondition = () => Player.ScoreProcessor.TotalScore.Value == 1_000_000
+            });
+        }
+
         private void runSpmTest(Mod mod)
         {
             SpinnerSpmCalculator? spmCalculator = null;

From 7e5533e2057a215f8bcbc9b9f1e9edc2282edcdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 10 Jun 2023 11:02:29 +0200
Subject: [PATCH 0791/1604] Fix not being able to receive full score for
 extremely short sliders with repeats

Closes #23862.

Score V2 is a scoring algorithm, which aside from the raw numerical
values of each judgement, incorporates a combo component, wherein each
judgement's "combo score" is derived from both the raw numerical value
of the object and the current combo after the given judgement. In
particular, this means that Score V2 is sensitive to the _order_ of
judging objects, as if two objects with the same start time are judged
using different ordering, they can end up having a different "combo
score".

The issue that this change is fixing is an instance of one such
reordering. Upon inspection, it turned out that the simulated autoplay
run, which is used to determine max possible score so that it can be
standardised to 1 million again, was processing a slider repeat before a
slider tail circle, while actual gameplay was processing the same slider
repeat _after_ the slider tail circle.

The cause of that behaviour is unfortunately due to `LegacyLastTick`.
The sliders which cause the issue are extremely short. Stable had a
behaviour, in which to provide leniency, slider tails were artificially
offset back by 36ms. However, if the slider is not long enough to make
this possible, the last tick is placed in the middle of the slider. If
that slider also happens to have exactly 1 repeat, then this means that
the last tick and the repeat have the same time instant.

Because of the time equality, what begins to matter now is the _order_
of processing the elements of the drawable slider in the hierarchy. For
the purposes of legacy skins, tail circles were moved below ticks in
fce3eacd7de3254ce75619efaa2d15d59d564623 - but in this particular case,
it means that the order of processing the slider elements is now
inadvertently inverted, causing the entire debacle.

While the fact that scoring depends on order of processing of visuals is
suboptimal, there isn't a great way to address this without significant
restructuring. Due to the structure of processing judgements currently
in place, in which each judgement is processed independently from others
by its corresponding drawable hit object, this is probably the best that
can be done for the time being at least.
---
 .../Objects/Drawables/DrawableSlider.cs                | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 664a8146e7..01174d4d61 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -75,18 +75,24 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         [BackgroundDependencyLoader]
         private void load()
         {
+            tailContainer = new Container<DrawableSliderTail> { RelativeSizeAxes = Axes.Both };
+
             AddRangeInternal(new Drawable[]
             {
                 shakeContainer = new ShakeContainer
                 {
                     ShakeDuration = 30,
                     RelativeSizeAxes = Axes.Both,
-                    Children = new Drawable[]
+                    Children = new[]
                     {
                         Body = new SkinnableDrawable(new OsuSkinComponentLookup(OsuSkinComponents.SliderBody), _ => new DefaultSliderBody(), confineMode: ConfineMode.NoScaling),
-                        tailContainer = new Container<DrawableSliderTail> { RelativeSizeAxes = Axes.Both },
+                        // proxied here so that the tail is drawn under repeats/ticks - legacy skins rely on this
+                        tailContainer.CreateProxy(),
                         tickContainer = new Container<DrawableSliderTick> { RelativeSizeAxes = Axes.Both },
                         repeatContainer = new Container<DrawableSliderRepeat> { RelativeSizeAxes = Axes.Both },
+                        // actual tail container is placed here to ensure that tail hitobjects are processed after ticks/repeats.
+                        // this is required for the correct operation of Score V2.
+                        tailContainer,
                     }
                 },
                 // slider head is not included in shake as it handles hit detection, and handles its own shaking.

From 31f370ec9b944ab994c3b4100b835f2a7d780fdb Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Sat, 10 Jun 2023 13:50:45 +0300
Subject: [PATCH 0792/1604] Add comments for `ModSelectOverlayStatics`

---
 osu.Game/Overlays/Mods/ModSelectOverlayStatics.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlayStatics.cs b/osu.Game/Overlays/Mods/ModSelectOverlayStatics.cs
index d9e66d8f4f..2d432b010f 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlayStatics.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlayStatics.cs
@@ -5,6 +5,9 @@ using osu.Game.Configuration;
 
 namespace osu.Game.Overlays.Mods
 {
+    /// <summary>
+    /// Stores global mod overlay statics. These will not be stored after disposal of <see cref="ModSelectOverlay"/>
+    /// </summary>
     public class ModSelectOverlayStatics : InMemoryConfigManager<Static>
     {
         protected override void InitialiseDefaults()
@@ -15,6 +18,10 @@ namespace osu.Game.Overlays.Mods
 
     public enum Static
     {
+        /// <summary>
+        /// The last playback time in milliseconds of an on/off sample (from <see cref="ModSelectPanel"/>).
+        /// Used to debounce <see cref="ModSelectPanel"/> on/off sounds game-wide to avoid volume saturation, especially in activating mod presets with many mods.
+        /// </summary>
         LastModSelectPanelSamplePlaybackTime
     }
 }

From 502193e1c6f2cbb812c5b2f2af6392794e6af456 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Sat, 10 Jun 2023 13:55:37 +0300
Subject: [PATCH 0793/1604] Use debounce constant for select/deselect animation

---
 osu.Game/Overlays/Mods/ModColumn.cs      | 2 +-
 osu.Game/Overlays/Mods/ModSelectPanel.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModColumn.cs b/osu.Game/Overlays/Mods/ModColumn.cs
index 5d9f616e5f..fe42cc0abf 100644
--- a/osu.Game/Overlays/Mods/ModColumn.cs
+++ b/osu.Game/Overlays/Mods/ModColumn.cs
@@ -176,7 +176,7 @@ namespace osu.Game.Overlays.Mods
                     dequeuedAction();
 
                     // each time we play an animation, we decrease the time until the next animation (to ramp the visual and audible elements).
-                    selectionDelay = Math.Max(30, selectionDelay * 0.8f);
+                    selectionDelay = Math.Max(ModSelectPanel.SAMPLE_PLAYBACK_DELAY, selectionDelay * 0.8f);
                     lastSelection = Time.Current;
                 }
                 else
diff --git a/osu.Game/Overlays/Mods/ModSelectPanel.cs b/osu.Game/Overlays/Mods/ModSelectPanel.cs
index 42f72fbdca..4c06378d89 100644
--- a/osu.Game/Overlays/Mods/ModSelectPanel.cs
+++ b/osu.Game/Overlays/Mods/ModSelectPanel.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Overlays.Mods
 
         public const float CORNER_RADIUS = 7;
         public const float HEIGHT = 42;
-        public double SAMPLE_PLAYBACK_DELAY = 30;
+        public const double SAMPLE_PLAYBACK_DELAY = 30;
 
         protected virtual float IdleSwitchWidth => 14;
         protected virtual float ExpandedSwitchWidth => 30;

From 274736b9c7fe0055c9da9c2401205d884c3ad9f7 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Sat, 10 Jun 2023 15:14:25 +0300
Subject: [PATCH 0794/1604] Fix missing dependency exception in unit tests

---
 osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs      | 3 +++
 osu.Game.Tests/Visual/UserInterface/TestSceneModPanel.cs       | 3 +++
 .../Visual/UserInterface/TestSceneModPresetColumn.cs           | 3 +++
 osu.Game.Tests/Visual/UserInterface/TestSceneModPresetPanel.cs | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs
index a11000214c..08110382df 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs
@@ -27,6 +27,9 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Cached]
         private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
 
+        [Cached]
+        private ModSelectOverlayStatics modOverlayStatics = new ModSelectOverlayStatics();
+
         [Resolved]
         private OsuConfigManager configManager { get; set; } = null!;
 
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModPanel.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModPanel.cs
index 64bdc167c2..f1283994d6 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModPanel.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModPanel.cs
@@ -23,6 +23,9 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Cached]
         private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
 
+        [Cached]
+        private ModSelectOverlayStatics modOverlayStatics = new ModSelectOverlayStatics();
+
         [Test]
         public void TestVariousPanels()
         {
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
index 3efdba8754..3bbc24ed23 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
@@ -37,6 +37,9 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Cached]
         private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
 
+        [Cached]
+        private ModSelectOverlayStatics modOverlayStatics = new ModSelectOverlayStatics();
+
         [Cached(typeof(IDialogOverlay))]
         private readonly DialogOverlay dialogOverlay = new DialogOverlay();
 
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetPanel.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetPanel.cs
index 35e352534b..f1899b9e29 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetPanel.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetPanel.cs
@@ -26,6 +26,9 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Cached]
         private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
 
+        [Cached]
+        private ModSelectOverlayStatics modOverlayStatics = new ModSelectOverlayStatics();
+
         [SetUpSteps]
         public void SetUpSteps()
         {

From 61a9c6fd7eb29b964a566e8224fef41c464b86c2 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sat, 10 Jun 2023 11:53:45 -0700
Subject: [PATCH 0795/1604] Disable `Truncate` in `OsuSpriteText`

Co-Authored-By: Salman Ahmed <frenzibyte@gmail.com>
---
 osu.Game/Graphics/Sprites/OsuSpriteText.cs        | 7 +++++++
 osu.Game/Graphics/Sprites/TruncatingSpriteText.cs | 3 ++-
 osu.Game/Overlays/Mods/ModSelectPanel.cs          | 6 ++----
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Graphics/Sprites/OsuSpriteText.cs b/osu.Game/Graphics/Sprites/OsuSpriteText.cs
index e149e0abfb..afbec0eab4 100644
--- a/osu.Game/Graphics/Sprites/OsuSpriteText.cs
+++ b/osu.Game/Graphics/Sprites/OsuSpriteText.cs
@@ -3,12 +3,19 @@
 
 #nullable disable
 
+using System;
 using osu.Framework.Graphics.Sprites;
 
 namespace osu.Game.Graphics.Sprites
 {
     public partial class OsuSpriteText : SpriteText
     {
+        [Obsolete("Use TruncatingSpriteText instead.")]
+        public new bool Truncate
+        {
+            set => throw new InvalidOperationException($"Use {nameof(TruncatingSpriteText)} instead.");
+        }
+
         public OsuSpriteText()
         {
             Shadow = true;
diff --git a/osu.Game/Graphics/Sprites/TruncatingSpriteText.cs b/osu.Game/Graphics/Sprites/TruncatingSpriteText.cs
index da0dbd49d2..229fad29f9 100644
--- a/osu.Game/Graphics/Sprites/TruncatingSpriteText.cs
+++ b/osu.Game/Graphics/Sprites/TruncatingSpriteText.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
 
 namespace osu.Game.Graphics.Sprites
@@ -14,7 +15,7 @@ namespace osu.Game.Graphics.Sprites
 
         public TruncatingSpriteText()
         {
-            Truncate = true;
+            ((SpriteText)this).Truncate = true;
         }
     }
 }
diff --git a/osu.Game/Overlays/Mods/ModSelectPanel.cs b/osu.Game/Overlays/Mods/ModSelectPanel.cs
index 81285833bd..6179f31637 100644
--- a/osu.Game/Overlays/Mods/ModSelectPanel.cs
+++ b/osu.Game/Overlays/Mods/ModSelectPanel.cs
@@ -118,22 +118,20 @@ namespace osu.Game.Overlays.Mods
                                 Direction = FillDirection.Vertical,
                                 Children = new[]
                                 {
-                                    titleText = new OsuSpriteText
+                                    titleText = new TruncatingSpriteText
                                     {
                                         Font = OsuFont.TorusAlternate.With(size: 18, weight: FontWeight.SemiBold),
                                         RelativeSizeAxes = Axes.X,
-                                        Truncate = true,
                                         Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
                                         Margin = new MarginPadding
                                         {
                                             Left = -18 * ShearedOverlayContainer.SHEAR
                                         }
                                     },
-                                    descriptionText = new OsuSpriteText
+                                    descriptionText = new TruncatingSpriteText
                                     {
                                         Font = OsuFont.Default.With(size: 12),
                                         RelativeSizeAxes = Axes.X,
-                                        Truncate = true,
                                         Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0)
                                     }
                                 }

From 0d51e4f6cea0aeded84760a17156f0331c89f3bf Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sat, 10 Jun 2023 12:24:58 -0700
Subject: [PATCH 0796/1604] Fix mod select panels having conflicting tooltips

Going simple with a bool instead of making `TooltipText` init-able, as the current cases will just init `string.Empty`. And not sure if we want custom tooltip text in the future.
---
 osu.Game/Graphics/Sprites/TruncatingSpriteText.cs | 4 +++-
 osu.Game/Overlays/Mods/ModSelectPanel.cs          | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Graphics/Sprites/TruncatingSpriteText.cs b/osu.Game/Graphics/Sprites/TruncatingSpriteText.cs
index 229fad29f9..254e708183 100644
--- a/osu.Game/Graphics/Sprites/TruncatingSpriteText.cs
+++ b/osu.Game/Graphics/Sprites/TruncatingSpriteText.cs
@@ -9,9 +9,11 @@ namespace osu.Game.Graphics.Sprites
 {
     public sealed partial class TruncatingSpriteText : OsuSpriteText, IHasTooltip
     {
+        public bool ShowTooltip { get; init; } = true;
+
         public LocalisableString TooltipText => Text;
 
-        public override bool HandlePositionalInput => IsTruncated;
+        public override bool HandlePositionalInput => IsTruncated && ShowTooltip;
 
         public TruncatingSpriteText()
         {
diff --git a/osu.Game/Overlays/Mods/ModSelectPanel.cs b/osu.Game/Overlays/Mods/ModSelectPanel.cs
index 6179f31637..09f5e5ced7 100644
--- a/osu.Game/Overlays/Mods/ModSelectPanel.cs
+++ b/osu.Game/Overlays/Mods/ModSelectPanel.cs
@@ -126,13 +126,15 @@ namespace osu.Game.Overlays.Mods
                                         Margin = new MarginPadding
                                         {
                                             Left = -18 * ShearedOverlayContainer.SHEAR
-                                        }
+                                        },
+                                        ShowTooltip = false,
                                     },
                                     descriptionText = new TruncatingSpriteText
                                     {
                                         Font = OsuFont.Default.With(size: 12),
                                         RelativeSizeAxes = Axes.X,
-                                        Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0)
+                                        Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
+                                        ShowTooltip = false,
                                     }
                                 }
                             }

From 4819a2879190b80c87c8822f451abb45b1d90cfc Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Sun, 11 Jun 2023 13:53:17 +0300
Subject: [PATCH 0797/1604] Move mod overlay statics to `SessionStatics`

---
 .../UserInterface/TestSceneModColumn.cs       |  3 ---
 .../Visual/UserInterface/TestSceneModPanel.cs |  3 ---
 .../UserInterface/TestSceneModPresetColumn.cs |  3 ---
 .../UserInterface/TestSceneModPresetPanel.cs  |  3 ---
 osu.Game/Configuration/SessionStatics.cs      |  8 ++++++
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    |  3 ---
 .../Overlays/Mods/ModSelectOverlayStatics.cs  | 27 -------------------
 osu.Game/Overlays/Mods/ModSelectPanel.cs      |  7 ++---
 8 files changed, 12 insertions(+), 45 deletions(-)
 delete mode 100644 osu.Game/Overlays/Mods/ModSelectOverlayStatics.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs
index 08110382df..a11000214c 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs
@@ -27,9 +27,6 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Cached]
         private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
 
-        [Cached]
-        private ModSelectOverlayStatics modOverlayStatics = new ModSelectOverlayStatics();
-
         [Resolved]
         private OsuConfigManager configManager { get; set; } = null!;
 
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModPanel.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModPanel.cs
index f1283994d6..64bdc167c2 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModPanel.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModPanel.cs
@@ -23,9 +23,6 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Cached]
         private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
 
-        [Cached]
-        private ModSelectOverlayStatics modOverlayStatics = new ModSelectOverlayStatics();
-
         [Test]
         public void TestVariousPanels()
         {
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
index 3bbc24ed23..3efdba8754 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
@@ -37,9 +37,6 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Cached]
         private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
 
-        [Cached]
-        private ModSelectOverlayStatics modOverlayStatics = new ModSelectOverlayStatics();
-
         [Cached(typeof(IDialogOverlay))]
         private readonly DialogOverlay dialogOverlay = new DialogOverlay();
 
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetPanel.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetPanel.cs
index f1899b9e29..35e352534b 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetPanel.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetPanel.cs
@@ -26,9 +26,6 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Cached]
         private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
 
-        [Cached]
-        private ModSelectOverlayStatics modOverlayStatics = new ModSelectOverlayStatics();
-
         [SetUpSteps]
         public void SetUpSteps()
         {
diff --git a/osu.Game/Configuration/SessionStatics.cs b/osu.Game/Configuration/SessionStatics.cs
index 276563e163..5e2f0c2128 100644
--- a/osu.Game/Configuration/SessionStatics.cs
+++ b/osu.Game/Configuration/SessionStatics.cs
@@ -6,6 +6,7 @@
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays;
+using osu.Game.Overlays.Mods;
 
 namespace osu.Game.Configuration
 {
@@ -21,6 +22,7 @@ namespace osu.Game.Configuration
             SetDefault(Static.LowBatteryNotificationShownOnce, false);
             SetDefault(Static.FeaturedArtistDisclaimerShownOnce, false);
             SetDefault(Static.LastHoverSoundPlaybackTime, (double?)null);
+            SetDefault(Static.LastModSelectPanelSamplePlaybackTime, (double?)null);
             SetDefault<APISeasonalBackgrounds>(Static.SeasonalBackgrounds, null);
         }
 
@@ -56,5 +58,11 @@ namespace osu.Game.Configuration
         /// Used to debounce hover sounds game-wide to avoid volume saturation, especially in scrolling views with many UI controls like <see cref="SettingsOverlay"/>.
         /// </summary>
         LastHoverSoundPlaybackTime,
+
+        /// <summary>
+        /// The last playback time in milliseconds of an on/off sample (from <see cref="ModSelectPanel"/>).
+        /// Used to debounce <see cref="ModSelectPanel"/> on/off sounds game-wide to avoid volume saturation, especially in activating mod presets with many mods.
+        /// </summary>
+        LastModSelectPanelSamplePlaybackTime
     }
 }
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index f2b61e3543..38ae8c68cb 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -103,9 +103,6 @@ namespace osu.Game.Overlays.Mods
 
         private readonly BindableBool customisationVisible = new BindableBool();
 
-        [Cached]
-        protected readonly ModSelectOverlayStatics Statics = new ModSelectOverlayStatics();
-
         private ModSettingsArea modSettingsArea = null!;
         private ColumnScrollContainer columnScroll = null!;
         private ColumnFlowContainer columnFlow = null!;
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlayStatics.cs b/osu.Game/Overlays/Mods/ModSelectOverlayStatics.cs
deleted file mode 100644
index 2d432b010f..0000000000
--- a/osu.Game/Overlays/Mods/ModSelectOverlayStatics.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Game.Configuration;
-
-namespace osu.Game.Overlays.Mods
-{
-    /// <summary>
-    /// Stores global mod overlay statics. These will not be stored after disposal of <see cref="ModSelectOverlay"/>
-    /// </summary>
-    public class ModSelectOverlayStatics : InMemoryConfigManager<Static>
-    {
-        protected override void InitialiseDefaults()
-        {
-            SetDefault(Static.LastModSelectPanelSamplePlaybackTime, (double?)null);
-        }
-    }
-
-    public enum Static
-    {
-        /// <summary>
-        /// The last playback time in milliseconds of an on/off sample (from <see cref="ModSelectPanel"/>).
-        /// Used to debounce <see cref="ModSelectPanel"/> on/off sounds game-wide to avoid volume saturation, especially in activating mod presets with many mods.
-        /// </summary>
-        LastModSelectPanelSamplePlaybackTime
-    }
-}
diff --git a/osu.Game/Overlays/Mods/ModSelectPanel.cs b/osu.Game/Overlays/Mods/ModSelectPanel.cs
index 4c06378d89..be07759984 100644
--- a/osu.Game/Overlays/Mods/ModSelectPanel.cs
+++ b/osu.Game/Overlays/Mods/ModSelectPanel.cs
@@ -14,6 +14,7 @@ using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
 using osu.Framework.Utils;
 using osu.Game.Audio;
+using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
@@ -64,7 +65,7 @@ namespace osu.Game.Overlays.Mods
         protected OverlayColourProvider ColourProvider { get; private set; } = null!;
 
         [Resolved]
-        protected ModSelectOverlayStatics ModOverlayStatics { get; private set; } = null!;
+        protected SessionStatics Statics { get; private set; } = null!;
 
         private readonly OsuSpriteText titleText;
         private readonly OsuSpriteText descriptionText;
@@ -196,7 +197,7 @@ namespace osu.Game.Overlays.Mods
             if (samplePlaybackDisabled.Value)
                 return;
 
-            double? lastPlaybackTime = ModOverlayStatics.Get<double?>(Static.LastModSelectPanelSamplePlaybackTime);
+            double? lastPlaybackTime = Statics.Get<double?>(Static.LastModSelectPanelSamplePlaybackTime);
 
             if (lastPlaybackTime is not null && Time.Current - lastPlaybackTime < SAMPLE_PLAYBACK_DELAY)
                 return;
@@ -206,7 +207,7 @@ namespace osu.Game.Overlays.Mods
             else
                 sampleOff?.Play();
 
-            ModOverlayStatics.SetValue<double?>(Static.LastModSelectPanelSamplePlaybackTime, Time.Current);
+            Statics.SetValue<double?>(Static.LastModSelectPanelSamplePlaybackTime, Time.Current);
         }
 
         protected override bool OnHover(HoverEvent e)

From 82b7e570cddc271e36360de10ee447d129733114 Mon Sep 17 00:00:00 2001
From: yhsphd <yhsphd05@gmail.com>
Date: Sun, 11 Jun 2023 22:43:06 +0900
Subject: [PATCH 0798/1604] Add a checkbox to toggle line breaking for each mod
 in mappool screen

---
 .../Screens/MapPool/MapPoolScreen.cs          | 48 +++++++++++++------
 1 file changed, 34 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index f0e34d78c3..fcb0c4d70b 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
 using osu.Framework.Threading;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays.Settings;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.IPC;
 using osu.Game.Tournament.Models;
@@ -25,6 +26,7 @@ namespace osu.Game.Tournament.Screens.MapPool
     public partial class MapPoolScreen : TournamentMatchScreen
     {
         private readonly FillFlowContainer<FillFlowContainer<TournamentBeatmapPanel>> mapFlows;
+        private TournamentMatch currentMatch;
 
         [Resolved(canBeNull: true)]
         private TournamentSceneManager sceneManager { get; set; }
@@ -37,6 +39,8 @@ namespace osu.Game.Tournament.Screens.MapPool
         private readonly OsuButton buttonRedPick;
         private readonly OsuButton buttonBluePick;
 
+        private readonly SettingsCheckbox chkBoxLineBreak;
+
         public MapPoolScreen()
         {
             InternalChildren = new Drawable[]
@@ -98,6 +102,15 @@ namespace osu.Game.Tournament.Screens.MapPool
                             Action = reset
                         },
                         new ControlPanel.Spacer(),
+                        new TournamentSpriteText
+                        {
+                            Text = "Each modpool takes"
+                        },
+                        new TournamentSpriteText
+                        {
+                            Text = "different row"
+                        },
+                        chkBoxLineBreak = new SettingsCheckbox()
                     },
                 }
             };
@@ -107,6 +120,8 @@ namespace osu.Game.Tournament.Screens.MapPool
         private void load(MatchIPCInfo ipc)
         {
             ipc.Beatmap.BindValueChanged(beatmapChanged);
+            chkBoxLineBreak.Current.Value = true;
+            chkBoxLineBreak.Current.BindValueChanged(_ => rearrangeMappool());
         }
 
         private void beatmapChanged(ValueChangedEvent<TournamentBeatmap> beatmap)
@@ -213,37 +228,42 @@ namespace osu.Game.Tournament.Screens.MapPool
         protected override void CurrentMatchChanged(ValueChangedEvent<TournamentMatch> match)
         {
             base.CurrentMatchChanged(match);
+            currentMatch = match.NewValue;
+            rearrangeMappool();
+        }
 
+        private void rearrangeMappool()
+        {
             mapFlows.Clear();
 
-            if (match.NewValue == null)
+            if (currentMatch == null)
                 return;
-
             int totalRows = 0;
 
-            if (match.NewValue.Round.Value != null)
+            if (currentMatch.Round.Value != null)
             {
                 FillFlowContainer<TournamentBeatmapPanel> currentFlow = null;
                 string currentMod = null;
-
                 int flowCount = 0;
 
-                foreach (var b in match.NewValue.Round.Value.Beatmaps)
+                foreach (var b in currentMatch.Round.Value.Beatmaps)
                 {
                     if (currentFlow == null || currentMod != b.Mods)
                     {
-                        mapFlows.Add(currentFlow = new FillFlowContainer<TournamentBeatmapPanel>
+                        if (chkBoxLineBreak.Current.Value || currentFlow == null)
                         {
-                            Spacing = new Vector2(10, 5),
-                            Direction = FillDirection.Full,
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y
-                        });
+                            mapFlows.Add(currentFlow = new FillFlowContainer<TournamentBeatmapPanel>
+                            {
+                                Spacing = new Vector2(10, 5),
+                                Direction = FillDirection.Full,
+                                RelativeSizeAxes = Axes.X,
+                                AutoSizeAxes = Axes.Y
+                            });
 
+                            totalRows++;
+                            flowCount = 0;
+                        }
                         currentMod = b.Mods;
-
-                        totalRows++;
-                        flowCount = 0;
                     }
 
                     if (++flowCount > 2)

From b986d1cee1d679fd893704e5b010a8464ab785b3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Jun 2023 14:18:26 +0900
Subject: [PATCH 0799/1604] Rename variables to give more context

---
 osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonCirclePiece.cs | 4 ++--
 osu.Game.Rulesets.Taiko/Skinning/Default/CirclePiece.cs    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonCirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonCirclePiece.cs
index e67417c384..cecb99c690 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonCirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonCirclePiece.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
 
         private const double pre_beat_transition_time = 80;
 
-        private const float flash_opacity = 0.15f;
+        private const float kiai_flash_opacity = 0.15f;
 
         private ColourInfo accentColour;
 
@@ -107,7 +107,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
             if (drawableHitObject.State.Value == ArmedState.Idle)
             {
                 flash
-                    .FadeTo(flash_opacity)
+                    .FadeTo(kiai_flash_opacity)
                     .Then()
                     .FadeOut(timingPoint.BeatLength * 0.75, Easing.OutSine);
             }
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Default/CirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Default/CirclePiece.cs
index 776996fdd2..b3833d372c 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Default/CirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Default/CirclePiece.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Default
 
         private const double pre_beat_transition_time = 80;
 
-        private const float flash_opacity = 0.15f;
+        private const float kiai_flash_opacity = 0.15f;
 
         [Resolved]
         private DrawableHitObject drawableHitObject { get; set; } = null!;
@@ -187,7 +187,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Default
             if (drawableHitObject.State.Value == ArmedState.Idle)
             {
                 flashBox
-                    .FadeTo(flash_opacity)
+                    .FadeTo(kiai_flash_opacity)
                     .Then()
                     .FadeOut(timingPoint.BeatLength * 0.75, Easing.OutSine);
             }

From 03a5b701e907d46861accc439a629e7778df1e79 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Jun 2023 14:20:54 +0900
Subject: [PATCH 0800/1604] Fix incorrect inline comment
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs
index 83de50184f..b0492ca6df 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
 
             InternalChildren = new Drawable[]
             {
-                outerFill = new Circle // renders white outer border and dark fill
+                outerFill = new Circle // renders dark fill
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,

From bddb91dc0af428928485082c5db73560d61bbfbe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Jun 2023 14:23:46 +0900
Subject: [PATCH 0801/1604] Adjust adjustment to 1px based on review feedback

Also split out `Size` variable for clarity
---
 .../Skinning/Argon/ArgonMainCirclePiece.cs                | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs
index b0492ca6df..3427031dc8 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs
@@ -48,12 +48,14 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
 
         private Bindable<bool> configHitLighting = null!;
 
+        private static readonly Vector2 circle_size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+
         [Resolved]
         private DrawableHitObject drawableObject { get; set; } = null!;
 
         public ArgonMainCirclePiece(bool withOuterFill)
         {
-            Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+            Size = circle_size;
 
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
@@ -65,7 +67,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     // Slightly inset to prevent bleeding outside the ring
-                    Size = Size - new Vector2(0.5f),
+                    Size = circle_size - new Vector2(1),
                     Alpha = withOuterFill ? 1 : 0,
                 },
                 outerGradient = new Circle // renders the outer bright gradient
@@ -91,7 +93,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
                     Masking = true,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Size = Size,
+                    Size = circle_size,
                     Child = new KiaiFlash
                     {
                         RelativeSizeAxes = Axes.Both,

From 1e774fc0170585b67d2a0d8b01500998a884c3f2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Jun 2023 14:32:55 +0900
Subject: [PATCH 0802/1604] Refactor implementation to roughly match existing
 `HoverSampleDebounceComponent`

---
 osu.Game/Overlays/Mods/ModSelectPanel.cs | 28 +++++++++++++-----------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectPanel.cs b/osu.Game/Overlays/Mods/ModSelectPanel.cs
index be07759984..be01d239b6 100644
--- a/osu.Game/Overlays/Mods/ModSelectPanel.cs
+++ b/osu.Game/Overlays/Mods/ModSelectPanel.cs
@@ -45,6 +45,7 @@ namespace osu.Game.Overlays.Mods
 
         public const float CORNER_RADIUS = 7;
         public const float HEIGHT = 42;
+
         public const double SAMPLE_PLAYBACK_DELAY = 30;
 
         protected virtual float IdleSwitchWidth => 14;
@@ -64,9 +65,6 @@ namespace osu.Game.Overlays.Mods
         [Resolved]
         protected OverlayColourProvider ColourProvider { get; private set; } = null!;
 
-        [Resolved]
-        protected SessionStatics Statics { get; private set; } = null!;
-
         private readonly OsuSpriteText titleText;
         private readonly OsuSpriteText descriptionText;
 
@@ -74,6 +72,8 @@ namespace osu.Game.Overlays.Mods
         private Sample? sampleOff;
         private Sample? sampleOn;
 
+        private Bindable<double?> lastPlaybackTime = null!;
+
         protected ModSelectPanel()
         {
             RelativeSizeAxes = Axes.X;
@@ -168,13 +168,15 @@ namespace osu.Game.Overlays.Mods
         protected abstract void Deselect();
 
         [BackgroundDependencyLoader]
-        private void load(AudioManager audio, ISamplePlaybackDisabler? samplePlaybackDisabler)
+        private void load(AudioManager audio, SessionStatics statics, ISamplePlaybackDisabler? samplePlaybackDisabler)
         {
             sampleOn = audio.Samples.Get(@"UI/check-on");
             sampleOff = audio.Samples.Get(@"UI/check-off");
 
             if (samplePlaybackDisabler != null)
                 ((IBindable<bool>)samplePlaybackDisabled).BindTo(samplePlaybackDisabler.SamplePlaybackDisabled);
+
+            lastPlaybackTime = statics.GetBindable<double?>(Static.LastHoverSoundPlaybackTime);
         }
 
         protected sealed override HoverSounds CreateHoverSounds(HoverSampleSet sampleSet) => new HoverSounds(sampleSet);
@@ -197,17 +199,17 @@ namespace osu.Game.Overlays.Mods
             if (samplePlaybackDisabled.Value)
                 return;
 
-            double? lastPlaybackTime = Statics.Get<double?>(Static.LastModSelectPanelSamplePlaybackTime);
+            bool enoughTimePassedSinceLastPlayback = !lastPlaybackTime.Value.HasValue || Time.Current - lastPlaybackTime.Value >= SAMPLE_PLAYBACK_DELAY;
 
-            if (lastPlaybackTime is not null && Time.Current - lastPlaybackTime < SAMPLE_PLAYBACK_DELAY)
-                return;
+            if (enoughTimePassedSinceLastPlayback)
+            {
+                if (Active.Value)
+                    sampleOn?.Play();
+                else
+                    sampleOff?.Play();
 
-            if (Active.Value)
-                sampleOn?.Play();
-            else
-                sampleOff?.Play();
-
-            Statics.SetValue<double?>(Static.LastModSelectPanelSamplePlaybackTime, Time.Current);
+                lastPlaybackTime.Value = Time.Current;
+            }
         }
 
         protected override bool OnHover(HoverEvent e)

From 8864014af84f1dcb6932d6f4573b1c9dae6d38f1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Jun 2023 15:25:12 +0900
Subject: [PATCH 0803/1604] Add xmldoc

---
 osu.Game/Graphics/Sprites/TruncatingSpriteText.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Graphics/Sprites/TruncatingSpriteText.cs b/osu.Game/Graphics/Sprites/TruncatingSpriteText.cs
index 254e708183..46abdbf09e 100644
--- a/osu.Game/Graphics/Sprites/TruncatingSpriteText.cs
+++ b/osu.Game/Graphics/Sprites/TruncatingSpriteText.cs
@@ -7,8 +7,14 @@ using osu.Framework.Localisation;
 
 namespace osu.Game.Graphics.Sprites
 {
+    /// <summary>
+    /// A derived version of <see cref="OsuSpriteText"/> which automatically shows non-truncated text in tooltip when required.
+    /// </summary>
     public sealed partial class TruncatingSpriteText : OsuSpriteText, IHasTooltip
     {
+        /// <summary>
+        /// Whether a tooltip should be shown with non-truncated text on hover.
+        /// </summary>
         public bool ShowTooltip { get; init; } = true;
 
         public LocalisableString TooltipText => Text;

From 99f93f518555bebd6c024230b359addca0954181 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Jun 2023 15:31:22 +0900
Subject: [PATCH 0804/1604] Add comment mentioning why `ShowTooltip` is
 disabled in mod select panels

---
 osu.Game/Overlays/Mods/ModSelectPanel.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectPanel.cs b/osu.Game/Overlays/Mods/ModSelectPanel.cs
index 09f5e5ced7..d6916c49da 100644
--- a/osu.Game/Overlays/Mods/ModSelectPanel.cs
+++ b/osu.Game/Overlays/Mods/ModSelectPanel.cs
@@ -127,14 +127,14 @@ namespace osu.Game.Overlays.Mods
                                         {
                                             Left = -18 * ShearedOverlayContainer.SHEAR
                                         },
-                                        ShowTooltip = false,
+                                        ShowTooltip = false, // Tooltip is handled by `IncompatibilityDisplayingModPanel`.
                                     },
                                     descriptionText = new TruncatingSpriteText
                                     {
                                         Font = OsuFont.Default.With(size: 12),
                                         RelativeSizeAxes = Axes.X,
                                         Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
-                                        ShowTooltip = false,
+                                        ShowTooltip = false, // Tooltip is handled by `IncompatibilityDisplayingModPanel`.
                                     }
                                 }
                             }

From c9f9569e4a6403e637cb586db2b7e21212e8e97a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Jun 2023 16:22:38 +0900
Subject: [PATCH 0805/1604] Add ability to change background colour in song
 progress test scene

---
 .../Visual/Gameplay/TestSceneSongProgress.cs  | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
index 5855838d3c..530e4af062 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
@@ -7,12 +7,15 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Testing;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Skinning;
+using osuTK.Graphics;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
@@ -21,6 +24,8 @@ namespace osu.Game.Tests.Visual.Gameplay
     {
         private GameplayClockContainer gameplayClockContainer = null!;
 
+        private Box background = null!;
+
         private const double skip_target_time = -2000;
 
         [BackgroundDependencyLoader]
@@ -30,11 +35,20 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             FrameStabilityContainer frameStabilityContainer;
 
-            Add(gameplayClockContainer = new MasterGameplayClockContainer(Beatmap.Value, skip_target_time)
+            AddRange(new Drawable[]
             {
-                Child = frameStabilityContainer = new FrameStabilityContainer
+                background = new Box
                 {
-                    MaxCatchUpFrames = 1
+                    Colour = Color4.Black,
+                    RelativeSizeAxes = Axes.Both,
+                    Depth = float.MaxValue
+                },
+                gameplayClockContainer = new MasterGameplayClockContainer(Beatmap.Value, skip_target_time)
+                {
+                    Child = frameStabilityContainer = new FrameStabilityContainer
+                    {
+                        MaxCatchUpFrames = 1
+                    }
                 }
             });
 
@@ -71,6 +85,9 @@ namespace osu.Game.Tests.Visual.Gameplay
                 applyToArgonProgress(s => s.ShowGraph.Value = b);
             });
 
+            AddStep("set white background", () => background.FadeColour(Color4.White, 200, Easing.OutQuint));
+            AddStep("randomise background colour", () => background.FadeColour(new Colour4(RNG.NextSingle(), RNG.NextSingle(), RNG.NextSingle(), 1), 200, Easing.OutQuint));
+
             AddStep("stop", gameplayClockContainer.Stop);
         }
 

From 84670d4c909df978adc96f7864762fb6cdf80661 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Jun 2023 15:52:25 +0900
Subject: [PATCH 0806/1604] Adjust argon graph to use a non-gray colour range

---
 .../Screens/Play/HUD/ArgonSongProgressGraph.cs  | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonSongProgressGraph.cs b/osu.Game/Screens/Play/HUD/ArgonSongProgressGraph.cs
index 63ab9d15e0..be570c1578 100644
--- a/osu.Game/Screens/Play/HUD/ArgonSongProgressGraph.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonSongProgressGraph.cs
@@ -4,8 +4,10 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Graphics.UserInterface;
 
@@ -13,6 +15,10 @@ namespace osu.Game.Screens.Play.HUD
 {
     public partial class ArgonSongProgressGraph : SegmentedGraph<int>
     {
+        private const int tier_count = 5;
+
+        private const int display_granularity = 200;
+
         private IEnumerable<HitObject>? objects;
 
         public IEnumerable<HitObject> Objects
@@ -21,8 +27,7 @@ namespace osu.Game.Screens.Play.HUD
             {
                 objects = value;
 
-                const int granularity = 200;
-                int[] values = new int[granularity];
+                int[] values = new int[display_granularity];
 
                 if (!objects.Any())
                     return;
@@ -32,7 +37,7 @@ namespace osu.Game.Screens.Play.HUD
                 if (lastHit == 0)
                     lastHit = objects.Last().StartTime;
 
-                double interval = (lastHit - firstHit + 1) / granularity;
+                double interval = (lastHit - firstHit + 1) / display_granularity;
 
                 foreach (var h in objects)
                 {
@@ -51,12 +56,12 @@ namespace osu.Game.Screens.Play.HUD
         }
 
         public ArgonSongProgressGraph()
-            : base(5)
+            : base(tier_count)
         {
             var colours = new List<Colour4>();
 
-            for (int i = 0; i < 5; i++)
-                colours.Add(Colour4.White.Darken(1 + 1 / 5f).Opacity(1 / 5f));
+            for (int i = 0; i < tier_count; i++)
+                colours.Add(OsuColour.Gray(0.2f).Opacity(0.1f));
 
             TierColours = colours;
         }

From 855185ca858f9973f6f31985499c81714c811cd2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Jun 2023 16:10:51 +0900
Subject: [PATCH 0807/1604] Adjust argon song progress bar's background fill to
 always display

---
 .../Screens/Play/HUD/ArgonSongProgress.cs     |  1 -
 .../Screens/Play/HUD/ArgonSongProgressBar.cs  | 34 ++++++-------------
 2 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonSongProgress.cs b/osu.Game/Screens/Play/HUD/ArgonSongProgress.cs
index 9dce8996c3..be2ce3b272 100644
--- a/osu.Game/Screens/Play/HUD/ArgonSongProgress.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonSongProgress.cs
@@ -95,7 +95,6 @@ namespace osu.Game.Screens.Play.HUD
         private void updateGraphVisibility()
         {
             graph.FadeTo(ShowGraph.Value ? 1 : 0, 200, Easing.In);
-            bar.ShowBackground = !ShowGraph.Value;
         }
 
         protected override void Update()
diff --git a/osu.Game/Screens/Play/HUD/ArgonSongProgressBar.cs b/osu.Game/Screens/Play/HUD/ArgonSongProgressBar.cs
index dd6e10ba5d..beaee0e9ee 100644
--- a/osu.Game/Screens/Play/HUD/ArgonSongProgressBar.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonSongProgressBar.cs
@@ -14,7 +14,6 @@ using osu.Framework.Threading;
 using osu.Framework.Utils;
 using osu.Game.Graphics;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Screens.Play.HUD
 {
@@ -32,18 +31,8 @@ namespace osu.Game.Screens.Play.HUD
 
         private readonly Box background;
 
-        private readonly BindableBool showBackground = new BindableBool();
-
         private readonly ColourInfo mainColour;
-        private readonly ColourInfo mainColourDarkened;
         private ColourInfo catchUpColour;
-        private ColourInfo catchUpColourDarkened;
-
-        public bool ShowBackground
-        {
-            get => showBackground.Value;
-            set => showBackground.Value = value;
-        }
 
         public double StartTime
         {
@@ -95,7 +84,7 @@ namespace osu.Game.Screens.Play.HUD
                 {
                     RelativeSizeAxes = Axes.Both,
                     Alpha = 0,
-                    Colour = Colour4.White.Darken(1 + 1 / 4f)
+                    Colour = OsuColour.Gray(0.2f),
                 },
                 catchupBar = new RoundedBar
                 {
@@ -112,12 +101,10 @@ namespace osu.Game.Screens.Play.HUD
                     Anchor = Anchor.BottomLeft,
                     Origin = Anchor.BottomLeft,
                     CornerRadius = 5,
-                    AccentColour = mainColour = Color4.White,
+                    AccentColour = mainColour = OsuColour.Gray(0.9f),
                     RelativeSizeAxes = Axes.Both
                 },
             };
-
-            mainColourDarkened = Colour4.White.Darken(1 / 3f);
         }
 
         private void setupAlternateValue()
@@ -141,16 +128,15 @@ namespace osu.Game.Screens.Play.HUD
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            catchUpColour = colours.BlueLight;
-            catchUpColourDarkened = colours.BlueDark;
-
-            showBackground.BindValueChanged(_ => updateBackground(), true);
+            catchUpColour = colours.BlueDark;
         }
 
-        private void updateBackground()
+        protected override void LoadComplete()
         {
-            background.FadeTo(showBackground.Value ? 1 / 4f : 0, 200, Easing.In);
-            playfieldBar.TransformTo(nameof(playfieldBar.AccentColour), ShowBackground ? mainColour : mainColourDarkened, 200, Easing.In);
+            base.LoadComplete();
+
+            background.FadeTo(0.3f, 200, Easing.In);
+            playfieldBar.TransformTo(nameof(playfieldBar.AccentColour), mainColour, 200, Easing.In);
         }
 
         protected override bool OnHover(HoverEvent e)
@@ -190,8 +176,8 @@ namespace osu.Game.Screens.Play.HUD
 
             catchupBar.AccentColour = Interpolation.ValueAt(
                 Math.Min(timeDelta, colour_transition_threshold),
-                ShowBackground ? mainColour : mainColourDarkened,
-                ShowBackground ? catchUpColour : catchUpColourDarkened,
+                mainColour,
+                catchUpColour,
                 0, colour_transition_threshold,
                 Easing.OutQuint);
 

From 062fd58602545dec493ee210daee49a2851c2ba7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Jun 2023 16:25:53 +0900
Subject: [PATCH 0808/1604] Add test to known time

---
 osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
index 530e4af062..e975a85401 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
@@ -91,6 +91,14 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("stop", gameplayClockContainer.Stop);
         }
 
+        [Test]
+        public void TestSeekToKnownTime()
+        {
+            AddStep("seek to known time", () => gameplayClockContainer.Seek(60000));
+            AddWaitStep("wait some for seek", 15);
+            AddStep("stop", () => gameplayClockContainer.Stop());
+        }
+
         private void applyToArgonProgress(Action<ArgonSongProgress> action) =>
             this.ChildrenOfType<ArgonSongProgress>().ForEach(action);
 

From a1b17c4468a58179d2226457d9de2c76505682c6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Jun 2023 17:12:18 +0900
Subject: [PATCH 0809/1604] Adjust log output for global background changes to
 make more sense

---
 osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
index 0d9b39f099..d9554c10e2 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Screens.Backgrounds
             if (nextBackground == background)
                 return false;
 
-            Logger.Log("🌅 Background change queued");
+            Logger.Log(@"🌅 Global background change queued");
 
             cancellationTokenSource?.Cancel();
             cancellationTokenSource = new CancellationTokenSource();
@@ -94,6 +94,7 @@ namespace osu.Game.Screens.Backgrounds
             nextTask?.Cancel();
             nextTask = Scheduler.AddDelayed(() =>
             {
+                Logger.Log(@"🌅 Global background loading");
                 LoadComponentAsync(nextBackground, displayNext, cancellationTokenSource.Token);
             }, 500);
 

From a201339f9c9ab250ce10a691cda52855f4f17374 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Jun 2023 17:12:38 +0900
Subject: [PATCH 0810/1604] Fix background track restarting twice when exiting
 song select with no active selection

---
 osu.Game/Screens/Select/SongSelect.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 4d6a5398c5..01c38667b1 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -814,6 +814,9 @@ namespace osu.Game.Screens.Select
             if (!ControlGlobalMusic)
                 return;
 
+            if (Beatmap.Value is DummyWorkingBeatmap)
+                return;
+
             ITrack track = music.CurrentTrack;
 
             bool isNewTrack = !lastTrack.TryGetTarget(out var last) || last != track;

From a29f6772cd57f5194a07fb717a333bcd6d3f0b62 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Jun 2023 17:22:11 +0900
Subject: [PATCH 0811/1604] Fix storyboard being null if file doesn't exist

It's expected that `WorkingBeatmap.Storyboard` is non-null.

An example fail case is in `BeatmapBackgroundWithStoryboard.load`.
---
 osu.Game/Beatmaps/WorkingBeatmapCache.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/WorkingBeatmapCache.cs b/osu.Game/Beatmaps/WorkingBeatmapCache.cs
index 0f3d61f527..78eed626f2 100644
--- a/osu.Game/Beatmaps/WorkingBeatmapCache.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmapCache.cs
@@ -264,7 +264,7 @@ namespace osu.Game.Beatmaps
                     if (beatmapFileStream == null)
                     {
                         Logger.Log($"Beatmap failed to load (file {BeatmapInfo.Path} not found on disk at expected location {fileStorePath})", level: LogLevel.Error);
-                        return null;
+                        return new Storyboard();
                     }
 
                     using (var reader = new LineBufferedReader(beatmapFileStream))

From 430938fbb2c9591cb5222187e118fca4e6ea3832 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Mon, 12 Jun 2023 21:47:13 +0900
Subject: [PATCH 0812/1604] allow custom username color for chatLine

user's color (e.g. green for NAT) will be ignore
---
 .../Online/TestSceneChatLineTruncation.cs     |  8 +++++--
 osu.Game/Overlays/Chat/ChatLine.cs            | 22 ++++++++++++++++++-
 .../Overlays/Chat/DrawableChatUsername.cs     | 10 ++++++++-
 3 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatLineTruncation.cs b/osu.Game.Tests/Visual/Online/TestSceneChatLineTruncation.cs
index 32d95ec8dc..d816555237 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatLineTruncation.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatLineTruncation.cs
@@ -38,10 +38,13 @@ namespace osu.Game.Tests.Visual.Online
 
         private void clear() => AddStep("clear messages", textContainer.Clear);
 
-        private void addMessageWithChecks(string text, bool isAction = false, bool isImportant = false, string username = null)
+        private void addMessageWithChecks(string text, bool isAction = false, bool isImportant = false, string username = null, Colour4? color = null)
         {
             int index = textContainer.Count + 1;
-            var newLine = new ChatLine(new DummyMessage(text, isAction, isImportant, index, username));
+            var newLine = new ChatLine(new DummyMessage(text, isAction, isImportant, index, username))
+            {
+                UsernameColour = color
+            };
             textContainer.Add(newLine);
         }
 
@@ -51,6 +54,7 @@ namespace osu.Game.Tests.Visual.Online
                 addMessageWithChecks($"Wide {a} character username.", username: new string('w', a));
             addMessageWithChecks("Short name with spaces.", username: "sho rt name");
             addMessageWithChecks("Long name with spaces.", username: "long name with s p a c e s");
+            addMessageWithChecks("message with custom color", username: "I have custom color", color: Colour4.Green);
         }
 
         private class DummyMessage : Message
diff --git a/osu.Game/Overlays/Chat/ChatLine.cs b/osu.Game/Overlays/Chat/ChatLine.cs
index c85206d5f7..5691a61fc4 100644
--- a/osu.Game/Overlays/Chat/ChatLine.cs
+++ b/osu.Game/Overlays/Chat/ChatLine.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
@@ -18,6 +19,7 @@ using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Chat;
 
 namespace osu.Game.Overlays.Chat
@@ -66,6 +68,24 @@ namespace osu.Game.Overlays.Chat
 
         private Container? highlight;
 
+        private Colour4? usernameColour;
+
+        /// <summary>
+        /// if set, it will override <see cref="APIUser.Colour"/> or <see cref="DrawableChatUsername.default_colours"/>.
+        /// Must be set when constructor, otherwise throw <see cref="InvalidOperationException"/>.
+        /// </summary>
+        public Colour4? UsernameColour
+        {
+            get => usernameColour;
+            set
+            {
+                if (drawableUsername != null)
+                    throw new InvalidOperationException("Can't change Username color after DrawableChatUsername created");
+
+                usernameColour = value;
+            }
+        }
+
         public ChatLine(Message message)
         {
             Message = message;
@@ -103,7 +123,7 @@ namespace osu.Game.Overlays.Chat
                             Font = OsuFont.GetFont(size: FontSize * 0.75f, weight: FontWeight.SemiBold, fixedWidth: true),
                             AlwaysPresent = true,
                         },
-                        drawableUsername = new DrawableChatUsername(message.Sender)
+                        drawableUsername = new DrawableChatUsername(message.Sender, usernameColour)
                         {
                             Width = UsernameWidth,
                             FontSize = FontSize,
diff --git a/osu.Game/Overlays/Chat/DrawableChatUsername.cs b/osu.Game/Overlays/Chat/DrawableChatUsername.cs
index 4b4afc204c..57fddf0575 100644
--- a/osu.Game/Overlays/Chat/DrawableChatUsername.cs
+++ b/osu.Game/Overlays/Chat/DrawableChatUsername.cs
@@ -77,7 +77,7 @@ namespace osu.Game.Overlays.Chat
 
         private readonly Drawable colouredDrawable;
 
-        public DrawableChatUsername(APIUser user)
+        public DrawableChatUsername(APIUser user, Color4? customColor = null)
         {
             this.user = user;
 
@@ -92,6 +92,14 @@ namespace osu.Game.Overlays.Chat
                 Origin = Anchor.TopRight,
             };
 
+            if (customColor != null)
+            {
+                AccentColour = customColor.Value;
+
+                Add(colouredDrawable = drawableText);
+                return;
+            }
+
             if (string.IsNullOrWhiteSpace(user.Colour))
             {
                 AccentColour = default_colours[user.Id % default_colours.Length];

From 2da8335da21d7ded7a4553928dd75054e84a2899 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Mon, 12 Jun 2023 21:56:37 +0900
Subject: [PATCH 0813/1604] let team member color match their team color

---
 .../TestSceneTournamentMatchChatDisplay.cs    | 15 +++++++++++++
 .../Components/TournamentMatchChatDisplay.cs  | 21 ++++++++-----------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs b/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs
index d9ae8df651..5128add9bd 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs
@@ -3,11 +3,14 @@
 
 #nullable disable
 
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Testing;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Chat;
+using osu.Game.Overlays.Chat;
 using osu.Game.Tests.Visual;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.IPC;
@@ -86,6 +89,12 @@ namespace osu.Game.Tournament.Tests.Components
                 Content = "I am team red."
             }));
 
+            AddUntilStep("message from team red is red color", () =>
+            {
+                var chatLine = this.ChildrenOfType<ChatLine>().FirstOrDefault(m => m.Message.Sender.OnlineID == redUser.OnlineID);
+                return chatLine!.UsernameColour == TournamentGame.COLOUR_RED;
+            });
+
             AddStep("message from team red", () => testChannel.AddNewMessages(new Message(nextMessageId())
             {
                 Sender = redUser.ToAPIUser(),
@@ -98,6 +107,12 @@ namespace osu.Game.Tournament.Tests.Components
                 Content = "Not on my watch. Prepare to eat saaaaaaaaaand. Lots and lots of saaaaaaand."
             }));
 
+            AddUntilStep("message from team blue is blue color", () =>
+            {
+                var chatLine = this.ChildrenOfType<ChatLine>().FirstOrDefault(m => m.Message.Sender.OnlineID == blueUser.OnlineID);
+                return chatLine!.UsernameColour == TournamentGame.COLOUR_BLUE;
+            });
+
             AddStep("message from admin", () => testChannel.AddNewMessages(new Message(nextMessageId())
             {
                 Sender = admin,
diff --git a/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs b/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
index 8a0dd6e336..2a2e45d70c 100644
--- a/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
+++ b/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
@@ -21,6 +21,9 @@ namespace osu.Game.Tournament.Components
 
         private ChannelManager manager;
 
+        [Resolved]
+        private LadderInfo ladderInfo { get; set; }
+
         public TournamentMatchChatDisplay()
         {
             RelativeSizeAxes = Axes.X;
@@ -71,7 +74,7 @@ namespace osu.Game.Tournament.Components
 
         public void Contract() => this.FadeOut(200);
 
-        protected override ChatLine CreateMessage(Message message) => new MatchMessage(message);
+        protected override ChatLine CreateMessage(Message message) => new MatchMessage(message, ladderInfo);
 
         protected override StandAloneDrawableChannel CreateDrawableChannel(Channel channel) => new MatchChannel(channel);
 
@@ -86,19 +89,13 @@ namespace osu.Game.Tournament.Components
 
         protected partial class MatchMessage : StandAloneMessage
         {
-            public MatchMessage(Message message)
+            public MatchMessage(Message message, LadderInfo info)
                 : base(message)
             {
-            }
-
-            private void load(LadderInfo info)
-            {
-                // if (info.CurrentMatch.Value.Team1.Value.Players.Any(u => u.Id == Message.Sender.Id))
-                //     SenderText.Colour = TournamentGame.COLOUR_RED;
-                // else if (info.CurrentMatch.Value.Team2.Value.Players.Any(u => u.Id == Message.Sender.Id))
-                //     SenderText.Colour = TournamentGame.COLOUR_BLUE;
-                // else if (Message.Sender.Colour != null)
-                //     SenderText.Colour = ColourBox.Colour = Color4Extensions.FromHex(Message.Sender.Colour);
+                if (info.CurrentMatch.Value.Team1.Value.Players.Any(u => u.OnlineID == Message.Sender.OnlineID))
+                    UsernameColour = TournamentGame.COLOUR_RED;
+                else if (info.CurrentMatch.Value.Team2.Value.Players.Any(u => u.OnlineID == Message.Sender.OnlineID))
+                    UsernameColour = TournamentGame.COLOUR_BLUE;
             }
         }
     }

From 446807e7f67e89ee261393b1e367cead689b51bb Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 12 Jun 2023 23:00:29 +0900
Subject: [PATCH 0814/1604] Add combo score / bonus score attributes

---
 .../Difficulty/OsuDifficultyCalculator.cs     | 47 +++++++++++++++----
 .../Difficulty/DifficultyAttributes.cs        | 25 ++++++++--
 2 files changed, 59 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
index 5292707ac1..2095738a81 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
@@ -93,11 +93,12 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
             double hitWindowGreat = hitWindows.WindowFor(HitResult.Great) / clockRate;
 
+            OsuScoreV1Processor sv1Processor = new OsuScoreV1Processor(workingBeatmap.Beatmap, beatmap, mods);
+
             return new OsuDifficultyAttributes
             {
                 StarRating = starRating,
                 Mods = mods,
-                LegacyTotalScore = new OsuScoreV1Processor(workingBeatmap.Beatmap, beatmap, mods).TotalScore,
                 AimDifficulty = aimRating,
                 SpeedDifficulty = speedRating,
                 SpeedNoteCount = speedNotes,
@@ -110,6 +111,9 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                 HitCircleCount = hitCirclesCount,
                 SliderCount = sliderCount,
                 SpinnerCount = spinnerCount,
+                LegacyTotalScore = sv1Processor.TotalScore,
+                LegacyComboScore = sv1Processor.ComboScore,
+                LegacyBonusScore = sv1Processor.BonusScore
             };
         }
 
@@ -198,20 +202,38 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
     public class OsuScoreV1Processor : ScoreV1Processor
     {
-        public int TotalScore { get; private set; }
+        public int TotalScore => BaseScore + ComboScore + BonusScore;
+
+        /// <summary>
+        /// Amount of score that is combo-and-difficulty-multiplied, excluding mod multipliers.
+        /// </summary>
+        public int ComboScore { get; private set; }
+
+        /// <summary>
+        /// Amount of score that is NOT combo-and-difficulty-multiplied.
+        /// </summary>
+        public int BaseScore { get; private set; }
+
+        /// <summary>
+        /// Amount of score whose judgements would be treated as "bonus" in ScoreV2.
+        /// </summary>
+        public int BonusScore { get; private set; }
+
         private int combo;
 
         public OsuScoreV1Processor(IBeatmap baseBeatmap, IBeatmap playableBeatmap, IReadOnlyList<Mod> mods)
             : base(baseBeatmap, playableBeatmap, mods)
         {
             foreach (var obj in playableBeatmap.HitObjects)
-                increaseScore(obj);
+                simulateHit(obj);
         }
 
-        private void increaseScore(HitObject hitObject)
+        private void simulateHit(HitObject hitObject)
         {
             bool increaseCombo = true;
             bool addScoreComboMultiplier = false;
+            bool isBonus = false;
+
             int scoreIncrease = 0;
 
             switch (hitObject)
@@ -229,11 +251,13 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                 case SpinnerBonusTick:
                     scoreIncrease = 1100;
                     increaseCombo = false;
+                    isBonus = true;
                     break;
 
                 case SpinnerTick:
                     scoreIncrease = 100;
                     increaseCombo = false;
+                    isBonus = true;
                     break;
 
                 case HitCircle:
@@ -243,7 +267,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
                 case Slider:
                     foreach (var nested in hitObject.NestedHitObjects)
-                        increaseScore(nested);
+                        simulateHit(nested);
 
                     scoreIncrease = 300;
                     increaseCombo = false;
@@ -267,9 +291,9 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                     for (int i = 0; i <= totalHalfSpinsPossible; i++)
                     {
                         if (i > halfSpinsRequiredBeforeBonus && (i - halfSpinsRequiredBeforeBonus) % 2 == 0)
-                            increaseScore(new SpinnerBonusTick());
+                            simulateHit(new SpinnerBonusTick());
                         else if (i > 1 && i % 2 == 0)
-                            increaseScore(new SpinnerTick());
+                            simulateHit(new SpinnerTick());
                     }
 
                     scoreIncrease = 300;
@@ -280,13 +304,16 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             if (addScoreComboMultiplier)
             {
                 // ReSharper disable once PossibleLossOfFraction (intentional to match osu-stable...)
-                scoreIncrease += (int)(Math.Max(0, combo - 1) * (scoreIncrease / 25 * ScoreMultiplier));
+                ComboScore += (int)(Math.Max(0, combo - 1) * (scoreIncrease / 25 * ScoreMultiplier));
             }
 
+            if (isBonus)
+                BonusScore += scoreIncrease;
+            else
+                BaseScore += scoreIncrease;
+
             if (increaseCombo)
                 combo++;
-
-            TotalScore += scoreIncrease;
         }
     }
 }
diff --git a/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs b/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
index 8e30050a7f..5a51fb24a6 100644
--- a/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
+++ b/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using Newtonsoft.Json;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Difficulty
 {
@@ -27,6 +28,8 @@ namespace osu.Game.Rulesets.Difficulty
         protected const int ATTRIB_ID_SLIDER_FACTOR = 19;
         protected const int ATTRIB_ID_SPEED_NOTE_COUNT = 21;
         protected const int ATTRIB_ID_LEGACY_TOTAL_SCORE = 23;
+        protected const int ATTRIB_ID_LEGACY_COMBO_SCORE = 25;
+        protected const int ATTRIB_ID_LEGACY_BONUS_SCORE = 27;
 
         /// <summary>
         /// The mods which were applied to the beatmap.
@@ -36,21 +39,33 @@ namespace osu.Game.Rulesets.Difficulty
         /// <summary>
         /// The combined star rating of all skills.
         /// </summary>
-        [JsonProperty("star_rating", Order = -4)]
+        [JsonProperty("star_rating", Order = -7)]
         public double StarRating { get; set; }
 
         /// <summary>
         /// The maximum achievable combo.
         /// </summary>
-        [JsonProperty("max_combo", Order = -3)]
+        [JsonProperty("max_combo", Order = -6)]
         public int MaxCombo { get; set; }
 
         /// <summary>
         /// The maximum achievable legacy total score.
         /// </summary>
-        [JsonProperty("legacy_total_score", Order = -2)]
+        [JsonProperty("legacy_total_score", Order = -5)]
         public int LegacyTotalScore { get; set; }
 
+        /// <summary>
+        /// The combo-multiplied portion of <see cref="LegacyTotalScore"/>.
+        /// </summary>
+        [JsonProperty("legacy_combo_score", Order = -4)]
+        public int LegacyComboScore { get; set; }
+
+        /// <summary>
+        /// The "bonus" portion of <see cref="LegacyTotalScore"/> consisting of all judgements that would be <see cref="HitResult.SmallBonus"/> or <see cref="HitResult.LargeBonus"/>.
+        /// </summary>
+        [JsonProperty("legacy_bonus_score", Order = -3)]
+        public int LegacyBonusScore { get; set; }
+
         /// <summary>
         /// Creates new <see cref="DifficultyAttributes"/>.
         /// </summary>
@@ -79,6 +94,8 @@ namespace osu.Game.Rulesets.Difficulty
         {
             yield return (ATTRIB_ID_MAX_COMBO, MaxCombo);
             yield return (ATTRIB_ID_LEGACY_TOTAL_SCORE, LegacyTotalScore);
+            yield return (ATTRIB_ID_LEGACY_COMBO_SCORE, LegacyComboScore);
+            yield return (ATTRIB_ID_LEGACY_BONUS_SCORE, LegacyBonusScore);
         }
 
         /// <summary>
@@ -90,6 +107,8 @@ namespace osu.Game.Rulesets.Difficulty
         {
             MaxCombo = (int)values[ATTRIB_ID_MAX_COMBO];
             LegacyTotalScore = (int)values[ATTRIB_ID_LEGACY_TOTAL_SCORE];
+            LegacyComboScore = (int)values[ATTRIB_ID_LEGACY_COMBO_SCORE];
+            LegacyBonusScore = (int)values[ATTRIB_ID_LEGACY_BONUS_SCORE];
         }
     }
 }

From 27b99ea923a590a09dea50905031daa5a7a112bb Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Tue, 13 Jun 2023 00:39:25 +0900
Subject: [PATCH 0815/1604] use `{ get; init; }`

---
 .../TestSceneTournamentMatchChatDisplay.cs    | 10 +---
 osu.Game/Overlays/Chat/ChatLine.cs            | 49 ++++++++++---------
 .../Overlays/Chat/DrawableChatUsername.cs     | 12 +----
 3 files changed, 29 insertions(+), 42 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs b/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs
index 5128add9bd..fada340cf7 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs
@@ -90,10 +90,7 @@ namespace osu.Game.Tournament.Tests.Components
             }));
 
             AddUntilStep("message from team red is red color", () =>
-            {
-                var chatLine = this.ChildrenOfType<ChatLine>().FirstOrDefault(m => m.Message.Sender.OnlineID == redUser.OnlineID);
-                return chatLine!.UsernameColour == TournamentGame.COLOUR_RED;
-            });
+                this.ChildrenOfType<DrawableChatUsername>().Any(s => s.AccentColour == TournamentGame.COLOUR_RED));
 
             AddStep("message from team red", () => testChannel.AddNewMessages(new Message(nextMessageId())
             {
@@ -108,10 +105,7 @@ namespace osu.Game.Tournament.Tests.Components
             }));
 
             AddUntilStep("message from team blue is blue color", () =>
-            {
-                var chatLine = this.ChildrenOfType<ChatLine>().FirstOrDefault(m => m.Message.Sender.OnlineID == blueUser.OnlineID);
-                return chatLine!.UsernameColour == TournamentGame.COLOUR_BLUE;
-            });
+                this.ChildrenOfType<DrawableChatUsername>().Any(s => s.AccentColour == TournamentGame.COLOUR_BLUE));
 
             AddStep("message from admin", () => testChannel.AddNewMessages(new Message(nextMessageId())
             {
diff --git a/osu.Game/Overlays/Chat/ChatLine.cs b/osu.Game/Overlays/Chat/ChatLine.cs
index 5691a61fc4..3e484d962b 100644
--- a/osu.Game/Overlays/Chat/ChatLine.cs
+++ b/osu.Game/Overlays/Chat/ChatLine.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
@@ -21,6 +20,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Chat;
+using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Chat
 {
@@ -68,23 +68,10 @@ namespace osu.Game.Overlays.Chat
 
         private Container? highlight;
 
-        private Colour4? usernameColour;
-
         /// <summary>
         /// if set, it will override <see cref="APIUser.Colour"/> or <see cref="DrawableChatUsername.default_colours"/>.
-        /// Must be set when constructor, otherwise throw <see cref="InvalidOperationException"/>.
         /// </summary>
-        public Colour4? UsernameColour
-        {
-            get => usernameColour;
-            set
-            {
-                if (drawableUsername != null)
-                    throw new InvalidOperationException("Can't change Username color after DrawableChatUsername created");
-
-                usernameColour = value;
-            }
-        }
+        public Color4? UsernameColour { get; init; }
 
         public ChatLine(Message message)
         {
@@ -100,6 +87,28 @@ namespace osu.Game.Overlays.Chat
             configManager.BindWith(OsuSetting.Prefer24HourTime, prefer24HourTime);
             prefer24HourTime.BindValueChanged(_ => updateTimestamp());
 
+            if (UsernameColour != null)
+            {
+                drawableUsername = new DrawableChatUsername(message.Sender)
+                {
+                    AccentColour = UsernameColour.Value
+                };
+            }
+            else
+            {
+                drawableUsername = new DrawableChatUsername(message.Sender);
+            }
+
+            drawableUsername.With(u =>
+            {
+                u.Width = UsernameWidth;
+                u.FontSize = FontSize;
+                u.AutoSizeAxes = Axes.Y;
+                u.Origin = Anchor.TopRight;
+                u.Anchor = Anchor.TopRight;
+                u.Margin = new MarginPadding { Horizontal = Spacing };
+            });
+
             InternalChild = new GridContainer
             {
                 RelativeSizeAxes = Axes.X,
@@ -123,15 +132,7 @@ namespace osu.Game.Overlays.Chat
                             Font = OsuFont.GetFont(size: FontSize * 0.75f, weight: FontWeight.SemiBold, fixedWidth: true),
                             AlwaysPresent = true,
                         },
-                        drawableUsername = new DrawableChatUsername(message.Sender, usernameColour)
-                        {
-                            Width = UsernameWidth,
-                            FontSize = FontSize,
-                            AutoSizeAxes = Axes.Y,
-                            Origin = Anchor.TopRight,
-                            Anchor = Anchor.TopRight,
-                            Margin = new MarginPadding { Horizontal = Spacing },
-                        },
+                        drawableUsername,
                         drawableContentFlow = new LinkFlowContainer(styleMessageContent)
                         {
                             AutoSizeAxes = Axes.Y,
diff --git a/osu.Game/Overlays/Chat/DrawableChatUsername.cs b/osu.Game/Overlays/Chat/DrawableChatUsername.cs
index 57fddf0575..9b802a8070 100644
--- a/osu.Game/Overlays/Chat/DrawableChatUsername.cs
+++ b/osu.Game/Overlays/Chat/DrawableChatUsername.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Overlays.Chat
     {
         public Action? ReportRequested;
 
-        public Color4 AccentColour { get; }
+        public Color4 AccentColour { get; init; }
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
             colouredDrawable.ReceivePositionalInputAt(screenSpacePos);
@@ -77,7 +77,7 @@ namespace osu.Game.Overlays.Chat
 
         private readonly Drawable colouredDrawable;
 
-        public DrawableChatUsername(APIUser user, Color4? customColor = null)
+        public DrawableChatUsername(APIUser user)
         {
             this.user = user;
 
@@ -92,14 +92,6 @@ namespace osu.Game.Overlays.Chat
                 Origin = Anchor.TopRight,
             };
 
-            if (customColor != null)
-            {
-                AccentColour = customColor.Value;
-
-                Add(colouredDrawable = drawableText);
-                return;
-            }
-
             if (string.IsNullOrWhiteSpace(user.Colour))
             {
                 AccentColour = default_colours[user.Id % default_colours.Length];

From f30c1a564fa074b4ffc1167cb34acdd35b4e68e7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Jun 2023 01:08:51 +0900
Subject: [PATCH 0816/1604] Add basic setup for score migration

---
 osu.Game/Database/RealmAccess.cs              |  50 ++++++++-
 .../StandardisedScoreMigrationTools.cs        | 100 ++++++++++++++++++
 2 files changed, 149 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/Database/StandardisedScoreMigrationTools.cs

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index 63ab18db8c..4c55a408c4 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -28,7 +28,10 @@ using osu.Game.IO.Legacy;
 using osu.Game.Models;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Scoring.Legacy;
 using osu.Game.Skinning;
@@ -76,8 +79,9 @@ namespace osu.Game.Database
         /// 26   2023-02-05    Added BeatmapHash to ScoreInfo.
         /// 27   2023-06-06    Added EditorTimestamp to BeatmapInfo.
         /// 28   2023-06-08    Added IsLegacyScore to ScoreInfo, parsed from replay files.
+        /// 29   2023-06-12    Run migration of old lazer scores to be best-effort in the new scoring number space. No actual realm changes.
         /// </summary>
-        private const int schema_version = 28;
+        private const int schema_version = 29;
 
         /// <summary>
         /// Lock object which is held during <see cref="BlockAllOperations"/> sections, blocking realm retrieval during blocking periods.
@@ -930,6 +934,28 @@ namespace osu.Game.Database
 
                     break;
                 }
+
+                case 29:
+                {
+                    var scores = migration.NewRealm
+                                          .All<ScoreInfo>()
+                                          .Where(s => !s.IsLegacyScore);
+
+                    foreach (var score in scores)
+                    {
+                        // Recalculate the old-style standardised score to see if this was an old lazer score.
+                        long oldStandardised = StandardisedScoreMigrationTools.GetOldStandardised(score);
+
+                        if (oldStandardised == score.TotalScore)
+                        {
+                            long calculatedNew = StandardisedScoreMigrationTools.GetNewStandardised(score);
+                            Logger.Log($"Converting score {score.Rank} {score.Accuracy:P1} {score.TotalScore} -> {calculatedNew}");
+                            score.TotalScore = calculatedNew;
+                        }
+                    }
+
+                    break;
+                }
             }
         }
 
@@ -1151,4 +1177,26 @@ namespace osu.Game.Database
             }
         }
     }
+
+    internal class FakeHit : HitObject
+    {
+        private readonly Judgement judgement;
+
+        public override Judgement CreateJudgement() => judgement;
+
+        public FakeHit(Judgement judgement)
+        {
+            this.judgement = judgement;
+        }
+    }
+
+    internal class FakeJudgement : Judgement
+    {
+        public override HitResult MaxResult { get; }
+
+        public FakeJudgement(HitResult result)
+        {
+            MaxResult = result;
+        }
+    }
 }
diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
new file mode 100644
index 0000000000..3133095df6
--- /dev/null
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -0,0 +1,100 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
+
+namespace osu.Game.Database
+{
+    public static class StandardisedScoreMigrationTools
+    {
+        public static long GetNewStandardised(ScoreInfo score)
+        {
+            var processor = score.Ruleset.CreateInstance().CreateScoreProcessor();
+
+            var beatmap = new Beatmap();
+
+            var maximumJudgements = score.MaximumStatistics
+                                         .Where(kvp => kvp.Key.AffectsCombo())
+                                         .OrderByDescending(kvp => Judgement.ToNumericResult(kvp.Key))
+                                         .SelectMany(kvp => Enumerable.Repeat(new FakeJudgement(kvp.Key), kvp.Value))
+                                         .ToList();
+
+            // This is a list of all results, ordered from best to worst.
+            // We are constructing a "best possible" score from the statistics provided because it's the best we can do.
+            List<HitResult> sortedHits = score.Statistics
+                                              .Where(kvp => kvp.Key.AffectsCombo() && kvp.Key != HitResult.Miss && kvp.Key != HitResult.LargeTickMiss)
+                                              .OrderByDescending(kvp => Judgement.ToNumericResult(kvp.Key))
+                                              .SelectMany(kvp => Enumerable.Repeat(kvp.Key, kvp.Value))
+                                              .ToList();
+
+            foreach (var judgement in maximumJudgements)
+                beatmap.HitObjects.Add(new FakeHit(judgement));
+
+            processor.ApplyBeatmap(beatmap);
+
+            Queue<HitResult> misses = new Queue<HitResult>(score.Statistics
+                                                                .Where(kvp => kvp.Key == HitResult.Miss || kvp.Key == HitResult.LargeTickMiss)
+                                                                .SelectMany(kvp => Enumerable.Repeat(kvp.Key, kvp.Value)));
+
+            int maxJudgementIndex = 0;
+
+            foreach (var result in sortedHits)
+            {
+                if (processor.Combo.Value == score.MaxCombo)
+                {
+                    processor.ApplyResult(new JudgementResult(null!, maximumJudgements[maxJudgementIndex++])
+                    {
+                        Type = misses.Dequeue(),
+                    });
+                }
+
+                // TODO: pass a Judgement with correct MaxResult
+                processor.ApplyResult(new JudgementResult(null!, maximumJudgements[maxJudgementIndex++])
+                {
+                    Type = result
+                });
+            }
+
+            var bonusHits = score.Statistics
+                                 .Where(kvp => kvp.Key.IsBonus())
+                                 .SelectMany(kvp => Enumerable.Repeat(kvp.Key, kvp.Value));
+
+            foreach (var result in bonusHits)
+                processor.ApplyResult(new JudgementResult(null!, new FakeJudgement(result)) { Type = result });
+
+            Debug.Assert(processor.HighestCombo.Value == score.MaxCombo);
+
+            return processor.TotalScore.Value;
+        }
+
+        public static long GetOldStandardised(ScoreInfo score)
+        {
+            double accuracyScore =
+                (double)score.Statistics.Where(kvp => kvp.Key.AffectsAccuracy()).Sum(kvp => Judgement.ToNumericResult(kvp.Key) * kvp.Value)
+                / score.MaximumStatistics.Where(kvp => kvp.Key.AffectsAccuracy()).Sum(kvp => Judgement.ToNumericResult(kvp.Key) * kvp.Value);
+            double comboScore = (double)score.MaxCombo / score.MaximumStatistics.Where(kvp => kvp.Key.AffectsCombo()).Sum(kvp => kvp.Value);
+            double bonusScore = score.Statistics.Where(kvp => kvp.Key.IsBonus()).Sum(kvp => Judgement.ToNumericResult(kvp.Key) * kvp.Value);
+
+            double accuracyPortion = 0.3;
+
+            switch (score.RulesetID)
+            {
+                case 1:
+                    accuracyPortion = 0.75;
+                    break;
+
+                case 3:
+                    accuracyPortion = 0.99;
+                    break;
+            }
+
+            return (long)(1000000 * (accuracyPortion * accuracyScore + (1 - accuracyPortion) * comboScore) + bonusScore);
+        }
+    }
+}

From d19f8997fc2288df0ec333fca0369be974f0c0d0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Jun 2023 01:39:38 +0900
Subject: [PATCH 0817/1604] Account for scores which don't have correct maximum
 statistics populated

---
 .../StandardisedScoreMigrationTools.cs        | 65 +++++++++++++++++--
 1 file changed, 58 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index 3133095df6..e8f1fd640b 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -15,10 +15,13 @@ namespace osu.Game.Database
     {
         public static long GetNewStandardised(ScoreInfo score)
         {
-            var processor = score.Ruleset.CreateInstance().CreateScoreProcessor();
+            var ruleset = score.Ruleset.CreateInstance();
+            var processor = ruleset.CreateScoreProcessor();
 
             var beatmap = new Beatmap();
 
+            HitResult maxRulesetJudgement = ruleset.GetHitResults().First().result;
+
             var maximumJudgements = score.MaximumStatistics
                                          .Where(kvp => kvp.Key.AffectsCombo())
                                          .OrderByDescending(kvp => Judgement.ToNumericResult(kvp.Key))
@@ -28,11 +31,20 @@ namespace osu.Game.Database
             // This is a list of all results, ordered from best to worst.
             // We are constructing a "best possible" score from the statistics provided because it's the best we can do.
             List<HitResult> sortedHits = score.Statistics
-                                              .Where(kvp => kvp.Key.AffectsCombo() && kvp.Key != HitResult.Miss && kvp.Key != HitResult.LargeTickMiss)
+                                              .Where(kvp => kvp.Key.AffectsCombo())
                                               .OrderByDescending(kvp => Judgement.ToNumericResult(kvp.Key))
                                               .SelectMany(kvp => Enumerable.Repeat(kvp.Key, kvp.Value))
                                               .ToList();
 
+            if (maximumJudgements.Count != sortedHits.Count)
+            {
+                // Older scores may not have maximum judgements populated correctly.
+                // In this case we need to fill them.
+                maximumJudgements = sortedHits
+                                    .Select(r => new FakeJudgement(getMaxJudgementFor(r, maxRulesetJudgement)))
+                                    .ToList();
+            }
+
             foreach (var judgement in maximumJudgements)
                 beatmap.HitObjects.Add(new FakeHit(judgement));
 
@@ -46,15 +58,29 @@ namespace osu.Game.Database
 
             foreach (var result in sortedHits)
             {
+                // misses are handled from the queue.
+                if (result == HitResult.Miss || result == HitResult.LargeTickMiss)
+                    continue;
+
                 if (processor.Combo.Value == score.MaxCombo)
                 {
-                    processor.ApplyResult(new JudgementResult(null!, maximumJudgements[maxJudgementIndex++])
+                    if (misses.Count > 0)
                     {
-                        Type = misses.Dequeue(),
-                    });
+                        processor.ApplyResult(new JudgementResult(null!, maximumJudgements[maxJudgementIndex++])
+                        {
+                            Type = misses.Dequeue(),
+                        });
+                    }
+                    else
+                    {
+                        // worst case scenario, insert a miss.
+                        processor.ApplyResult(new JudgementResult(null!, new FakeJudgement(getMaxJudgementFor(HitResult.Miss, maxRulesetJudgement)))
+                        {
+                            Type = HitResult.Miss,
+                        });
+                    }
                 }
 
-                // TODO: pass a Judgement with correct MaxResult
                 processor.ApplyResult(new JudgementResult(null!, maximumJudgements[maxJudgementIndex++])
                 {
                     Type = result
@@ -68,11 +94,36 @@ namespace osu.Game.Database
             foreach (var result in bonusHits)
                 processor.ApplyResult(new JudgementResult(null!, new FakeJudgement(result)) { Type = result });
 
-            Debug.Assert(processor.HighestCombo.Value == score.MaxCombo);
+            // Not true for all scores for whatever reason. Oh well.
+            // Debug.Assert(processor.HighestCombo.Value == score.MaxCombo);
 
             return processor.TotalScore.Value;
         }
 
+        private static HitResult getMaxJudgementFor(HitResult hitResult, HitResult max)
+        {
+            switch (hitResult)
+            {
+                case HitResult.Miss:
+                case HitResult.Meh:
+                case HitResult.Ok:
+                case HitResult.Good:
+                case HitResult.Great:
+                case HitResult.Perfect:
+                    return max;
+
+                case HitResult.SmallTickMiss:
+                case HitResult.SmallTickHit:
+                    return HitResult.SmallTickHit;
+
+                case HitResult.LargeTickMiss:
+                case HitResult.LargeTickHit:
+                    return HitResult.LargeTickHit;
+            }
+
+            return HitResult.IgnoreHit;
+        }
+
         public static long GetOldStandardised(ScoreInfo score)
         {
             double accuracyScore =

From 0e9576acfb0d282dbde2046a3cdcfbe7e840efe3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Jun 2023 01:40:32 +0900
Subject: [PATCH 0818/1604] Remove logging and catch any kind of errors

---
 osu.Game/Database/RealmAccess.cs | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index 4c55a408c4..070738363a 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -944,13 +944,20 @@ namespace osu.Game.Database
                     foreach (var score in scores)
                     {
                         // Recalculate the old-style standardised score to see if this was an old lazer score.
-                        long oldStandardised = StandardisedScoreMigrationTools.GetOldStandardised(score);
+                        bool oldScoreMatchesExpectations = StandardisedScoreMigrationTools.GetOldStandardised(score) == score.TotalScore;
+                        // Some older score don't have correct statistics populated, so let's give them benefit of doubt.
+                        bool scoreIsVeryOld = score.Date < new DateTime(2023, 1, 1, 0, 0, 0);
 
-                        if (oldStandardised == score.TotalScore)
+                        if (oldScoreMatchesExpectations || scoreIsVeryOld)
                         {
-                            long calculatedNew = StandardisedScoreMigrationTools.GetNewStandardised(score);
-                            Logger.Log($"Converting score {score.Rank} {score.Accuracy:P1} {score.TotalScore} -> {calculatedNew}");
-                            score.TotalScore = calculatedNew;
+                            try
+                            {
+                                long calculatedNew = StandardisedScoreMigrationTools.GetNewStandardised(score);
+                                score.TotalScore = calculatedNew;
+                            }
+                            catch
+                            {
+                            }
                         }
                     }
 

From 0916ae1671b18cfba735f3804cbc56ecd57983a2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Jun 2023 01:48:32 +0900
Subject: [PATCH 0819/1604] Add basic profiling output of realm migrations

---
 osu.Game/Database/RealmAccess.cs                     | 8 ++++++++
 osu.Game/Database/StandardisedScoreMigrationTools.cs | 1 -
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index 070738363a..cea307f255 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -37,6 +37,7 @@ using osu.Game.Scoring.Legacy;
 using osu.Game.Skinning;
 using Realms;
 using Realms.Exceptions;
+using Stopwatch = System.Diagnostics.Stopwatch;
 
 namespace osu.Game.Database
 {
@@ -728,6 +729,11 @@ namespace osu.Game.Database
 
         private void applyMigrationsForVersion(Migration migration, ulong targetVersion)
         {
+            Logger.Log($"Running realm migration to version {targetVersion}...");
+            Stopwatch stopwatch = new Stopwatch();
+
+            stopwatch.Start();
+
             switch (targetVersion)
             {
                 case 7:
@@ -964,6 +970,8 @@ namespace osu.Game.Database
                     break;
                 }
             }
+
+            Logger.Log($"Migration completed in {stopwatch.ElapsedMilliseconds}ms");
         }
 
         private string? getRulesetShortNameFromLegacyID(long rulesetId)
diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index e8f1fd640b..f103ded6d5 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Judgements;

From 87520ae4000ec34efbc22560d5566c8602acc782 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Jun 2023 02:05:00 +0900
Subject: [PATCH 0820/1604] Avoid overhead from retrieving `MaxCombo` inside
 loop from realm

---
 osu.Game/Database/StandardisedScoreMigrationTools.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index f103ded6d5..b621b67cf8 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -14,6 +14,9 @@ namespace osu.Game.Database
     {
         public static long GetNewStandardised(ScoreInfo score)
         {
+            // Avoid retrieving from realm inside loops.
+            int maxCombo = score.MaxCombo;
+
             var ruleset = score.Ruleset.CreateInstance();
             var processor = ruleset.CreateScoreProcessor();
 
@@ -61,7 +64,7 @@ namespace osu.Game.Database
                 if (result == HitResult.Miss || result == HitResult.LargeTickMiss)
                     continue;
 
-                if (processor.Combo.Value == score.MaxCombo)
+                if (processor.Combo.Value == maxCombo)
                 {
                     if (misses.Count > 0)
                     {

From e0ebb000d697aebeab253bf810c371d020b7ec31 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Jun 2023 02:05:11 +0900
Subject: [PATCH 0821/1604] Avoid unnecessary operations during score processor
 simulation

---
 osu.Game/Rulesets/Scoring/JudgementProcessor.cs | 9 +++++++++
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs     | 9 ++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/JudgementProcessor.cs b/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
index 09b5f0a6bc..b16c307206 100644
--- a/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
@@ -30,6 +30,11 @@ namespace osu.Game.Rulesets.Scoring
         /// </summary>
         protected int MaxHits { get; private set; }
 
+        /// <summary>
+        /// Whether <see cref="SimulateAutoplay"/> is currently running.
+        /// </summary>
+        protected bool IsSimulating { get; private set; }
+
         /// <summary>
         /// The total number of judged <see cref="HitObject"/>s at the current point in time.
         /// </summary>
@@ -146,6 +151,8 @@ namespace osu.Game.Rulesets.Scoring
         /// <param name="beatmap">The <see cref="IBeatmap"/> to simulate.</param>
         protected virtual void SimulateAutoplay(IBeatmap beatmap)
         {
+            IsSimulating = true;
+
             foreach (var obj in beatmap.HitObjects)
                 simulate(obj);
 
@@ -163,6 +170,8 @@ namespace osu.Game.Rulesets.Scoring
                 result.Type = GetSimulatedHitResult(judgement);
                 ApplyResult(result);
             }
+
+            IsSimulating = false;
         }
 
         protected override void Update()
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index ac17de32d8..87f2b1e5ee 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -226,10 +226,13 @@ namespace osu.Game.Rulesets.Scoring
 
             ApplyScoreChange(result);
 
-            hitEvents.Add(CreateHitEvent(result));
-            lastHitObject = result.HitObject;
+            if (!IsSimulating)
+            {
+                hitEvents.Add(CreateHitEvent(result));
+                lastHitObject = result.HitObject;
 
-            updateScore();
+                updateScore();
+            }
         }
 
         /// <summary>

From 385f6dbd84f3af5d76d984f09a489e5b44da15f6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Jun 2023 02:12:23 +0900
Subject: [PATCH 0822/1604] Move local classes to their rightful location

---
 osu.Game/Database/RealmAccess.cs              | 22 ------------------
 .../StandardisedScoreMigrationTools.cs        | 23 +++++++++++++++++++
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index cea307f255..1194e1d9f8 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -1192,26 +1192,4 @@ namespace osu.Game.Database
             }
         }
     }
-
-    internal class FakeHit : HitObject
-    {
-        private readonly Judgement judgement;
-
-        public override Judgement CreateJudgement() => judgement;
-
-        public FakeHit(Judgement judgement)
-        {
-            this.judgement = judgement;
-        }
-    }
-
-    internal class FakeJudgement : Judgement
-    {
-        public override HitResult MaxResult { get; }
-
-        public FakeJudgement(HitResult result)
-        {
-            MaxResult = result;
-        }
-    }
 }
diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index b621b67cf8..ec08168f7c 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 
@@ -149,5 +150,27 @@ namespace osu.Game.Database
 
             return (long)(1000000 * (accuracyPortion * accuracyScore + (1 - accuracyPortion) * comboScore) + bonusScore);
         }
+
+        private class FakeHit : HitObject
+        {
+            private readonly Judgement judgement;
+
+            public override Judgement CreateJudgement() => judgement;
+
+            public FakeHit(Judgement judgement)
+            {
+                this.judgement = judgement;
+            }
+        }
+
+        private class FakeJudgement : Judgement
+        {
+            public override HitResult MaxResult { get; }
+
+            public FakeJudgement(HitResult result)
+            {
+                MaxResult = result;
+            }
+        }
     }
 }

From e9fb1f89326d549ee6f67e457daa471f1ee23467 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Jun 2023 02:15:08 +0900
Subject: [PATCH 0823/1604] Avoid tracking hit events altogether during
 migration

---
 osu.Game/Database/StandardisedScoreMigrationTools.cs | 2 ++
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs          | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index ec08168f7c..c06502b521 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -21,6 +21,8 @@ namespace osu.Game.Database
             var ruleset = score.Ruleset.CreateInstance();
             var processor = ruleset.CreateScoreProcessor();
 
+            processor.TrackHitEvents = false;
+
             var beatmap = new Beatmap();
 
             HitResult maxRulesetJudgement = ruleset.GetHitResults().First().result;
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 87f2b1e5ee..f29e3533a0 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -30,6 +30,11 @@ namespace osu.Game.Rulesets.Scoring
         private const double accuracy_cutoff_c = 0.7;
         private const double accuracy_cutoff_d = 0;
 
+        /// <summary>
+        /// Whether <see cref="HitEvents"/> should be populated during application of results.
+        /// </summary>
+        internal bool TrackHitEvents = true;
+
         /// <summary>
         /// Invoked when this <see cref="ScoreProcessor"/> was reset from a replay frame.
         /// </summary>
@@ -226,7 +231,7 @@ namespace osu.Game.Rulesets.Scoring
 
             ApplyScoreChange(result);
 
-            if (!IsSimulating)
+            if (!IsSimulating && TrackHitEvents)
             {
                 hitEvents.Add(CreateHitEvent(result));
                 lastHitObject = result.HitObject;

From b9f485b551f672c25721cbd28d9124f8f6fe1b6d Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 12 Jun 2023 23:05:09 +0900
Subject: [PATCH 0824/1604] Merge classes + split out

---
 .../Difficulty/OsuDifficultyCalculator.cs     | 164 -----------------
 .../Difficulty/OsuScoreV1Processor.cs         | 167 ++++++++++++++++++
 2 files changed, 167 insertions(+), 164 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/Difficulty/OsuScoreV1Processor.cs

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
index 2095738a81..21ee03d1a5 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
@@ -11,8 +11,6 @@ using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Skills;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Osu.Difficulty.Skills;
 using osu.Game.Rulesets.Osu.Mods;
@@ -154,166 +152,4 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             new MultiMod(new OsuModFlashlight(), new OsuModHidden())
         };
     }
-
-    public abstract class ScoreV1Processor
-    {
-        protected readonly int DifficultyPeppyStars;
-        protected readonly double ScoreMultiplier;
-
-        protected readonly IBeatmap PlayableBeatmap;
-
-        protected ScoreV1Processor(IBeatmap baseBeatmap, IBeatmap playableBeatmap, IReadOnlyList<Mod> mods)
-        {
-            PlayableBeatmap = playableBeatmap;
-
-            int countNormal = 0;
-            int countSlider = 0;
-            int countSpinner = 0;
-
-            foreach (HitObject obj in baseBeatmap.HitObjects)
-            {
-                switch (obj)
-                {
-                    case IHasPath:
-                        countSlider++;
-                        break;
-
-                    case IHasDuration:
-                        countSpinner++;
-                        break;
-
-                    default:
-                        countNormal++;
-                        break;
-                }
-            }
-
-            int objectCount = countNormal + countSlider + countSpinner;
-
-            DifficultyPeppyStars = (int)Math.Round(
-                (baseBeatmap.Difficulty.DrainRate
-                 + baseBeatmap.Difficulty.OverallDifficulty
-                 + baseBeatmap.Difficulty.CircleSize
-                 + Math.Clamp(objectCount / baseBeatmap.Difficulty.DrainRate * 8, 0, 16)) / 38 * 5);
-
-            ScoreMultiplier = DifficultyPeppyStars * mods.Aggregate(1.0, (current, mod) => current * mod.ScoreMultiplier);
-        }
-    }
-
-    public class OsuScoreV1Processor : ScoreV1Processor
-    {
-        public int TotalScore => BaseScore + ComboScore + BonusScore;
-
-        /// <summary>
-        /// Amount of score that is combo-and-difficulty-multiplied, excluding mod multipliers.
-        /// </summary>
-        public int ComboScore { get; private set; }
-
-        /// <summary>
-        /// Amount of score that is NOT combo-and-difficulty-multiplied.
-        /// </summary>
-        public int BaseScore { get; private set; }
-
-        /// <summary>
-        /// Amount of score whose judgements would be treated as "bonus" in ScoreV2.
-        /// </summary>
-        public int BonusScore { get; private set; }
-
-        private int combo;
-
-        public OsuScoreV1Processor(IBeatmap baseBeatmap, IBeatmap playableBeatmap, IReadOnlyList<Mod> mods)
-            : base(baseBeatmap, playableBeatmap, mods)
-        {
-            foreach (var obj in playableBeatmap.HitObjects)
-                simulateHit(obj);
-        }
-
-        private void simulateHit(HitObject hitObject)
-        {
-            bool increaseCombo = true;
-            bool addScoreComboMultiplier = false;
-            bool isBonus = false;
-
-            int scoreIncrease = 0;
-
-            switch (hitObject)
-            {
-                case SliderHeadCircle:
-                case SliderTailCircle:
-                case SliderRepeat:
-                    scoreIncrease = 30;
-                    break;
-
-                case SliderTick:
-                    scoreIncrease = 10;
-                    break;
-
-                case SpinnerBonusTick:
-                    scoreIncrease = 1100;
-                    increaseCombo = false;
-                    isBonus = true;
-                    break;
-
-                case SpinnerTick:
-                    scoreIncrease = 100;
-                    increaseCombo = false;
-                    isBonus = true;
-                    break;
-
-                case HitCircle:
-                    scoreIncrease = 300;
-                    addScoreComboMultiplier = true;
-                    break;
-
-                case Slider:
-                    foreach (var nested in hitObject.NestedHitObjects)
-                        simulateHit(nested);
-
-                    scoreIncrease = 300;
-                    increaseCombo = false;
-                    addScoreComboMultiplier = true;
-                    break;
-
-                case Spinner spinner:
-                    // The spinner object applies a lenience because gameplay mechanics differ from osu-stable.
-                    // We'll redo the calculations to match osu-stable here...
-                    const double maximum_rotations_per_second = 477.0 / 60;
-                    double minimumRotationsPerSecond = IBeatmapDifficultyInfo.DifficultyRange(PlayableBeatmap.Difficulty.OverallDifficulty, 3, 5, 7.5);
-                    double secondsDuration = spinner.Duration / 1000;
-
-                    // The total amount of half spins possible for the entire spinner.
-                    int totalHalfSpinsPossible = (int)(secondsDuration * maximum_rotations_per_second * 2);
-                    // The amount of half spins that are required to successfully complete the spinner (i.e. get a 300).
-                    int halfSpinsRequiredForCompletion = (int)(secondsDuration * minimumRotationsPerSecond);
-                    // To be able to receive bonus points, the spinner must be rotated another 1.5 times.
-                    int halfSpinsRequiredBeforeBonus = halfSpinsRequiredForCompletion + 3;
-
-                    for (int i = 0; i <= totalHalfSpinsPossible; i++)
-                    {
-                        if (i > halfSpinsRequiredBeforeBonus && (i - halfSpinsRequiredBeforeBonus) % 2 == 0)
-                            simulateHit(new SpinnerBonusTick());
-                        else if (i > 1 && i % 2 == 0)
-                            simulateHit(new SpinnerTick());
-                    }
-
-                    scoreIncrease = 300;
-                    addScoreComboMultiplier = true;
-                    break;
-            }
-
-            if (addScoreComboMultiplier)
-            {
-                // ReSharper disable once PossibleLossOfFraction (intentional to match osu-stable...)
-                ComboScore += (int)(Math.Max(0, combo - 1) * (scoreIncrease / 25 * ScoreMultiplier));
-            }
-
-            if (isBonus)
-                BonusScore += scoreIncrease;
-            else
-                BaseScore += scoreIncrease;
-
-            if (increaseCombo)
-                combo++;
-        }
-    }
 }
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuScoreV1Processor.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuScoreV1Processor.cs
new file mode 100644
index 0000000000..c82928b745
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuScoreV1Processor.cs
@@ -0,0 +1,167 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu.Objects;
+
+namespace osu.Game.Rulesets.Osu.Difficulty
+{
+    internal class OsuScoreV1Processor
+    {
+        public int TotalScore => BaseScore + ComboScore + BonusScore;
+
+        /// <summary>
+        /// Amount of score that is combo-and-difficulty-multiplied, excluding mod multipliers.
+        /// </summary>
+        public int ComboScore { get; private set; }
+
+        /// <summary>
+        /// Amount of score that is NOT combo-and-difficulty-multiplied.
+        /// </summary>
+        public int BaseScore { get; private set; }
+
+        /// <summary>
+        /// Amount of score whose judgements would be treated as "bonus" in ScoreV2.
+        /// </summary>
+        public int BonusScore { get; private set; }
+
+        private int combo;
+
+        private readonly double scoreMultiplier;
+        private readonly IBeatmap playableBeatmap;
+
+        public OsuScoreV1Processor(IBeatmap baseBeatmap, IBeatmap playableBeatmap, IReadOnlyList<Mod> mods)
+        {
+            this.playableBeatmap = playableBeatmap;
+
+            int countNormal = 0;
+            int countSlider = 0;
+            int countSpinner = 0;
+
+            foreach (HitObject obj in baseBeatmap.HitObjects)
+            {
+                switch (obj)
+                {
+                    case IHasPath:
+                        countSlider++;
+                        break;
+
+                    case IHasDuration:
+                        countSpinner++;
+                        break;
+
+                    default:
+                        countNormal++;
+                        break;
+                }
+            }
+
+            int objectCount = countNormal + countSlider + countSpinner;
+
+            int difficultyPeppyStars = (int)Math.Round(
+                (baseBeatmap.Difficulty.DrainRate
+                 + baseBeatmap.Difficulty.OverallDifficulty
+                 + baseBeatmap.Difficulty.CircleSize
+                 + Math.Clamp(objectCount / baseBeatmap.Difficulty.DrainRate * 8, 0, 16)) / 38 * 5);
+
+            scoreMultiplier = difficultyPeppyStars * mods.Aggregate(1.0, (current, mod) => current * mod.ScoreMultiplier);
+
+            foreach (var obj in playableBeatmap.HitObjects)
+                simulateHit(obj);
+        }
+
+        private void simulateHit(HitObject hitObject)
+        {
+            bool increaseCombo = true;
+            bool addScoreComboMultiplier = false;
+            bool isBonus = false;
+
+            int scoreIncrease = 0;
+
+            switch (hitObject)
+            {
+                case SliderHeadCircle:
+                case SliderTailCircle:
+                case SliderRepeat:
+                    scoreIncrease = 30;
+                    break;
+
+                case SliderTick:
+                    scoreIncrease = 10;
+                    break;
+
+                case SpinnerBonusTick:
+                    scoreIncrease = 1100;
+                    increaseCombo = false;
+                    isBonus = true;
+                    break;
+
+                case SpinnerTick:
+                    scoreIncrease = 100;
+                    increaseCombo = false;
+                    isBonus = true;
+                    break;
+
+                case HitCircle:
+                    scoreIncrease = 300;
+                    addScoreComboMultiplier = true;
+                    break;
+
+                case Slider:
+                    foreach (var nested in hitObject.NestedHitObjects)
+                        simulateHit(nested);
+
+                    scoreIncrease = 300;
+                    increaseCombo = false;
+                    addScoreComboMultiplier = true;
+                    break;
+
+                case Spinner spinner:
+                    // The spinner object applies a lenience because gameplay mechanics differ from osu-stable.
+                    // We'll redo the calculations to match osu-stable here...
+                    const double maximum_rotations_per_second = 477.0 / 60;
+                    double minimumRotationsPerSecond = IBeatmapDifficultyInfo.DifficultyRange(playableBeatmap.Difficulty.OverallDifficulty, 3, 5, 7.5);
+                    double secondsDuration = spinner.Duration / 1000;
+
+                    // The total amount of half spins possible for the entire spinner.
+                    int totalHalfSpinsPossible = (int)(secondsDuration * maximum_rotations_per_second * 2);
+                    // The amount of half spins that are required to successfully complete the spinner (i.e. get a 300).
+                    int halfSpinsRequiredForCompletion = (int)(secondsDuration * minimumRotationsPerSecond);
+                    // To be able to receive bonus points, the spinner must be rotated another 1.5 times.
+                    int halfSpinsRequiredBeforeBonus = halfSpinsRequiredForCompletion + 3;
+
+                    for (int i = 0; i <= totalHalfSpinsPossible; i++)
+                    {
+                        if (i > halfSpinsRequiredBeforeBonus && (i - halfSpinsRequiredBeforeBonus) % 2 == 0)
+                            simulateHit(new SpinnerBonusTick());
+                        else if (i > 1 && i % 2 == 0)
+                            simulateHit(new SpinnerTick());
+                    }
+
+                    scoreIncrease = 300;
+                    addScoreComboMultiplier = true;
+                    break;
+            }
+
+            if (addScoreComboMultiplier)
+            {
+                // ReSharper disable once PossibleLossOfFraction (intentional to match osu-stable...)
+                ComboScore += (int)(Math.Max(0, combo - 1) * (scoreIncrease / 25 * scoreMultiplier));
+            }
+
+            if (isBonus)
+                BonusScore += scoreIncrease;
+            else
+                BaseScore += scoreIncrease;
+
+            if (increaseCombo)
+                combo++;
+        }
+    }
+}

From afb5a9243a2b47e084ff1dc01f4ef2037ded3ea8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Jun 2023 05:13:22 +0900
Subject: [PATCH 0825/1604] Fix typo
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 osu.Game/Database/RealmAccess.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index 1194e1d9f8..663833575a 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -951,7 +951,7 @@ namespace osu.Game.Database
                     {
                         // Recalculate the old-style standardised score to see if this was an old lazer score.
                         bool oldScoreMatchesExpectations = StandardisedScoreMigrationTools.GetOldStandardised(score) == score.TotalScore;
-                        // Some older score don't have correct statistics populated, so let's give them benefit of doubt.
+                        // Some older scores don't have correct statistics populated, so let's give them benefit of doubt.
                         bool scoreIsVeryOld = score.Date < new DateTime(2023, 1, 1, 0, 0, 0);
 
                         if (oldScoreMatchesExpectations || scoreIsVeryOld)

From 3304e41a3012492bf054460462ea449f1d55d002 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Jun 2023 05:20:29 +0900
Subject: [PATCH 0826/1604] Add more commenting

---
 .../StandardisedScoreMigrationTools.cs        | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index c06502b521..edc3288f61 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -27,12 +27,6 @@ namespace osu.Game.Database
 
             HitResult maxRulesetJudgement = ruleset.GetHitResults().First().result;
 
-            var maximumJudgements = score.MaximumStatistics
-                                         .Where(kvp => kvp.Key.AffectsCombo())
-                                         .OrderByDescending(kvp => Judgement.ToNumericResult(kvp.Key))
-                                         .SelectMany(kvp => Enumerable.Repeat(new FakeJudgement(kvp.Key), kvp.Value))
-                                         .ToList();
-
             // This is a list of all results, ordered from best to worst.
             // We are constructing a "best possible" score from the statistics provided because it's the best we can do.
             List<HitResult> sortedHits = score.Statistics
@@ -41,20 +35,29 @@ namespace osu.Game.Database
                                               .SelectMany(kvp => Enumerable.Repeat(kvp.Key, kvp.Value))
                                               .ToList();
 
+            // Attempt to use maximum statistics from the database.
+            var maximumJudgements = score.MaximumStatistics
+                                         .Where(kvp => kvp.Key.AffectsCombo())
+                                         .OrderByDescending(kvp => Judgement.ToNumericResult(kvp.Key))
+                                         .SelectMany(kvp => Enumerable.Repeat(new FakeJudgement(kvp.Key), kvp.Value))
+                                         .ToList();
+
+            // Some older scores may not have maximum statistics populated correctly.
+            // In this case we need to fill them with best-known-defaults.
             if (maximumJudgements.Count != sortedHits.Count)
             {
-                // Older scores may not have maximum judgements populated correctly.
-                // In this case we need to fill them.
                 maximumJudgements = sortedHits
                                     .Select(r => new FakeJudgement(getMaxJudgementFor(r, maxRulesetJudgement)))
                                     .ToList();
             }
 
+            // This is required to get the correct maximum combo portion.
             foreach (var judgement in maximumJudgements)
                 beatmap.HitObjects.Add(new FakeHit(judgement));
-
             processor.ApplyBeatmap(beatmap);
 
+            // Insert all misses into a queue.
+            // These will be nibbled at whenever we need to reset the combo.
             Queue<HitResult> misses = new Queue<HitResult>(score.Statistics
                                                                 .Where(kvp => kvp.Key == HitResult.Miss || kvp.Key == HitResult.LargeTickMiss)
                                                                 .SelectMany(kvp => Enumerable.Repeat(kvp.Key, kvp.Value)));
@@ -63,7 +66,7 @@ namespace osu.Game.Database
 
             foreach (var result in sortedHits)
             {
-                // misses are handled from the queue.
+                // For the main part of this loop, ignore all misses, as they will be inserted from the queue.
                 if (result == HitResult.Miss || result == HitResult.LargeTickMiss)
                     continue;
 
@@ -78,7 +81,8 @@ namespace osu.Game.Database
                     }
                     else
                     {
-                        // worst case scenario, insert a miss.
+                        // We ran out of misses. But we can't let max combo increase beyond the known value,
+                        // so let's forge a miss.
                         processor.ApplyResult(new JudgementResult(null!, new FakeJudgement(getMaxJudgementFor(HitResult.Miss, maxRulesetJudgement)))
                         {
                             Type = HitResult.Miss,
@@ -169,9 +173,9 @@ namespace osu.Game.Database
         {
             public override HitResult MaxResult { get; }
 
-            public FakeJudgement(HitResult result)
+            public FakeJudgement(HitResult maxResult)
             {
-                MaxResult = result;
+                MaxResult = maxResult;
             }
         }
     }

From c1b0c60e79c9b828b6ed69e8e34ec82f5e6cda58 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Jun 2023 05:24:04 +0900
Subject: [PATCH 0827/1604] Ensure all misses are dequeued

---
 .../StandardisedScoreMigrationTools.cs        | 48 +++++++++++--------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index edc3288f61..d980f7a858 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -15,6 +15,8 @@ namespace osu.Game.Database
     {
         public static long GetNewStandardised(ScoreInfo score)
         {
+            int maxJudgementIndex = 0;
+
             // Avoid retrieving from realm inside loops.
             int maxCombo = score.MaxCombo;
 
@@ -62,33 +64,15 @@ namespace osu.Game.Database
                                                                 .Where(kvp => kvp.Key == HitResult.Miss || kvp.Key == HitResult.LargeTickMiss)
                                                                 .SelectMany(kvp => Enumerable.Repeat(kvp.Key, kvp.Value)));
 
-            int maxJudgementIndex = 0;
-
             foreach (var result in sortedHits)
             {
                 // For the main part of this loop, ignore all misses, as they will be inserted from the queue.
                 if (result == HitResult.Miss || result == HitResult.LargeTickMiss)
                     continue;
 
+                // Reset combo if required.
                 if (processor.Combo.Value == maxCombo)
-                {
-                    if (misses.Count > 0)
-                    {
-                        processor.ApplyResult(new JudgementResult(null!, maximumJudgements[maxJudgementIndex++])
-                        {
-                            Type = misses.Dequeue(),
-                        });
-                    }
-                    else
-                    {
-                        // We ran out of misses. But we can't let max combo increase beyond the known value,
-                        // so let's forge a miss.
-                        processor.ApplyResult(new JudgementResult(null!, new FakeJudgement(getMaxJudgementFor(HitResult.Miss, maxRulesetJudgement)))
-                        {
-                            Type = HitResult.Miss,
-                        });
-                    }
-                }
+                    insertMiss();
 
                 processor.ApplyResult(new JudgementResult(null!, maximumJudgements[maxJudgementIndex++])
                 {
@@ -96,6 +80,10 @@ namespace osu.Game.Database
                 });
             }
 
+            // Ensure we haven't forgotten any misses.
+            while (misses.Count > 0)
+                insertMiss();
+
             var bonusHits = score.Statistics
                                  .Where(kvp => kvp.Key.IsBonus())
                                  .SelectMany(kvp => Enumerable.Repeat(kvp.Key, kvp.Value));
@@ -107,6 +95,26 @@ namespace osu.Game.Database
             // Debug.Assert(processor.HighestCombo.Value == score.MaxCombo);
 
             return processor.TotalScore.Value;
+
+            void insertMiss()
+            {
+                if (misses.Count > 0)
+                {
+                    processor.ApplyResult(new JudgementResult(null!, maximumJudgements[maxJudgementIndex++])
+                    {
+                        Type = misses.Dequeue(),
+                    });
+                }
+                else
+                {
+                    // We ran out of misses. But we can't let max combo increase beyond the known value,
+                    // so let's forge a miss.
+                    processor.ApplyResult(new JudgementResult(null!, new FakeJudgement(getMaxJudgementFor(HitResult.Miss, maxRulesetJudgement)))
+                    {
+                        Type = HitResult.Miss,
+                    });
+                }
+            }
         }
 
         private static HitResult getMaxJudgementFor(HitResult hitResult, HitResult max)

From 422e87f0ec362506ccbe16943f3732a14c9018cd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Jun 2023 05:30:12 +0900
Subject: [PATCH 0828/1604] Fix weird usings

---
 osu.Game/Database/RealmAccess.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index 663833575a..68a4679656 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -28,16 +28,12 @@ using osu.Game.IO.Legacy;
 using osu.Game.Models;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Rulesets;
-using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Scoring.Legacy;
 using osu.Game.Skinning;
 using Realms;
 using Realms.Exceptions;
-using Stopwatch = System.Diagnostics.Stopwatch;
 
 namespace osu.Game.Database
 {

From 0ab9a48f004be0e6b044391eed4b2677bf07180d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Jun 2023 11:44:52 +0900
Subject: [PATCH 0829/1604] Fix score not updating when `TrackHitEvents` is set
 to `false`

---
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index f29e3533a0..7d2bc17bda 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -33,6 +33,9 @@ namespace osu.Game.Rulesets.Scoring
         /// <summary>
         /// Whether <see cref="HitEvents"/> should be populated during application of results.
         /// </summary>
+        /// <remarks>
+        /// Should only be disabled for special cases.
+        /// When disabled, <see cref="JudgementProcessor.RevertResult"/> cannot be used.</remarks>
         internal bool TrackHitEvents = true;
 
         /// <summary>
@@ -231,10 +234,13 @@ namespace osu.Game.Rulesets.Scoring
 
             ApplyScoreChange(result);
 
-            if (!IsSimulating && TrackHitEvents)
+            if (!IsSimulating)
             {
-                hitEvents.Add(CreateHitEvent(result));
-                lastHitObject = result.HitObject;
+                if (TrackHitEvents)
+                {
+                    hitEvents.Add(CreateHitEvent(result));
+                    lastHitObject = result.HitObject;
+                }
 
                 updateScore();
             }
@@ -250,6 +256,9 @@ namespace osu.Game.Rulesets.Scoring
 
         protected sealed override void RevertResultInternal(JudgementResult result)
         {
+            if (!TrackHitEvents)
+                throw new InvalidOperationException(@$"Rewind is not supported when {nameof(TrackHitEvents)} is disabled.");
+
             Combo.Value = result.ComboAtJudgement;
             HighestCombo.Value = result.HighestComboAtJudgement;
 

From 4cdd4561c4e00c5253ff10d735046bd0be21f715 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Jun 2023 14:17:32 +0900
Subject: [PATCH 0830/1604] Add a few more search keywords for offset settings

https://github.com/ppy/osu/discussions/23898#discussioncomment-6159206
---
 osu.Game/Overlays/Settings/Sections/Audio/OffsetSettings.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Audio/OffsetSettings.cs b/osu.Game/Overlays/Settings/Sections/Audio/OffsetSettings.cs
index 1755c12f94..fc354027c1 100644
--- a/osu.Game/Overlays/Settings/Sections/Audio/OffsetSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Audio/OffsetSettings.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
     {
         protected override LocalisableString Header => AudioSettingsStrings.OffsetHeader;
 
-        public override IEnumerable<LocalisableString> FilterTerms => base.FilterTerms.Concat(new LocalisableString[] { "universal", "uo", "timing" });
+        public override IEnumerable<LocalisableString> FilterTerms => base.FilterTerms.Concat(new LocalisableString[] { "universal", "uo", "timing", "delay", "latency" });
 
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)

From a5c3c9a93f4adf8ee0ceab485eb650de8e1acf70 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Mon, 12 Jun 2023 23:30:08 -0700
Subject: [PATCH 0831/1604] Use `FillFlowContainer` instead of `GridContainer`
 for drawable room background gradient

---
 .../Lounge/Components/DrawableRoom.cs         | 34 ++++++++-----------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
index 8c85a8235c..522438227a 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
@@ -103,29 +103,25 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
                             CornerRadius = CORNER_RADIUS,
                             Children = new Drawable[]
                             {
-                                new GridContainer
+                                new FillFlowContainer
                                 {
                                     RelativeSizeAxes = Axes.Both,
-                                    ColumnDimensions = new[]
+                                    Direction = FillDirection.Horizontal,
+                                    Children = new Drawable[]
                                     {
-                                        new Dimension(GridSizeMode.Relative, 0.2f)
-                                    },
-                                    Content = new[]
-                                    {
-                                        new Drawable[]
+                                        new Box
                                         {
-                                            new Box
-                                            {
-                                                RelativeSizeAxes = Axes.Both,
-                                                Colour = colours.Background5,
-                                            },
-                                            new Box
-                                            {
-                                                RelativeSizeAxes = Axes.Both,
-                                                Colour = ColourInfo.GradientHorizontal(colours.Background5, colours.Background5.Opacity(0.3f))
-                                            },
-                                        }
-                                    }
+                                            RelativeSizeAxes = Axes.Both,
+                                            Colour = colours.Background5,
+                                            Width = 0.2f,
+                                        },
+                                        new Box
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                            Colour = ColourInfo.GradientHorizontal(colours.Background5, colours.Background5.Opacity(0.3f)),
+                                            Width = 0.8f,
+                                        },
+                                    },
                                 },
                                 new Container
                                 {

From 432b5e2d258091d27f3b8262fddfa35aa6b83f50 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Tue, 13 Jun 2023 15:47:44 +0900
Subject: [PATCH 0832/1604] move Inverted and color logic to ChatLine

---
 .../TestSceneTournamentMatchChatDisplay.cs    |  4 +-
 osu.Game/Overlays/Chat/ChatLine.cs            | 80 ++++++++++++++-----
 .../Overlays/Chat/DrawableChatUsername.cs     | 66 ++++-----------
 3 files changed, 76 insertions(+), 74 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs b/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs
index fada340cf7..71d8cbeea7 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs
@@ -90,7 +90,7 @@ namespace osu.Game.Tournament.Tests.Components
             }));
 
             AddUntilStep("message from team red is red color", () =>
-                this.ChildrenOfType<DrawableChatUsername>().Any(s => s.AccentColour == TournamentGame.COLOUR_RED));
+                this.ChildrenOfType<DrawableChatUsername>().Any(s => s.AccentColour.Value == TournamentGame.COLOUR_RED));
 
             AddStep("message from team red", () => testChannel.AddNewMessages(new Message(nextMessageId())
             {
@@ -105,7 +105,7 @@ namespace osu.Game.Tournament.Tests.Components
             }));
 
             AddUntilStep("message from team blue is blue color", () =>
-                this.ChildrenOfType<DrawableChatUsername>().Any(s => s.AccentColour == TournamentGame.COLOUR_BLUE));
+                this.ChildrenOfType<DrawableChatUsername>().Any(s => s.AccentColour.Value == TournamentGame.COLOUR_BLUE));
 
             AddStep("message from admin", () => testChannel.AddNewMessages(new Message(nextMessageId())
             {
diff --git a/osu.Game/Overlays/Chat/ChatLine.cs b/osu.Game/Overlays/Chat/ChatLine.cs
index 3e484d962b..2931685239 100644
--- a/osu.Game/Overlays/Chat/ChatLine.cs
+++ b/osu.Game/Overlays/Chat/ChatLine.cs
@@ -21,6 +21,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Chat;
 using osuTK.Graphics;
+using Message = osu.Game.Online.Chat.Message;
 
 namespace osu.Game.Overlays.Chat
 {
@@ -69,9 +70,9 @@ namespace osu.Game.Overlays.Chat
         private Container? highlight;
 
         /// <summary>
-        /// if set, it will override <see cref="APIUser.Colour"/> or <see cref="DrawableChatUsername.default_colours"/>.
+        /// if set, it will override <see cref="APIUser.Colour"/> or <see cref="default_colours"/>.
         /// </summary>
-        public Color4? UsernameColour { get; init; }
+        public Color4 UsernameColour { get; init; }
 
         public ChatLine(Message message)
         {
@@ -79,6 +80,11 @@ namespace osu.Game.Overlays.Chat
 
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
+
+            // If we have custom value, this value will be override.
+            UsernameColour = !string.IsNullOrEmpty(message.Sender.Colour)
+                ? Color4Extensions.FromHex(message.Sender.Colour)
+                : default_colours[message.SenderId % default_colours.Length];
         }
 
         [BackgroundDependencyLoader]
@@ -87,27 +93,18 @@ namespace osu.Game.Overlays.Chat
             configManager.BindWith(OsuSetting.Prefer24HourTime, prefer24HourTime);
             prefer24HourTime.BindValueChanged(_ => updateTimestamp());
 
-            if (UsernameColour != null)
+            drawableUsername = new DrawableChatUsername(message.Sender)
             {
-                drawableUsername = new DrawableChatUsername(message.Sender)
-                {
-                    AccentColour = UsernameColour.Value
-                };
-            }
-            else
-            {
-                drawableUsername = new DrawableChatUsername(message.Sender);
-            }
+                Width = UsernameWidth,
+                FontSize = FontSize,
+                AutoSizeAxes = Axes.Y,
+                Origin = Anchor.TopRight,
+                Anchor = Anchor.TopRight,
+                Margin = new MarginPadding { Horizontal = Spacing },
+                Inverted = !string.IsNullOrEmpty(message.Sender.Colour),
+            };
 
-            drawableUsername.With(u =>
-            {
-                u.Width = UsernameWidth;
-                u.FontSize = FontSize;
-                u.AutoSizeAxes = Axes.Y;
-                u.Origin = Anchor.TopRight;
-                u.Anchor = Anchor.TopRight;
-                u.Margin = new MarginPadding { Horizontal = Spacing };
-            });
+            drawableUsername.AccentColour.Value = UsernameColour;
 
             InternalChild = new GridContainer
             {
@@ -178,7 +175,7 @@ namespace osu.Game.Overlays.Chat
                     CornerRadius = 2f,
                     Masking = true,
                     RelativeSizeAxes = Axes.Both,
-                    Colour = drawableUsername.AccentColour.Darken(1f),
+                    Colour = drawableUsername.AccentColour.Value.Darken(1f),
                     Depth = float.MaxValue,
                     Child = new Box { RelativeSizeAxes = Axes.Both }
                 });
@@ -216,5 +213,44 @@ namespace osu.Game.Overlays.Chat
         {
             drawableTimestamp.Text = message.Timestamp.LocalDateTime.ToLocalisableString(prefer24HourTime.Value ? @"HH:mm:ss" : @"hh:mm:ss tt");
         }
+
+        private static readonly Color4[] default_colours =
+        {
+            Color4Extensions.FromHex("588c7e"),
+            Color4Extensions.FromHex("b2a367"),
+            Color4Extensions.FromHex("c98f65"),
+            Color4Extensions.FromHex("bc5151"),
+            Color4Extensions.FromHex("5c8bd6"),
+            Color4Extensions.FromHex("7f6ab7"),
+            Color4Extensions.FromHex("a368ad"),
+            Color4Extensions.FromHex("aa6880"),
+
+            Color4Extensions.FromHex("6fad9b"),
+            Color4Extensions.FromHex("f2e394"),
+            Color4Extensions.FromHex("f2ae72"),
+            Color4Extensions.FromHex("f98f8a"),
+            Color4Extensions.FromHex("7daef4"),
+            Color4Extensions.FromHex("a691f2"),
+            Color4Extensions.FromHex("c894d3"),
+            Color4Extensions.FromHex("d895b0"),
+
+            Color4Extensions.FromHex("53c4a1"),
+            Color4Extensions.FromHex("eace5c"),
+            Color4Extensions.FromHex("ea8c47"),
+            Color4Extensions.FromHex("fc4f4f"),
+            Color4Extensions.FromHex("3d94ea"),
+            Color4Extensions.FromHex("7760ea"),
+            Color4Extensions.FromHex("af52c6"),
+            Color4Extensions.FromHex("e25696"),
+
+            Color4Extensions.FromHex("677c66"),
+            Color4Extensions.FromHex("9b8732"),
+            Color4Extensions.FromHex("8c5129"),
+            Color4Extensions.FromHex("8c3030"),
+            Color4Extensions.FromHex("1f5d91"),
+            Color4Extensions.FromHex("4335a5"),
+            Color4Extensions.FromHex("812a96"),
+            Color4Extensions.FromHex("992861"),
+        };
     }
 }
diff --git a/osu.Game/Overlays/Chat/DrawableChatUsername.cs b/osu.Game/Overlays/Chat/DrawableChatUsername.cs
index 9b802a8070..05772051da 100644
--- a/osu.Game/Overlays/Chat/DrawableChatUsername.cs
+++ b/osu.Game/Overlays/Chat/DrawableChatUsername.cs
@@ -33,7 +33,9 @@ namespace osu.Game.Overlays.Chat
     {
         public Action? ReportRequested;
 
-        public Color4 AccentColour { get; init; }
+        public Bindable<Color4> AccentColour { get; } = new Bindable<Color4>();
+
+        public bool Inverted { get; init; }
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
             colouredDrawable.ReceivePositionalInputAt(screenSpacePos);
@@ -75,7 +77,7 @@ namespace osu.Game.Overlays.Chat
         private readonly APIUser user;
         private readonly OsuSpriteText drawableText;
 
-        private readonly Drawable colouredDrawable;
+        private Drawable colouredDrawable = null!;
 
         public DrawableChatUsername(APIUser user)
         {
@@ -91,17 +93,17 @@ namespace osu.Game.Overlays.Chat
                 Anchor = Anchor.TopRight,
                 Origin = Anchor.TopRight,
             };
+        }
 
-            if (string.IsNullOrWhiteSpace(user.Colour))
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            if (!Inverted)
             {
-                AccentColour = default_colours[user.Id % default_colours.Length];
-
                 Add(colouredDrawable = drawableText);
             }
             else
             {
-                AccentColour = Color4Extensions.FromHex(user.Colour);
-
                 Add(new Container
                 {
                     Anchor = Anchor.TopRight,
@@ -143,9 +145,12 @@ namespace osu.Game.Overlays.Chat
         protected override void LoadComplete()
         {
             base.LoadComplete();
-
             drawableText.Colour = colours.ChatBlue;
-            colouredDrawable.Colour = AccentColour;
+
+            AccentColour.BindValueChanged(c =>
+            {
+                colouredDrawable.Colour = c.NewValue;
+            }, true);
         }
 
         public MenuItem[] ContextMenuItems
@@ -191,7 +196,7 @@ namespace osu.Game.Overlays.Chat
 
         protected override bool OnHover(HoverEvent e)
         {
-            colouredDrawable.FadeColour(AccentColour.Lighten(0.6f), 30, Easing.OutQuint);
+            colouredDrawable.FadeColour(AccentColour.Value.Lighten(0.6f), 30, Easing.OutQuint);
 
             return base.OnHover(e);
         }
@@ -200,46 +205,7 @@ namespace osu.Game.Overlays.Chat
         {
             base.OnHoverLost(e);
 
-            colouredDrawable.FadeColour(AccentColour, 800, Easing.OutQuint);
+            colouredDrawable.FadeColour(AccentColour.Value, 800, Easing.OutQuint);
         }
-
-        private static readonly Color4[] default_colours =
-        {
-            Color4Extensions.FromHex("588c7e"),
-            Color4Extensions.FromHex("b2a367"),
-            Color4Extensions.FromHex("c98f65"),
-            Color4Extensions.FromHex("bc5151"),
-            Color4Extensions.FromHex("5c8bd6"),
-            Color4Extensions.FromHex("7f6ab7"),
-            Color4Extensions.FromHex("a368ad"),
-            Color4Extensions.FromHex("aa6880"),
-
-            Color4Extensions.FromHex("6fad9b"),
-            Color4Extensions.FromHex("f2e394"),
-            Color4Extensions.FromHex("f2ae72"),
-            Color4Extensions.FromHex("f98f8a"),
-            Color4Extensions.FromHex("7daef4"),
-            Color4Extensions.FromHex("a691f2"),
-            Color4Extensions.FromHex("c894d3"),
-            Color4Extensions.FromHex("d895b0"),
-
-            Color4Extensions.FromHex("53c4a1"),
-            Color4Extensions.FromHex("eace5c"),
-            Color4Extensions.FromHex("ea8c47"),
-            Color4Extensions.FromHex("fc4f4f"),
-            Color4Extensions.FromHex("3d94ea"),
-            Color4Extensions.FromHex("7760ea"),
-            Color4Extensions.FromHex("af52c6"),
-            Color4Extensions.FromHex("e25696"),
-
-            Color4Extensions.FromHex("677c66"),
-            Color4Extensions.FromHex("9b8732"),
-            Color4Extensions.FromHex("8c5129"),
-            Color4Extensions.FromHex("8c3030"),
-            Color4Extensions.FromHex("1f5d91"),
-            Color4Extensions.FromHex("4335a5"),
-            Color4Extensions.FromHex("812a96"),
-            Color4Extensions.FromHex("992861"),
-        };
     }
 }

From 0adb399ea869c758796790edb8184df173c43f69 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 13 Jun 2023 00:09:58 -0700
Subject: [PATCH 0833/1604] Use anchor instead of `FillFlowContainer`

---
 .../Lounge/Components/DrawableRoom.cs         | 28 ++++++++-----------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
index 522438227a..f1fc751630 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
@@ -103,25 +103,19 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
                             CornerRadius = CORNER_RADIUS,
                             Children = new Drawable[]
                             {
-                                new FillFlowContainer
+                                new Box
                                 {
                                     RelativeSizeAxes = Axes.Both,
-                                    Direction = FillDirection.Horizontal,
-                                    Children = new Drawable[]
-                                    {
-                                        new Box
-                                        {
-                                            RelativeSizeAxes = Axes.Both,
-                                            Colour = colours.Background5,
-                                            Width = 0.2f,
-                                        },
-                                        new Box
-                                        {
-                                            RelativeSizeAxes = Axes.Both,
-                                            Colour = ColourInfo.GradientHorizontal(colours.Background5, colours.Background5.Opacity(0.3f)),
-                                            Width = 0.8f,
-                                        },
-                                    },
+                                    Colour = colours.Background5,
+                                    Width = 0.2f,
+                                },
+                                new Box
+                                {
+                                    Anchor = Anchor.TopRight,
+                                    Origin = Anchor.TopRight,
+                                    RelativeSizeAxes = Axes.Both,
+                                    Colour = ColourInfo.GradientHorizontal(colours.Background5, colours.Background5.Opacity(0.3f)),
+                                    Width = 0.8f,
                                 },
                                 new Container
                                 {

From aa644832dccf4a979b67f53a605cb644f02fbaa8 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 13 Jun 2023 02:33:22 +0900
Subject: [PATCH 0834/1604] Add ScoreV1 calculation for TaikoRuleset

---
 .../TestSceneFlyingHits.cs                    |   2 +-
 .../Difficulty/TaikoDifficultyCalculator.cs   |   8 +
 .../Difficulty/TaikoScoreV1Processor.cs       | 196 ++++++++++++++++++
 osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs   |   2 +-
 .../Objects/DrumRollTick.cs                   |   7 +
 5 files changed, 213 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko/Difficulty/TaikoScoreV1Processor.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneFlyingHits.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneFlyingHits.cs
index e0ff617b59..88af50d36b 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneFlyingHits.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneFlyingHits.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
         private void addFlyingHit(HitType hitType)
         {
-            var tick = new DrumRollTick { HitWindows = HitWindows.Empty, StartTime = DrawableRuleset.Playfield.Time.Current };
+            var tick = new DrumRollTick(null) { HitWindows = HitWindows.Empty, StartTime = DrawableRuleset.Playfield.Time.Current };
 
             DrawableDrumRollTick h;
             DrawableRuleset.Playfield.Add(h = new DrawableDrumRollTick(tick) { JudgementType = hitType });
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
index 24b5f5939a..28b07c0d59 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
@@ -27,9 +27,12 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
 
         public override int Version => 20220902;
 
+        private readonly IWorkingBeatmap workingBeatmap;
+
         public TaikoDifficultyCalculator(IRulesetInfo ruleset, IWorkingBeatmap beatmap)
             : base(ruleset, beatmap)
         {
+            workingBeatmap = beatmap;
         }
 
         protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods, double clockRate)
@@ -86,6 +89,8 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
             HitWindows hitWindows = new TaikoHitWindows();
             hitWindows.SetDifficulty(beatmap.Difficulty.OverallDifficulty);
 
+            TaikoScoreV1Processor sv1Processor = new TaikoScoreV1Processor(workingBeatmap.Beatmap, beatmap, mods);
+
             return new TaikoDifficultyAttributes
             {
                 StarRating = starRating,
@@ -96,6 +101,9 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
                 PeakDifficulty = combinedRating,
                 GreatHitWindow = hitWindows.WindowFor(HitResult.Great) / clockRate,
                 MaxCombo = beatmap.HitObjects.Count(h => h is Hit),
+                LegacyTotalScore = sv1Processor.TotalScore,
+                LegacyComboScore = sv1Processor.ComboScore,
+                LegacyBonusScore = sv1Processor.BonusScore
             };
         }
 
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoScoreV1Processor.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoScoreV1Processor.cs
new file mode 100644
index 0000000000..ee52424b26
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoScoreV1Processor.cs
@@ -0,0 +1,196 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Taiko.Objects;
+
+namespace osu.Game.Rulesets.Taiko.Difficulty
+{
+    internal class TaikoScoreV1Processor
+    {
+        public int TotalScore => BaseScore + ComboScore + BonusScore;
+
+        /// <summary>
+        /// Amount of score that is combo-and-difficulty-multiplied, excluding mod multipliers.
+        /// </summary>
+        public int ComboScore { get; private set; }
+
+        /// <summary>
+        /// Amount of score that is NOT combo-and-difficulty-multiplied.
+        /// </summary>
+        public int BaseScore { get; private set; }
+
+        /// <summary>
+        /// Amount of score whose judgements would be treated as "bonus" in ScoreV2.
+        /// </summary>
+        public int BonusScore { get; private set; }
+
+        private int combo;
+
+        private readonly double modMultiplier;
+        private readonly int difficultyPeppyStars;
+        private readonly IBeatmap playableBeatmap;
+        private readonly IReadOnlyList<Mod> mods;
+
+        public TaikoScoreV1Processor(IBeatmap baseBeatmap, IBeatmap playableBeatmap, IReadOnlyList<Mod> mods)
+        {
+            this.playableBeatmap = playableBeatmap;
+            this.mods = mods;
+
+            int countNormal = 0;
+            int countSlider = 0;
+            int countSpinner = 0;
+
+            foreach (HitObject obj in baseBeatmap.HitObjects)
+            {
+                switch (obj)
+                {
+                    case IHasPath:
+                        countSlider++;
+                        break;
+
+                    case IHasDuration:
+                        countSpinner++;
+                        break;
+
+                    default:
+                        countNormal++;
+                        break;
+                }
+            }
+
+            int objectCount = countNormal + countSlider + countSpinner;
+
+            difficultyPeppyStars = (int)Math.Round(
+                (baseBeatmap.Difficulty.DrainRate
+                 + baseBeatmap.Difficulty.OverallDifficulty
+                 + baseBeatmap.Difficulty.CircleSize
+                 + Math.Clamp(objectCount / baseBeatmap.Difficulty.DrainRate * 8, 0, 16)) / 38 * 5);
+
+            modMultiplier = mods.Aggregate(1.0, (current, mod) => current * mod.ScoreMultiplier);
+
+            foreach (var obj in playableBeatmap.HitObjects)
+                simulateHit(obj);
+        }
+
+        private void simulateHit(HitObject hitObject)
+        {
+            bool increaseCombo = true;
+            bool addScoreComboMultiplier = false;
+            bool isBonus = false;
+
+            int scoreIncrease = 0;
+
+            switch (hitObject)
+            {
+                case SwellTick:
+                    scoreIncrease = 300;
+                    increaseCombo = false;
+                    break;
+
+                case DrumRollTick:
+                    scoreIncrease = 300;
+                    increaseCombo = false;
+                    isBonus = true;
+                    break;
+
+                case Swell swell:
+                    // The taiko swell generally does not match the osu-stable implementation in any way.
+                    // We'll redo the calculations to match osu-stable here...
+                    double minimumRotationsPerSecond = IBeatmapDifficultyInfo.DifficultyRange(playableBeatmap.Difficulty.OverallDifficulty, 3, 5, 7.5);
+                    double secondsDuration = swell.Duration / 1000;
+
+                    // The amount of half spins that are required to successfully complete the spinner (i.e. get a 300).
+                    int halfSpinsRequiredForCompletion = (int)(secondsDuration * minimumRotationsPerSecond);
+
+                    halfSpinsRequiredForCompletion = (int)Math.Max(1, halfSpinsRequiredForCompletion * 1.65f);
+
+                    if (mods.Any(m => m is ModDoubleTime))
+                        halfSpinsRequiredForCompletion = Math.Max(1, (int)(halfSpinsRequiredForCompletion * 0.75f));
+                    if (mods.Any(m => m is ModHalfTime))
+                        halfSpinsRequiredForCompletion = Math.Max(1, (int)(halfSpinsRequiredForCompletion * 1.5f));
+
+                    for (int i = 0; i <= halfSpinsRequiredForCompletion; i++)
+                        simulateHit(new SwellTick());
+
+                    scoreIncrease = 300;
+                    addScoreComboMultiplier = true;
+                    increaseCombo = false;
+                    isBonus = true;
+                    break;
+
+                case Hit:
+                    scoreIncrease = 300;
+                    addScoreComboMultiplier = true;
+                    break;
+
+                case DrumRoll:
+                    foreach (var nested in hitObject.NestedHitObjects)
+                        simulateHit(nested);
+                    return;
+            }
+
+            if (hitObject is DrumRollTick tick)
+            {
+                if (playableBeatmap.ControlPointInfo.EffectPointAt(tick.Parent.StartTime).KiaiMode)
+                    scoreIncrease = (int)(scoreIncrease * 1.2f);
+
+                if (tick.IsStrong)
+                    scoreIncrease += scoreIncrease / 5;
+            }
+
+            // The score increase directly contributed to by the combo-multiplied portion.
+            int comboScoreIncrease = 0;
+
+            if (addScoreComboMultiplier)
+            {
+                int oldScoreIncrease = scoreIncrease;
+
+                // ReSharper disable once PossibleLossOfFraction (intentional to match osu-stable...)
+                scoreIncrease += (int)(scoreIncrease / 35 * 2 * (difficultyPeppyStars + 1) * modMultiplier) * (Math.Min(100, combo) / 10);
+
+                if (hitObject is Swell)
+                {
+                    if (playableBeatmap.ControlPointInfo.EffectPointAt(hitObject.GetEndTime()).KiaiMode)
+                        scoreIncrease = (int)(scoreIncrease * 1.2f);
+                }
+                else
+                {
+                    if (playableBeatmap.ControlPointInfo.EffectPointAt(hitObject.StartTime).KiaiMode)
+                        scoreIncrease = (int)(scoreIncrease * 1.2f);
+                }
+
+                comboScoreIncrease = scoreIncrease - oldScoreIncrease;
+            }
+
+            if (hitObject is Swell || (hitObject is TaikoStrongableHitObject strongable && strongable.IsStrong))
+            {
+                scoreIncrease *= 2;
+                comboScoreIncrease *= 2;
+            }
+
+            scoreIncrease -= comboScoreIncrease;
+
+            if (addScoreComboMultiplier)
+                ComboScore += comboScoreIncrease;
+
+            if (isBonus)
+                BonusScore += scoreIncrease;
+            else
+                BaseScore += scoreIncrease;
+
+            if (increaseCombo)
+                combo++;
+
+            if (hitObject is Swell)
+            {
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
index 2f4a98bd8f..76d1a58506 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
@@ -90,7 +90,7 @@ namespace osu.Game.Rulesets.Taiko.Objects
             {
                 cancellationToken.ThrowIfCancellationRequested();
 
-                AddNested(new DrumRollTick
+                AddNested(new DrumRollTick(this)
                 {
                     FirstTick = first,
                     TickSpacing = tickSpacing,
diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
index 206e8ecb5a..a8f309f7a6 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
@@ -11,6 +11,8 @@ namespace osu.Game.Rulesets.Taiko.Objects
 {
     public class DrumRollTick : TaikoStrongableHitObject
     {
+        public readonly DrumRoll Parent;
+
         /// <summary>
         /// Whether this is the first (initial) tick of the slider.
         /// </summary>
@@ -27,6 +29,11 @@ namespace osu.Game.Rulesets.Taiko.Objects
         /// </summary>
         public double HitWindow => TickSpacing / 2;
 
+        public DrumRollTick(DrumRoll parent)
+        {
+            Parent = parent;
+        }
+
         public override Judgement CreateJudgement() => new TaikoDrumRollTickJudgement();
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;

From 3ec97121e1a62bbfdec75de21d0afa6d1b94098b Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 13 Jun 2023 19:41:39 +0900
Subject: [PATCH 0835/1604] Add ScoreV1 calculation for CatchRuleset

---
 .../Difficulty/CatchDifficultyCalculator.cs   |   8 ++
 .../Difficulty/CatchScoreV1Processor.cs       | 133 ++++++++++++++++++
 2 files changed, 141 insertions(+)
 create mode 100644 osu.Game.Rulesets.Catch/Difficulty/CatchScoreV1Processor.cs

diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
index 42cfde268e..fb7c4f05f4 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
@@ -25,9 +25,12 @@ namespace osu.Game.Rulesets.Catch.Difficulty
 
         public override int Version => 20220701;
 
+        private readonly IWorkingBeatmap workingBeatmap;
+
         public CatchDifficultyCalculator(IRulesetInfo ruleset, IWorkingBeatmap beatmap)
             : base(ruleset, beatmap)
         {
+            workingBeatmap = beatmap;
         }
 
         protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beatmap, Mod[] mods, Skill[] skills, double clockRate)
@@ -38,12 +41,17 @@ namespace osu.Game.Rulesets.Catch.Difficulty
             // this is the same as osu!, so there's potential to share the implementation... maybe
             double preempt = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.ApproachRate, 1800, 1200, 450) / clockRate;
 
+            CatchScoreV1Processor sv1Processor = new CatchScoreV1Processor(workingBeatmap.Beatmap, beatmap, mods);
+
             return new CatchDifficultyAttributes
             {
                 StarRating = Math.Sqrt(skills[0].DifficultyValue()) * star_scaling_factor,
                 Mods = mods,
                 ApproachRate = preempt > 1200.0 ? -(preempt - 1800.0) / 120.0 : -(preempt - 1200.0) / 150.0 + 5.0,
                 MaxCombo = beatmap.HitObjects.Count(h => h is Fruit) + beatmap.HitObjects.OfType<JuiceStream>().SelectMany(j => j.NestedHitObjects).Count(h => !(h is TinyDroplet)),
+                LegacyTotalScore = sv1Processor.TotalScore,
+                LegacyComboScore = sv1Processor.ComboScore,
+                LegacyBonusScore = sv1Processor.BonusScore
             };
         }
 
diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchScoreV1Processor.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchScoreV1Processor.cs
new file mode 100644
index 0000000000..b5c3838fdc
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchScoreV1Processor.cs
@@ -0,0 +1,133 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+
+namespace osu.Game.Rulesets.Catch.Difficulty
+{
+    internal class CatchScoreV1Processor
+    {
+        public int TotalScore => BaseScore + ComboScore + BonusScore;
+
+        /// <summary>
+        /// Amount of score that is combo-and-difficulty-multiplied, excluding mod multipliers.
+        /// </summary>
+        public int ComboScore { get; private set; }
+
+        /// <summary>
+        /// Amount of score that is NOT combo-and-difficulty-multiplied.
+        /// </summary>
+        public int BaseScore { get; private set; }
+
+        /// <summary>
+        /// Amount of score whose judgements would be treated as "bonus" in ScoreV2.
+        /// </summary>
+        public int BonusScore { get; private set; }
+
+        private int combo;
+
+        private readonly double scoreMultiplier;
+
+        public CatchScoreV1Processor(IBeatmap baseBeatmap, IBeatmap playableBeatmap, IReadOnlyList<Mod> mods)
+        {
+            int countNormal = 0;
+            int countSlider = 0;
+            int countSpinner = 0;
+
+            foreach (HitObject obj in baseBeatmap.HitObjects)
+            {
+                switch (obj)
+                {
+                    case IHasPath:
+                        countSlider++;
+                        break;
+
+                    case IHasDuration:
+                        countSpinner++;
+                        break;
+
+                    default:
+                        countNormal++;
+                        break;
+                }
+            }
+
+            int objectCount = countNormal + countSlider + countSpinner;
+
+            int difficultyPeppyStars = (int)Math.Round(
+                (baseBeatmap.Difficulty.DrainRate
+                 + baseBeatmap.Difficulty.OverallDifficulty
+                 + baseBeatmap.Difficulty.CircleSize
+                 + Math.Clamp(objectCount / baseBeatmap.Difficulty.DrainRate * 8, 0, 16)) / 38 * 5);
+
+            scoreMultiplier = difficultyPeppyStars * mods.Aggregate(1.0, (current, mod) => current * mod.ScoreMultiplier);
+
+            foreach (var obj in playableBeatmap.HitObjects)
+                simulateHit(obj);
+        }
+
+        private void simulateHit(HitObject hitObject)
+        {
+            bool increaseCombo = true;
+            bool addScoreComboMultiplier = false;
+            bool isBonus = false;
+
+            int scoreIncrease = 0;
+
+            switch (hitObject)
+            {
+                case TinyDroplet:
+                    scoreIncrease = 10;
+                    increaseCombo = false;
+                    break;
+
+                case Droplet:
+                    scoreIncrease = 100;
+                    break;
+
+                case Fruit:
+                    scoreIncrease = 300;
+                    addScoreComboMultiplier = true;
+                    increaseCombo = true;
+                    break;
+
+                case Banana:
+                    scoreIncrease = 1100;
+                    increaseCombo = false;
+                    isBonus = true;
+                    break;
+
+                case JuiceStream:
+                    foreach (var nested in hitObject.NestedHitObjects)
+                        simulateHit(nested);
+                    return;
+
+                case BananaShower:
+                    foreach (var nested in hitObject.NestedHitObjects)
+                        simulateHit(nested);
+                    return;
+            }
+
+            if (addScoreComboMultiplier)
+            {
+                // ReSharper disable once PossibleLossOfFraction (intentional to match osu-stable...)
+                ComboScore += (int)(Math.Max(0, combo - 1) * (scoreIncrease / 25 * scoreMultiplier));
+            }
+
+            if (isBonus)
+                BonusScore += scoreIncrease;
+            else
+                BaseScore += scoreIncrease;
+
+            if (increaseCombo)
+                combo++;
+        }
+    }
+}

From 13d1f9c902c68c708cde89cd162de8f0c9f3a1ed Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 13 Jun 2023 23:22:27 +0900
Subject: [PATCH 0836/1604] Add ScoreV1 calculation for ManiaRuleset

---
 .../Difficulty/ManiaDifficultyCalculator.cs   | 10 +++++++-
 .../Difficulty/ManiaScoreV1Processor.cs       | 24 +++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Rulesets.Mania/Difficulty/ManiaScoreV1Processor.cs

diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
index 63e61f17e3..cb41b93deb 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
@@ -33,9 +33,13 @@ namespace osu.Game.Rulesets.Mania.Difficulty
 
         public override int Version => 20220902;
 
+        private readonly IWorkingBeatmap workingBeatmap;
+
         public ManiaDifficultyCalculator(IRulesetInfo ruleset, IWorkingBeatmap beatmap)
             : base(ruleset, beatmap)
         {
+            workingBeatmap = beatmap;
+
             isForCurrentRuleset = beatmap.BeatmapInfo.Ruleset.MatchesOnlineID(ruleset);
             originalOverallDifficulty = beatmap.BeatmapInfo.Difficulty.OverallDifficulty;
         }
@@ -48,6 +52,8 @@ namespace osu.Game.Rulesets.Mania.Difficulty
             HitWindows hitWindows = new ManiaHitWindows();
             hitWindows.SetDifficulty(beatmap.Difficulty.OverallDifficulty);
 
+            ManiaScoreV1Processor sv1Processor = new ManiaScoreV1Processor(mods);
+
             return new ManiaDifficultyAttributes
             {
                 StarRating = skills[0].DifficultyValue() * star_scaling_factor,
@@ -55,7 +61,9 @@ namespace osu.Game.Rulesets.Mania.Difficulty
                 // In osu-stable mania, rate-adjustment mods don't affect the hit window.
                 // This is done the way it is to introduce fractional differences in order to match osu-stable for the time being.
                 GreatHitWindow = Math.Ceiling((int)(getHitWindow300(mods) * clockRate) / clockRate),
-                MaxCombo = beatmap.HitObjects.Sum(maxComboForObject)
+                MaxCombo = beatmap.HitObjects.Sum(maxComboForObject),
+                LegacyTotalScore = sv1Processor.TotalScore,
+                LegacyComboScore = sv1Processor.TotalScore
             };
         }
 
diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaScoreV1Processor.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaScoreV1Processor.cs
new file mode 100644
index 0000000000..5712205e8f
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaScoreV1Processor.cs
@@ -0,0 +1,24 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using System.Linq;
+using osu.Game.Rulesets.Mania.Mods;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Mania.Difficulty
+{
+    internal class ManiaScoreV1Processor
+    {
+        public int TotalScore { get; private set; }
+
+        public ManiaScoreV1Processor(IReadOnlyList<Mod> mods)
+        {
+            double multiplier = mods.Where(m => m is not (ModHidden or ModHardRock or ModDoubleTime or ModFlashlight or ManiaModFadeIn))
+                                    .Select(m => m.ScoreMultiplier)
+                                    .Aggregate((c, n) => c * n);
+
+            TotalScore = (int)(1000000 * multiplier);
+        }
+    }
+}

From 51451bd53e92c4e160bfee4d319669cc9937b7e8 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Wed, 14 Jun 2023 01:32:27 +0900
Subject: [PATCH 0837/1604] fix test

---
 .../Visual/Online/TestSceneChatLineTruncation.cs     | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatLineTruncation.cs b/osu.Game.Tests/Visual/Online/TestSceneChatLineTruncation.cs
index d816555237..d1c380e2c7 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatLineTruncation.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatLineTruncation.cs
@@ -41,10 +41,14 @@ namespace osu.Game.Tests.Visual.Online
         private void addMessageWithChecks(string text, bool isAction = false, bool isImportant = false, string username = null, Colour4? color = null)
         {
             int index = textContainer.Count + 1;
-            var newLine = new ChatLine(new DummyMessage(text, isAction, isImportant, index, username))
-            {
-                UsernameColour = color
-            };
+
+            var newLine = color != null
+                ? new ChatLine(new DummyMessage(text, isAction, isImportant, index, username))
+                {
+                    UsernameColour = color.Value
+                }
+                : new ChatLine(new DummyMessage(text, isAction, isImportant, index, username));
+
             textContainer.Add(newLine);
         }
 

From 3334323eb7cdecf753fe3266e5edc85e332b6373 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Jun 2023 01:54:57 +0900
Subject: [PATCH 0838/1604] Run `updateScore` on `Reset` for good measure

---
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 7d2bc17bda..35a7dfe369 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -328,6 +328,9 @@ namespace osu.Game.Rulesets.Scoring
         /// <param name="storeResults">Whether to store the current state of the <see cref="ScoreProcessor"/> for future use.</param>
         protected override void Reset(bool storeResults)
         {
+            // Run one last time to store max values.
+            updateScore();
+
             base.Reset(storeResults);
 
             hitEvents.Clear();

From 6205864c62571faea9a6af432091c3f7b30a4fce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 13 Jun 2023 18:45:35 +0200
Subject: [PATCH 0839/1604] Fix score migration not considering mod multipliers

---
 osu.Game/Database/StandardisedScoreMigrationTools.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index d980f7a858..af91bee9e4 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -57,6 +57,7 @@ namespace osu.Game.Database
             foreach (var judgement in maximumJudgements)
                 beatmap.HitObjects.Add(new FakeHit(judgement));
             processor.ApplyBeatmap(beatmap);
+            processor.Mods.Value = score.Mods;
 
             // Insert all misses into a queue.
             // These will be nibbled at whenever we need to reset the combo.
@@ -162,7 +163,12 @@ namespace osu.Game.Database
                     break;
             }
 
-            return (long)(1000000 * (accuracyPortion * accuracyScore + (1 - accuracyPortion) * comboScore) + bonusScore);
+            double modMultiplier = 1;
+
+            foreach (var mod in score.Mods)
+                modMultiplier *= mod.ScoreMultiplier;
+
+            return (long)((1000000 * (accuracyPortion * accuracyScore + (1 - accuracyPortion) * comboScore) + bonusScore) * modMultiplier);
         }
 
         private class FakeHit : HitObject

From f553efba8a03639f8e086a244eabfbc8b2527759 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Jun 2023 02:29:56 +0900
Subject: [PATCH 0840/1604] Fix playback controls in editor handling key repeat
 when they probably shouldn't

Closes https://github.com/ppy/osu/issues/23903.
---
 osu.Game/Screens/Edit/Components/PlaybackControl.cs |  3 +++
 osu.Game/Screens/Edit/Editor.cs                     | 12 ++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/osu.Game/Screens/Edit/Components/PlaybackControl.cs b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
index 72c299f443..431336aa60 100644
--- a/osu.Game/Screens/Edit/Components/PlaybackControl.cs
+++ b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
@@ -76,6 +76,9 @@ namespace osu.Game.Screens.Edit.Components
 
         protected override bool OnKeyDown(KeyDownEvent e)
         {
+            if (e.Repeat)
+                return false;
+
             switch (e.Key)
             {
                 case Key.Space:
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index bb052b1d22..74947aab09 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -533,6 +533,9 @@ namespace osu.Game.Screens.Edit
                 // Track traversal keys.
                 // Matching osu-stable implementations.
                 case Key.Z:
+                    if (e.Repeat)
+                        return false;
+
                     // Seek to first object time, or track start if already there.
                     double? firstObjectTime = editorBeatmap.HitObjects.FirstOrDefault()?.StartTime;
 
@@ -543,12 +546,18 @@ namespace osu.Game.Screens.Edit
                     return true;
 
                 case Key.X:
+                    if (e.Repeat)
+                        return false;
+
                     // Restart playback from beginning of track.
                     clock.Seek(0);
                     clock.Start();
                     return true;
 
                 case Key.C:
+                    if (e.Repeat)
+                        return false;
+
                     // Pause or resume.
                     if (clock.IsRunning)
                         clock.Stop();
@@ -557,6 +566,9 @@ namespace osu.Game.Screens.Edit
                     return true;
 
                 case Key.V:
+                    if (e.Repeat)
+                        return false;
+
                     // Seek to last object time, or track end if already there.
                     // Note that in osu-stable subsequent presses when at track end won't return to last object.
                     // This has intentionally been changed to make it more useful.

From df49a48d4d70e3a365cccd76778c0b8f60f0adb2 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 13 Jun 2023 13:48:47 -0700
Subject: [PATCH 0841/1604] Put left and right details inside `GridContainer`

---
 .../Lounge/Components/DrawableRoom.cs         | 163 ++++++++++--------
 1 file changed, 89 insertions(+), 74 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
index f1fc751630..f26d9b168d 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
@@ -117,94 +117,109 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
                                     Colour = ColourInfo.GradientHorizontal(colours.Background5, colours.Background5.Opacity(0.3f)),
                                     Width = 0.8f,
                                 },
-                                new Container
+                                new GridContainer
                                 {
-                                    Name = @"Left details",
                                     RelativeSizeAxes = Axes.Both,
-                                    Padding = new MarginPadding
+                                    ColumnDimensions = new[]
                                     {
-                                        Left = 20,
-                                        Vertical = 5
+                                        new Dimension(),
+                                        new Dimension(GridSizeMode.AutoSize),
                                     },
-                                    Children = new Drawable[]
+                                    Content = new[]
                                     {
-                                        new FillFlowContainer
+                                        new Drawable[]
                                         {
-                                            RelativeSizeAxes = Axes.X,
-                                            AutoSizeAxes = Axes.Y,
-                                            Direction = FillDirection.Vertical,
-                                            Children = new Drawable[]
+                                            new Container
                                             {
-                                                new FillFlowContainer
+                                                Name = @"Left details",
+                                                RelativeSizeAxes = Axes.Both,
+                                                Padding = new MarginPadding
                                                 {
-                                                    AutoSizeAxes = Axes.Both,
-                                                    Direction = FillDirection.Horizontal,
-                                                    Spacing = new Vector2(5),
-                                                    Children = new Drawable[]
-                                                    {
-                                                        new RoomStatusPill
-                                                        {
-                                                            Anchor = Anchor.CentreLeft,
-                                                            Origin = Anchor.CentreLeft
-                                                        },
-                                                        specialCategoryPill = new RoomSpecialCategoryPill
-                                                        {
-                                                            Anchor = Anchor.CentreLeft,
-                                                            Origin = Anchor.CentreLeft
-                                                        },
-                                                        endDateInfo = new EndDateInfo
-                                                        {
-                                                            Anchor = Anchor.CentreLeft,
-                                                            Origin = Anchor.CentreLeft,
-                                                        },
-                                                    }
+                                                    Left = 20,
+                                                    Vertical = 5
                                                 },
-                                                new FillFlowContainer
+                                                Children = new Drawable[]
                                                 {
-                                                    RelativeSizeAxes = Axes.X,
-                                                    AutoSizeAxes = Axes.Y,
-                                                    Padding = new MarginPadding { Top = 3 },
-                                                    Direction = FillDirection.Vertical,
-                                                    Children = new Drawable[]
+                                                    new FillFlowContainer
                                                     {
-                                                        new RoomNameText(),
-                                                        new RoomStatusText()
+                                                        RelativeSizeAxes = Axes.X,
+                                                        AutoSizeAxes = Axes.Y,
+                                                        Direction = FillDirection.Vertical,
+                                                        Children = new Drawable[]
+                                                        {
+                                                            new FillFlowContainer
+                                                            {
+                                                                AutoSizeAxes = Axes.Both,
+                                                                Direction = FillDirection.Horizontal,
+                                                                Spacing = new Vector2(5),
+                                                                Children = new Drawable[]
+                                                                {
+                                                                    new RoomStatusPill
+                                                                    {
+                                                                        Anchor = Anchor.CentreLeft,
+                                                                        Origin = Anchor.CentreLeft
+                                                                    },
+                                                                    specialCategoryPill = new RoomSpecialCategoryPill
+                                                                    {
+                                                                        Anchor = Anchor.CentreLeft,
+                                                                        Origin = Anchor.CentreLeft
+                                                                    },
+                                                                    endDateInfo = new EndDateInfo
+                                                                    {
+                                                                        Anchor = Anchor.CentreLeft,
+                                                                        Origin = Anchor.CentreLeft,
+                                                                    },
+                                                                }
+                                                            },
+                                                            new FillFlowContainer
+                                                            {
+                                                                RelativeSizeAxes = Axes.X,
+                                                                AutoSizeAxes = Axes.Y,
+                                                                Padding = new MarginPadding { Top = 3 },
+                                                                Direction = FillDirection.Vertical,
+                                                                Children = new Drawable[]
+                                                                {
+                                                                    new RoomNameText(),
+                                                                    new RoomStatusText()
+                                                                }
+                                                            }
+                                                        },
+                                                    },
+                                                    new FillFlowContainer
+                                                    {
+                                                        Anchor = Anchor.BottomLeft,
+                                                        Origin = Anchor.BottomLeft,
+                                                        AutoSizeAxes = Axes.Both,
+                                                        Direction = FillDirection.Horizontal,
+                                                        Spacing = new Vector2(5),
+                                                        ChildrenEnumerable = CreateBottomDetails()
+                                                    }
+                                                }
+                                            },
+                                            new FillFlowContainer
+                                            {
+                                                Name = "Right content",
+                                                Anchor = Anchor.CentreRight,
+                                                Origin = Anchor.CentreRight,
+                                                AutoSizeAxes = Axes.X,
+                                                RelativeSizeAxes = Axes.Y,
+                                                Spacing = new Vector2(5),
+                                                Padding = new MarginPadding
+                                                {
+                                                    Right = 10,
+                                                    Vertical = 20,
+                                                },
+                                                Children = new Drawable[]
+                                                {
+                                                    ButtonsContainer,
+                                                    drawableRoomParticipantsList = new DrawableRoomParticipantsList
+                                                    {
+                                                        Anchor = Anchor.CentreRight,
+                                                        Origin = Anchor.CentreRight,
+                                                        NumberOfCircles = NumberOfAvatars
                                                     }
                                                 }
                                             },
-                                        },
-                                        new FillFlowContainer
-                                        {
-                                            Anchor = Anchor.BottomLeft,
-                                            Origin = Anchor.BottomLeft,
-                                            AutoSizeAxes = Axes.Both,
-                                            Direction = FillDirection.Horizontal,
-                                            Spacing = new Vector2(5),
-                                            ChildrenEnumerable = CreateBottomDetails()
-                                        }
-                                    }
-                                },
-                                new FillFlowContainer
-                                {
-                                    Name = "Right content",
-                                    Anchor = Anchor.CentreRight,
-                                    Origin = Anchor.CentreRight,
-                                    AutoSizeAxes = Axes.X,
-                                    RelativeSizeAxes = Axes.Y,
-                                    Spacing = new Vector2(5),
-                                    Padding = new MarginPadding
-                                    {
-                                        Right = 10,
-                                        Vertical = 20,
-                                    },
-                                    Children = new Drawable[]
-                                    {
-                                        ButtonsContainer,
-                                        drawableRoomParticipantsList = new DrawableRoomParticipantsList
-                                        {
-                                            Anchor = Anchor.CentreRight,
-                                            Origin = Anchor.CentreRight,
-                                            NumberOfCircles = NumberOfAvatars
                                         }
                                     }
                                 },

From 2a3f2ff122e0ec8fe0d26ddc9a6b72c4ca253af9 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 13 Jun 2023 13:56:29 -0700
Subject: [PATCH 0842/1604] Truncate room name text

---
 .../Lounge/Components/DrawableRoom.cs         | 24 +++++--------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
index f26d9b168d..11c649a9ae 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
@@ -179,7 +179,12 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
                                                                 Direction = FillDirection.Vertical,
                                                                 Children = new Drawable[]
                                                                 {
-                                                                    new RoomNameText(),
+                                                                    new TruncatingSpriteText
+                                                                    {
+                                                                        RelativeSizeAxes = Axes.X,
+                                                                        Font = OsuFont.GetFont(size: 28),
+                                                                        Current = { BindTarget = Room.Name }
+                                                                    },
                                                                     new RoomStatusText()
                                                                 }
                                                             }
@@ -316,23 +321,6 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
             return pills;
         }
 
-        private partial class RoomNameText : OsuSpriteText
-        {
-            [Resolved(typeof(Room), nameof(Online.Rooms.Room.Name))]
-            private Bindable<string> name { get; set; }
-
-            public RoomNameText()
-            {
-                Font = OsuFont.GetFont(size: 28);
-            }
-
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                Current = name;
-            }
-        }
-
         private partial class RoomStatusText : OnlinePlayComposite
         {
             [Resolved]

From 05bdc924267edf3afdea1a8573cc5ce603c5c1e5 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 13 Jun 2023 13:58:58 -0700
Subject: [PATCH 0843/1604] Add right padding according to right detail shear

---
 .../OnlinePlay/Lounge/Components/DrawableRoom.cs     |  1 +
 .../Components/DrawableRoomParticipantsList.cs       | 12 +++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
index 11c649a9ae..ad421fce94 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
@@ -136,6 +136,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
                                                 Padding = new MarginPadding
                                                 {
                                                     Left = 20,
+                                                    Right = DrawableRoomParticipantsList.SHEAR_WIDTH,
                                                     Vertical = 5
                                                 },
                                                 Children = new Drawable[]
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoomParticipantsList.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoomParticipantsList.cs
index c31633eefc..06f9f35479 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoomParticipantsList.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoomParticipantsList.cs
@@ -24,8 +24,14 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
     public partial class DrawableRoomParticipantsList : OnlinePlayComposite
     {
+        public const float SHEAR_WIDTH = 12f;
+
         private const float avatar_size = 36;
 
+        private const float height = 60f;
+
+        private static readonly Vector2 shear = new Vector2(SHEAR_WIDTH / height, 0);
+
         private FillFlowContainer<CircularAvatar> avatarFlow;
 
         private CircularAvatar hostAvatar;
@@ -36,7 +42,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
         public DrawableRoomParticipantsList()
         {
             AutoSizeAxes = Axes.X;
-            Height = 60;
+            Height = height;
         }
 
         [BackgroundDependencyLoader]
@@ -49,7 +55,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
                     RelativeSizeAxes = Axes.Both,
                     Masking = true,
                     CornerRadius = 10,
-                    Shear = new Vector2(0.2f, 0),
+                    Shear = shear,
                     Child = new Box
                     {
                         RelativeSizeAxes = Axes.Both,
@@ -98,7 +104,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
                                     RelativeSizeAxes = Axes.Both,
                                     Masking = true,
                                     CornerRadius = 10,
-                                    Shear = new Vector2(0.2f, 0),
+                                    Shear = shear,
                                     Child = new Box
                                     {
                                         RelativeSizeAxes = Axes.Both,

From 83abc80950f5e19c590d8c5099aaf872411a7708 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Jun 2023 13:54:37 +0900
Subject: [PATCH 0844/1604] Update resources

---
 osu.Game/osu.Game.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index b2faa7dfc2..e08b09aef9 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -37,7 +37,7 @@
     </PackageReference>
     <PackageReference Include="Realm" Version="10.20.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2023.608.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.510.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.605.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />

From 24d8e336e24fbdb1f4fdfe01f7c2336546a3184b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 14 Jun 2023 07:55:03 +0300
Subject: [PATCH 0845/1604] Remove width limit on room status text in favour of
 cell distribution

---
 osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
index ad421fce94..ef06d21655 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
@@ -337,7 +337,6 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
             {
                 RelativeSizeAxes = Axes.X;
                 AutoSizeAxes = Axes.Y;
-                Width = 0.5f;
             }
 
             [BackgroundDependencyLoader]

From 6543c720efcf154f0d29b8e839aa076e5a8359d0 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 14 Jun 2023 09:58:39 +0300
Subject: [PATCH 0846/1604] Fix map pool test scene using invalid mod acronyms

---
 osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
index 5695cb5574..48375c2cbd 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
@@ -92,7 +92,7 @@ namespace osu.Game.Tournament.Tests.Screens
                 Ladder.CurrentMatch.Value.Round.Value.Beatmaps.Clear();
 
                 for (int i = 0; i < 11; i++)
-                    addBeatmap(i > 4 ? $"M{i}" : "NM");
+                    addBeatmap(i > 4 ? Ruleset.Value.CreateInstance().AllMods.ElementAt(i).Acronym : "NM");
             });
 
             AddStep("reset match", () =>
@@ -118,7 +118,7 @@ namespace osu.Game.Tournament.Tests.Screens
                 Ladder.CurrentMatch.Value.Round.Value.Beatmaps.Clear();
 
                 for (int i = 0; i < 12; i++)
-                    addBeatmap(i > 4 ? $"M{i}" : "NM");
+                    addBeatmap(i > 4 ? Ruleset.Value.CreateInstance().AllMods.ElementAt(i).Acronym : "NM");
             });
 
             AddStep("reset match", () =>
@@ -130,7 +130,7 @@ namespace osu.Game.Tournament.Tests.Screens
             assertThreeWide();
         }
 
-        private void addBeatmap(string mods = "nm")
+        private void addBeatmap(string mods = "NM")
         {
             Ladder.CurrentMatch.Value.Round.Value.Beatmaps.Add(new RoundBeatmap
             {

From 90a5c75474275cd56bfd8031bd35b6a94d7c3e4c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 14 Jun 2023 10:01:01 +0300
Subject: [PATCH 0847/1604] Add setting to ladder info and simplify changes

---
 osu.Game.Tournament/Models/LadderInfo.cs      |  2 +
 .../Screens/MapPool/MapPoolScreen.cs          | 79 +++++++++----------
 2 files changed, 39 insertions(+), 42 deletions(-)

diff --git a/osu.Game.Tournament/Models/LadderInfo.cs b/osu.Game.Tournament/Models/LadderInfo.cs
index 6b64a1156e..cb4e8bc16a 100644
--- a/osu.Game.Tournament/Models/LadderInfo.cs
+++ b/osu.Game.Tournament/Models/LadderInfo.cs
@@ -42,5 +42,7 @@ namespace osu.Game.Tournament.Models
         };
 
         public Bindable<bool> AutoProgressScreens = new BindableBool(true);
+
+        public Bindable<bool> SplitMapPoolByMods = new BindableBool(true);
     }
 }
diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index fcb0c4d70b..cb6c5902ec 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
@@ -11,7 +11,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
 using osu.Framework.Threading;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Overlays.Settings;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.IPC;
 using osu.Game.Tournament.Models;
@@ -25,8 +24,7 @@ namespace osu.Game.Tournament.Screens.MapPool
 {
     public partial class MapPoolScreen : TournamentMatchScreen
     {
-        private readonly FillFlowContainer<FillFlowContainer<TournamentBeatmapPanel>> mapFlows;
-        private TournamentMatch currentMatch;
+        private FillFlowContainer<FillFlowContainer<TournamentBeatmapPanel>> mapFlows;
 
         [Resolved(canBeNull: true)]
         private TournamentSceneManager sceneManager { get; set; }
@@ -34,14 +32,13 @@ namespace osu.Game.Tournament.Screens.MapPool
         private TeamColour pickColour;
         private ChoiceType pickType;
 
-        private readonly OsuButton buttonRedBan;
-        private readonly OsuButton buttonBlueBan;
-        private readonly OsuButton buttonRedPick;
-        private readonly OsuButton buttonBluePick;
+        private OsuButton buttonRedBan;
+        private OsuButton buttonBlueBan;
+        private OsuButton buttonRedPick;
+        private OsuButton buttonBluePick;
 
-        private readonly SettingsCheckbox chkBoxLineBreak;
-
-        public MapPoolScreen()
+        [BackgroundDependencyLoader]
+        private void load(MatchIPCInfo ipc)
         {
             InternalChildren = new Drawable[]
             {
@@ -102,26 +99,26 @@ namespace osu.Game.Tournament.Screens.MapPool
                             Action = reset
                         },
                         new ControlPanel.Spacer(),
-                        new TournamentSpriteText
+                        new OsuCheckbox
                         {
-                            Text = "Each modpool takes"
+                            LabelText = "Split display by mods",
+                            Current = LadderInfo.SplitMapPoolByMods,
                         },
-                        new TournamentSpriteText
-                        {
-                            Text = "different row"
-                        },
-                        chkBoxLineBreak = new SettingsCheckbox()
                     },
                 }
             };
+
+            ipc.Beatmap.BindValueChanged(beatmapChanged);
         }
 
-        [BackgroundDependencyLoader]
-        private void load(MatchIPCInfo ipc)
+        private Bindable<bool> splitMapPoolByMods;
+
+        protected override void LoadComplete()
         {
-            ipc.Beatmap.BindValueChanged(beatmapChanged);
-            chkBoxLineBreak.Current.Value = true;
-            chkBoxLineBreak.Current.BindValueChanged(_ => rearrangeMappool());
+            base.LoadComplete();
+
+            splitMapPoolByMods = LadderInfo.SplitMapPoolByMods.GetBoundCopy();
+            splitMapPoolByMods.BindValueChanged(_ => updateDisplay());
         }
 
         private void beatmapChanged(ValueChangedEvent<TournamentBeatmap> beatmap)
@@ -228,42 +225,40 @@ namespace osu.Game.Tournament.Screens.MapPool
         protected override void CurrentMatchChanged(ValueChangedEvent<TournamentMatch> match)
         {
             base.CurrentMatchChanged(match);
-            currentMatch = match.NewValue;
-            rearrangeMappool();
+            updateDisplay();
         }
 
-        private void rearrangeMappool()
+        private void updateDisplay()
         {
             mapFlows.Clear();
 
-            if (currentMatch == null)
+            if (CurrentMatch.Value == null)
                 return;
+
             int totalRows = 0;
 
-            if (currentMatch.Round.Value != null)
+            if (CurrentMatch.Value.Round.Value != null)
             {
                 FillFlowContainer<TournamentBeatmapPanel> currentFlow = null;
-                string currentMod = null;
+                string currentMods = null;
                 int flowCount = 0;
 
-                foreach (var b in currentMatch.Round.Value.Beatmaps)
+                foreach (var b in CurrentMatch.Value.Round.Value.Beatmaps)
                 {
-                    if (currentFlow == null || currentMod != b.Mods)
+                    if (currentFlow == null || (LadderInfo.SplitMapPoolByMods.Value && currentMods != b.Mods))
                     {
-                        if (chkBoxLineBreak.Current.Value || currentFlow == null)
+                        mapFlows.Add(currentFlow = new FillFlowContainer<TournamentBeatmapPanel>
                         {
-                            mapFlows.Add(currentFlow = new FillFlowContainer<TournamentBeatmapPanel>
-                            {
-                                Spacing = new Vector2(10, 5),
-                                Direction = FillDirection.Full,
-                                RelativeSizeAxes = Axes.X,
-                                AutoSizeAxes = Axes.Y
-                            });
+                            Spacing = new Vector2(10, 5),
+                            Direction = FillDirection.Full,
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y
+                        });
 
-                            totalRows++;
-                            flowCount = 0;
-                        }
-                        currentMod = b.Mods;
+                        currentMods = b.Mods;
+
+                        totalRows++;
+                        flowCount = 0;
                     }
 
                     if (++flowCount > 2)

From 78fe71182430e145a4d647b40c15a6118b448550 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 14 Jun 2023 10:01:52 +0300
Subject: [PATCH 0848/1604] Add visual test case

---
 .../Screens/TestSceneMapPoolScreen.cs         | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
index 48375c2cbd..0ffbeeb491 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
@@ -24,6 +24,9 @@ namespace osu.Game.Tournament.Tests.Screens
             Add(screen = new MapPoolScreen { Width = 0.7f });
         }
 
+        [SetUp]
+        public void SetUp() => Schedule(() => Ladder.SplitMapPoolByMods.Value = true);
+
         [Test]
         public void TestFewMaps()
         {
@@ -130,6 +133,26 @@ namespace osu.Game.Tournament.Tests.Screens
             assertThreeWide();
         }
 
+        [Test]
+        public void TestDisableMapsPerMod()
+        {
+            AddStep("load many maps", () =>
+            {
+                Ladder.CurrentMatch.Value.Round.Value.Beatmaps.Clear();
+
+                for (int i = 0; i < 12; i++)
+                    addBeatmap(i > 4 ? Ruleset.Value.CreateInstance().AllMods.ElementAt(i).Acronym : "NM");
+            });
+
+            AddStep("disable maps per mod", () => Ladder.SplitMapPoolByMods.Value = false);
+
+            AddStep("reset match", () =>
+            {
+                Ladder.CurrentMatch.Value = new TournamentMatch();
+                Ladder.CurrentMatch.Value = Ladder.Matches.First();
+            });
+        }
+
         private void addBeatmap(string mods = "NM")
         {
             Ladder.CurrentMatch.Value.Round.Value.Beatmaps.Add(new RoundBeatmap

From 758831b983e86a3c178a0ae1e4efeaf9bdba2032 Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Wed, 14 Jun 2023 13:25:24 +0200
Subject: [PATCH 0849/1604] test: remove hard usages of `KeyCounterDisplay`

---
 osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs   |  7 ++++---
 .../Visual/Gameplay/TestSceneGameplayRewinding.cs     |  6 ++++--
 osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs | 11 +++++++----
 osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs     |  5 ++++-
 .../Gameplay/TestSceneSkinEditorMultipleSkins.cs      |  6 ------
 .../Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs   |  6 +++---
 6 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
index f3f942b74b..f628709db0 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
@@ -13,6 +13,7 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.Break;
+using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Ranking;
 using osu.Game.Users.Drawables;
 
@@ -35,14 +36,14 @@ namespace osu.Game.Tests.Visual.Gameplay
             var referenceBeatmap = CreateBeatmap(new OsuRuleset().RulesetInfo);
 
             AddUntilStep("score above zero", () => Player.ScoreProcessor.TotalScore.Value > 0);
-            AddUntilStep("key counter counted keys", () => Player.HUDOverlay.KeyCounter.Counters.Any(kc => kc.CountPresses.Value > 2));
+            AddUntilStep("key counter counted keys", () => Player.HUDOverlay.ChildrenOfType<KeyCounterDisplay>().FirstOrDefault()?.Counters.Any(kc => kc.CountPresses.Value > 2) ?? false);
 
             seekTo(referenceBeatmap.Breaks[0].StartTime);
-            AddAssert("keys not counting", () => !Player.HUDOverlay.KeyCounter.IsCounting.Value);
+            AddAssert("keys not counting", () => !Player.HUDOverlay.ChildrenOfType<KeyCounterDisplay>().FirstOrDefault()?.IsCounting.Value ?? false);
             AddAssert("overlay displays 100% accuracy", () => Player.BreakOverlay.ChildrenOfType<BreakInfo>().Single().AccuracyDisplay.Current.Value == 1);
 
             AddStep("rewind", () => Player.GameplayClockContainer.Seek(-80000));
-            AddUntilStep("key counter reset", () => Player.HUDOverlay.KeyCounter.Counters.All(kc => kc.CountPresses.Value == 0));
+            AddUntilStep("key counter reset", () => Player.HUDOverlay.ChildrenOfType<KeyCounterDisplay>().FirstOrDefault()?.Counters.All(kc => kc.CountPresses.Value == 0) ?? false);
 
             seekTo(referenceBeatmap.HitObjects[^1].GetEndTime());
             AddUntilStep("results displayed", () => getResultsScreen()?.IsLoaded == true);
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs
index 751aeb4e13..3d920a3e92 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs
@@ -7,11 +7,13 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
+using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Screens.Play.HUD;
 using osu.Game.Storyboards;
 using osuTK;
 
@@ -31,11 +33,11 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("wait for track to start running", () => Beatmap.Value.Track.IsRunning);
             addSeekStep(3000);
             AddAssert("all judged", () => Player.DrawableRuleset.Playfield.AllHitObjects.All(h => h.Judged));
-            AddUntilStep("key counter counted keys", () => Player.HUDOverlay.KeyCounter.Counters.Select(kc => kc.CountPresses.Value).Sum() == 15);
+            AddUntilStep("key counter counted keys", () => Player.HUDOverlay.ChildrenOfType<KeyCounterDisplay>()?.FirstOrDefault()?.Counters.Select(kc => kc.CountPresses.Value).Sum() == 15);
             AddStep("clear results", () => Player.Results.Clear());
             addSeekStep(0);
             AddAssert("none judged", () => Player.DrawableRuleset.Playfield.AllHitObjects.All(h => !h.Judged));
-            AddUntilStep("key counters reset", () => Player.HUDOverlay.KeyCounter.Counters.All(kc => kc.CountPresses.Value == 0));
+            AddUntilStep("key counters reset", () => Player.HUDOverlay.ChildrenOfType<KeyCounterDisplay>().FirstOrDefault()?.Counters.All(kc => kc.CountPresses.Value == 0) ?? false);
             AddAssert("no results triggered", () => Player.Results.Count == 0);
         }
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index f97019e466..857d2b1d2d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -6,6 +6,7 @@ using System.Diagnostics;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -44,8 +45,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         private readonly IGameplayClock gameplayClock = new GameplayClockContainer(new FramedClock());
 
         // best way to check without exposing.
-        private Drawable hideTarget => hudOverlay.KeyCounter;
-        private Drawable keyCounterFlow => hudOverlay.KeyCounter.ChildrenOfType<FillFlowContainer<KeyCounter>>().Single();
+        private Drawable hideTarget => hudOverlay.ChildrenOfType<KeyCounterDisplay>().First();
+        private Drawable keyCounterFlow => hudOverlay.ChildrenOfType<KeyCounterDisplay>().First().ChildrenOfType<FillFlowContainer<KeyCounter>>().Single();
 
         [BackgroundDependencyLoader]
         private void load()
@@ -138,7 +139,9 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("hide key overlay", () =>
             {
                 localConfig.SetValue(OsuSetting.KeyOverlay, false);
-                hudOverlay.KeyCounter.AlwaysVisible.Value = false;
+                var kcd = hudOverlay.ChildrenOfType<KeyCounterDisplay>().FirstOrDefault();
+                if (kcd != null)
+                    kcd.AlwaysVisible.Value = false;
             });
 
             AddStep("set showhud false", () => hudOverlay.ShowHud.Value = false);
@@ -267,7 +270,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 hudOverlay = new HUDOverlay(null, Array.Empty<Mod>());
 
                 // Add any key just to display the key counter visually.
-                hudOverlay.KeyCounter.Add(new KeyCounterKeyboardTrigger(Key.Space));
+                hudOverlay.ChildrenOfType<KeyCounterDisplay>().ForEach(k => k.Add(new KeyCounterKeyboardTrigger(Key.Space)));
 
                 scoreProcessor.Combo.Value = 1;
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs
index bf9b13b320..1fe7fc9063 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs
@@ -6,11 +6,13 @@
 using System;
 using System.ComponentModel;
 using System.Linq;
+using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
+using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
@@ -27,7 +29,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         protected override void AddCheckSteps()
         {
             AddUntilStep("score above zero", () => ((ScoreAccessibleReplayPlayer)Player).ScoreProcessor.TotalScore.Value > 0);
-            AddUntilStep("key counter counted keys", () => ((ScoreAccessibleReplayPlayer)Player).HUDOverlay.KeyCounter.Counters.Any(kc => kc.CountPresses.Value > 0));
+            AddUntilStep("key counter counted keys", () => ((ScoreAccessibleReplayPlayer)Player).HUDOverlay.ChildrenOfType<KeyCounterDisplay>().FirstOrDefault()?.Counters.Any(kc => kc.CountPresses
+                .Value > 0) ?? false);
             AddAssert("cannot fail", () => !((ScoreAccessibleReplayPlayer)Player).AllowFail);
         }
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
index 4ae115a68d..25cbe54cc3 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
@@ -14,9 +14,7 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Play;
-using osu.Game.Screens.Play.HUD;
 using osu.Game.Tests.Gameplay;
-using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
@@ -57,10 +55,6 @@ namespace osu.Game.Tests.Visual.Gameplay
                         Origin = Anchor.Centre,
                     };
 
-                    // Add any key just to display the key counter visually.
-                    hudOverlay.KeyCounter.Add(new KeyCounterKeyboardTrigger(Key.Space));
-                    scoreProcessor.Combo.Value = 1;
-
                     return new Container
                     {
                         RelativeSizeAxes = Axes.Both,
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
index 89432940ba..47f1ebf024 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
@@ -43,8 +43,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         private IEnumerable<HUDOverlay> hudOverlays => CreatedDrawables.OfType<HUDOverlay>();
 
         // best way to check without exposing.
-        private Drawable hideTarget => hudOverlay.KeyCounter;
-        private Drawable keyCounterFlow => hudOverlay.KeyCounter.ChildrenOfType<FillFlowContainer<KeyCounter>>().Single();
+        private Drawable hideTarget => hudOverlay.ChildrenOfType<KeyCounterDisplay>().First();
+        private Drawable keyCounterFlow => hudOverlay.ChildrenOfType<KeyCounterDisplay>().First().ChildrenOfType<FillFlowContainer<KeyCounter>>().Single();
 
         [Test]
         public void TestComboCounterIncrementing()
@@ -89,7 +89,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                     hudOverlay = new HUDOverlay(null, Array.Empty<Mod>());
 
                     // Add any key just to display the key counter visually.
-                    hudOverlay.KeyCounter.Add(new KeyCounterKeyboardTrigger(Key.Space));
+                    hudOverlay.ChildrenOfType<KeyCounterDisplay>().ForEach(k => k.Add(new KeyCounterKeyboardTrigger(Key.Space)));
 
                     action?.Invoke(hudOverlay);
 

From ed95fb59823d4c2459f8921aaa0c883535bb6e37 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Wed, 14 Jun 2023 07:30:46 -0700
Subject: [PATCH 0850/1604] Revert blocking password requirement text
 localisation

---
 osu.Game/Localisation/AccountCreationStrings.cs  | 11 -----------
 osu.Game/Overlays/AccountCreation/ScreenEntry.cs |  9 +++------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Localisation/AccountCreationStrings.cs b/osu.Game/Localisation/AccountCreationStrings.cs
index 6acfaaa9ac..3884e4d8bf 100644
--- a/osu.Game/Localisation/AccountCreationStrings.cs
+++ b/osu.Game/Localisation/AccountCreationStrings.cs
@@ -51,17 +51,6 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString MakeSureToGetIt => new TranslatableString(getKey(@"make_sure_to_get_it"), @" Make sure to get it right!");
 
-        /// <summary>
-        /// "At least {0}. Choose something long but also something you will remember, like a line from your favourite song."
-        /// </summary>
-        public static LocalisableString PasswordRequirements(string arg0) => new TranslatableString(getKey(@"password_requirements"),
-            @"At least {0}. Choose something long but also something you will remember, like a line from your favourite song.", arg0);
-
-        /// <summary>
-        /// "8 characters long"
-        /// </summary>
-        public static LocalisableString CharactersLong => new TranslatableString(getKey(@"characters_long"), @"8 characters long");
-
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
 }
diff --git a/osu.Game/Overlays/AccountCreation/ScreenEntry.cs b/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
index 5725f9cf7d..ec3e7f893f 100644
--- a/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
+++ b/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
@@ -139,12 +139,9 @@ namespace osu.Game.Overlays.AccountCreation
             emailAddressDescription.AddText(AccountCreationStrings.EmailUsage);
             emailAddressDescription.AddText(AccountCreationStrings.MakeSureToGetIt, cp => cp.Font = cp.Font.With(Typeface.Torus, weight: FontWeight.Bold));
 
-            string[] passwordReq = localisationManager.GetLocalisedBindableString(AccountCreationStrings.PasswordRequirements("{}")).Value.Split("{}");
-            if (passwordReq.Length != 2) passwordReq = AccountCreationStrings.PasswordRequirements("{}").ToString().Split("{}");
-
-            passwordDescription.AddText(passwordReq[0]);
-            characterCheckText = passwordDescription.AddText(AccountCreationStrings.CharactersLong);
-            passwordDescription.AddText(passwordReq[1]);
+            passwordDescription.AddText("At least ");
+            characterCheckText = passwordDescription.AddText("8 characters long");
+            passwordDescription.AddText(". Choose something long but also something you will remember, like a line from your favourite song.");
 
             passwordTextBox.Current.BindValueChanged(_ => updateCharacterCheckTextColour(), true);
             characterCheckText.DrawablePartsRecreated += _ => updateCharacterCheckTextColour();

From 8cecfef2ff6bfe30d2f2af2419449eadbacd4235 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Wed, 14 Jun 2023 07:40:26 -0700
Subject: [PATCH 0851/1604] Apply key renaming suggestions

---
 osu.Game/Localisation/AccountCreationStrings.cs    | 12 ++++++------
 osu.Game/Overlays/AccountCreation/ScreenEntry.cs   |  6 +++---
 osu.Game/Overlays/AccountCreation/ScreenWarning.cs |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Localisation/AccountCreationStrings.cs b/osu.Game/Localisation/AccountCreationStrings.cs
index 3884e4d8bf..282e458bb9 100644
--- a/osu.Game/Localisation/AccountCreationStrings.cs
+++ b/osu.Game/Localisation/AccountCreationStrings.cs
@@ -27,29 +27,29 @@ namespace osu.Game.Localisation
         /// <summary>
         /// "Help, I can&#39;t access my account!"
         /// </summary>
-        public static LocalisableString HelpICantAccess => new TranslatableString(getKey(@"help_icant_access"), @"Help, I can't access my account!");
+        public static LocalisableString MultiAccountWarningHelp => new TranslatableString(getKey(@"multi_account_warning_help"), @"Help, I can't access my account!");
 
         /// <summary>
         /// "I understand. This account isn&#39;t for me."
         /// </summary>
-        public static LocalisableString AccountIsntForMe => new TranslatableString(getKey(@"account_isnt_for_me"), @"I understand. This account isn't for me.");
+        public static LocalisableString MultiAccountWarningAccept => new TranslatableString(getKey(@"multi_account_warning_accept"), @"I understand. This account isn't for me.");
 
         /// <summary>
         /// "This will be your public presence. No profanity, no impersonation. Avoid exposing your own personal details, too!"
         /// </summary>
-        public static LocalisableString ThisWillBeYourPublic => new TranslatableString(getKey(@"this_will_be_your_public"),
+        public static LocalisableString UsernameDescription => new TranslatableString(getKey(@"username_description"),
             @"This will be your public presence. No profanity, no impersonation. Avoid exposing your own personal details, too!");
 
         /// <summary>
         /// "Will be used for notifications, account verification and in the case you forget your password. No spam, ever."
         /// </summary>
-        public static LocalisableString EmailUsage =>
-            new TranslatableString(getKey(@"email_usage"), @"Will be used for notifications, account verification and in the case you forget your password. No spam, ever.");
+        public static LocalisableString EmailDescription1 =>
+            new TranslatableString(getKey(@"email_description_1"), @"Will be used for notifications, account verification and in the case you forget your password. No spam, ever.");
 
         /// <summary>
         /// " Make sure to get it right!"
         /// </summary>
-        public static LocalisableString MakeSureToGetIt => new TranslatableString(getKey(@"make_sure_to_get_it"), @" Make sure to get it right!");
+        public static LocalisableString EmailDescription2 => new TranslatableString(getKey(@"email_description_2"), @" Make sure to get it right!");
 
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
diff --git a/osu.Game/Overlays/AccountCreation/ScreenEntry.cs b/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
index ec3e7f893f..726fcc4304 100644
--- a/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
+++ b/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
@@ -134,10 +134,10 @@ namespace osu.Game.Overlays.AccountCreation
 
             textboxes = new[] { usernameTextBox, emailTextBox, passwordTextBox };
 
-            usernameDescription.AddText(AccountCreationStrings.ThisWillBeYourPublic);
+            usernameDescription.AddText(AccountCreationStrings.UsernameDescription);
 
-            emailAddressDescription.AddText(AccountCreationStrings.EmailUsage);
-            emailAddressDescription.AddText(AccountCreationStrings.MakeSureToGetIt, cp => cp.Font = cp.Font.With(Typeface.Torus, weight: FontWeight.Bold));
+            emailAddressDescription.AddText(AccountCreationStrings.EmailDescription1);
+            emailAddressDescription.AddText(AccountCreationStrings.EmailDescription2, cp => cp.Font = cp.Font.With(Typeface.Torus, weight: FontWeight.Bold));
 
             passwordDescription.AddText("At least ");
             characterCheckText = passwordDescription.AddText("8 characters long");
diff --git a/osu.Game/Overlays/AccountCreation/ScreenWarning.cs b/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
index f5807b49b5..0fbf6ba59e 100644
--- a/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
+++ b/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
@@ -102,13 +102,13 @@ namespace osu.Game.Overlays.AccountCreation
                         },
                         new SettingsButton
                         {
-                            Text = AccountCreationStrings.HelpICantAccess,
+                            Text = AccountCreationStrings.MultiAccountWarningHelp,
                             Margin = new MarginPadding { Top = 50 },
                             Action = () => game?.OpenUrlExternally(help_centre_url)
                         },
                         new DangerousSettingsButton
                         {
-                            Text = AccountCreationStrings.AccountIsntForMe,
+                            Text = AccountCreationStrings.MultiAccountWarningAccept,
                             Action = () => this.Push(new ScreenEntry())
                         },
                         furtherAssistance = new LinkFlowContainer(cp => cp.Font = cp.Font.With(size: 12))

From e4af1df6637e8a2f4fbc6613013d6cfadb81b0f3 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Wed, 14 Jun 2023 07:41:14 -0700
Subject: [PATCH 0852/1604] Apply automated formatting changes

---
 osu.Game/Localisation/AccountCreationStrings.cs | 6 ++----
 osu.Game/Localisation/CommonStrings.cs          | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Localisation/AccountCreationStrings.cs b/osu.Game/Localisation/AccountCreationStrings.cs
index 282e458bb9..20ba7fe953 100644
--- a/osu.Game/Localisation/AccountCreationStrings.cs
+++ b/osu.Game/Localisation/AccountCreationStrings.cs
@@ -37,14 +37,12 @@ namespace osu.Game.Localisation
         /// <summary>
         /// "This will be your public presence. No profanity, no impersonation. Avoid exposing your own personal details, too!"
         /// </summary>
-        public static LocalisableString UsernameDescription => new TranslatableString(getKey(@"username_description"),
-            @"This will be your public presence. No profanity, no impersonation. Avoid exposing your own personal details, too!");
+        public static LocalisableString UsernameDescription => new TranslatableString(getKey(@"username_description"), @"This will be your public presence. No profanity, no impersonation. Avoid exposing your own personal details, too!");
 
         /// <summary>
         /// "Will be used for notifications, account verification and in the case you forget your password. No spam, ever."
         /// </summary>
-        public static LocalisableString EmailDescription1 =>
-            new TranslatableString(getKey(@"email_description_1"), @"Will be used for notifications, account verification and in the case you forget your password. No spam, ever.");
+        public static LocalisableString EmailDescription1 => new TranslatableString(getKey(@"email_description_1"), @"Will be used for notifications, account verification and in the case you forget your password. No spam, ever.");
 
         /// <summary>
         /// " Make sure to get it right!"
diff --git a/osu.Game/Localisation/CommonStrings.cs b/osu.Game/Localisation/CommonStrings.cs
index 4ce05e96ef..ec78d34a16 100644
--- a/osu.Game/Localisation/CommonStrings.cs
+++ b/osu.Game/Localisation/CommonStrings.cs
@@ -166,4 +166,4 @@ namespace osu.Game.Localisation
 
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
-}
\ No newline at end of file
+}

From b54f3a2cba46e7073d2f5ba3ac798f8a3b732852 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Wed, 14 Jun 2023 07:58:55 -0700
Subject: [PATCH 0853/1604] Normalise source strings to sentence case

The casing of the "caps lock" tooltip wasn't changed in code, as tooltips should be ideally sentence-cased, see https://github.com/ppy/osu/pull/21765#issuecomment-1552378930.
---
 osu.Game/Localisation/AccountCreationStrings.cs    | 8 ++++----
 osu.Game/Localisation/CommonStrings.cs             | 4 ++--
 osu.Game/Localisation/LoginPanelStrings.cs         | 4 ++--
 osu.Game/Overlays/AccountCreation/ScreenWelcome.cs | 5 +++--
 osu.Game/Overlays/Login/LoginPanel.cs              | 2 +-
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Localisation/AccountCreationStrings.cs b/osu.Game/Localisation/AccountCreationStrings.cs
index 20ba7fe953..2183df9b52 100644
--- a/osu.Game/Localisation/AccountCreationStrings.cs
+++ b/osu.Game/Localisation/AccountCreationStrings.cs
@@ -10,14 +10,14 @@ namespace osu.Game.Localisation
         private const string prefix = @"osu.Game.Resources.Localisation.AccountCreation";
 
         /// <summary>
-        /// "New Player Registration"
+        /// "New player registration"
         /// </summary>
-        public static LocalisableString NewPlayerRegistration => new TranslatableString(getKey(@"new_player_registration"), @"New Player Registration");
+        public static LocalisableString NewPlayerRegistration => new TranslatableString(getKey(@"new_player_registration"), @"New player registration");
 
         /// <summary>
-        /// "let&#39;s get you started"
+        /// "Let&#39;s get you started"
         /// </summary>
-        public static LocalisableString LetsGetYouStarted => new TranslatableString(getKey(@"lets_get_you_started"), @"let's get you started");
+        public static LocalisableString LetsGetYouStarted => new TranslatableString(getKey(@"lets_get_you_started"), @"Let's get you started");
 
         /// <summary>
         /// "Let&#39;s create an account!"
diff --git a/osu.Game/Localisation/CommonStrings.cs b/osu.Game/Localisation/CommonStrings.cs
index ec78d34a16..c9223db246 100644
--- a/osu.Game/Localisation/CommonStrings.cs
+++ b/osu.Game/Localisation/CommonStrings.cs
@@ -155,9 +155,9 @@ namespace osu.Game.Localisation
         public static LocalisableString Exit => new TranslatableString(getKey(@"exit"), @"Exit");
 
         /// <summary>
-        /// "caps lock is active"
+        /// "Caps lock is active"
         /// </summary>
-        public static LocalisableString CapsLockIsActive => new TranslatableString(getKey(@"caps_lock_is_active"), @"caps lock is active");
+        public static LocalisableString CapsLockIsActive => new TranslatableString(getKey(@"caps_lock_is_active"), @"Caps lock is active");
 
         /// <summary>
         /// "Revert to default"
diff --git a/osu.Game/Localisation/LoginPanelStrings.cs b/osu.Game/Localisation/LoginPanelStrings.cs
index 535d86fbc5..19b0ca3b52 100644
--- a/osu.Game/Localisation/LoginPanelStrings.cs
+++ b/osu.Game/Localisation/LoginPanelStrings.cs
@@ -25,9 +25,9 @@ namespace osu.Game.Localisation
         public static LocalisableString SignedIn => new TranslatableString(getKey(@"signed_in"), @"Signed in");
 
         /// <summary>
-        /// "ACCOUNT"
+        /// "Account"
         /// </summary>
-        public static LocalisableString Account => new TranslatableString(getKey(@"account"), @"ACCOUNT");
+        public static LocalisableString Account => new TranslatableString(getKey(@"account"), @"Account");
 
         /// <summary>
         /// "Remember username"
diff --git a/osu.Game/Overlays/AccountCreation/ScreenWelcome.cs b/osu.Game/Overlays/AccountCreation/ScreenWelcome.cs
index a81b1019fe..610b9ee282 100644
--- a/osu.Game/Overlays/AccountCreation/ScreenWelcome.cs
+++ b/osu.Game/Overlays/AccountCreation/ScreenWelcome.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
@@ -45,14 +46,14 @@ namespace osu.Game.Overlays.AccountCreation
                         Anchor = Anchor.TopCentre,
                         Origin = Anchor.TopCentre,
                         Font = OsuFont.GetFont(size: 24, weight: FontWeight.Light),
-                        Text = AccountCreationStrings.NewPlayerRegistration,
+                        Text = AccountCreationStrings.NewPlayerRegistration.ToTitle(),
                     },
                     new OsuSpriteText
                     {
                         Anchor = Anchor.TopCentre,
                         Origin = Anchor.TopCentre,
                         Font = OsuFont.GetFont(size: 12),
-                        Text = AccountCreationStrings.LetsGetYouStarted,
+                        Text = AccountCreationStrings.LetsGetYouStarted.ToLower(),
                     },
                     new SettingsButton
                     {
diff --git a/osu.Game/Overlays/Login/LoginPanel.cs b/osu.Game/Overlays/Login/LoginPanel.cs
index fb9987bd82..79569ada65 100644
--- a/osu.Game/Overlays/Login/LoginPanel.cs
+++ b/osu.Game/Overlays/Login/LoginPanel.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Overlays.Login
                     {
                         new OsuSpriteText
                         {
-                            Text = LoginPanelStrings.Account,
+                            Text = LoginPanelStrings.Account.ToUpper(),
                             Margin = new MarginPadding { Bottom = 5 },
                             Font = OsuFont.GetFont(weight: FontWeight.Bold),
                         },

From 45e67fbe788bb34ac315ed1fb10e48d777c47cbe Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Wed, 14 Jun 2023 08:09:03 -0700
Subject: [PATCH 0854/1604] Remove unused load dependency

---
 osu.Game/Overlays/AccountCreation/ScreenEntry.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/AccountCreation/ScreenEntry.cs b/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
index 726fcc4304..9ad507d82a 100644
--- a/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
+++ b/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
@@ -10,7 +10,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Localisation;
 using osu.Framework.Utils;
 using osu.Framework.Platform;
 using osu.Framework.Screens;
@@ -53,7 +52,7 @@ namespace osu.Game.Overlays.AccountCreation
         private OsuGame game { get; set; }
 
         [BackgroundDependencyLoader]
-        private void load(LocalisationManager localisationManager)
+        private void load()
         {
             InternalChildren = new Drawable[]
             {

From e9ef270e46b04a2d62d73106c9b3ae11d378c934 Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Wed, 14 Jun 2023 19:39:28 +0200
Subject: [PATCH 0855/1604] refactor: move count logic in `InputTrigger`

This will allow us to keep track of the real count regardless of whether
the key counter has been placed mid-replay or not.
---
 osu.Game/Screens/Play/HUD/InputTrigger.cs | 30 ++++++++++++++++++++--
 osu.Game/Screens/Play/HUD/KeyCounter.cs   | 31 +++--------------------
 2 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/InputTrigger.cs b/osu.Game/Screens/Play/HUD/InputTrigger.cs
index b57f2cdf91..edc61ec142 100644
--- a/osu.Game/Screens/Play/HUD/InputTrigger.cs
+++ b/osu.Game/Screens/Play/HUD/InputTrigger.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 
 namespace osu.Game.Screens.Play.HUD
@@ -25,13 +26,38 @@ namespace osu.Game.Screens.Play.HUD
         public event OnActivateCallback? OnActivate;
         public event OnDeactivateCallback? OnDeactivate;
 
+        private readonly Bindable<int> activationCount = new BindableInt();
+        private readonly Bindable<bool> isCounting = new BindableBool(true);
+
+        /// <summary>
+        /// Number of times this <see cref="InputTrigger"/> has been activated.
+        /// </summary>
+        public IBindable<int> ActivationCount => activationCount;
+
+        /// <summary>
+        /// Whether any activation or deactivation of this <see cref="InputTrigger"/> impacts its <see cref="ActivationCount"/>
+        /// </summary>
+        public IBindable<bool> IsCounting => isCounting;
+
         protected InputTrigger(string name)
         {
             Name = name;
         }
 
-        protected void Activate(bool forwardPlayback = true) => OnActivate?.Invoke(forwardPlayback);
+        protected void Activate(bool forwardPlayback = true)
+        {
+            if (forwardPlayback && isCounting.Value)
+                activationCount.Value++;
 
-        protected void Deactivate(bool forwardPlayback = true) => OnDeactivate?.Invoke(forwardPlayback);
+            OnActivate?.Invoke(forwardPlayback);
+        }
+
+        protected void Deactivate(bool forwardPlayback = true)
+        {
+            if (!forwardPlayback && isCounting.Value)
+                activationCount.Value--;
+
+            OnDeactivate?.Invoke(forwardPlayback);
+        }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/KeyCounter.cs b/osu.Game/Screens/Play/HUD/KeyCounter.cs
index 7cdd6b025f..8074b30e75 100644
--- a/osu.Game/Screens/Play/HUD/KeyCounter.cs
+++ b/osu.Game/Screens/Play/HUD/KeyCounter.cs
@@ -22,15 +22,10 @@ namespace osu.Game.Screens.Play.HUD
         /// </summary>
         public Bindable<bool> IsCounting { get; } = new BindableBool(true);
 
-        private readonly Bindable<int> countPresses = new BindableInt
-        {
-            MinValue = 0
-        };
-
         /// <summary>
         /// The current count of registered key presses.
         /// </summary>
-        public IBindable<int> CountPresses => countPresses;
+        public IBindable<int> CountPresses => Trigger.ActivationCount;
 
         private readonly Container content;
 
@@ -49,46 +44,28 @@ namespace osu.Game.Screens.Play.HUD
                 {
                     RelativeSizeAxes = Axes.Both
                 },
-                Trigger = trigger,
             };
 
+            Trigger = trigger;
+
             Trigger.OnActivate += Activate;
             Trigger.OnDeactivate += Deactivate;
         }
 
-        private void increment()
-        {
-            if (!IsCounting.Value)
-                return;
-
-            countPresses.Value++;
-        }
-
-        private void decrement()
-        {
-            if (!IsCounting.Value)
-                return;
-
-            countPresses.Value--;
-        }
-
         protected virtual void Activate(bool forwardPlayback = true)
         {
             IsActive.Value = true;
-            if (forwardPlayback)
-                increment();
         }
 
         protected virtual void Deactivate(bool forwardPlayback = true)
         {
             IsActive.Value = false;
-            if (!forwardPlayback)
-                decrement();
         }
 
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
+
             Trigger.OnActivate -= Activate;
             Trigger.OnDeactivate -= Deactivate;
         }

From c637fddf73a4c7ead1cc9d1a534e82d0ecb351a0 Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Wed, 14 Jun 2023 21:13:35 +0200
Subject: [PATCH 0856/1604] refactor: decouple Trigger logic from
 `KeyCounterDisplay`

This allows to keep a coeherent state regardless of the progress of the play
---
 .../Visual/Gameplay/TestSceneAutoplay.cs      |  7 +-
 .../Gameplay/TestSceneGameplayRewinding.cs    |  8 +-
 .../Visual/Gameplay/TestSceneHUDOverlay.cs    |  3 +-
 .../Visual/Gameplay/TestSceneKeyCounter.cs    | 69 ++++++++------
 .../Visual/Gameplay/TestSceneReplay.cs        |  5 +-
 .../TestSceneSkinEditorMultipleSkins.cs       |  7 ++
 .../Gameplay/TestSceneSkinnableHUDOverlay.cs  |  2 +-
 osu.Game/Rulesets/UI/RulesetInputManager.cs   | 23 +++--
 .../Screens/Play/HUD/KeyCounterController.cs  | 95 +++++++++++++++++++
 .../Screens/Play/HUD/KeyCounterDisplay.cs     | 78 +++------------
 osu.Game/Screens/Play/HUDOverlay.cs           | 19 ++--
 osu.Game/Screens/Play/Player.cs               |  1 -
 12 files changed, 180 insertions(+), 137 deletions(-)
 create mode 100644 osu.Game/Screens/Play/HUD/KeyCounterController.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
index f628709db0..c829b73f66 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
@@ -13,7 +13,6 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.Break;
-using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Ranking;
 using osu.Game.Users.Drawables;
 
@@ -36,14 +35,14 @@ namespace osu.Game.Tests.Visual.Gameplay
             var referenceBeatmap = CreateBeatmap(new OsuRuleset().RulesetInfo);
 
             AddUntilStep("score above zero", () => Player.ScoreProcessor.TotalScore.Value > 0);
-            AddUntilStep("key counter counted keys", () => Player.HUDOverlay.ChildrenOfType<KeyCounterDisplay>().FirstOrDefault()?.Counters.Any(kc => kc.CountPresses.Value > 2) ?? false);
+            AddUntilStep("key counter counted keys", () => Player.HUDOverlay.KeyCounter.Triggers.Any(kc => kc.ActivationCount.Value > 2));
 
             seekTo(referenceBeatmap.Breaks[0].StartTime);
-            AddAssert("keys not counting", () => !Player.HUDOverlay.ChildrenOfType<KeyCounterDisplay>().FirstOrDefault()?.IsCounting.Value ?? false);
+            AddAssert("keys not counting", () => !Player.HUDOverlay.KeyCounter.IsCounting.Value);
             AddAssert("overlay displays 100% accuracy", () => Player.BreakOverlay.ChildrenOfType<BreakInfo>().Single().AccuracyDisplay.Current.Value == 1);
 
             AddStep("rewind", () => Player.GameplayClockContainer.Seek(-80000));
-            AddUntilStep("key counter reset", () => Player.HUDOverlay.ChildrenOfType<KeyCounterDisplay>().FirstOrDefault()?.Counters.All(kc => kc.CountPresses.Value == 0) ?? false);
+            AddUntilStep("key counter reset", () => Player.HUDOverlay.KeyCounter.Triggers.All(kc => kc.ActivationCount.Value == 0));
 
             seekTo(referenceBeatmap.HitObjects[^1].GetEndTime());
             AddUntilStep("results displayed", () => getResultsScreen()?.IsLoaded == true);
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs
index 3d920a3e92..508cf192d3 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs
@@ -7,13 +7,11 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
-using osu.Framework.Testing;
-using osu.Framework.Utils;
 using osu.Framework.Timing;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Screens.Play.HUD;
 using osu.Game.Storyboards;
 using osuTK;
 
@@ -33,11 +31,11 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("wait for track to start running", () => Beatmap.Value.Track.IsRunning);
             addSeekStep(3000);
             AddAssert("all judged", () => Player.DrawableRuleset.Playfield.AllHitObjects.All(h => h.Judged));
-            AddUntilStep("key counter counted keys", () => Player.HUDOverlay.ChildrenOfType<KeyCounterDisplay>()?.FirstOrDefault()?.Counters.Select(kc => kc.CountPresses.Value).Sum() == 15);
+            AddUntilStep("key counter counted keys", () => Player.HUDOverlay.KeyCounter.Triggers.Select(kc => kc.ActivationCount.Value).Sum() == 15);
             AddStep("clear results", () => Player.Results.Clear());
             addSeekStep(0);
             AddAssert("none judged", () => Player.DrawableRuleset.Playfield.AllHitObjects.All(h => !h.Judged));
-            AddUntilStep("key counters reset", () => Player.HUDOverlay.ChildrenOfType<KeyCounterDisplay>().FirstOrDefault()?.Counters.All(kc => kc.CountPresses.Value == 0) ?? false);
+            AddUntilStep("key counters reset", () => Player.HUDOverlay.KeyCounter.Triggers.All(kc => kc.ActivationCount.Value == 0));
             AddAssert("no results triggered", () => Player.Results.Count == 0);
         }
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index 857d2b1d2d..bbb10c5957 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -6,7 +6,6 @@ using System.Diagnostics;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -270,7 +269,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 hudOverlay = new HUDOverlay(null, Array.Empty<Mod>());
 
                 // Add any key just to display the key counter visually.
-                hudOverlay.ChildrenOfType<KeyCounterDisplay>().ForEach(k => k.Add(new KeyCounterKeyboardTrigger(Key.Space)));
+                hudOverlay.KeyCounter.Add(new KeyCounterKeyboardTrigger(Key.Space));
 
                 scoreProcessor.Combo.Value = 1;
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
index 22f7111f68..7bf9738fb4 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
@@ -5,7 +5,9 @@
 
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Utils;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.HUD;
@@ -17,64 +19,69 @@ namespace osu.Game.Tests.Visual.Gameplay
     [TestFixture]
     public partial class TestSceneKeyCounter : OsuManualInputManagerTestScene
     {
+        [Cached]
+        private readonly KeyCounterController controller;
+
+        private readonly KeyCounterDisplay defaultDisplay;
+
         public TestSceneKeyCounter()
         {
-            KeyCounterDisplay defaultDisplay = new DefaultKeyCounterDisplay
+            Children = new Drawable[]
             {
-                Origin = Anchor.Centre,
-                Anchor = Anchor.Centre,
-                Position = new Vector2(0, 72.7f)
+                controller = new KeyCounterController(),
+                new FillFlowContainer
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
+                    Direction = FillDirection.Vertical,
+                    Spacing = new Vector2(72.7f),
+                    Children = new[]
+                    {
+                        defaultDisplay = new DefaultKeyCounterDisplay
+                        {
+                            Origin = Anchor.Centre,
+                            Anchor = Anchor.Centre,
+                        },
+                        new ArgonKeyCounterDisplay
+                        {
+                            Origin = Anchor.Centre,
+                            Anchor = Anchor.Centre,
+                        }
+                    }
+                }
             };
 
-            KeyCounterDisplay argonDisplay = new ArgonKeyCounterDisplay
-            {
-                Origin = Anchor.Centre,
-                Anchor = Anchor.Centre,
-                Position = new Vector2(0, -72.7f)
-            };
-
-            defaultDisplay.AddRange(new InputTrigger[]
-            {
-                new KeyCounterKeyboardTrigger(Key.X),
-                new KeyCounterKeyboardTrigger(Key.X),
-                new KeyCounterMouseTrigger(MouseButton.Left),
-                new KeyCounterMouseTrigger(MouseButton.Right),
-            });
-
-            argonDisplay.AddRange(new InputTrigger[]
+            controller.AddRange(new InputTrigger[]
             {
                 new KeyCounterKeyboardTrigger(Key.X),
                 new KeyCounterKeyboardTrigger(Key.X),
                 new KeyCounterMouseTrigger(MouseButton.Left),
                 new KeyCounterMouseTrigger(MouseButton.Right),
             });
+        }
 
+        [Test]
+        public void TestDoThings()
+        {
             var testCounter = (DefaultKeyCounter)defaultDisplay.Counters.First();
 
             AddStep("Add random", () =>
             {
                 Key key = (Key)((int)Key.A + RNG.Next(26));
-                defaultDisplay.Add(new KeyCounterKeyboardTrigger(key));
-                argonDisplay.Add(new KeyCounterKeyboardTrigger(key));
+                controller.Add(new KeyCounterKeyboardTrigger(key));
             });
 
-            Key testKey = ((KeyCounterKeyboardTrigger)defaultDisplay.Counters.First().Trigger).Key;
+            Key testKey = ((KeyCounterKeyboardTrigger)controller.Triggers.First()).Key;
 
             addPressKeyStep();
             AddAssert($"Check {testKey} counter after keypress", () => testCounter.CountPresses.Value == 1);
             addPressKeyStep();
             AddAssert($"Check {testKey} counter after keypress", () => testCounter.CountPresses.Value == 2);
-            AddStep("Disable counting", () =>
-            {
-                argonDisplay.IsCounting.Value = false;
-                defaultDisplay.IsCounting.Value = false;
-            });
+            AddStep("Disable counting", () => controller.IsCounting.Value = false);
             addPressKeyStep();
             AddAssert($"Check {testKey} count has not changed", () => testCounter.CountPresses.Value == 2);
 
-            Add(defaultDisplay);
-            Add(argonDisplay);
-
             void addPressKeyStep() => AddStep($"Press {testKey} key", () => InputManager.Key(testKey));
         }
     }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs
index 1fe7fc9063..5fb9bf004f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs
@@ -6,13 +6,11 @@
 using System;
 using System.ComponentModel;
 using System.Linq;
-using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
-using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
@@ -29,8 +27,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         protected override void AddCheckSteps()
         {
             AddUntilStep("score above zero", () => ((ScoreAccessibleReplayPlayer)Player).ScoreProcessor.TotalScore.Value > 0);
-            AddUntilStep("key counter counted keys", () => ((ScoreAccessibleReplayPlayer)Player).HUDOverlay.ChildrenOfType<KeyCounterDisplay>().FirstOrDefault()?.Counters.Any(kc => kc.CountPresses
-                .Value > 0) ?? false);
+            AddUntilStep("key counter counted keys", () => ((ScoreAccessibleReplayPlayer)Player).HUDOverlay.KeyCounter.Triggers.Any(kc => kc.ActivationCount.Value > 0));
             AddAssert("cannot fail", () => !((ScoreAccessibleReplayPlayer)Player).AllowFail);
         }
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
index 25cbe54cc3..ac772b980e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
@@ -14,7 +14,9 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Play;
+using osu.Game.Screens.Play.HUD;
 using osu.Game.Tests.Gameplay;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
@@ -55,6 +57,11 @@ namespace osu.Game.Tests.Visual.Gameplay
                         Origin = Anchor.Centre,
                     };
 
+                    // Add any key just to display the key counter visually.
+                    hudOverlay.KeyCounter.Add(new KeyCounterKeyboardTrigger(Key.Space));
+
+                    scoreProcessor.Combo.Value = 1;
+
                     return new Container
                     {
                         RelativeSizeAxes = Axes.Both,
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
index 47f1ebf024..6532aa4ae5 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
@@ -89,7 +89,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                     hudOverlay = new HUDOverlay(null, Array.Empty<Mod>());
 
                     // Add any key just to display the key counter visually.
-                    hudOverlay.ChildrenOfType<KeyCounterDisplay>().ForEach(k => k.Add(new KeyCounterKeyboardTrigger(Key.Space)));
+                    hudOverlay.KeyCounter.Add(new KeyCounterKeyboardTrigger(Key.Space));
 
                     action?.Invoke(hudOverlay);
 
diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 8065087341..294b72061b 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -164,9 +164,8 @@ namespace osu.Game.Rulesets.UI
         {
             switch (skinComponent)
             {
-                case KeyCounterDisplay keyCounterDisplay:
-                    attachKeyCounter(keyCounterDisplay);
-                    break;
+                case KeyCounterController keyCounterDisplay:
+                    attachKeyCounter(keyCounterDisplay); break;
 
                 case ClicksPerSecondCalculator clicksPerSecondCalculator:
                     attachClicksPerSecond(clicksPerSecondCalculator);
@@ -178,7 +177,7 @@ namespace osu.Game.Rulesets.UI
         {
             switch (skinComponent)
             {
-                case KeyCounterDisplay keyCounterDisplay:
+                case KeyCounterController keyCounterDisplay:
                     detachKeyCounter(keyCounterDisplay);
                     break;
 
@@ -192,7 +191,7 @@ namespace osu.Game.Rulesets.UI
 
         #region Key Counter Attachment
 
-        private void attachKeyCounter(KeyCounterDisplay keyCounter)
+        private void attachKeyCounter(KeyCounterController keyCounter)
         {
             var receptor = new ActionReceptor(keyCounter);
 
@@ -206,25 +205,25 @@ namespace osu.Game.Rulesets.UI
                                                    .Select(action => new KeyCounterActionTrigger<T>(action)));
         }
 
-        private void detachKeyCounter(KeyCounterDisplay keyCounter)
+        private void detachKeyCounter(KeyCounterController keyCounter)
         {
+            keyCounter.ClearReceptor();
         }
 
-        private partial class ActionReceptor : KeyCounterDisplay.Receptor, IKeyBindingHandler<T>
+        private partial class ActionReceptor : KeyCounterController.Receptor, IKeyBindingHandler<T>
         {
-            public ActionReceptor(KeyCounterDisplay target)
+            public ActionReceptor(KeyCounterController target)
                 : base(target)
             {
             }
 
-            public bool OnPressed(KeyBindingPressEvent<T> e) => Target.Counters.Where(c => c.Trigger is KeyCounterActionTrigger<T>)
-                                                                      .Select(c => (KeyCounterActionTrigger<T>)c.Trigger)
+            public bool OnPressed(KeyBindingPressEvent<T> e) => Target.Triggers
+                                                                      .OfType<KeyCounterActionTrigger<T>>()
                                                                       .Any(c => c.OnPressed(e.Action, Clock.Rate >= 0));
 
             public void OnReleased(KeyBindingReleaseEvent<T> e)
             {
-                foreach (var c
-                         in Target.Counters.Where(c => c.Trigger is KeyCounterActionTrigger<T>).Select(c => (KeyCounterActionTrigger<T>)c.Trigger))
+                foreach (var c in Target.Triggers.OfType<KeyCounterActionTrigger<T>>())
                     c.OnReleased(e.Action, Clock.Rate >= 0);
             }
         }
diff --git a/osu.Game/Screens/Play/HUD/KeyCounterController.cs b/osu.Game/Screens/Play/HUD/KeyCounterController.cs
new file mode 100644
index 0000000000..b138e64d6f
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/KeyCounterController.cs
@@ -0,0 +1,95 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Input.Events;
+using osu.Game.Rulesets.UI;
+using osuTK;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public partial class KeyCounterController : CompositeComponent, IAttachableSkinComponent
+    {
+        public readonly Bindable<bool> IsCounting = new BindableBool(true);
+
+        private Receptor? receptor;
+
+        public event Action<InputTrigger>? OnNewTrigger;
+
+        private readonly Container<InputTrigger> triggers;
+
+        public IReadOnlyList<InputTrigger> Triggers => triggers;
+
+        public KeyCounterController()
+        {
+            InternalChild = triggers = new Container<InputTrigger>();
+        }
+
+        public void Add(InputTrigger trigger)
+        {
+            triggers.Add(trigger);
+            trigger.IsCounting.BindTo(IsCounting);
+            OnNewTrigger?.Invoke(trigger);
+        }
+
+        public void AddRange(IEnumerable<InputTrigger> inputTriggers) => inputTriggers.ForEach(Add);
+
+        /// <summary>
+        /// Sets a <see cref="Receptor"/> that will populate keybinding events to this <see cref="KeyCounterController"/>.
+        /// </summary>
+        /// <param name="receptor">The receptor to set</param>
+        /// <exception cref="InvalidOperationException">When a <see cref="Receptor"/> is already active on this <see cref="KeyCounterDisplay"/></exception>
+        public void SetReceptor(Receptor receptor)
+        {
+            if (this.receptor != null)
+                throw new InvalidOperationException("Cannot set a new receptor when one is already active");
+
+            this.receptor = receptor;
+        }
+
+        /// <summary>
+        /// Clears any <see cref="KeyCounterController.Receptor"/> active
+        /// </summary>
+        public void ClearReceptor()
+        {
+            receptor = null;
+        }
+
+        public override bool HandleNonPositionalInput => receptor == null;
+
+        public override bool HandlePositionalInput => receptor == null;
+
+        public partial class Receptor : Drawable
+        {
+            protected readonly KeyCounterController Target;
+
+            public Receptor(KeyCounterController target)
+            {
+                RelativeSizeAxes = Axes.Both;
+                Depth = float.MinValue;
+                Target = target;
+            }
+
+            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
+
+            protected override bool Handle(UIEvent e)
+            {
+                switch (e)
+                {
+                    case KeyDownEvent:
+                    case KeyUpEvent:
+                    case MouseDownEvent:
+                    case MouseUpEvent:
+                        return Target.TriggerEvent(e);
+                }
+
+                return base.Handle(e);
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs b/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs
index b5c697ef13..b2d78216b2 100644
--- a/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs
@@ -1,18 +1,13 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
-using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Input.Events;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.UI;
-using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
 {
@@ -34,38 +29,13 @@ namespace osu.Game.Screens.Play.HUD
 
         protected abstract FillFlowContainer<KeyCounter> KeyFlow { get; }
 
-        /// <summary>
-        /// Whether the actions reported by all <see cref="InputTrigger"/>s within this <see cref="KeyCounterDisplay"/> should be counted.
-        /// </summary>
-        public Bindable<bool> IsCounting { get; } = new BindableBool(true);
-
         protected readonly Bindable<bool> ConfigVisibility = new Bindable<bool>();
 
+        [Resolved]
+        private KeyCounterController controller { get; set; } = null!;
+
         protected abstract void UpdateVisibility();
 
-        private Receptor? receptor;
-
-        /// <summary>
-        /// Sets a <see cref="Receptor"/> that will populate keybinding events to this <see cref="KeyCounterDisplay"/>.
-        /// </summary>
-        /// <param name="receptor">The receptor to set</param>
-        /// <exception cref="InvalidOperationException">When a <see cref="Receptor"/> is already active on this <see cref="KeyCounterDisplay"/></exception>
-        public void SetReceptor(Receptor receptor)
-        {
-            if (this.receptor != null)
-                throw new InvalidOperationException("Cannot set a new receptor when one is already active");
-
-            this.receptor = receptor;
-        }
-
-        /// <summary>
-        /// Clears any <see cref="Receptor"/> active
-        /// </summary>
-        public void ClearReceptor()
-        {
-            receptor = null;
-        }
-
         /// <summary>
         /// Add a <see cref="InputTrigger"/> to this display.
         /// </summary>
@@ -74,8 +44,6 @@ namespace osu.Game.Screens.Play.HUD
             var keyCounter = CreateCounter(trigger);
 
             KeyFlow.Add(keyCounter);
-
-            IsCounting.BindTo(keyCounter.IsCounting);
         }
 
         /// <summary>
@@ -86,49 +54,29 @@ namespace osu.Game.Screens.Play.HUD
         protected abstract KeyCounter CreateCounter(InputTrigger trigger);
 
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
+        private void load(OsuConfigManager config, DrawableRuleset? drawableRuleset)
         {
             config.BindWith(OsuSetting.KeyOverlay, ConfigVisibility);
+
+            if (drawableRuleset != null)
+                AlwaysVisible.BindTo(drawableRuleset.HasReplayLoaded);
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
+            controller.OnNewTrigger += Add;
+            AddRange(controller.Triggers);
+
             AlwaysVisible.BindValueChanged(_ => UpdateVisibility());
             ConfigVisibility.BindValueChanged(_ => UpdateVisibility(), true);
         }
 
-        public override bool HandleNonPositionalInput => receptor == null;
-
-        public override bool HandlePositionalInput => receptor == null;
-
-        public partial class Receptor : Drawable
+        protected override void Dispose(bool isDisposing)
         {
-            protected readonly KeyCounterDisplay Target;
-
-            public Receptor(KeyCounterDisplay target)
-            {
-                RelativeSizeAxes = Axes.Both;
-                Depth = float.MinValue;
-                Target = target;
-            }
-
-            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
-
-            protected override bool Handle(UIEvent e)
-            {
-                switch (e)
-                {
-                    case KeyDownEvent:
-                    case KeyUpEvent:
-                    case MouseDownEvent:
-                    case MouseUpEvent:
-                        return Target.InternalChildren.Any(c => c.TriggerEvent(e));
-                }
-
-                return base.Handle(e);
-            }
+            base.Dispose(isDisposing);
+            controller.OnNewTrigger -= Add;
         }
     }
 }
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index ae0e67867b..15a0e0688b 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -16,8 +16,10 @@ using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Configuration;
 using osu.Game.Input.Bindings;
+using osu.Game.Localisation;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
+using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
@@ -26,8 +28,6 @@ using osu.Game.Screens.Play.HUD.ClicksPerSecond;
 using osu.Game.Screens.Play.HUD.JudgementCounter;
 using osu.Game.Skinning;
 using osuTK;
-using osu.Game.Localisation;
-using osu.Game.Rulesets;
 
 namespace osu.Game.Screens.Play
 {
@@ -54,7 +54,6 @@ namespace osu.Game.Screens.Play
             return child == bottomRightElements;
         }
 
-        public readonly KeyCounterDisplay KeyCounter;
         public readonly ModDisplay ModDisplay;
         public readonly HoldForMenuButton HoldToQuit;
         public readonly PlayerSettingsOverlay PlayerSettingsOverlay;
@@ -62,6 +61,9 @@ namespace osu.Game.Screens.Play
         [Cached]
         private readonly ClicksPerSecondCalculator clicksPerSecondCalculator;
 
+        [Cached]
+        public readonly KeyCounterController KeyCounter;
+
         [Cached]
         private readonly JudgementTally tally;
 
@@ -145,7 +147,6 @@ namespace osu.Game.Screens.Play
                     Direction = FillDirection.Vertical,
                     Children = new Drawable[]
                     {
-                        KeyCounter = CreateKeyCounter(),
                         HoldToQuit = CreateHoldForMenuButton(),
                     }
                 },
@@ -157,9 +158,10 @@ namespace osu.Game.Screens.Play
                     Spacing = new Vector2(5)
                 },
                 clicksPerSecondCalculator = new ClicksPerSecondCalculator(),
+                KeyCounter = new KeyCounterController()
             };
 
-            hideTargets = new List<Drawable> { mainComponents, rulesetComponents, KeyCounter, topRightElements };
+            hideTargets = new List<Drawable> { mainComponents, rulesetComponents, topRightElements };
 
             if (!alwaysShowLeaderboard)
                 hideTargets.Add(LeaderboardFlow);
@@ -321,7 +323,6 @@ namespace osu.Game.Screens.Play
             {
                 attachTarget.Attach(KeyCounter);
                 attachTarget.Attach(clicksPerSecondCalculator);
-                mainComponents.SetAttachTarget(attachTarget);
             }
 
             replayLoaded.BindTo(drawableRuleset.HasReplayLoaded);
@@ -332,12 +333,6 @@ namespace osu.Game.Screens.Play
             ShowHealth = { BindTarget = ShowHealthBar }
         };
 
-        protected KeyCounterDisplay CreateKeyCounter() => new DefaultKeyCounterDisplay
-        {
-            Anchor = Anchor.BottomRight,
-            Origin = Anchor.BottomRight,
-        };
-
         protected HoldForMenuButton CreateHoldForMenuButton() => new HoldForMenuButton
         {
             Anchor = Anchor.BottomRight,
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 18ea9d0acb..9fc97162bf 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -438,7 +438,6 @@ namespace osu.Game.Screens.Play
                             {
                                 Value = false
                             },
-                            AlwaysVisible = { BindTarget = DrawableRuleset.HasReplayLoaded },
                         },
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre

From e26aeea589ffa3ad4bf5a3a391a3574feb8a36ad Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Wed, 14 Jun 2023 21:15:12 +0200
Subject: [PATCH 0857/1604] feat: make `KeyCounterDisplay` skinnable

---
 osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs |  5 ++++-
 osu.Game/Skinning/ArgonSkin.cs                 | 10 ++++++++++
 osu.Game/Skinning/TrianglesSkin.cs             | 10 ++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs b/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs
index b2d78216b2..d599d383a5 100644
--- a/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs
@@ -8,13 +8,14 @@ using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.UI;
+using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
     /// <summary>
     /// A flowing display of all gameplay keys. Individual keys can be added using <see cref="InputTrigger"/> implementations.
     /// </summary>
-    public abstract partial class KeyCounterDisplay : CompositeDrawable, IAttachableSkinComponent
+    public abstract partial class KeyCounterDisplay : CompositeDrawable, IAttachableSkinComponent, ISerialisableDrawable
     {
         /// <summary>
         /// Whether the key counter should be visible regardless of the configuration value.
@@ -78,5 +79,7 @@ namespace osu.Game.Screens.Play.HUD
             base.Dispose(isDisposing);
             controller.OnNewTrigger -= Add;
         }
+
+        public bool UsesFixedAnchor { get; set; }
     }
 }
diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs
index a9b26f13e8..48326bfe60 100644
--- a/osu.Game/Skinning/ArgonSkin.cs
+++ b/osu.Game/Skinning/ArgonSkin.cs
@@ -12,6 +12,7 @@ using osu.Game.Audio;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.Extensions;
 using osu.Game.IO;
+using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Play.HUD.HitErrorMeters;
 using osuTK;
@@ -113,6 +114,7 @@ namespace osu.Game.Skinning
                                 var combo = container.OfType<DefaultComboCounter>().FirstOrDefault();
                                 var ppCounter = container.OfType<PerformancePointsCounter>().FirstOrDefault();
                                 var songProgress = container.OfType<ArgonSongProgress>().FirstOrDefault();
+                                var keyCounter = container.OfType<ArgonKeyCounterDisplay>().FirstOrDefault();
 
                                 if (score != null)
                                 {
@@ -168,6 +170,13 @@ namespace osu.Game.Skinning
                                     {
                                         songProgress.Position = new Vector2(0, -10);
                                         songProgress.Scale = new Vector2(0.9f, 1);
+
+                                        if (keyCounter != null)
+                                        {
+                                            keyCounter.Anchor = Anchor.BottomLeft;
+                                            keyCounter.Origin = Anchor.BottomLeft;
+                                            keyCounter.Position = new Vector2(50, -57);
+                                        }
                                     }
                                 }
                             })
@@ -179,6 +188,7 @@ namespace osu.Game.Skinning
                                     new DefaultAccuracyCounter(),
                                     new DefaultHealthDisplay(),
                                     new ArgonSongProgress(),
+                                    new ArgonKeyCounterDisplay(),
                                     new BarHitErrorMeter(),
                                     new BarHitErrorMeter(),
                                     new PerformancePointsCounter()
diff --git a/osu.Game/Skinning/TrianglesSkin.cs b/osu.Game/Skinning/TrianglesSkin.cs
index e88b827807..bb562468db 100644
--- a/osu.Game/Skinning/TrianglesSkin.cs
+++ b/osu.Game/Skinning/TrianglesSkin.cs
@@ -90,6 +90,8 @@ namespace osu.Game.Skinning
                                 var accuracy = container.OfType<DefaultAccuracyCounter>().FirstOrDefault();
                                 var combo = container.OfType<DefaultComboCounter>().FirstOrDefault();
                                 var ppCounter = container.OfType<PerformancePointsCounter>().FirstOrDefault();
+                                var songProgress = container.OfType<DefaultSongProgress>().FirstOrDefault();
+                                var keyCounter = container.OfType<DefaultKeyCounterDisplay>().FirstOrDefault();
 
                                 if (score != null)
                                 {
@@ -141,6 +143,13 @@ namespace osu.Game.Skinning
                                         hitError2.Origin = Anchor.CentreLeft;
                                     }
                                 }
+
+                                if (songProgress != null && keyCounter != null)
+                                {
+                                    keyCounter.Anchor = Anchor.BottomRight;
+                                    keyCounter.Origin = Anchor.BottomRight;
+                                    keyCounter.Position = new Vector2(10, songProgress.Height + 10);
+                                }
                             })
                             {
                                 Children = new Drawable[]
@@ -150,6 +159,7 @@ namespace osu.Game.Skinning
                                     new DefaultAccuracyCounter(),
                                     new DefaultHealthDisplay(),
                                     new DefaultSongProgress(),
+                                    new DefaultKeyCounterDisplay(),
                                     new BarHitErrorMeter(),
                                     new BarHitErrorMeter(),
                                     new PerformancePointsCounter()

From 081190802e3f599b93559b84220909b9638130fe Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Wed, 14 Jun 2023 21:19:08 +0200
Subject: [PATCH 0858/1604] revert: remove attachment logic from
 `SkinComponentContainer`

This is no longer in the scope of the PR.
---
 osu.Game/Skinning/SkinComponentsContainer.cs | 26 --------------------
 1 file changed, 26 deletions(-)

diff --git a/osu.Game/Skinning/SkinComponentsContainer.cs b/osu.Game/Skinning/SkinComponentsContainer.cs
index 19c16d2177..adf0a288b4 100644
--- a/osu.Game/Skinning/SkinComponentsContainer.cs
+++ b/osu.Game/Skinning/SkinComponentsContainer.cs
@@ -6,10 +6,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Skinning
 {
@@ -41,8 +39,6 @@ namespace osu.Game.Skinning
 
         private CancellationTokenSource? cancellationSource;
 
-        private ICanAttachHUDPieces? attachTarget;
-
         public SkinComponentsContainer(SkinComponentsContainerLookup lookup)
         {
             Lookup = lookup;
@@ -66,10 +62,6 @@ namespace osu.Game.Skinning
 
         public void Reload(Container? componentsContainer)
         {
-            components
-                .OfType<IAttachableSkinComponent>()
-                .ForEach(c => attachTarget?.Detach(c));
-
             ClearInternal();
             components.Clear();
             ComponentsLoaded = false;
@@ -85,7 +77,6 @@ namespace osu.Game.Skinning
             LoadComponentAsync(content, wrapper =>
             {
                 AddInternal(wrapper);
-                wrapper.Children.OfType<IAttachableSkinComponent>().ForEach(c => attachTarget?.Attach(c));
                 components.AddRange(wrapper.Children.OfType<ISerialisableDrawable>());
                 ComponentsLoaded = true;
             }, (cancellationSource = new CancellationTokenSource()).Token);
@@ -102,9 +93,6 @@ namespace osu.Game.Skinning
             if (!(component is Drawable drawable))
                 throw new ArgumentException($"Provided argument must be of type {nameof(Drawable)}.", nameof(component));
 
-            if (component is IAttachableSkinComponent attachableSkinComponent)
-                attachTarget?.Attach(attachableSkinComponent);
-
             content.Add(drawable);
             components.Add(component);
         }
@@ -120,24 +108,10 @@ namespace osu.Game.Skinning
             if (!(component is Drawable drawable))
                 throw new ArgumentException($"Provided argument must be of type {nameof(Drawable)}.", nameof(component));
 
-            if (component is IAttachableSkinComponent attachableSkinComponent)
-                attachTarget?.Detach(attachableSkinComponent);
-
             content.Remove(drawable, disposeImmediately);
             components.Remove(component);
         }
 
-        public void SetAttachTarget(ICanAttachHUDPieces target)
-        {
-            attachTarget = target;
-
-            foreach (var child in InternalChildren)
-            {
-                if (child is IAttachableSkinComponent attachable)
-                    attachTarget.Attach(attachable);
-            }
-        }
-
         protected override void SkinChanged(ISkinSource skin)
         {
             base.SkinChanged(skin);

From 4cc2bb0c7db35e4b52ac230e81cb5f50a08dfbb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 14 Jun 2023 21:33:11 +0200
Subject: [PATCH 0859/1604] Rename things in test to match

---
 osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
index 0ffbeeb491..94086f10f2 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
@@ -134,7 +134,7 @@ namespace osu.Game.Tournament.Tests.Screens
         }
 
         [Test]
-        public void TestDisableMapsPerMod()
+        public void TestSplitMapPoolByMods()
         {
             AddStep("load many maps", () =>
             {
@@ -144,7 +144,7 @@ namespace osu.Game.Tournament.Tests.Screens
                     addBeatmap(i > 4 ? Ruleset.Value.CreateInstance().AllMods.ElementAt(i).Acronym : "NM");
             });
 
-            AddStep("disable maps per mod", () => Ladder.SplitMapPoolByMods.Value = false);
+            AddStep("disable splitting map pool by mods", () => Ladder.SplitMapPoolByMods.Value = false);
 
             AddStep("reset match", () =>
             {

From ccf6ed1e5b58f8b6810f589969d752f4681d3fc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 14 Jun 2023 18:10:49 +0200
Subject: [PATCH 0860/1604] Add failing test cases

---
 .../TestSceneMaximumScore.cs                  | 147 ++++++++++++++++++
 1 file changed, 147 insertions(+)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/TestSceneMaximumScore.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneMaximumScore.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneMaximumScore.cs
new file mode 100644
index 0000000000..3d0abaceb5
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneMaximumScore.cs
@@ -0,0 +1,147 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Screens;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Replays;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.Replays;
+using osu.Game.Rulesets.Replays;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
+using osu.Game.Screens.Play;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Mania.Tests
+{
+    public partial class TestSceneMaximumScore : RateAdjustedBeatmapTestScene
+    {
+        private ScoreAccessibleReplayPlayer currentPlayer = null!;
+
+        private List<JudgementResult> judgementResults = new List<JudgementResult>();
+
+        [Test]
+        public void TestSimultaneousTickAndNote()
+        {
+            performTest(
+                new List<ManiaHitObject>
+                {
+                    new HoldNote
+                    {
+                        StartTime = 1000,
+                        Duration = 2000,
+                        Column = 0,
+                    },
+                    new Note
+                    {
+                        StartTime = 2000,
+                        Column = 1
+                    }
+                },
+                new List<ReplayFrame>
+                {
+                    new ManiaReplayFrame(1000, ManiaAction.Key1),
+                    new ManiaReplayFrame(2000, ManiaAction.Key1, ManiaAction.Key2),
+                    new ManiaReplayFrame(2001, ManiaAction.Key1),
+                    new ManiaReplayFrame(3000)
+                });
+
+            AddAssert("all objects perfectly judged",
+                () => judgementResults.Select(result => result.Type),
+                () => Is.EquivalentTo(judgementResults.Select(result => result.Judgement.MaxResult)));
+            AddAssert("score is 1 million", () => currentPlayer.ScoreProcessor.TotalScore.Value, () => Is.EqualTo(1_000_000));
+        }
+
+        [Test]
+        public void TestSimultaneousLongNotes()
+        {
+            performTest(
+                new List<ManiaHitObject>
+                {
+                    new HoldNote
+                    {
+                        StartTime = 1000,
+                        Duration = 2000,
+                        Column = 0,
+                    },
+                    new HoldNote
+                    {
+                        StartTime = 2000,
+                        Duration = 2000,
+                        Column = 1
+                    }
+                },
+                new List<ReplayFrame>
+                {
+                    new ManiaReplayFrame(1000, ManiaAction.Key1),
+                    new ManiaReplayFrame(2000, ManiaAction.Key1, ManiaAction.Key2),
+                    new ManiaReplayFrame(3000, ManiaAction.Key2),
+                    new ManiaReplayFrame(4000)
+                });
+
+            AddAssert("all objects perfectly judged",
+                () => judgementResults.Select(result => result.Type),
+                () => Is.EquivalentTo(judgementResults.Select(result => result.Judgement.MaxResult)));
+            AddAssert("score is 1 million", () => currentPlayer.ScoreProcessor.TotalScore.Value, () => Is.EqualTo(1_000_000));
+        }
+
+        private void performTest(List<ManiaHitObject> hitObjects, List<ReplayFrame> frames)
+        {
+            var beatmap = new Beatmap<ManiaHitObject>
+            {
+                HitObjects = hitObjects,
+                BeatmapInfo =
+                {
+                    Difficulty = new BeatmapDifficulty { SliderTickRate = 4 },
+                    Ruleset = new ManiaRuleset().RulesetInfo
+                },
+            };
+
+            beatmap.ControlPointInfo.Add(0, new EffectControlPoint { ScrollSpeed = 0.1f });
+
+            AddStep("load player", () =>
+            {
+                Beatmap.Value = CreateWorkingBeatmap(beatmap);
+
+                var p = new ScoreAccessibleReplayPlayer(new Score { Replay = new Replay { Frames = frames } });
+
+                p.OnLoadComplete += _ =>
+                {
+                    p.ScoreProcessor.NewJudgement += result =>
+                    {
+                        if (currentPlayer == p) judgementResults.Add(result);
+                    };
+                };
+
+                LoadScreen(currentPlayer = p);
+                judgementResults = new List<JudgementResult>();
+            });
+
+            AddUntilStep("Beatmap at 0", () => Beatmap.Value.Track.CurrentTime == 0);
+            AddUntilStep("Wait until player is loaded", () => currentPlayer.IsCurrentScreen());
+
+            AddUntilStep("Wait for completion", () => currentPlayer.ScoreProcessor.HasCompleted.Value);
+        }
+
+        private partial class ScoreAccessibleReplayPlayer : ReplayPlayer
+        {
+            public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;
+
+            protected override bool PauseOnFocusLost => false;
+
+            public ScoreAccessibleReplayPlayer(Score score)
+                : base(score, new PlayerConfiguration
+                {
+                    AllowPause = false,
+                    ShowResults = false,
+                })
+            {
+            }
+        }
+    }
+}

From 04e812b5ab6f2098e548ca8f292053a2f84d2704 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 14 Jun 2023 20:08:14 +0200
Subject: [PATCH 0861/1604] Make `JudgementProcessor.SimulateAutoplay()`
 non-virtual

Nobody overrides this, and with the structure given, overriders would
have to rewrite half of this code anyway. The fact that the class has 2
other overridable members (`CreateResult()`, `GetSimulatedHitResult()`)
which cease to have any meaning if `SimulateAutoplay()` is overridden
also contributes to taking this decision.
---
 osu.Game/Rulesets/Scoring/JudgementProcessor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Scoring/JudgementProcessor.cs b/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
index b16c307206..181fbef405 100644
--- a/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
@@ -149,7 +149,7 @@ namespace osu.Game.Rulesets.Scoring
         /// </summary>
         /// <remarks>This provided temporarily. DO NOT USE.</remarks>
         /// <param name="beatmap">The <see cref="IBeatmap"/> to simulate.</param>
-        protected virtual void SimulateAutoplay(IBeatmap beatmap)
+        protected void SimulateAutoplay(IBeatmap beatmap)
         {
             IsSimulating = true;
 

From 3295294cbc4cc324dd8281c8ed1258ea7eeed0ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 14 Jun 2023 20:10:34 +0200
Subject: [PATCH 0862/1604] Reorder autoplay-related virtual methods closer
 together

---
 .../Rulesets/Scoring/JudgementProcessor.cs    | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/JudgementProcessor.cs b/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
index 181fbef405..9c86cbfe90 100644
--- a/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
@@ -137,13 +137,6 @@ namespace osu.Game.Rulesets.Scoring
                 JudgedHits += count;
         }
 
-        /// <summary>
-        /// Creates the <see cref="JudgementResult"/> that represents the scoring result for a <see cref="HitObject"/>.
-        /// </summary>
-        /// <param name="hitObject">The <see cref="HitObject"/> which was judged.</param>
-        /// <param name="judgement">The <see cref="Judgement"/> that provides the scoring information.</param>
-        protected virtual JudgementResult CreateResult(HitObject hitObject, Judgement judgement) => new JudgementResult(hitObject, judgement);
-
         /// <summary>
         /// Simulates an autoplay of the <see cref="IBeatmap"/> to determine scoring values.
         /// </summary>
@@ -174,6 +167,20 @@ namespace osu.Game.Rulesets.Scoring
             IsSimulating = false;
         }
 
+        /// <summary>
+        /// Creates the <see cref="JudgementResult"/> that represents the scoring result for a <see cref="HitObject"/>.
+        /// </summary>
+        /// <param name="hitObject">The <see cref="HitObject"/> which was judged.</param>
+        /// <param name="judgement">The <see cref="Judgement"/> that provides the scoring information.</param>
+        protected virtual JudgementResult CreateResult(HitObject hitObject, Judgement judgement) => new JudgementResult(hitObject, judgement);
+
+        /// <summary>
+        /// Gets a simulated <see cref="HitResult"/> for a judgement. Used during <see cref="SimulateAutoplay"/> to simulate a "perfect" play.
+        /// </summary>
+        /// <param name="judgement">The judgement to simulate a <see cref="HitResult"/> for.</param>
+        /// <returns>The simulated <see cref="HitResult"/> for the judgement.</returns>
+        protected virtual HitResult GetSimulatedHitResult(Judgement judgement) => judgement.MaxResult;
+
         protected override void Update()
         {
             base.Update();
@@ -184,12 +191,5 @@ namespace osu.Game.Rulesets.Scoring
                     // Last applied result is guaranteed to be non-null when JudgedHits > 0.
                     || lastAppliedResult.AsNonNull().TimeAbsolute < Clock.CurrentTime);
         }
-
-        /// <summary>
-        /// Gets a simulated <see cref="HitResult"/> for a judgement. Used during <see cref="SimulateAutoplay"/> to simulate a "perfect" play.
-        /// </summary>
-        /// <param name="judgement">The judgement to simulate a <see cref="HitResult"/> for.</param>
-        /// <returns>The simulated <see cref="HitResult"/> for the judgement.</returns>
-        protected virtual HitResult GetSimulatedHitResult(Judgement judgement) => judgement.MaxResult;
     }
 }

From 462570801a1441580af32e049400c2f682fb876d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 14 Jun 2023 20:15:43 +0200
Subject: [PATCH 0863/1604] Introduce new method for enumeration of objects
 during autoplay simulation

---
 .../Rulesets/Scoring/JudgementProcessor.cs    | 29 ++++++++++++++++---
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/JudgementProcessor.cs b/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
index 9c86cbfe90..2c42a08864 100644
--- a/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Extensions.TypeExtensions;
@@ -146,14 +147,11 @@ namespace osu.Game.Rulesets.Scoring
         {
             IsSimulating = true;
 
-            foreach (var obj in beatmap.HitObjects)
+            foreach (var obj in EnumerateHitObjects(beatmap))
                 simulate(obj);
 
             void simulate(HitObject obj)
             {
-                foreach (var nested in obj.NestedHitObjects)
-                    simulate(nested);
-
                 var judgement = obj.CreateJudgement();
 
                 var result = CreateResult(obj, judgement);
@@ -167,6 +165,29 @@ namespace osu.Game.Rulesets.Scoring
             IsSimulating = false;
         }
 
+        /// <summary>
+        /// Enumerates all <see cref="HitObject"/>s in the given <paramref name="beatmap"/> in the order in which they are to be judged.
+        /// Used in <see cref="SimulateAutoplay"/>.
+        /// </summary>
+        /// <remarks>
+        /// In Score V2, the score awarded for each object includes a component based on the combo value after the judgement of that object.
+        /// This means that the score is dependent on the order of evaluation of judgements.
+        /// This method is provided so that rulesets can specify custom ordering that is correct for them and matches processing order during actual gameplay.
+        /// </remarks>
+        protected virtual IEnumerable<HitObject> EnumerateHitObjects(IBeatmap beatmap)
+            => enumerateRecursively(beatmap.HitObjects);
+
+        private IEnumerable<HitObject> enumerateRecursively(IEnumerable<HitObject> hitObjects)
+        {
+            foreach (var hitObject in hitObjects)
+            {
+                foreach (var nested in enumerateRecursively(hitObject.NestedHitObjects))
+                    yield return nested;
+
+                yield return hitObject;
+            }
+        }
+
         /// <summary>
         /// Creates the <see cref="JudgementResult"/> that represents the scoring result for a <see cref="HitObject"/>.
         /// </summary>

From e46b4209c3efecf10143bf2b7ebb4a4b6bbe821d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 14 Jun 2023 20:35:49 +0200
Subject: [PATCH 0864/1604] Remove no-longer-needed local method

---
 osu.Game/Rulesets/Scoring/JudgementProcessor.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/JudgementProcessor.cs b/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
index 2c42a08864..e9f3bcb949 100644
--- a/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
@@ -148,9 +148,6 @@ namespace osu.Game.Rulesets.Scoring
             IsSimulating = true;
 
             foreach (var obj in EnumerateHitObjects(beatmap))
-                simulate(obj);
-
-            void simulate(HitObject obj)
             {
                 var judgement = obj.CreateJudgement();
 

From 0065334241f77b703c1c7523ab0e917a4ae53fb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 14 Jun 2023 20:34:06 +0200
Subject: [PATCH 0865/1604] Fix mania autoplay simulation judging objects in
 different order to gameplay

---
 .../Scoring/ManiaScoreProcessor.cs            | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
index 6292ed75cd..a0f6ac572d 100644
--- a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
+++ b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
@@ -2,7 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mania.Scoring
@@ -16,6 +21,9 @@ namespace osu.Game.Rulesets.Mania.Scoring
         {
         }
 
+        protected override IEnumerable<HitObject> EnumerateHitObjects(IBeatmap beatmap)
+            => base.EnumerateHitObjects(beatmap).OrderBy(ho => (ManiaHitObject)ho, JudgementOrderComparer.DEFAULT);
+
         protected override double ComputeTotalScore(double comboProgress, double accuracyProgress, double bonusPortion)
         {
             return 10000 * comboProgress
@@ -25,5 +33,27 @@ namespace osu.Game.Rulesets.Mania.Scoring
 
         protected override double GetComboScoreChange(JudgementResult result)
             => Judgement.ToNumericResult(result.Type) * Math.Min(Math.Max(0.5, Math.Log(result.ComboAfterJudgement, combo_base)), Math.Log(400, combo_base));
+
+        private class JudgementOrderComparer : IComparer<ManiaHitObject>
+        {
+            public static readonly JudgementOrderComparer DEFAULT = new JudgementOrderComparer();
+
+            public int Compare(ManiaHitObject? x, ManiaHitObject? y)
+            {
+                if (ReferenceEquals(x, y)) return 0;
+                if (ReferenceEquals(x, null)) return -1;
+                if (ReferenceEquals(y, null)) return 1;
+
+                int result = x.GetEndTime().CompareTo(y.GetEndTime());
+                if (result != 0)
+                    return result;
+
+                // due to the way input is handled in mania, notes take precedence over ticks in judging order.
+                if (x is Note && y is not Note) return -1;
+                if (x is not Note && y is Note) return 1;
+
+                return x.Column.CompareTo(y.Column);
+            }
+        }
     }
 }

From 0ddd43d44df5e2f5c78b0be670c1ce978f59824a Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 15 Jun 2023 15:15:32 +0900
Subject: [PATCH 0866/1604] Update CFS to NET6.0

---
 .config/dotnet-tools.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 1f937e1837..8c8a3be771 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
       ]
     },
     "codefilesanity": {
-      "version": "0.0.36",
+      "version": "0.0.37",
       "commands": [
         "CodeFileSanity"
       ]

From b9543f4fddb173701fc1e110d25c5522d85b22fe Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 15 Jun 2023 11:05:06 +0300
Subject: [PATCH 0867/1604] Add failing test case

---
 .../SongSelect/TestSceneBeatmapCarousel.cs    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 61a8322ee3..61f95dc628 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -453,6 +453,25 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddStep("Un-filter", () => carousel.Filter(new FilterCriteria(), false));
         }
 
+        [Test]
+        public void TestRewindToDeletedBeatmap()
+        {
+            loadBeatmaps();
+
+            var firstAdded = TestResources.CreateTestBeatmapSetInfo();
+
+            AddStep("add new set", () => carousel.UpdateBeatmapSet(firstAdded));
+            AddStep("select set", () => carousel.SelectBeatmap(firstAdded.Beatmaps.First()));
+
+            nextRandom();
+
+            AddStep("delete set", () => carousel.RemoveBeatmapSet(firstAdded));
+
+            prevRandom();
+
+            AddAssert("deleted set not selected", () => carousel.SelectedBeatmapSet?.Equals(firstAdded) == false);
+        }
+
         /// <summary>
         /// Test adding and removing beatmap sets
         /// </summary>

From 39db17d2e97c20f3d56c55113514ac80724aa5f5 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 15 Jun 2023 11:22:11 +0300
Subject: [PATCH 0868/1604] Use better method to avoid rewinding to deleted
 beatmaps

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 8c0f67564a..3d87a57295 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -155,7 +155,7 @@ namespace osu.Game.Screens.Select
 
         public Bindable<RandomSelectAlgorithm> RandomAlgorithm = new Bindable<RandomSelectAlgorithm>();
         private readonly List<CarouselBeatmapSet> previouslyVisitedRandomSets = new List<CarouselBeatmapSet>();
-        private readonly Stack<CarouselBeatmap> randomSelectedBeatmaps = new Stack<CarouselBeatmap>();
+        private readonly List<CarouselBeatmap> randomSelectedBeatmaps = new List<CarouselBeatmap>();
 
         private CarouselRoot root;
 
@@ -348,6 +348,11 @@ namespace osu.Game.Screens.Select
             if (!root.BeatmapSetsByID.TryGetValue(beatmapSetID, out var existingSet))
                 return;
 
+            foreach (var beatmap in existingSet.Beatmaps)
+                randomSelectedBeatmaps.Remove(beatmap);
+
+            previouslyVisitedRandomSets.Remove(existingSet);
+
             root.RemoveItem(existingSet);
             itemsCache.Invalidate();
 
@@ -501,7 +506,7 @@ namespace osu.Game.Screens.Select
 
             if (selectedBeatmap != null && selectedBeatmapSet != null)
             {
-                randomSelectedBeatmaps.Push(selectedBeatmap);
+                randomSelectedBeatmaps.Add(selectedBeatmap);
 
                 // when performing a random, we want to add the current set to the previously visited list
                 // else the user may be "randomised" to the existing selection.
@@ -538,9 +543,10 @@ namespace osu.Game.Screens.Select
         {
             while (randomSelectedBeatmaps.Any())
             {
-                var beatmap = randomSelectedBeatmaps.Pop();
+                var beatmap = randomSelectedBeatmaps[^1];
+                randomSelectedBeatmaps.Remove(beatmap);
 
-                if (!beatmap.Filtered.Value && beatmapSets.Any(beatset => beatset.Beatmaps.Contains(beatmap)))
+                if (!beatmap.Filtered.Value && beatmap.BeatmapInfo.BeatmapSet?.DeletePending != true)
                 {
                     if (selectedBeatmapSet != null)
                     {

From 2f40f5bd1969863f86930beab52e031e35efd917 Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Thu, 15 Jun 2023 12:01:38 +0200
Subject: [PATCH 0869/1604] fix: change key counter position in Triangles and
 Legacy skins

---
 osu.Game/Skinning/LegacySkin.cs    | 10 ++++++++++
 osu.Game/Skinning/TrianglesSkin.cs |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index e46eaf90c1..e35f8fbe4d 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -22,6 +22,7 @@ using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Play.HUD.HitErrorMeters;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Skinning
@@ -372,12 +373,20 @@ namespace osu.Game.Skinning
                                 }
 
                                 var hitError = container.OfType<HitErrorMeter>().FirstOrDefault();
+                                var keyCounter = container.OfType<DefaultKeyCounterDisplay>().FirstOrDefault();
 
                                 if (hitError != null)
                                 {
                                     hitError.Anchor = Anchor.BottomCentre;
                                     hitError.Origin = Anchor.CentreLeft;
                                     hitError.Rotation = -90;
+
+                                    if (keyCounter != null)
+                                    {
+                                        keyCounter.Anchor = Anchor.BottomRight;
+                                        keyCounter.Origin = Anchor.BottomRight;
+                                        keyCounter.Position = new Vector2(10, -10 - hitError.Width);
+                                    }
                                 }
                             })
                             {
@@ -389,6 +398,7 @@ namespace osu.Game.Skinning
                                     new LegacyHealthDisplay(),
                                     new LegacySongProgress(),
                                     new BarHitErrorMeter(),
+                                    new DefaultKeyCounterDisplay()
                                 }
                             };
                     }
diff --git a/osu.Game/Skinning/TrianglesSkin.cs b/osu.Game/Skinning/TrianglesSkin.cs
index bb562468db..424c477bda 100644
--- a/osu.Game/Skinning/TrianglesSkin.cs
+++ b/osu.Game/Skinning/TrianglesSkin.cs
@@ -148,7 +148,7 @@ namespace osu.Game.Skinning
                                 {
                                     keyCounter.Anchor = Anchor.BottomRight;
                                     keyCounter.Origin = Anchor.BottomRight;
-                                    keyCounter.Position = new Vector2(10, songProgress.Height + 10);
+                                    keyCounter.Position = new Vector2(10, -57 - 10);
                                 }
                             })
                             {

From 7e705987738729ddbb01de3554d99de24f0f7a87 Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Thu, 15 Jun 2023 12:02:30 +0200
Subject: [PATCH 0870/1604] test: move back key counter tests in ctor

---
 .../Visual/Gameplay/TestSceneKeyCounter.cs    | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
index 7bf9738fb4..d7c2b1c7dd 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
@@ -22,8 +22,6 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached]
         private readonly KeyCounterController controller;
 
-        private readonly KeyCounterDisplay defaultDisplay;
-
         public TestSceneKeyCounter()
         {
             Children = new Drawable[]
@@ -36,9 +34,9 @@ namespace osu.Game.Tests.Visual.Gameplay
                     RelativeSizeAxes = Axes.Both,
                     Direction = FillDirection.Vertical,
                     Spacing = new Vector2(72.7f),
-                    Children = new[]
+                    Children = new KeyCounterDisplay[]
                     {
-                        defaultDisplay = new DefaultKeyCounterDisplay
+                        new DefaultKeyCounterDisplay
                         {
                             Origin = Anchor.Centre,
                             Anchor = Anchor.Centre,
@@ -59,12 +57,6 @@ namespace osu.Game.Tests.Visual.Gameplay
                 new KeyCounterMouseTrigger(MouseButton.Left),
                 new KeyCounterMouseTrigger(MouseButton.Right),
             });
-        }
-
-        [Test]
-        public void TestDoThings()
-        {
-            var testCounter = (DefaultKeyCounter)defaultDisplay.Counters.First();
 
             AddStep("Add random", () =>
             {
@@ -72,15 +64,16 @@ namespace osu.Game.Tests.Visual.Gameplay
                 controller.Add(new KeyCounterKeyboardTrigger(key));
             });
 
-            Key testKey = ((KeyCounterKeyboardTrigger)controller.Triggers.First()).Key;
+            InputTrigger testTrigger = controller.Triggers.First();
+            Key testKey = ((KeyCounterKeyboardTrigger)testTrigger).Key;
 
             addPressKeyStep();
-            AddAssert($"Check {testKey} counter after keypress", () => testCounter.CountPresses.Value == 1);
+            AddAssert($"Check {testKey} counter after keypress", () => testTrigger.ActivationCount.Value == 1);
             addPressKeyStep();
-            AddAssert($"Check {testKey} counter after keypress", () => testCounter.CountPresses.Value == 2);
+            AddAssert($"Check {testKey} counter after keypress", () => testTrigger.ActivationCount.Value == 2);
             AddStep("Disable counting", () => controller.IsCounting.Value = false);
             addPressKeyStep();
-            AddAssert($"Check {testKey} count has not changed", () => testCounter.CountPresses.Value == 2);
+            AddAssert($"Check {testKey} count has not changed", () => testTrigger.ActivationCount.Value == 2);
 
             void addPressKeyStep() => AddStep($"Press {testKey} key", () => InputManager.Key(testKey));
         }

From b4cbcb210e71ea874de76e73a295940b3cf442fd Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Thu, 15 Jun 2023 12:24:37 +0200
Subject: [PATCH 0871/1604] refactor: remove detachment logic

No real use case, cleaning up the diff
---
 osu.Game/Rulesets/UI/DrawableRuleset.cs     |  3 ---
 osu.Game/Rulesets/UI/RulesetInputManager.cs | 27 ++-------------------
 2 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index d899b6bad1..4fa18f53a7 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -330,9 +330,6 @@ namespace osu.Game.Rulesets.UI
         public void Attach(IAttachableSkinComponent skinComponent) =>
             (KeyBindingInputManager as ICanAttachHUDPieces)?.Attach(skinComponent);
 
-        public void Detach(IAttachableSkinComponent skinComponent) =>
-            (KeyBindingInputManager as ICanAttachHUDPieces)?.Detach(skinComponent);
-
         /// <summary>
         /// Creates a key conversion input manager. An exception will be thrown if a valid <see cref="RulesetInputManager{T}"/> is not returned.
         /// </summary>
diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 294b72061b..889890e711 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -165,7 +165,8 @@ namespace osu.Game.Rulesets.UI
             switch (skinComponent)
             {
                 case KeyCounterController keyCounterDisplay:
-                    attachKeyCounter(keyCounterDisplay); break;
+                    attachKeyCounter(keyCounterDisplay);
+                    break;
 
                 case ClicksPerSecondCalculator clicksPerSecondCalculator:
                     attachClicksPerSecond(clicksPerSecondCalculator);
@@ -173,20 +174,6 @@ namespace osu.Game.Rulesets.UI
             }
         }
 
-        public void Detach(IAttachableSkinComponent skinComponent)
-        {
-            switch (skinComponent)
-            {
-                case KeyCounterController keyCounterDisplay:
-                    detachKeyCounter(keyCounterDisplay);
-                    break;
-
-                case ClicksPerSecondCalculator clicksPerSecondCalculator:
-                    detachClicksPerSecond(clicksPerSecondCalculator);
-                    break;
-            }
-        }
-
         #endregion
 
         #region Key Counter Attachment
@@ -205,11 +192,6 @@ namespace osu.Game.Rulesets.UI
                                                    .Select(action => new KeyCounterActionTrigger<T>(action)));
         }
 
-        private void detachKeyCounter(KeyCounterController keyCounter)
-        {
-            keyCounter.ClearReceptor();
-        }
-
         private partial class ActionReceptor : KeyCounterController.Receptor, IKeyBindingHandler<T>
         {
             public ActionReceptor(KeyCounterController target)
@@ -239,10 +221,6 @@ namespace osu.Game.Rulesets.UI
             KeyBindingContainer.Add(listener);
         }
 
-        private void detachClicksPerSecond(ClicksPerSecondCalculator calculator)
-        {
-        }
-
         private partial class ActionListener : Component, IKeyBindingHandler<T>
         {
             private readonly ClicksPerSecondCalculator calculator;
@@ -306,7 +284,6 @@ namespace osu.Game.Rulesets.UI
     public interface ICanAttachHUDPieces
     {
         void Attach(IAttachableSkinComponent component);
-        void Detach(IAttachableSkinComponent component);
     }
 
     public interface IAttachableSkinComponent

From a61c1116f5f5d1d2b87e8176390e7c9338b88c87 Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Thu, 15 Jun 2023 12:27:37 +0200
Subject: [PATCH 0872/1604] style: remove unused IAttachableSkinComponent on
 KCD

---
 osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs b/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs
index d599d383a5..8b92a5e3b8 100644
--- a/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Screens.Play.HUD
     /// <summary>
     /// A flowing display of all gameplay keys. Individual keys can be added using <see cref="InputTrigger"/> implementations.
     /// </summary>
-    public abstract partial class KeyCounterDisplay : CompositeDrawable, IAttachableSkinComponent, ISerialisableDrawable
+    public abstract partial class KeyCounterDisplay : CompositeDrawable, ISerialisableDrawable
     {
         /// <summary>
         /// Whether the key counter should be visible regardless of the configuration value.

From 184c793f568f568e9d855656d7c3b91a355976b1 Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Thu, 15 Jun 2023 12:33:26 +0200
Subject: [PATCH 0873/1604] style(KeyCounter): remove useless `Content`
 override

---
 osu.Game/Screens/Play/HUD/KeyCounter.cs | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/KeyCounter.cs b/osu.Game/Screens/Play/HUD/KeyCounter.cs
index 8074b30e75..7b99c34a55 100644
--- a/osu.Game/Screens/Play/HUD/KeyCounter.cs
+++ b/osu.Game/Screens/Play/HUD/KeyCounter.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Bindables;
-using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 
 namespace osu.Game.Screens.Play.HUD
@@ -27,10 +26,6 @@ namespace osu.Game.Screens.Play.HUD
         /// </summary>
         public IBindable<int> CountPresses => Trigger.ActivationCount;
 
-        private readonly Container content;
-
-        protected override Container<Drawable> Content => content;
-
         /// <summary>
         /// Whether this <see cref="KeyCounter"/> is currently in the "activated" state because the associated key is currently pressed.
         /// </summary>
@@ -38,14 +33,6 @@ namespace osu.Game.Screens.Play.HUD
 
         protected KeyCounter(InputTrigger trigger)
         {
-            InternalChildren = new Drawable[]
-            {
-                content = new Container
-                {
-                    RelativeSizeAxes = Axes.Both
-                },
-            };
-
             Trigger = trigger;
 
             Trigger.OnActivate += Activate;

From fcdaf729158cf3461d64c784f47930487b24a8b6 Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Thu, 15 Jun 2023 12:40:47 +0200
Subject: [PATCH 0874/1604] style(KeyCounter): remove useless `IsCounting`
 bindable

Counting logic has been moved to the `Trigger`
---
 osu.Game/Screens/Play/HUD/KeyCounter.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/KeyCounter.cs b/osu.Game/Screens/Play/HUD/KeyCounter.cs
index 7b99c34a55..f12d2166fc 100644
--- a/osu.Game/Screens/Play/HUD/KeyCounter.cs
+++ b/osu.Game/Screens/Play/HUD/KeyCounter.cs
@@ -16,11 +16,6 @@ namespace osu.Game.Screens.Play.HUD
         /// </summary>
         public readonly InputTrigger Trigger;
 
-        /// <summary>
-        /// Whether the actions reported by <see cref="Trigger"/> should be counted.
-        /// </summary>
-        public Bindable<bool> IsCounting { get; } = new BindableBool(true);
-
         /// <summary>
         /// The current count of registered key presses.
         /// </summary>

From 975e9baf432dcb2af21869ad5f5e7fa47bfce34d Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 15 Jun 2023 19:55:51 +0900
Subject: [PATCH 0875/1604] Fix exception with no matching mods

---
 osu.Game.Rulesets.Mania/Difficulty/ManiaScoreV1Processor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaScoreV1Processor.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaScoreV1Processor.cs
index 5712205e8f..f28a86b6b4 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/ManiaScoreV1Processor.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaScoreV1Processor.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Mania.Difficulty
         {
             double multiplier = mods.Where(m => m is not (ModHidden or ModHardRock or ModDoubleTime or ModFlashlight or ManiaModFadeIn))
                                     .Select(m => m.ScoreMultiplier)
-                                    .Aggregate((c, n) => c * n);
+                                    .Aggregate(1.0, (c, n) => c * n);
 
             TotalScore = (int)(1000000 * multiplier);
         }

From 145530035cccad94947aba2e4c8ba78d3c18c817 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 15 Jun 2023 20:00:15 +0900
Subject: [PATCH 0876/1604] Optimise mania density calculation during beatmap
 conversion

---
 osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
index 632b7cdcc7..bdc5a00583 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
@@ -119,14 +119,12 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
                 yield return obj;
         }
 
-        private readonly List<double> prevNoteTimes = new List<double>(max_notes_for_density);
+        private readonly LimitedCapacityQueue<double> prevNoteTimes = new LimitedCapacityQueue<double>(max_notes_for_density);
         private double density = int.MaxValue;
 
         private void computeDensity(double newNoteTime)
         {
-            if (prevNoteTimes.Count == max_notes_for_density)
-                prevNoteTimes.RemoveAt(0);
-            prevNoteTimes.Add(newNoteTime);
+            prevNoteTimes.Enqueue(newNoteTime);
 
             if (prevNoteTimes.Count >= 2)
                 density = (prevNoteTimes[^1] - prevNoteTimes[0]) / prevNoteTimes.Count;

From 9d688733ac247169cc62fd29432e4ccd507f5440 Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Thu, 15 Jun 2023 13:12:05 +0200
Subject: [PATCH 0877/1604] fix: correct key counter position in Triangles and
 Legacy skins

---
 osu.Game/Skinning/LegacySkin.cs    | 2 +-
 osu.Game/Skinning/TrianglesSkin.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index e35f8fbe4d..e264af4c83 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -385,7 +385,7 @@ namespace osu.Game.Skinning
                                     {
                                         keyCounter.Anchor = Anchor.BottomRight;
                                         keyCounter.Origin = Anchor.BottomRight;
-                                        keyCounter.Position = new Vector2(10, -10 - hitError.Width);
+                                        keyCounter.Position = new Vector2(-10, -10 - hitError.Width);
                                     }
                                 }
                             })
diff --git a/osu.Game/Skinning/TrianglesSkin.cs b/osu.Game/Skinning/TrianglesSkin.cs
index 424c477bda..5f839fad0b 100644
--- a/osu.Game/Skinning/TrianglesSkin.cs
+++ b/osu.Game/Skinning/TrianglesSkin.cs
@@ -148,7 +148,7 @@ namespace osu.Game.Skinning
                                 {
                                     keyCounter.Anchor = Anchor.BottomRight;
                                     keyCounter.Origin = Anchor.BottomRight;
-                                    keyCounter.Position = new Vector2(10, -57 - 10);
+                                    keyCounter.Position = new Vector2(-10, -60 - 10);
                                 }
                             })
                             {

From d83bf029239bf54c4ef290b210c8d8dc232b206f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Jun 2023 17:50:46 +0900
Subject: [PATCH 0878/1604] Fix thing

---
 osu.Game/Database/RealmAccess.cs | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index 68a4679656..b2bbbf3155 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -945,22 +945,26 @@ namespace osu.Game.Database
 
                     foreach (var score in scores)
                     {
-                        // Recalculate the old-style standardised score to see if this was an old lazer score.
-                        bool oldScoreMatchesExpectations = StandardisedScoreMigrationTools.GetOldStandardised(score) == score.TotalScore;
-                        // Some older scores don't have correct statistics populated, so let's give them benefit of doubt.
-                        bool scoreIsVeryOld = score.Date < new DateTime(2023, 1, 1, 0, 0, 0);
-
-                        if (oldScoreMatchesExpectations || scoreIsVeryOld)
+                        try
                         {
-                            try
-                            {
-                                long calculatedNew = StandardisedScoreMigrationTools.GetNewStandardised(score);
-                                score.TotalScore = calculatedNew;
-                            }
-                            catch
+                            // Recalculate the old-style standardised score to see if this was an old lazer score.
+                            bool oldScoreMatchesExpectations = StandardisedScoreMigrationTools.GetOldStandardised(score) == score.TotalScore;
+                            // Some older scores don't have correct statistics populated, so let's give them benefit of doubt.
+                            bool scoreIsVeryOld = score.Date < new DateTime(2023, 1, 1, 0, 0, 0);
+
+                            if (oldScoreMatchesExpectations || scoreIsVeryOld)
                             {
+                                try
+                                {
+                                    long calculatedNew = StandardisedScoreMigrationTools.GetNewStandardised(score);
+                                    score.TotalScore = calculatedNew;
+                                }
+                                catch
+                                {
+                                }
                             }
                         }
+                        catch { }
                     }
 
                     break;

From 51b5a0863f97b0d3e777fbcae5490e10848e0d45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 15 Jun 2023 21:48:57 +0200
Subject: [PATCH 0879/1604] Apply migration to new standardised score on normal
 reimport too

---
 osu.Game/Database/RealmAccess.cs                   |  7 +------
 .../Database/StandardisedScoreMigrationTools.cs    | 14 ++++++++++++++
 osu.Game/Scoring/ScoreImporter.cs                  |  5 +++++
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index b2bbbf3155..48eb2826f5 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -947,12 +947,7 @@ namespace osu.Game.Database
                     {
                         try
                         {
-                            // Recalculate the old-style standardised score to see if this was an old lazer score.
-                            bool oldScoreMatchesExpectations = StandardisedScoreMigrationTools.GetOldStandardised(score) == score.TotalScore;
-                            // Some older scores don't have correct statistics populated, so let's give them benefit of doubt.
-                            bool scoreIsVeryOld = score.Date < new DateTime(2023, 1, 1, 0, 0, 0);
-
-                            if (oldScoreMatchesExpectations || scoreIsVeryOld)
+                            if (StandardisedScoreMigrationTools.ShouldMigrateToNewStandardised(score))
                             {
                                 try
                                 {
diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index af91bee9e4..66e64f3f7a 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
@@ -13,6 +14,19 @@ namespace osu.Game.Database
 {
     public static class StandardisedScoreMigrationTools
     {
+        public static bool ShouldMigrateToNewStandardised(ScoreInfo score)
+        {
+            if (score.IsLegacyScore)
+                return false;
+
+            // Recalculate the old-style standardised score to see if this was an old lazer score.
+            bool oldScoreMatchesExpectations = GetOldStandardised(score) == score.TotalScore;
+            // Some older scores don't have correct statistics populated, so let's give them benefit of doubt.
+            bool scoreIsVeryOld = score.Date < new DateTime(2023, 1, 1, 0, 0, 0);
+
+            return oldScoreMatchesExpectations || scoreIsVeryOld;
+        }
+
         public static long GetNewStandardised(ScoreInfo score)
         {
             int maxJudgementIndex = 0;
diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index 1c24cfbc85..16658a598a 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -83,6 +83,11 @@ namespace osu.Game.Scoring
 
             if (string.IsNullOrEmpty(model.MaximumStatisticsJson))
                 model.MaximumStatisticsJson = JsonConvert.SerializeObject(model.MaximumStatistics);
+
+            // for pre-ScoreV2 lazer scores, apply a best-effort conversion of total score to ScoreV2.
+            // this requires: max combo, statistics, max statistics (where available), and mods to already be populated on the score.
+            if (StandardisedScoreMigrationTools.ShouldMigrateToNewStandardised(model))
+                model.TotalScore = StandardisedScoreMigrationTools.GetNewStandardised(model);
         }
 
         /// <summary>

From 94b7de4b3f5b131a231aba17c48c75c721884169 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Jun 2023 14:01:56 +0900
Subject: [PATCH 0880/1604] Fix old-new standardised score conversion missing
 some scores due to not rounding correctly

---
 osu.Game/Database/StandardisedScoreMigrationTools.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index 66e64f3f7a..582a656efa 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -182,7 +182,7 @@ namespace osu.Game.Database
             foreach (var mod in score.Mods)
                 modMultiplier *= mod.ScoreMultiplier;
 
-            return (long)((1000000 * (accuracyPortion * accuracyScore + (1 - accuracyPortion) * comboScore) + bonusScore) * modMultiplier);
+            return (long)Math.Round((1000000 * (accuracyPortion * accuracyScore + (1 - accuracyPortion) * comboScore) + bonusScore) * modMultiplier);
         }
 
         private class FakeHit : HitObject

From 1f17f416a4e43112303407998bf09b6b9fe42e32 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Jun 2023 14:04:18 +0900
Subject: [PATCH 0881/1604] Force migration of old-new standardised scores to
 run once more

---
 osu.Game/Database/RealmAccess.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index 48eb2826f5..da4caa42ba 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -77,8 +77,9 @@ namespace osu.Game.Database
         /// 27   2023-06-06    Added EditorTimestamp to BeatmapInfo.
         /// 28   2023-06-08    Added IsLegacyScore to ScoreInfo, parsed from replay files.
         /// 29   2023-06-12    Run migration of old lazer scores to be best-effort in the new scoring number space. No actual realm changes.
+        /// 30   2023-06-16    Run migration of old lazer scores again. This time with more correct rounding considerations.
         /// </summary>
-        private const int schema_version = 29;
+        private const int schema_version = 30;
 
         /// <summary>
         /// Lock object which is held during <see cref="BlockAllOperations"/> sections, blocking realm retrieval during blocking periods.
@@ -938,6 +939,7 @@ namespace osu.Game.Database
                 }
 
                 case 29:
+                case 30:
                 {
                     var scores = migration.NewRealm
                                           .All<ScoreInfo>()

From b5de109cb31ab021778677722c959e49d6c6f4ed Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Jun 2023 14:54:19 +0900
Subject: [PATCH 0882/1604] Fix osu!mania hold notes sometimes looking
 incorrect after rewind

---
 osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index 3f91328128..faeb133615 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -254,6 +254,8 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                 float yOffset = Direction.Value == ScrollingDirection.Up ? -Y : Y;
                 sizingContainer.Height = 1 - yOffset / DrawHeight;
             }
+            else
+                sizingContainer.Height = 1;
         }
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)

From ce41ef6e5d3e6163dfbd6d1dfadb53aabfe409d8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Jun 2023 15:24:30 +0900
Subject: [PATCH 0883/1604] Move `OrderByTotalScore()` to an extension method

---
 .../Overlays/BeatmapSet/Scores/ScoresContainer.cs   |  5 +----
 osu.Game/Scoring/ScoreInfoExtensions.cs             | 13 +++++++++++++
 osu.Game/Scoring/ScoreManager.cs                    | 11 -----------
 .../OnlinePlay/Playlists/PlaylistsResultsScreen.cs  |  2 +-
 osu.Game/Screens/Select/Carousel/TopLocalRank.cs    |  5 +----
 .../Select/Leaderboards/BeatmapLeaderboard.cs       |  7 ++-----
 6 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
index 6d89313979..b53b7826f3 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
@@ -47,9 +47,6 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
-        [Resolved]
-        private ScoreManager scoreManager { get; set; }
-
         private GetScoresRequest getScoresRequest;
 
         private CancellationTokenSource loadCancellationSource;
@@ -85,7 +82,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                     MD5Hash = apiBeatmap.MD5Hash
                 };
 
-                var scores = scoreManager.OrderByTotalScore(value.Scores.Select(s => s.ToScoreInfo(rulesets, beatmapInfo))).ToArray();
+                var scores = value.Scores.Select(s => s.ToScoreInfo(rulesets, beatmapInfo)).OrderByTotalScore().ToArray();
                 var topScore = scores.First();
 
                 scoreTable.DisplayScores(scores, apiBeatmap.Status.GrantsPerformancePoints());
diff --git a/osu.Game/Scoring/ScoreInfoExtensions.cs b/osu.Game/Scoring/ScoreInfoExtensions.cs
index 7979ca8aaa..e15ab0d34c 100644
--- a/osu.Game/Scoring/ScoreInfoExtensions.cs
+++ b/osu.Game/Scoring/ScoreInfoExtensions.cs
@@ -3,6 +3,8 @@
 
 #nullable disable
 
+using System.Collections.Generic;
+using System.Linq;
 using osu.Game.Beatmaps;
 
 namespace osu.Game.Scoring
@@ -13,5 +15,16 @@ namespace osu.Game.Scoring
         /// A user-presentable display title representing this score.
         /// </summary>
         public static string GetDisplayTitle(this IScoreInfo scoreInfo) => $"{scoreInfo.User.Username} playing {scoreInfo.Beatmap.GetDisplayTitle()}";
+
+        /// <summary>
+        /// Orders an array of <see cref="ScoreInfo"/>s by total score.
+        /// </summary>
+        /// <param name="scores">The array of <see cref="ScoreInfo"/>s to reorder.</param>
+        /// <returns>The given <paramref name="scores"/> ordered by decreasing total score.</returns>
+        public static IEnumerable<ScoreInfo> OrderByTotalScore(this IEnumerable<ScoreInfo> scores)
+            => scores.OrderByDescending(s => s.TotalScore)
+                     .ThenBy(s => s.OnlineID)
+                     // Local scores may not have an online ID. Fall back to date in these cases.
+                     .ThenBy(s => s.Date);
     }
 }
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index d5509538fd..9ba7339a31 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -69,17 +69,6 @@ namespace osu.Game.Scoring
             return Realm.Run(r => r.All<ScoreInfo>().FirstOrDefault(query)?.Detach());
         }
 
-        /// <summary>
-        /// Orders an array of <see cref="ScoreInfo"/>s by total score.
-        /// </summary>
-        /// <param name="scores">The array of <see cref="ScoreInfo"/>s to reorder.</param>
-        /// <returns>The given <paramref name="scores"/> ordered by decreasing total score.</returns>
-        public IEnumerable<ScoreInfo> OrderByTotalScore(IEnumerable<ScoreInfo> scores)
-            => scores.OrderByDescending(s => s.TotalScore)
-                     .ThenBy(s => s.OnlineID)
-                     // Local scores may not have an online ID. Fall back to date in these cases.
-                     .ThenBy(s => s.Date);
-
         /// <summary>
         /// Retrieves a bindable that represents the total score of a <see cref="ScoreInfo"/>.
         /// </summary>
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsResultsScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsResultsScreen.cs
index d40d43cd54..aa72394ac9 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsResultsScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsResultsScreen.cs
@@ -182,7 +182,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         /// <param name="pivot">An optional pivot around which the scores were retrieved.</param>
         private void performSuccessCallback([NotNull] Action<IEnumerable<ScoreInfo>> callback, [NotNull] List<MultiplayerScore> scores, [CanBeNull] MultiplayerScores pivot = null) => Schedule(() =>
         {
-            var scoreInfos = scoreManager.OrderByTotalScore(scores.Select(s => s.CreateScoreInfo(scoreManager, rulesets, playlistItem, Beatmap.Value.BeatmapInfo))).ToArray();
+            var scoreInfos = scores.Select(s => s.CreateScoreInfo(scoreManager, rulesets, playlistItem, Beatmap.Value.BeatmapInfo)).OrderByTotalScore().ToArray();
 
             // Select a score if we don't already have one selected.
             // Note: This is done before the callback so that the panel list centres on the selected score before panels are added (eliminating initial scroll).
diff --git a/osu.Game/Screens/Select/Carousel/TopLocalRank.cs b/osu.Game/Screens/Select/Carousel/TopLocalRank.cs
index a57a8b0f27..7c632b63db 100644
--- a/osu.Game/Screens/Select/Carousel/TopLocalRank.cs
+++ b/osu.Game/Screens/Select/Carousel/TopLocalRank.cs
@@ -29,9 +29,6 @@ namespace osu.Game.Screens.Select.Carousel
         [Resolved]
         private RealmAccess realm { get; set; } = null!;
 
-        [Resolved]
-        private ScoreManager scoreManager { get; set; } = null!;
-
         [Resolved]
         private IAPIProvider api { get; set; } = null!;
 
@@ -78,7 +75,7 @@ namespace osu.Game.Screens.Select.Carousel
                 if (changes?.HasCollectionChanges() == false)
                     return;
 
-                ScoreInfo? topScore = scoreManager.OrderByTotalScore(sender.Detach()).FirstOrDefault();
+                ScoreInfo? topScore = sender.Detach().OrderByTotalScore().FirstOrDefault();
 
                 updateable.Rank = topScore?.Rank;
                 updateable.Alpha = topScore != null ? 1 : 0;
diff --git a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
index 2b40b9faf8..4c41ed3622 100644
--- a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
@@ -67,9 +67,6 @@ namespace osu.Game.Screens.Select.Leaderboards
             }
         }
 
-        [Resolved]
-        private ScoreManager scoreManager { get; set; } = null!;
-
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; } = null!;
 
@@ -164,7 +161,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                     return;
 
                 SetScores(
-                    scoreManager.OrderByTotalScore(response.Scores.Select(s => s.ToScoreInfo(rulesets, fetchBeatmapInfo))),
+                    response.Scores.Select(s => s.ToScoreInfo(rulesets, fetchBeatmapInfo)).OrderByTotalScore(),
                     response.UserScore?.CreateScoreInfo(rulesets, fetchBeatmapInfo)
                 );
             });
@@ -222,7 +219,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                     scores = scores.Where(s => selectedMods.SetEquals(s.Mods.Select(m => m.Acronym)));
                 }
 
-                scores = scoreManager.OrderByTotalScore(scores.Detach());
+                scores = scores.Detach().OrderByTotalScore();
 
                 SetScores(scores);
             }

From 362aa4b3763223c3294b23029eb6284d45525ad6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Jun 2023 15:26:13 +0900
Subject: [PATCH 0884/1604] Also move `GetMaxAchievableCombo`

---
 osu.Game/Scoring/ScoreInfoExtensions.cs                | 10 ++++++++--
 osu.Game/Scoring/ScoreManager.cs                       |  7 -------
 .../Ranking/Expanded/ExpandedPanelMiddleContent.cs     |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Scoring/ScoreInfoExtensions.cs b/osu.Game/Scoring/ScoreInfoExtensions.cs
index e15ab0d34c..85598076d6 100644
--- a/osu.Game/Scoring/ScoreInfoExtensions.cs
+++ b/osu.Game/Scoring/ScoreInfoExtensions.cs
@@ -1,11 +1,10 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Scoring
 {
@@ -26,5 +25,12 @@ namespace osu.Game.Scoring
                      .ThenBy(s => s.OnlineID)
                      // Local scores may not have an online ID. Fall back to date in these cases.
                      .ThenBy(s => s.Date);
+
+        /// <summary>
+        /// Retrieves the maximum achievable combo for the provided score.
+        /// </summary>
+        /// <param name="score">The <see cref="ScoreInfo"/> to compute the maximum achievable combo for.</param>
+        /// <returns>The maximum achievable combo.</returns>
+        public static int GetMaximumAchievableCombo(this ScoreInfo score) => score.MaximumStatistics.Where(kvp => kvp.Key.AffectsCombo()).Sum(kvp => kvp.Value);
     }
 }
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 9ba7339a31..55bcb9f79d 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -89,13 +89,6 @@ namespace osu.Game.Scoring
         /// <returns>The bindable containing the formatted total score string.</returns>
         public Bindable<string> GetBindableTotalScoreString([NotNull] ScoreInfo score) => new TotalScoreStringBindable(GetBindableTotalScore(score));
 
-        /// <summary>
-        /// Retrieves the maximum achievable combo for the provided score.
-        /// </summary>
-        /// <param name="score">The <see cref="ScoreInfo"/> to compute the maximum achievable combo for.</param>
-        /// <returns>The maximum achievable combo.</returns>
-        public int GetMaximumAchievableCombo([NotNull] ScoreInfo score) => score.MaximumStatistics.Where(kvp => kvp.Key.AffectsCombo()).Sum(kvp => kvp.Value);
-
         /// <summary>
         /// Provides the total score of a <see cref="ScoreInfo"/>. Responds to changes in the currently-selected <see cref="ScoringMode"/>.
         /// </summary>
diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index fe74c1ba0d..82c429798e 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Screens.Ranking.Expanded
             var topStatistics = new List<StatisticDisplay>
             {
                 new AccuracyStatistic(score.Accuracy),
-                new ComboStatistic(score.MaxCombo, scoreManager.GetMaximumAchievableCombo(score)),
+                new ComboStatistic(score.MaxCombo, score.GetMaximumAchievableCombo()),
                 new PerformanceStatistic(score),
             };
 

From 36954e55ad395b99673d15ee68eba42800fa8362 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Jun 2023 17:15:45 +0900
Subject: [PATCH 0885/1604] Fix incorrect mapping when distance spacing is not
 1.0x

---
 .../Compose/Components/CircularDistanceSnapGrid.cs    | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/CircularDistanceSnapGrid.cs b/osu.Game/Screens/Edit/Compose/Components/CircularDistanceSnapGrid.cs
index 2eec833832..63886e38eb 100644
--- a/osu.Game/Screens/Edit/Compose/Components/CircularDistanceSnapGrid.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/CircularDistanceSnapGrid.cs
@@ -101,12 +101,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (travelLength < DistanceBetweenTicks)
                 travelLength = DistanceBetweenTicks;
 
-            if (LimitedDistanceSnap.Value)
-                travelLength = SnapProvider.DurationToDistance(ReferenceObject, editorClock.CurrentTime - ReferenceObject.GetEndTime());
-
-            // When interacting with the resolved snap provider, the distance spacing multiplier should first be removed
-            // to allow for snapping at a non-multiplied ratio.
-            float snappedDistance = SnapProvider.FindSnappedDistance(ReferenceObject, travelLength / distanceSpacingMultiplier);
+            float snappedDistance = LimitedDistanceSnap.Value
+                ? SnapProvider.DurationToDistance(ReferenceObject, editorClock.CurrentTime - ReferenceObject.GetEndTime())
+                // When interacting with the resolved snap provider, the distance spacing multiplier should first be removed
+                // to allow for snapping at a non-multiplied ratio.
+                : SnapProvider.FindSnappedDistance(ReferenceObject, travelLength / distanceSpacingMultiplier);
 
             double snappedTime = StartTime + SnapProvider.DistanceToDuration(ReferenceObject, snappedDistance);
 

From d965d39c4442849561d59c25186c2a6fb6ad7af9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Jun 2023 17:16:11 +0900
Subject: [PATCH 0886/1604] Fix distance snap grid circles not correctly being
 centered on snap point

---
 .../Edit/Compose/Components/CircularDistanceSnapGrid.cs      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/CircularDistanceSnapGrid.cs b/osu.Game/Screens/Edit/Compose/Components/CircularDistanceSnapGrid.cs
index d6e4e1f030..f27ecf60cc 100644
--- a/osu.Game/Screens/Edit/Compose/Components/CircularDistanceSnapGrid.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/CircularDistanceSnapGrid.cs
@@ -63,13 +63,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
             for (int i = 0; i < requiredCircles; i++)
             {
                 float diameter = (offset + (i + 1) * DistanceBetweenTicks) * 2;
+                const float thickness = 4;
 
                 AddInternal(new Ring(ReferenceObject, GetColourForIndexFromPlacement(i))
                 {
                     Position = StartPosition,
                     Origin = Anchor.Centre,
-                    Size = new Vector2(diameter),
-                    InnerRadius = 4 * 1f / diameter,
+                    Size = new Vector2(diameter + thickness / 2),
+                    InnerRadius = thickness * 1f / diameter,
                 });
             }
         }

From 28696f595fbd601b18808af1c5dba47c7eb764ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 16 Jun 2023 16:24:07 +0200
Subject: [PATCH 0887/1604] Privatise setter

---
 osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs b/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs
index 9882f6596f..8aa2fa9f45 100644
--- a/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// When enabled, distance snap should only snap to the current time (as per the editor clock).
         /// This is to emulate stable behaviour.
         /// </summary>
-        protected Bindable<bool> LimitedDistanceSnap;
+        protected Bindable<bool> LimitedDistanceSnap { get; private set; }
 
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)

From f9321a24d9192ab49980eaa657bfbc2a412a051d Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Fri, 16 Jun 2023 17:24:40 +0200
Subject: [PATCH 0888/1604] test: change hideTarget drawable and testing logic

Doesn't change what it needs to test conceptually
---
 .../Visual/Gameplay/TestSceneHUDOverlay.cs    | 20 +++++++++----------
 .../TestSceneSkinEditorMultipleSkins.cs       |  1 -
 .../Gameplay/TestSceneSkinnableHUDOverlay.cs  |  5 +++--
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index bbb10c5957..5002281544 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         private readonly IGameplayClock gameplayClock = new GameplayClockContainer(new FramedClock());
 
         // best way to check without exposing.
-        private Drawable hideTarget => hudOverlay.ChildrenOfType<KeyCounterDisplay>().First();
+        private Drawable hideTarget => hudOverlay.ChildrenOfType<SkinComponentsContainer>().First();
         private Drawable keyCounterFlow => hudOverlay.ChildrenOfType<KeyCounterDisplay>().First().ChildrenOfType<FillFlowContainer<KeyCounter>>().Single();
 
         [BackgroundDependencyLoader]
@@ -73,7 +73,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddAssert("showhud is set", () => hudOverlay.ShowHud.Value);
 
-            AddAssert("hidetarget is visible", () => hideTarget.IsPresent);
+            AddAssert("hidetarget is visible", () => hideTarget.Alpha, () => Is.GreaterThan(0));
             AddAssert("key counter flow is visible", () => keyCounterFlow.IsPresent);
             AddAssert("pause button is visible", () => hudOverlay.HoldToQuit.IsPresent);
         }
@@ -95,7 +95,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddStep("set showhud false", () => hudOverlay.ShowHud.Value = false);
 
-            AddUntilStep("hidetarget is hidden", () => !hideTarget.IsPresent);
+            AddUntilStep("hidetarget is hidden", () => hideTarget.Alpha, () => Is.LessThanOrEqualTo(0));
             AddAssert("pause button is still visible", () => hudOverlay.HoldToQuit.IsPresent);
 
             // Key counter flow container should not be affected by this, only the key counter display will be hidden as checked above.
@@ -109,13 +109,13 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddStep("set hud to never show", () => localConfig.SetValue(OsuSetting.HUDVisibilityMode, HUDVisibilityMode.Never));
 
-            AddUntilStep("wait for fade", () => !hideTarget.IsPresent);
+            AddUntilStep("wait for fade", () => hideTarget.Alpha, () => Is.LessThanOrEqualTo(0));
 
             AddStep("trigger momentary show", () => InputManager.PressKey(Key.ControlLeft));
-            AddUntilStep("wait for visible", () => hideTarget.IsPresent);
+            AddUntilStep("wait for visible", () => hideTarget.Alpha, () => Is.GreaterThan(0));
 
             AddStep("stop trigering", () => InputManager.ReleaseKey(Key.ControlLeft));
-            AddUntilStep("wait for fade", () => !hideTarget.IsPresent);
+            AddUntilStep("wait for fade", () => hideTarget.Alpha, () => Is.LessThanOrEqualTo(0));
         }
 
         [Test]
@@ -144,11 +144,11 @@ namespace osu.Game.Tests.Visual.Gameplay
             });
 
             AddStep("set showhud false", () => hudOverlay.ShowHud.Value = false);
-            AddUntilStep("hidetarget is hidden", () => !hideTarget.IsPresent);
+            AddUntilStep("hidetarget is hidden", () => hideTarget.Alpha, () => Is.LessThanOrEqualTo(0));
             AddAssert("key counters hidden", () => !keyCounterFlow.IsPresent);
 
             AddStep("set showhud true", () => hudOverlay.ShowHud.Value = true);
-            AddUntilStep("hidetarget is visible", () => hideTarget.IsPresent);
+            AddUntilStep("hidetarget is visible", () => hideTarget.Alpha, () => Is.GreaterThan(0));
             AddAssert("key counters still hidden", () => !keyCounterFlow.IsPresent);
         }
 
@@ -171,7 +171,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             });
 
             AddStep("set showhud false", () => hudOverlay.ShowHud.Value = false);
-            AddUntilStep("hidetarget is hidden", () => !hideTarget.IsPresent);
+            AddUntilStep("hidetarget is hidden", () => hideTarget.Alpha, () => Is.LessThanOrEqualTo(0));
 
             AddStep("attempt activate", () =>
             {
@@ -211,7 +211,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             });
 
             AddStep("set showhud false", () => hudOverlay.ShowHud.Value = false);
-            AddUntilStep("hidetarget is hidden", () => !hideTarget.IsPresent);
+            AddUntilStep("hidetarget is hidden", () => hideTarget.Alpha, () => Is.LessThanOrEqualTo(0));
 
             AddStep("attempt seek", () =>
             {
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
index ac772b980e..4ae115a68d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
@@ -59,7 +59,6 @@ namespace osu.Game.Tests.Visual.Gameplay
 
                     // Add any key just to display the key counter visually.
                     hudOverlay.KeyCounter.Add(new KeyCounterKeyboardTrigger(Key.Space));
-
                     scoreProcessor.Combo.Value = 1;
 
                     return new Container
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
index 6532aa4ae5..cab52ddab5 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
@@ -19,6 +19,7 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.HUD;
+using osu.Game.Skinning;
 using osu.Game.Tests.Gameplay;
 using osuTK.Input;
 
@@ -43,7 +44,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         private IEnumerable<HUDOverlay> hudOverlays => CreatedDrawables.OfType<HUDOverlay>();
 
         // best way to check without exposing.
-        private Drawable hideTarget => hudOverlay.ChildrenOfType<KeyCounterDisplay>().First();
+        private Drawable hideTarget => hudOverlay.ChildrenOfType<SkinComponentsContainer>().First();
         private Drawable keyCounterFlow => hudOverlay.ChildrenOfType<KeyCounterDisplay>().First().ChildrenOfType<FillFlowContainer<KeyCounter>>().Single();
 
         [Test]
@@ -73,7 +74,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddStep("set showhud false", () => hudOverlays.ForEach(h => h.ShowHud.Value = false));
 
-            AddUntilStep("hidetarget is hidden", () => !hideTarget.IsPresent);
+            AddUntilStep("hidetarget is hidden", () => hideTarget.Alpha, () => Is.LessThanOrEqualTo(0));
             AddAssert("pause button is still visible", () => hudOverlay.HoldToQuit.IsPresent);
 
             // Key counter flow container should not be affected by this, only the key counter display will be hidden as checked above.

From b9d6ba193422afe8ed72f62a43b5085885157b83 Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Fri, 16 Jun 2023 18:26:30 +0200
Subject: [PATCH 0889/1604] test: add skin deserialisation test resource

---
 .../Archives/modified-argon-pro-20230616.osk     | Bin 0 -> 1234 bytes
 osu.Game.Tests/Skins/SkinDeserialisationTest.cs  |   2 ++
 2 files changed, 2 insertions(+)
 create mode 100644 osu.Game.Tests/Resources/Archives/modified-argon-pro-20230616.osk

diff --git a/osu.Game.Tests/Resources/Archives/modified-argon-pro-20230616.osk b/osu.Game.Tests/Resources/Archives/modified-argon-pro-20230616.osk
new file mode 100644
index 0000000000000000000000000000000000000000..5e5d7960dd585f9ed89c16e4b961e12fe968ace3
GIT binary patch
literal 1234
zcmWIWW@Zs#U|`^2V3>R%?D;~^O|yZ#?GO=$;_S>kz0AB!)iZ{CO%4KX59hU5{|RzT
zIudXx@@8aast#LOL+@_mlt?Fw*{$xMxRTb~pZ>ja?`fgyjTcuI?}~VNah1!oj#jk`
zGFOAQ=vr=X>Pc))YxVogm&RwG_jiTjyNegLxQdos+c+V8%KnuP8O~4SakW}<^6!~L
zjdzrN^=7a9zq-e1{iH;mu02*^p^bM|Z=9PNyyRqNUvrz3d1aU0B(?Ye6b~r1KeVm_
zI({+`^8zu*1DSbg`FdH!`FW<j8@UcS2(bQk_?LKBtFhq3)UqVSOc#OOCfqw)RG;MT
zm=n?Qf1Ucq+QWM)r?Lvhr|{J%Z2P)#ai3~mTVH0U+tmBj@xi9i>zmv5J$tr%PSS)F
z!{~CK4eDkWl6;$%OuBL*X~WwabN36D&lU;jc{fA)dPZf&i}O2m?#ZJ%(z=XQEtiRb
z!4(+rVn9dwCT8Y&gt|EA=N9DWrRJ3sgI)VJJU0K9fk^HAE&l~R@`U;P2vGZYAVK=F
z3GdW0{ZLWMhe9?zz3XIet$0;GpLyW~-P(n^OKv@2om>22?~flbkA8oDFSFdtrR=m5
zWBgN}t9BOOB{LpIteC*b9h1+Pemv*K=@Qmyt2O6N(9hva5mIcplA;sg<reO2)FSEK
zBDo@U1)J7HwhiyzJSlyyzTlbHx0p?p*XK5hs&m+Kb~>uPI%mPj+P}}SYNeP$wUOYW
zF#C+eH74d|owesJ3)2N}En4z&SKjKl1wr1GxsTo*Y(K23KPB<!q)31EGb%|;r?f>|
zDtUjUbnfeU#%1jJUEp7%&9lhZ{{nk2EwKM=J;Sap`&dhxQ*r{&^o{4Lv_+)O?3|&L
zk{x&d&4;~@G>p|JI$7+UnRipHI&W&O&Y{rH8|7U&H)+`Jo!V<I?Q_1mZE>qz#J=AL
zr@Wq8s`fk3-{h;*v;GE7WBI)7`PN6Ta%_x$RblF0D4(pV?sY6V#IWhw^KBa(<FC0)
z|KUFKMu~T<&Y|-s*UnpgTfuGHtmsn-OzUND^<KTUs>Wx&-KJdY)tX=bly$y-%lGl^
z>d?j?m(qUL7i^xyC|CHIGw@;ghIv_^CMGgkmd{yjI5D$w#>?*3pW#NmiJX^Mn!GvA
z%yH+=T)t9t+rKxKK~Aa?Ej-Pp*KM9O%{H0O==wCxMd#|RX*@TiCL9e|)t!^rl5nzs
zQ6gh<-nM=**QQp5Z%;Jk1plqveAD7vLDky-?Vowti+L=9ccd6KZG3d;Mb{k{YuQI>
z=Ck}npFNA-(>L$4;BrUX-xDss3;OlF&OBqYr_HPK)eqKOx9r}0o8NrrhP2DaZ!SKx
ziGM$1fHxzP2m|hd0GLW4pb<pDiUo9C=(!K7hk>E-AXFDTFQRKj&l3o(X^gmXNPssh
Q8%P~95N-w1>?|N200~+DYybcN

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Skins/SkinDeserialisationTest.cs b/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
index bd8088cfb6..d60dd3da1c 100644
--- a/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
+++ b/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
@@ -51,6 +51,8 @@ namespace osu.Game.Tests.Skins
             "Archives/modified-default-20230117.osk",
             // Covers player avatar and flag.
             "Archives/modified-argon-20230305.osk",
+            // Covers key counters
+            "Archives/modified-argon-pro-20230616.osk"
         };
 
         /// <summary>

From a62b11606e75b579fa2086b5f191c251f54b41f2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 17 Jun 2023 01:32:41 +0900
Subject: [PATCH 0890/1604] Attempt to fix NaN fps display

The only thing I can see which could cause this is reading from the `drawClock.ElapsedFrameTime` after the `isSpike` read causing a div-by-zero. Reading the values once at the start should avoid this.
---
 osu.Game/Graphics/UserInterface/FPSCounter.cs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/FPSCounter.cs b/osu.Game/Graphics/UserInterface/FPSCounter.cs
index 9dbeba6449..c1ef573848 100644
--- a/osu.Game/Graphics/UserInterface/FPSCounter.cs
+++ b/osu.Game/Graphics/UserInterface/FPSCounter.cs
@@ -167,9 +167,12 @@ namespace osu.Game.Graphics.UserInterface
         {
             base.Update();
 
+            double elapsedDrawFrameTime = drawClock.ElapsedFrameTime;
+            double elapsedUpdateFrameTime = updateClock.ElapsedFrameTime;
+
             // If the game goes into a suspended state (ie. debugger attached or backgrounded on a mobile device)
             // we want to ignore really long periods of no processing.
-            if (updateClock.ElapsedFrameTime > 10000)
+            if (elapsedUpdateFrameTime > 10000)
                 return;
 
             mainContent.Width = Math.Max(mainContent.Width, counters.DrawWidth);
@@ -178,17 +181,17 @@ namespace osu.Game.Graphics.UserInterface
             // frame limiter (we want to show the FPS as it's changing, even if it isn't an outlier).
             bool aimRatesChanged = updateAimFPS();
 
-            bool hasUpdateSpike = displayedFrameTime < spike_time_ms && updateClock.ElapsedFrameTime > spike_time_ms;
+            bool hasUpdateSpike = displayedFrameTime < spike_time_ms && elapsedUpdateFrameTime > spike_time_ms;
             // use elapsed frame time rather then FramesPerSecond to better catch stutter frames.
-            bool hasDrawSpike = displayedFpsCount > (1000 / spike_time_ms) && drawClock.ElapsedFrameTime > spike_time_ms;
+            bool hasDrawSpike = displayedFpsCount > (1000 / spike_time_ms) && elapsedDrawFrameTime > spike_time_ms;
 
             const float damp_time = 100;
 
-            displayedFrameTime = Interpolation.DampContinuously(displayedFrameTime, updateClock.ElapsedFrameTime, hasUpdateSpike ? 0 : damp_time, updateClock.ElapsedFrameTime);
+            displayedFrameTime = Interpolation.DampContinuously(displayedFrameTime, elapsedUpdateFrameTime, hasUpdateSpike ? 0 : damp_time, elapsedUpdateFrameTime);
 
             if (hasDrawSpike)
                 // show spike time using raw elapsed value, to account for `FramesPerSecond` being so averaged spike frames don't show.
-                displayedFpsCount = 1000 / drawClock.ElapsedFrameTime;
+                displayedFpsCount = 1000 / elapsedDrawFrameTime;
             else
                 displayedFpsCount = Interpolation.DampContinuously(displayedFpsCount, drawClock.FramesPerSecond, damp_time, Time.Elapsed);
 

From 3b1f92d8b84f081738d7b660aaa03910ac8fcecc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 17 Jun 2023 01:37:09 +0900
Subject: [PATCH 0891/1604] Fix fix logic causing further regression on release

---
 .../Objects/Drawables/DrawableHoldNote.cs     | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index faeb133615..a8563d65c4 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -242,17 +242,20 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             bodyPiece.Y = (Direction.Value == ScrollingDirection.Up ? 1 : -1) * Head.Height / 2;
             bodyPiece.Height = DrawHeight - Head.Height / 2 + Tail.Height / 2;
 
-            // As the note is being held, adjust the size of the sizing container. This has two effects:
-            // 1. The contained masking container will mask the body and ticks.
-            // 2. The head note will move along with the new "head position" in the container.
-            //
-            // As per stable, this should not apply for early hits, waiting until the object starts to touch the
-            // judgement area first.
-            if (Head.IsHit && releaseTime == null && DrawHeight > 0 && Time.Current >= HitObject.StartTime)
+            if (Time.Current >= HitObject.StartTime)
             {
-                // How far past the hit target this hold note is.
-                float yOffset = Direction.Value == ScrollingDirection.Up ? -Y : Y;
-                sizingContainer.Height = 1 - yOffset / DrawHeight;
+                // As the note is being held, adjust the size of the sizing container. This has two effects:
+                // 1. The contained masking container will mask the body and ticks.
+                // 2. The head note will move along with the new "head position" in the container.
+                //
+                // As per stable, this should not apply for early hits, waiting until the object starts to touch the
+                // judgement area first.
+                if (Head.IsHit && releaseTime == null && DrawHeight > 0)
+                {
+                    // How far past the hit target this hold note is.
+                    float yOffset = Direction.Value == ScrollingDirection.Up ? -Y : Y;
+                    sizingContainer.Height = 1 - yOffset / DrawHeight;
+                }
             }
             else
                 sizingContainer.Height = 1;

From b960741ff78a2926d334f81bcf042c83b26130d3 Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Fri, 16 Jun 2023 18:54:19 +0200
Subject: [PATCH 0892/1604] test: adapt touch input test to changes

---
 .../TestSceneOsuTouchInput.cs                 | 58 ++++++++++++-------
 1 file changed, 38 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuTouchInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuTouchInput.cs
index bb424eb587..4572970011 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuTouchInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuTouchInput.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Diagnostics;
 using System.Linq;
 using NUnit.Framework;
@@ -38,6 +39,8 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private DefaultKeyCounter rightKeyCounter = null!;
 
+        private KeyCounterController controller = null!;
+
         private OsuInputManager osuInputManager = null!;
 
         private Container mainContent = null!;
@@ -53,35 +56,50 @@ namespace osu.Game.Rulesets.Osu.Tests
                 {
                     osuInputManager = new OsuInputManager(new OsuRuleset().RulesetInfo)
                     {
-                        Child = mainContent = new Container
+                        Children = new Drawable[]
                         {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Children = new Drawable[]
+                            controller = new KeyCounterController(),
+                            mainContent = new DependencyProvidingContainer
                             {
-                                leftKeyCounter = new DefaultKeyCounter(new TestActionKeyCounterTrigger(OsuAction.LeftButton))
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                CachedDependencies = new (Type, object)[] { (typeof(KeyCounterController), controller) },
+                                Children = new Drawable[]
                                 {
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.CentreRight,
-                                    Depth = float.MinValue,
-                                    X = -100,
+                                    new OsuCursorContainer
+                                    {
+                                        Depth = float.MinValue,
+                                    }
                                 },
-                                rightKeyCounter = new DefaultKeyCounter(new TestActionKeyCounterTrigger(OsuAction.RightButton))
-                                {
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.CentreLeft,
-                                    Depth = float.MinValue,
-                                    X = 100,
-                                },
-                                new OsuCursorContainer
-                                {
-                                    Depth = float.MinValue,
-                                }
                             },
                         }
                     },
                     new TouchVisualiser(),
                 };
+
+                InputTrigger triggerLeft;
+                InputTrigger triggerRight;
+
+                controller.Add(triggerLeft = new TestActionKeyCounterTrigger(OsuAction.LeftButton));
+                controller.Add(triggerRight = new TestActionKeyCounterTrigger(OsuAction.RightButton));
+
+                mainContent.AddRange(new[]
+                {
+                    leftKeyCounter = new DefaultKeyCounter(triggerLeft)
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.CentreRight,
+                        Depth = float.MinValue,
+                        X = -100,
+                    },
+                    rightKeyCounter = new DefaultKeyCounter(triggerRight)
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.CentreLeft,
+                        Depth = float.MinValue,
+                        X = 100,
+                    },
+                });
             });
         }
 

From 61101335cca6968ad37092230663932b660ce2d4 Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Fri, 16 Jun 2023 19:00:09 +0200
Subject: [PATCH 0893/1604] test: fix `KeyCounterController` not provided as a
 dependency

---
 .../Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs          | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs
index 514a2d7e84..56c405d81f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs
@@ -18,6 +18,7 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Skinning.Legacy;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play;
+using osu.Game.Screens.Play.HUD;
 using osu.Game.Skinning;
 using osu.Game.Storyboards;
 
@@ -77,7 +78,8 @@ namespace osu.Game.Tests.Visual.Gameplay
                     (typeof(ScoreProcessor), actualComponentsContainer.Dependencies.Get<ScoreProcessor>()),
                     (typeof(HealthProcessor), actualComponentsContainer.Dependencies.Get<HealthProcessor>()),
                     (typeof(GameplayState), actualComponentsContainer.Dependencies.Get<GameplayState>()),
-                    (typeof(IGameplayClock), actualComponentsContainer.Dependencies.Get<IGameplayClock>())
+                    (typeof(IGameplayClock), actualComponentsContainer.Dependencies.Get<IGameplayClock>()),
+                    (typeof(KeyCounterController), actualComponentsContainer.Dependencies.Get<KeyCounterController>())
                 },
             };
 

From f70342bd6772cefbfcd389dc30b780116c6ed8d3 Mon Sep 17 00:00:00 2001
From: Maksim Kan <max-kan@outlook.com>
Date: Tue, 13 Jun 2023 18:18:46 +0300
Subject: [PATCH 0894/1604] Fix Triangle skin colors with Dual Stage mod

---
 .../Skinning/Default/ManiaTrianglesSkinTransformer.cs       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Default/ManiaTrianglesSkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Default/ManiaTrianglesSkinTransformer.cs
index eb51179cea..3e0fe8ed4b 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Default/ManiaTrianglesSkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Default/ManiaTrianglesSkinTransformer.cs
@@ -35,10 +35,12 @@ namespace osu.Game.Rulesets.Mania.Skinning.Default
 
                         var stage = beatmap.GetStageForColumnIndex(column);
 
-                        if (stage.IsSpecialColumn(column))
+                        int columnInStage = column % stage.Columns;
+
+                        if (stage.IsSpecialColumn(columnInStage))
                             return SkinUtils.As<TValue>(new Bindable<Color4>(colourSpecial));
 
-                        int distanceToEdge = Math.Min(column, (stage.Columns - 1) - column);
+                        int distanceToEdge = Math.Min(columnInStage, (stage.Columns - 1) - columnInStage);
                         return SkinUtils.As<TValue>(new Bindable<Color4>(distanceToEdge % 2 == 0 ? colourOdd : colourEven));
                 }
             }

From 688e65475dd938544924ba2d7e06355b50fb4bc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 17 Jun 2023 10:25:09 +0200
Subject: [PATCH 0895/1604] Add better test coverage of dual stages in
 skinnable tests

---
 .../Skinning/TestScenePlayfield.cs            | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestScenePlayfield.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestScenePlayfield.cs
index f85e303940..6485cbb76b 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestScenePlayfield.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestScenePlayfield.cs
@@ -8,6 +8,7 @@ using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.UI;
+using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Tests.Skinning
 {
@@ -25,22 +26,35 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
                     new StageDefinition(2)
                 };
 
-                SetContents(_ => new ManiaPlayfield(stageDefinitions));
+                SetContents(_ => new ManiaInputManager(new ManiaRuleset().RulesetInfo, 2)
+                {
+                    Child = new ManiaPlayfield(stageDefinitions)
+                });
             });
         }
 
-        [Test]
-        public void TestDualStages()
+        [TestCase(2)]
+        [TestCase(3)]
+        [TestCase(5)]
+        public void TestDualStages(int columnCount)
         {
             AddStep("create stage", () =>
             {
                 stageDefinitions = new List<StageDefinition>
                 {
-                    new StageDefinition(2),
-                    new StageDefinition(2)
+                    new StageDefinition(columnCount),
+                    new StageDefinition(columnCount)
                 };
 
-                SetContents(_ => new ManiaPlayfield(stageDefinitions));
+                SetContents(_ => new ManiaInputManager(new ManiaRuleset().RulesetInfo, (int)PlayfieldType.Dual + 2 * columnCount)
+                {
+                    Child = new ManiaPlayfield(stageDefinitions)
+                    {
+                        // bit of a hack to make sure the dual stages fit on screen without overlapping each other.
+                        Size = new Vector2(1.5f),
+                        Scale = new Vector2(1 / 1.5f)
+                    }
+                });
             });
         }
 

From 4919069ea6d115c49b0b7993016d92110e350974 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 18 Jun 2023 01:58:02 +0900
Subject: [PATCH 0896/1604] Avoid humanizer regex compilation overhead when
 opening song select for the first time

---
 osu.Game/Screens/Select/SongSelect.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 4d6a5398c5..91799dabf0 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using Humanizer;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
@@ -864,7 +863,7 @@ namespace osu.Game.Screens.Select
         {
             // Intentionally not localised until we have proper support for this (see https://github.com/ppy/osu-framework/pull/4918
             // but also in this case we want support for formatting a number within a string).
-            FilterControl.InformationalText = $"{"match".ToQuantity(Carousel.CountDisplayed, "#,0")}";
+            FilterControl.InformationalText = Carousel.CountDisplayed != 1 ? $"{Carousel.CountDisplayed} matches" : $"{Carousel.CountDisplayed} match";
         }
 
         private bool boundLocalBindables;

From 25fa4a2eb53b00fcb66a6fb2ce4f5fc5dc7d8082 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 17 Jun 2023 19:57:08 +0300
Subject: [PATCH 0897/1604] Move `DragDrop` handling to base game
 implementation for iOS support

---
 osu.Desktop/OsuGameDesktop.cs | 45 --------------------------------
 osu.Game/OsuGame.cs           | 48 +++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 45 deletions(-)

diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index d92fea27bf..21cea3ba76 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -2,12 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Reflection;
 using System.Runtime.Versioning;
-using System.Threading.Tasks;
 using Microsoft.Win32;
 using osu.Desktop.Security;
 using osu.Framework.Platform;
@@ -17,7 +15,6 @@ using osu.Framework;
 using osu.Framework.Logging;
 using osu.Game.Updater;
 using osu.Desktop.Windows;
-using osu.Framework.Threading;
 using osu.Game.IO;
 using osu.Game.IPC;
 using osu.Game.Utils;
@@ -138,52 +135,10 @@ namespace osu.Desktop
 
             desktopWindow.CursorState |= CursorState.Hidden;
             desktopWindow.Title = Name;
-            desktopWindow.DragDrop += f =>
-            {
-                // on macOS, URL associations are handled via SDL_DROPFILE events.
-                if (f.StartsWith(OSU_PROTOCOL, StringComparison.Ordinal))
-                {
-                    HandleLink(f);
-                    return;
-                }
-
-                fileDrop(new[] { f });
-            };
         }
 
         protected override BatteryInfo CreateBatteryInfo() => new SDL2BatteryInfo();
 
-        private readonly List<string> importableFiles = new List<string>();
-        private ScheduledDelegate? importSchedule;
-
-        private void fileDrop(string[] filePaths)
-        {
-            lock (importableFiles)
-            {
-                importableFiles.AddRange(filePaths);
-
-                Logger.Log($"Adding {filePaths.Length} files for import");
-
-                // File drag drop operations can potentially trigger hundreds or thousands of these calls on some platforms.
-                // In order to avoid spawning multiple import tasks for a single drop operation, debounce a touch.
-                importSchedule?.Cancel();
-                importSchedule = Scheduler.AddDelayed(handlePendingImports, 100);
-            }
-        }
-
-        private void handlePendingImports()
-        {
-            lock (importableFiles)
-            {
-                Logger.Log($"Handling batch import of {importableFiles.Count} files");
-
-                string[] paths = importableFiles.ToArray();
-                importableFiles.Clear();
-
-                Task.Factory.StartNew(() => Import(paths), TaskCreationOptions.LongRunning);
-            }
-        }
-
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 3768dad370..a80639d4ff 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -6,6 +6,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -28,6 +29,7 @@ using osu.Framework.Input.Events;
 using osu.Framework.Input.Handlers.Tablet;
 using osu.Framework.Localisation;
 using osu.Framework.Logging;
+using osu.Framework.Platform;
 using osu.Framework.Screens;
 using osu.Framework.Threading;
 using osu.Game.Beatmaps;
@@ -281,6 +283,52 @@ namespace osu.Game
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) =>
             dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
 
+        private readonly List<string> dragDropFiles = new List<string>();
+        private ScheduledDelegate dragDropImportSchedule;
+
+        public override void SetHost(GameHost host)
+        {
+            base.SetHost(host);
+
+            if (host.Window is SDL2Window sdlWindow)
+            {
+                sdlWindow.DragDrop += path =>
+                {
+                    // on macOS/iOS, URL associations are handled via SDL_DROPFILE events.
+                    if (path.StartsWith(OSU_PROTOCOL, StringComparison.Ordinal))
+                    {
+                        HandleLink(path);
+                        return;
+                    }
+
+                    lock (dragDropFiles)
+                    {
+                        dragDropFiles.Add(path);
+
+                        Logger.Log($@"Adding ""{Path.GetFileName(path)}"" for import");
+
+                        // File drag drop operations can potentially trigger hundreds or thousands of these calls on some platforms.
+                        // In order to avoid spawning multiple import tasks for a single drop operation, debounce a touch.
+                        dragDropImportSchedule?.Cancel();
+                        dragDropImportSchedule = Scheduler.AddDelayed(handlePendingDragDropImports, 100);
+                    }
+                };
+            }
+        }
+
+        private void handlePendingDragDropImports()
+        {
+            lock (dragDropFiles)
+            {
+                Logger.Log($"Handling batch import of {dragDropFiles.Count} files");
+
+                string[] paths = dragDropFiles.ToArray();
+                dragDropFiles.Clear();
+
+                Task.Factory.StartNew(() => Import(paths), TaskCreationOptions.LongRunning);
+            }
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {

From eafd774044faad4030a4f4d19a4c26d03e13f2f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 17 Jun 2023 20:03:24 +0200
Subject: [PATCH 0898/1604] Bring back old formatting spec

---
 osu.Game/Screens/Select/SongSelect.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 91799dabf0..47e5325baf 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -863,7 +863,7 @@ namespace osu.Game.Screens.Select
         {
             // Intentionally not localised until we have proper support for this (see https://github.com/ppy/osu-framework/pull/4918
             // but also in this case we want support for formatting a number within a string).
-            FilterControl.InformationalText = Carousel.CountDisplayed != 1 ? $"{Carousel.CountDisplayed} matches" : $"{Carousel.CountDisplayed} match";
+            FilterControl.InformationalText = Carousel.CountDisplayed != 1 ? $"{Carousel.CountDisplayed:#,0} matches" : $"{Carousel.CountDisplayed:#,0} match";
         }
 
         private bool boundLocalBindables;

From fdebf93ae41a87010b973a4ec73bbf9312e8b99b Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sat, 17 Jun 2023 14:55:27 -0700
Subject: [PATCH 0899/1604] Fix incorrect xmldoc of `IBeatmapInfo.Length`

---
 osu.Game/Beatmaps/IBeatmapInfo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/IBeatmapInfo.cs b/osu.Game/Beatmaps/IBeatmapInfo.cs
index 4f2c08f63d..b8c69cc525 100644
--- a/osu.Game/Beatmaps/IBeatmapInfo.cs
+++ b/osu.Game/Beatmaps/IBeatmapInfo.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Beatmaps
         IBeatmapSetInfo? BeatmapSet { get; }
 
         /// <summary>
-        /// The playable length in milliseconds of this beatmap.
+        /// The total length in milliseconds of this beatmap.
         /// </summary>
         double Length { get; }
 

From 9ae864c219c1bed9f6777383f9ddcbf13fca4019 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sat, 17 Jun 2023 15:00:32 -0700
Subject: [PATCH 0900/1604] Fix beatmap info length tooltip not showing actual
 drain length

---
 .../Visual/Online/TestSceneBeatmapSetOverlay.cs        |  1 +
 osu.Game/Beatmaps/IBeatmapOnlineInfo.cs                |  5 +++++
 osu.Game/Online/API/Requests/Responses/APIBeatmap.cs   | 10 ++++++++++
 osu.Game/Overlays/BeatmapSet/BasicStats.cs             |  8 ++++----
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
index a27c4ddad2..d9763ef6c8 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
@@ -86,6 +86,7 @@ namespace osu.Game.Tests.Visual.Online
                             StarRating = 9.99,
                             DifficultyName = @"TEST",
                             Length = 456000,
+                            HitLength = 400000,
                             RulesetID = 3,
                             CircleSize = 1,
                             DrainRate = 2.3f,
diff --git a/osu.Game/Beatmaps/IBeatmapOnlineInfo.cs b/osu.Game/Beatmaps/IBeatmapOnlineInfo.cs
index e1634e7d24..707a0696ba 100644
--- a/osu.Game/Beatmaps/IBeatmapOnlineInfo.cs
+++ b/osu.Game/Beatmaps/IBeatmapOnlineInfo.cs
@@ -59,5 +59,10 @@ namespace osu.Game.Beatmaps
         int PassCount { get; }
 
         APIFailTimes? FailTimes { get; }
+
+        /// <summary>
+        /// The playable length in milliseconds of this beatmap.
+        /// </summary>
+        double HitLength { get; }
     }
 }
diff --git a/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs b/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
index 7d6740ee46..902b651be9 100644
--- a/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
@@ -63,6 +63,16 @@ namespace osu.Game.Online.API.Requests.Responses
             set => Length = TimeSpan.FromSeconds(value).TotalMilliseconds;
         }
 
+        [JsonIgnore]
+        public double HitLength { get; set; }
+
+        [JsonProperty(@"hit_length")]
+        private double hitLengthInSeconds
+        {
+            get => TimeSpan.FromMilliseconds(HitLength).TotalSeconds;
+            set => HitLength = TimeSpan.FromSeconds(value).TotalMilliseconds;
+        }
+
         [JsonProperty(@"convert")]
         public bool Convert { get; set; }
 
diff --git a/osu.Game/Overlays/BeatmapSet/BasicStats.cs b/osu.Game/Overlays/BeatmapSet/BasicStats.cs
index 4a9a3d8089..3cc655d561 100644
--- a/osu.Game/Overlays/BeatmapSet/BasicStats.cs
+++ b/osu.Game/Overlays/BeatmapSet/BasicStats.cs
@@ -68,13 +68,13 @@ namespace osu.Game.Overlays.BeatmapSet
             }
             else
             {
-                length.TooltipText = BeatmapsetsStrings.ShowStatsTotalLength(TimeSpan.FromMilliseconds(beatmapInfo.Length).ToFormattedDuration());
                 length.Value = TimeSpan.FromMilliseconds(beatmapInfo.Length).ToFormattedDuration();
 
-                var onlineInfo = beatmapInfo as IBeatmapOnlineInfo;
+                if (beatmapInfo is not IBeatmapOnlineInfo onlineInfo) return;
 
-                circleCount.Value = (onlineInfo?.CircleCount ?? 0).ToLocalisableString(@"N0");
-                sliderCount.Value = (onlineInfo?.SliderCount ?? 0).ToLocalisableString(@"N0");
+                circleCount.Value = onlineInfo.CircleCount.ToLocalisableString(@"N0");
+                sliderCount.Value = onlineInfo.SliderCount.ToLocalisableString(@"N0");
+                length.TooltipText = BeatmapsetsStrings.ShowStatsTotalLength(TimeSpan.FromMilliseconds(onlineInfo.HitLength).ToFormattedDuration());
             }
         }
 

From eb31fdecee97c8551788aa6422aac492357230fa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Jun 2023 13:48:56 +0900
Subject: [PATCH 0901/1604] Apply osu! side changes in line with
 `FocusedOverlayContainer.PopIn` `abstract` change

See https://github.com/ppy/osu-framework/pull/5834
---
 .../Visual/UserInterface/TestSceneOverlayContainer.cs       | 4 ++++
 osu.Game/Collections/ManageCollectionsDialog.cs             | 2 --
 osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs  | 1 -
 osu.Game/Overlays/AccountCreationOverlay.cs                 | 1 -
 osu.Game/Overlays/ChatOverlay.cs                            | 2 --
 osu.Game/Overlays/DialogOverlay.cs                          | 1 -
 osu.Game/Overlays/LoginOverlay.cs                           | 2 --
 osu.Game/Overlays/MedalOverlay.cs                           | 6 +++++-
 osu.Game/Overlays/Mods/ShearedOverlayContainer.cs           | 1 -
 osu.Game/Overlays/NotificationOverlay.cs                    | 2 --
 osu.Game/Overlays/NowPlayingOverlay.cs                      | 2 --
 osu.Game/Overlays/SettingsPanel.cs                          | 2 --
 osu.Game/Overlays/WaveOverlayContainer.cs                   | 2 --
 .../OnlinePlay/Match/Components/RoomSettingsOverlay.cs      | 2 --
 osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs    | 2 --
 15 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayContainer.cs
index d9c2774611..bb94912c83 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayContainer.cs
@@ -101,6 +101,10 @@ namespace osu.Game.Tests.Visual.UserInterface
                     },
                 };
             }
+
+            protected override void PopIn()
+            {
+            }
         }
     }
 }
diff --git a/osu.Game/Collections/ManageCollectionsDialog.cs b/osu.Game/Collections/ManageCollectionsDialog.cs
index 36142cf26f..31016b807b 100644
--- a/osu.Game/Collections/ManageCollectionsDialog.cs
+++ b/osu.Game/Collections/ManageCollectionsDialog.cs
@@ -114,8 +114,6 @@ namespace osu.Game.Collections
 
         protected override void PopIn()
         {
-            base.PopIn();
-
             lowPassFilter.CutoffTo(300, 100, Easing.OutCubic);
             this.FadeIn(enter_duration, Easing.OutQuint);
             this.ScaleTo(0.9f).Then().ScaleTo(1f, enter_duration, Easing.OutQuint);
diff --git a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
index 07b5b53e0e..f92cfc2306 100644
--- a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
+++ b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
@@ -152,7 +152,6 @@ namespace osu.Game.Graphics.Containers
 
         protected override void PopOut()
         {
-            base.PopOut();
             previewTrackManager.StopAnyPlaying(this);
         }
 
diff --git a/osu.Game/Overlays/AccountCreationOverlay.cs b/osu.Game/Overlays/AccountCreationOverlay.cs
index 6f79316670..ef2e055eae 100644
--- a/osu.Game/Overlays/AccountCreationOverlay.cs
+++ b/osu.Game/Overlays/AccountCreationOverlay.cs
@@ -90,7 +90,6 @@ namespace osu.Game.Overlays
 
         protected override void PopIn()
         {
-            base.PopIn();
             this.FadeIn(transition_time, Easing.OutQuint);
 
             if (welcomeScreen.GetChildScreen() != null)
diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 96dbfe31f3..87df08ceec 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -276,8 +276,6 @@ namespace osu.Game.Overlays
 
         protected override void PopIn()
         {
-            base.PopIn();
-
             this.MoveToY(0, transition_length, Easing.OutQuint);
             this.FadeIn(transition_length, Easing.OutQuint);
         }
diff --git a/osu.Game/Overlays/DialogOverlay.cs b/osu.Game/Overlays/DialogOverlay.cs
index 098a5d0a33..005162bbcc 100644
--- a/osu.Game/Overlays/DialogOverlay.cs
+++ b/osu.Game/Overlays/DialogOverlay.cs
@@ -99,7 +99,6 @@ namespace osu.Game.Overlays
 
         protected override void PopIn()
         {
-            base.PopIn();
             lowPassFilter.CutoffTo(300, 100, Easing.OutCubic);
         }
 
diff --git a/osu.Game/Overlays/LoginOverlay.cs b/osu.Game/Overlays/LoginOverlay.cs
index 536811dfcf..8b60024682 100644
--- a/osu.Game/Overlays/LoginOverlay.cs
+++ b/osu.Game/Overlays/LoginOverlay.cs
@@ -75,8 +75,6 @@ namespace osu.Game.Overlays
 
         protected override void PopIn()
         {
-            base.PopIn();
-
             panel.Bounding = true;
             this.FadeIn(transition_time, Easing.OutQuint);
 
diff --git a/osu.Game/Overlays/MedalOverlay.cs b/osu.Game/Overlays/MedalOverlay.cs
index bd895fe6bf..eba35ec6f9 100644
--- a/osu.Game/Overlays/MedalOverlay.cs
+++ b/osu.Game/Overlays/MedalOverlay.cs
@@ -246,9 +246,13 @@ namespace osu.Game.Overlays
             }
         }
 
+        protected override void PopIn()
+        {
+            this.FadeIn(200);
+        }
+
         protected override void PopOut()
         {
-            base.PopOut();
             this.FadeOut(200);
         }
 
diff --git a/osu.Game/Overlays/Mods/ShearedOverlayContainer.cs b/osu.Game/Overlays/Mods/ShearedOverlayContainer.cs
index 7f7b09a62c..a372ec70db 100644
--- a/osu.Game/Overlays/Mods/ShearedOverlayContainer.cs
+++ b/osu.Game/Overlays/Mods/ShearedOverlayContainer.cs
@@ -130,7 +130,6 @@ namespace osu.Game.Overlays.Mods
         {
             const double fade_in_duration = 400;
 
-            base.PopIn();
             this.FadeIn(fade_in_duration, Easing.OutQuint);
 
             Header.MoveToY(0, fade_in_duration, Easing.OutQuint);
diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index f2eefb6e4b..15e6c94b34 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -206,8 +206,6 @@ namespace osu.Game.Overlays
 
         protected override void PopIn()
         {
-            base.PopIn();
-
             this.MoveToX(0, TRANSITION_LENGTH, Easing.OutQuint);
             mainContent.FadeTo(1, TRANSITION_LENGTH, Easing.OutQuint);
             mainContent.FadeEdgeEffectTo(WaveContainer.SHADOW_OPACITY, WaveContainer.APPEAR_DURATION, Easing.Out);
diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index e3e3b4bd80..15eefb2d9f 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -229,8 +229,6 @@ namespace osu.Game.Overlays
 
         protected override void PopIn()
         {
-            base.PopIn();
-
             this.FadeIn(transition_length, Easing.OutQuint);
             dragContainer.ScaleTo(1, transition_length, Easing.OutElastic);
         }
diff --git a/osu.Game/Overlays/SettingsPanel.cs b/osu.Game/Overlays/SettingsPanel.cs
index 1681187f82..d7f39a9d8f 100644
--- a/osu.Game/Overlays/SettingsPanel.cs
+++ b/osu.Game/Overlays/SettingsPanel.cs
@@ -163,8 +163,6 @@ namespace osu.Game.Overlays
 
         protected override void PopIn()
         {
-            base.PopIn();
-
             ContentContainer.MoveToX(ExpandedPosition, TRANSITION_LENGTH, Easing.OutQuint);
 
             SectionsContainer.FadeEdgeEffectTo(WaveContainer.SHADOW_OPACITY, WaveContainer.APPEAR_DURATION, Easing.Out);
diff --git a/osu.Game/Overlays/WaveOverlayContainer.cs b/osu.Game/Overlays/WaveOverlayContainer.cs
index 00474cc0d8..34fbec93b7 100644
--- a/osu.Game/Overlays/WaveOverlayContainer.cs
+++ b/osu.Game/Overlays/WaveOverlayContainer.cs
@@ -34,8 +34,6 @@ namespace osu.Game.Overlays
 
         protected override void PopIn()
         {
-            base.PopIn();
-
             Waves.Show();
             this.FadeIn(100, Easing.OutQuint);
         }
diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/RoomSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Match/Components/RoomSettingsOverlay.cs
index 4d4fe4ea56..05232fe0e2 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/RoomSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/RoomSettingsOverlay.cs
@@ -54,14 +54,12 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
 
         protected override void PopIn()
         {
-            base.PopIn();
             Settings.MoveToY(0, TRANSITION_DURATION, Easing.OutQuint);
             Settings.FadeIn(TRANSITION_DURATION / 2);
         }
 
         protected override void PopOut()
         {
-            base.PopOut();
             Settings.MoveToY(-1, TRANSITION_DURATION, Easing.InSine);
             Settings.Delay(TRANSITION_DURATION / 2).FadeOut(TRANSITION_DURATION / 2);
         }
diff --git a/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs b/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
index c92dc2e343..5753c268d9 100644
--- a/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
+++ b/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
@@ -86,8 +86,6 @@ namespace osu.Game.Screens.Select.Options
 
         protected override void PopIn()
         {
-            base.PopIn();
-
             this.FadeIn(transition_duration, Easing.OutQuint);
 
             if (buttonsContainer.Position.X == 1 || Alpha == 0)

From d9c00fc4be6aeb7fba570ccee75e39095d0363f3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 18 Jun 2023 20:57:43 +0900
Subject: [PATCH 0902/1604] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index f4d08e443c..522d28dca7 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -11,7 +11,7 @@
     <AndroidManifestMerger>manifestmerger.jar</AndroidManifestMerger>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.608.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.618.0" />
   </ItemGroup>
   <ItemGroup>
     <AndroidManifestOverlay Include="$(MSBuildThisFileDirectory)osu.Android\Properties\AndroidManifestOverlay.xml" />
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index e08b09aef9..4b9f37270b 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,7 +36,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="10.20.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.608.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.618.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.605.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 9aafec6c50..96396ca4ad 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -16,6 +16,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.608.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.618.0" />
   </ItemGroup>
 </Project>

From 62f01e4f4008421280925c7bd26608f084c10ec3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 18 Jun 2023 13:49:29 +0200
Subject: [PATCH 0903/1604] Rename `ModState` members to better convey what's
 what

---
 osu.Game/Overlays/Mods/ModColumn.cs | 2 +-
 osu.Game/Overlays/Mods/ModPanel.cs  | 8 ++++----
 osu.Game/Overlays/Mods/ModState.cs  | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModColumn.cs b/osu.Game/Overlays/Mods/ModColumn.cs
index 610fd4e935..0845edf7f8 100644
--- a/osu.Game/Overlays/Mods/ModColumn.cs
+++ b/osu.Game/Overlays/Mods/ModColumn.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Overlays.Mods
                 foreach (var mod in availableMods)
                 {
                     mod.Active.BindValueChanged(_ => updateState());
-                    mod.MatchingFilter.BindValueChanged(_ => updateState());
+                    mod.MatchingTextFilter.BindValueChanged(_ => updateState());
                     mod.ValidForSelection.BindValueChanged(_ => updateState());
                 }
 
diff --git a/osu.Game/Overlays/Mods/ModPanel.cs b/osu.Game/Overlays/Mods/ModPanel.cs
index 86ecdfa31d..3f85e0b5eb 100644
--- a/osu.Game/Overlays/Mods/ModPanel.cs
+++ b/osu.Game/Overlays/Mods/ModPanel.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Overlays.Mods
             base.LoadComplete();
 
             modState.ValidForSelection.BindValueChanged(_ => updateFilterState());
-            modState.MatchingFilter.BindValueChanged(_ => updateFilterState(), true);
+            modState.MatchingTextFilter.BindValueChanged(_ => updateFilterState(), true);
         }
 
         protected override void Select()
@@ -100,13 +100,13 @@ namespace osu.Game.Overlays.Mods
 
         public override bool MatchingFilter
         {
-            get => modState.MatchingFilter.Value;
+            get => modState.MatchingTextFilter.Value;
             set
             {
-                if (modState.MatchingFilter.Value == value)
+                if (modState.MatchingTextFilter.Value == value)
                     return;
 
-                modState.MatchingFilter.Value = value;
+                modState.MatchingTextFilter.Value = value;
             }
         }
 
diff --git a/osu.Game/Overlays/Mods/ModState.cs b/osu.Game/Overlays/Mods/ModState.cs
index 5e0d768021..1ec517ca11 100644
--- a/osu.Game/Overlays/Mods/ModState.cs
+++ b/osu.Game/Overlays/Mods/ModState.cs
@@ -39,14 +39,14 @@ namespace osu.Game.Overlays.Mods
         public BindableBool ValidForSelection { get; } = new BindableBool(true);
 
         /// <summary>
-        /// Whether the <see cref="Mod"/> is passing all filters and visible for user
+        /// Whether the mod is matching the current textual filter.
         /// </summary>
-        public bool Visible => MatchingFilter.Value && ValidForSelection.Value;
+        public BindableBool MatchingTextFilter { get; } = new BindableBool(true);
 
         /// <summary>
-        /// Whether the mod is matching the current filter, i.e. it is available for user selection.
+        /// Whether the <see cref="Mod"/> matches all applicable filters and visible for the user to select.
         /// </summary>
-        public BindableBool MatchingFilter { get; } = new BindableBool(true);
+        public bool Visible => MatchingTextFilter.Value && ValidForSelection.Value;
 
         public ModState(Mod mod)
         {

From c7e89905767a6cffc6437eece94ddde56d8c2365 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 18 Jun 2023 13:51:03 +0200
Subject: [PATCH 0904/1604] Remove unused property

---
 osu.Game/Overlays/Mods/ModPanel.cs | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModPanel.cs b/osu.Game/Overlays/Mods/ModPanel.cs
index 3f85e0b5eb..829a0886c3 100644
--- a/osu.Game/Overlays/Mods/ModPanel.cs
+++ b/osu.Game/Overlays/Mods/ModPanel.cs
@@ -77,18 +77,6 @@ namespace osu.Game.Overlays.Mods
         /// </summary>
         public bool Visible => modState.Visible;
 
-        public bool ValidForSelection
-        {
-            get => modState.ValidForSelection.Value;
-            set
-            {
-                if (modState.ValidForSelection.Value == value)
-                    return;
-
-                modState.ValidForSelection.Value = value;
-            }
-        }
-
         #region Filtering support
 
         public override IEnumerable<LocalisableString> FilterTerms => new[]

From 1b4d7db1e6254d55683ae9bbb14a7313a82cb088 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 18 Jun 2023 13:51:13 +0200
Subject: [PATCH 0905/1604] Remove redundant guard

`Bindable` has one of those already.
---
 osu.Game/Overlays/Mods/ModPanel.cs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModPanel.cs b/osu.Game/Overlays/Mods/ModPanel.cs
index 829a0886c3..14e5040767 100644
--- a/osu.Game/Overlays/Mods/ModPanel.cs
+++ b/osu.Game/Overlays/Mods/ModPanel.cs
@@ -89,13 +89,7 @@ namespace osu.Game.Overlays.Mods
         public override bool MatchingFilter
         {
             get => modState.MatchingTextFilter.Value;
-            set
-            {
-                if (modState.MatchingTextFilter.Value == value)
-                    return;
-
-                modState.MatchingTextFilter.Value = value;
-            }
+            set => modState.MatchingTextFilter.Value = value;
         }
 
         private void updateFilterState()

From a1015b4145502fc5951548f2bdcd08de857f13e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 18 Jun 2023 13:59:02 +0200
Subject: [PATCH 0906/1604] Remove duplicated xmldoc and move into relevant
 region

---
 osu.Game/Overlays/Mods/ModPanel.cs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModPanel.cs b/osu.Game/Overlays/Mods/ModPanel.cs
index 14e5040767..f294b1892d 100644
--- a/osu.Game/Overlays/Mods/ModPanel.cs
+++ b/osu.Game/Overlays/Mods/ModPanel.cs
@@ -72,13 +72,11 @@ namespace osu.Game.Overlays.Mods
             Active.Value = false;
         }
 
-        /// <summary>
-        /// Whether the <see cref="ModPanel"/> is passing all filters and visible for user
-        /// </summary>
-        public bool Visible => modState.Visible;
-
         #region Filtering support
 
+        /// <seealso cref="ModState.Visible"/>
+        public bool Visible => modState.Visible;
+
         public override IEnumerable<LocalisableString> FilterTerms => new[]
         {
             Mod.Name,

From 64e96c6d82772e19a4a8cc8733ef8a560eeb5ad6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 18 Jun 2023 14:03:26 +0200
Subject: [PATCH 0907/1604] Fix duplicate linq and reword comment

---
 osu.Game/Overlays/Mods/ModColumn.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModColumn.cs b/osu.Game/Overlays/Mods/ModColumn.cs
index 0845edf7f8..60c1282a65 100644
--- a/osu.Game/Overlays/Mods/ModColumn.cs
+++ b/osu.Game/Overlays/Mods/ModColumn.cs
@@ -150,10 +150,12 @@ namespace osu.Game.Overlays.Mods
 
             if (toggleAllCheckbox != null && !SelectionAnimationRunning)
             {
-                toggleAllCheckbox.Alpha = availableMods.Any(panel => panel.Visible) ? 1 : 0;
+                bool anyPanelsVisible = availableMods.Any(panel => panel.Visible);
 
-                //Prevent checkbox from checking when column have on valid panels
-                if (availableMods.Any(panel => panel.Visible))
+                toggleAllCheckbox.Alpha = anyPanelsVisible ? 1 : 0;
+
+                // checking `anyPanelsVisible` is important since `.All()` returns `true` for empty enumerables.
+                if (anyPanelsVisible)
                     toggleAllCheckbox.Current.Value = availableMods.Where(panel => panel.Visible).All(panel => panel.Active.Value);
             }
         }

From 4c78144d10093b4ee3dcd718d06e7ca8b4b66e5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 18 Jun 2023 14:04:00 +0200
Subject: [PATCH 0908/1604] Remove obvious comment

---
 osu.Game/Overlays/Mods/ModColumn.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/ModColumn.cs b/osu.Game/Overlays/Mods/ModColumn.cs
index 60c1282a65..d65c94d14d 100644
--- a/osu.Game/Overlays/Mods/ModColumn.cs
+++ b/osu.Game/Overlays/Mods/ModColumn.cs
@@ -215,7 +215,7 @@ namespace osu.Game.Overlays.Mods
             foreach (var button in availableMods.Where(b => b.Active.Value))
             {
                 if (!button.Visible)
-                    button.Active.Value = false; //If mod panel is hidden change state manually without any animation
+                    button.Active.Value = false;
                 else
                     pendingSelectionOperations.Enqueue(() => button.Active.Value = false);
             }

From 9758e5f840c88b3dc39745a4bd8f7841ef9fcc44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 18 Jun 2023 14:16:31 +0200
Subject: [PATCH 0909/1604] Fix utterly broken test

- Was on wrong ruleset, so the mod/free mod sets did literally nothing
- `assertHasFreeModButton` had a param that did nothing
- Was checking `MatchingFilter` rather than `Visible`
---
 .../TestSceneMultiplayerMatchSongSelect.cs            | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
index 23090e9da4..947b7e5be6 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
@@ -94,6 +94,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [TestCase(typeof(OsuModHidden), typeof(OsuModTraceable))] // Incompatible.
         public void TestAllowedModDeselectedWhenRequired(Type allowedMod, Type requiredMod)
         {
+            AddStep("change ruleset", () => Ruleset.Value = new OsuRuleset().RulesetInfo);
             AddStep($"select {allowedMod.ReadableName()} as allowed", () => songSelect.FreeMods.Value = new[] { (Mod)Activator.CreateInstance(allowedMod) });
             AddStep($"select {requiredMod.ReadableName()} as required", () => songSelect.Mods.Value = new[] { (Mod)Activator.CreateInstance(requiredMod) });
 
@@ -102,17 +103,17 @@ namespace osu.Game.Tests.Visual.Multiplayer
             // A previous test's mod overlay could still be fading out.
             AddUntilStep("wait for only one freemod overlay", () => this.ChildrenOfType<FreeModSelectOverlay>().Count() == 1);
 
-            assertHasFreeModButton(allowedMod, false);
-            assertHasFreeModButton(requiredMod, false);
+            assertFreeModNotShown(allowedMod);
+            assertFreeModNotShown(requiredMod);
         }
 
-        private void assertHasFreeModButton(Type type, bool hasButton = true)
+        private void assertFreeModNotShown(Type type)
         {
-            AddAssert($"{type.ReadableName()} {(hasButton ? "displayed" : "not displayed")} in freemod overlay",
+            AddAssert($"{type.ReadableName()} not displayed in freemod overlay",
                 () => this.ChildrenOfType<FreeModSelectOverlay>()
                           .Single()
                           .ChildrenOfType<ModPanel>()
-                          .Where(panel => panel.MatchingFilter)
+                          .Where(panel => panel.Visible)
                           .All(b => b.Mod.GetType() != type));
         }
 

From 76f509a1db5d57601595b3c050d3ba9458e3383e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 18 Jun 2023 14:19:38 +0200
Subject: [PATCH 0910/1604] Do not use `?? true` pattern

Universally disliked. `!= false` is preferred.
---
 osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs
index 255dbfcdd3..18739c0275 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs
@@ -334,7 +334,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         private void setFilter(Func<Mod, bool>? filter)
         {
             foreach (var modState in this.ChildrenOfType<ModColumn>().Single().AvailableMods)
-                modState.ValidForSelection.Value = filter?.Invoke(modState.Mod) ?? true;
+                modState.ValidForSelection.Value = filter?.Invoke(modState.Mod) != false;
         }
 
         private partial class TestModColumn : ModColumn

From b9156b1df312789c17b8815120e84b19f096784b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 18 Jun 2023 14:24:35 +0200
Subject: [PATCH 0911/1604] Reword/rename some stuff in test

---
 .../Visual/UserInterface/TestSceneModSelectOverlay.cs  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index ffc0a0a0ad..868ee2c73c 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -678,10 +678,10 @@ namespace osu.Game.Tests.Visual.UserInterface
         }
 
         /// <summary>
-        /// Internal search applies from code by setting <see cref="ModSelectOverlay.IsValidMod"/>
+        /// Covers columns hiding/unhiding on changes of <see cref="ModSelectOverlay.IsValidMod"/>.
         /// </summary>
         [Test]
-        public void TestColumnHidingOnInternalSearch()
+        public void TestColumnHidingOnIsValidChange()
         {
             AddStep("create screen", () => Child = modSelectOverlay = new TestModSelectOverlay
             {
@@ -711,10 +711,10 @@ namespace osu.Game.Tests.Visual.UserInterface
         }
 
         /// <summary>
-        /// External search applies by user by entering search term into search bar
+        /// Covers columns hiding/unhiding on changes of <see cref="ModSelectOverlay.SearchTerm"/>.
         /// </summary>
         [Test]
-        public void TestColumnHidingOnExternalSearch()
+        public void TestColumnHidingOnTextFilterChange()
         {
             AddStep("create screen", () => Child = modSelectOverlay = new TestModSelectOverlay
             {
@@ -738,7 +738,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         }
 
         [Test]
-        public void TestHidingOverlayClearsSearch()
+        public void TestHidingOverlayClearsTextSearch()
         {
             AddStep("create screen", () => Child = modSelectOverlay = new TestModSelectOverlay
             {

From 28f929dc4db740c5037c99d77f36791927a36f8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 18 Jun 2023 14:28:26 +0200
Subject: [PATCH 0912/1604] Remove yet another redundant guard

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 574d18de0e..a741a7a005 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -70,13 +70,7 @@ namespace osu.Game.Overlays.Mods
         public string SearchTerm
         {
             get => SearchTextBox.Current.Value;
-            set
-            {
-                if (SearchTextBox.Current.Value == value)
-                    return;
-
-                SearchTextBox.Current.Value = value;
-            }
+            set => SearchTextBox.Current.Value = value;
         }
 
         public ShearedSearchTextBox SearchTextBox { get; private set; } = null!;

From a49af06e883d4270cca6061c8c8d8864be6283af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 18 Jun 2023 14:34:33 +0200
Subject: [PATCH 0913/1604] Reword comments in `ModSelectOverlay`

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index a741a7a005..b12b1a7df4 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -247,7 +247,7 @@ namespace osu.Game.Overlays.Mods
         {
             base.Hide();
 
-            //We want to clear search for next user interaction with mod overlay
+            // clear search for next user interaction with mod overlay
             SearchTextBox.Current.Value = string.Empty;
         }
 
@@ -615,7 +615,9 @@ namespace osu.Game.Overlays.Mods
                     hideOverlay(true);
                     return true;
 
-                //This is handled locally here to prevent search box from coupling in DeselectAllModsButton
+                // This is handled locally here due to conflicts in input handling between the search text box and the deselect all mods button.
+                // Attempting to handle this action locally in both places leads to a possible scenario
+                // wherein activating the binding will both change the contents of the search text box and deselect all mods.
                 case GlobalAction.DeselectAllMods:
                 {
                     if (!SearchTextBox.HasFocus)
@@ -664,7 +666,9 @@ namespace osu.Game.Overlays.Mods
 
         /// <inheritdoc cref="IKeyBindingHandler{PlatformAction}"/>
         /// <remarks>
-        /// This is handled locally here to allow <see cref="SearchTextBox"/> handle <see cref="PlatformAction"/> first
+        /// This is handled locally here due to conflicts in input handling between the search text box and the select all mods button.
+        /// Attempting to handle this action locally in both places leads to a possible scenario
+        /// wherein activating the "select all" platform binding will both select all text in the search box and select all mods.
         /// </remarks>>
         public bool OnPressed(KeyBindingPressEvent<PlatformAction> e)
         {
@@ -832,8 +836,7 @@ namespace osu.Game.Overlays.Mods
                 if (!Active.Value)
                     RequestScroll?.Invoke(this);
 
-                //By doing this we kill the focus on SearchTextBox.
-                //Killing focus is done here because it's the only feasible place on ModSelectOverlay you can click on without triggering any action.
+                // Killing focus is done here because it's the only feasible place on ModSelectOverlay you can click on without triggering any action.
                 Scheduler.Add(() => GetContainingInputManager().ChangeFocus(null));
 
                 return true;

From 0b6c0592e4ee8ab28babdcc3384135e86b3d2145 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 18 Jun 2023 14:45:43 +0200
Subject: [PATCH 0914/1604] Add failing test case for mod preset filtering not
 working after ruleset change

---
 .../UserInterface/TestSceneModPresetColumn.cs | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
index 3efdba8754..2d54a4e566 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
@@ -392,6 +392,28 @@ namespace osu.Game.Tests.Visual.UserInterface
                 new HashSet<Mod>(this.ChildrenOfType<ModPresetPanel>().First().Preset.Value.Mods).SetEquals(mods));
         }
 
+        [Test]
+        public void TestTextFiltering()
+        {
+            ModPresetColumn modPresetColumn = null!;
+
+            AddStep("clear mods", () => SelectedMods.Value = Array.Empty<Mod>());
+            AddStep("create content", () => Child = modPresetColumn = new ModPresetColumn
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+            });
+
+            AddUntilStep("items loaded", () => modPresetColumn.IsLoaded && modPresetColumn.ItemsLoaded);
+
+            AddStep("set osu! ruleset", () => Ruleset.Value = rulesets.GetRuleset(0));
+            AddStep("set text filter", () => modPresetColumn.SearchTerm = "First");
+            AddUntilStep("one panel visible", () => modPresetColumn.ChildrenOfType<ModPresetPanel>().Count(panel => panel.IsPresent), () => Is.EqualTo(1));
+
+            AddStep("set mania ruleset", () => Ruleset.Value = rulesets.GetRuleset(3));
+            AddUntilStep("no panels visible", () => modPresetColumn.ChildrenOfType<ModPresetPanel>().Count(panel => panel.IsPresent), () => Is.EqualTo(0));
+        }
+
         private ICollection<ModPreset> createTestPresets() => new[]
         {
             new ModPreset

From d4c9eb013e22290fe0b2998abdbf69073aee281e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 18 Jun 2023 14:51:50 +0200
Subject: [PATCH 0915/1604] Fix bugged initial state of matching filter flag

Was preventing mod preset panels from refiltering correctly on ruleset
change due to the `matchingFilter == value` guard.
---
 osu.Game/Overlays/Mods/ModSelectPanel.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectPanel.cs b/osu.Game/Overlays/Mods/ModSelectPanel.cs
index cc13657c04..a69fb19c4c 100644
--- a/osu.Game/Overlays/Mods/ModSelectPanel.cs
+++ b/osu.Game/Overlays/Mods/ModSelectPanel.cs
@@ -286,7 +286,7 @@ namespace osu.Game.Overlays.Mods
 
         public abstract IEnumerable<LocalisableString> FilterTerms { get; }
 
-        private bool matchingFilter;
+        private bool matchingFilter = true;
 
         public virtual bool MatchingFilter
         {

From 75300ca2295bce92b70e23450a1b1ffe61efa221 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 18 Jun 2023 15:50:25 +0200
Subject: [PATCH 0916/1604] Switch search box to initially unfocused

Done primarily to keep mod hotkeys working without any behavioural
changes when mod select is opened.
---
 .../Visual/UserInterface/TestSceneModSelectOverlay.cs  | 10 +++++-----
 osu.Game/Overlays/Mods/ModSelectOverlay.cs             |  2 --
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 868ee2c73c..d566a04261 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -550,12 +550,12 @@ namespace osu.Game.Tests.Visual.UserInterface
         {
             createScreen();
 
-            AddStep("click on mod column", navigateAndClick<ModColumn>);
-            AddAssert("lost focus", () => !modSelectOverlay.SearchTextBox.HasFocus);
-
             AddStep("click on search", navigateAndClick<ShearedSearchTextBox>);
             AddAssert("focused", () => modSelectOverlay.SearchTextBox.HasFocus);
 
+            AddStep("click on mod column", navigateAndClick<ModColumn>);
+            AddAssert("lost focus", () => !modSelectOverlay.SearchTextBox.HasFocus);
+
             void navigateAndClick<T>() where T : Drawable
             {
                 InputManager.MoveMouseTo(modSelectOverlay.ChildrenOfType<T>().FirstOrDefault());
@@ -571,10 +571,10 @@ namespace osu.Game.Tests.Visual.UserInterface
             const Key focus_switch_key = Key.Tab;
 
             AddStep("press tab", () => InputManager.Key(focus_switch_key));
-            AddAssert("lost focus", () => !modSelectOverlay.SearchTextBox.HasFocus);
+            AddAssert("focused", () => modSelectOverlay.SearchTextBox.HasFocus);
 
             AddStep("press tab", () => InputManager.Key(focus_switch_key));
-            AddAssert("focused", () => modSelectOverlay.SearchTextBox.HasFocus);
+            AddAssert("lost focus", () => !modSelectOverlay.SearchTextBox.HasFocus);
         }
 
         [Test]
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index b12b1a7df4..23e278e378 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -500,8 +500,6 @@ namespace osu.Game.Overlays.Mods
 
             base.PopIn();
 
-            SearchTextBox.TakeFocus();
-
             aboveColumnsContent
                 .FadeIn(fade_in_duration, Easing.OutQuint)
                 .MoveToY(0, fade_in_duration, Easing.OutQuint);

From b87acfa66feb51787b9a46a207d84af762f82865 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 18 Jun 2023 15:53:49 +0200
Subject: [PATCH 0917/1604] Dynamically change placeholder to convey how to
 activate search

---
 osu.Game/Graphics/UserInterface/ShearedSearchTextBox.cs | 7 +++++++
 osu.Game/Localisation/ModSelectOverlayStrings.cs        | 9 +++++++--
 osu.Game/Overlays/Mods/ModSelectOverlay.cs              | 7 +++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/ShearedSearchTextBox.cs b/osu.Game/Graphics/UserInterface/ShearedSearchTextBox.cs
index a6954fafb1..fb0a66cb8d 100644
--- a/osu.Game/Graphics/UserInterface/ShearedSearchTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/ShearedSearchTextBox.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Localisation;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
@@ -37,6 +38,12 @@ namespace osu.Game.Graphics.UserInterface
             set => textBox.HoldFocus = value;
         }
 
+        public LocalisableString PlaceholderText
+        {
+            get => textBox.PlaceholderText;
+            set => textBox.PlaceholderText = value;
+        }
+
         public new bool HasFocus => textBox.HasFocus;
 
         public void TakeFocus() => textBox.TakeFocus();
diff --git a/osu.Game/Localisation/ModSelectOverlayStrings.cs b/osu.Game/Localisation/ModSelectOverlayStrings.cs
index f11c52ee20..05dcf138d7 100644
--- a/osu.Game/Localisation/ModSelectOverlayStrings.cs
+++ b/osu.Game/Localisation/ModSelectOverlayStrings.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Localisation;
@@ -39,6 +39,11 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString UseCurrentMods => new TranslatableString(getKey(@"use_current_mods"), @"Use current mods");
 
+        /// <summary>
+        /// "tab to search..."
+        /// </summary>
+        public static LocalisableString TabToSearch => new TranslatableString(getKey(@"tab_to_search"), @"tab to search...");
+
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
-}
+}
\ No newline at end of file
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 23e278e378..2f39758982 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -303,6 +303,13 @@ namespace osu.Game.Overlays.Mods
             });
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            SearchTextBox.PlaceholderText = SearchTextBox.HasFocus ? Resources.Localisation.Web.CommonStrings.InputSearch : ModSelectOverlayStrings.TabToSearch;
+        }
+
         /// <summary>
         /// Select all visible mods in all columns.
         /// </summary>

From b4c1266fc5ca746cb0ea0c50b0093bc74796038b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 18 Jun 2023 15:56:15 +0200
Subject: [PATCH 0918/1604] Add TODO for future support of typical search
 shortcuts

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 2f39758982..9035503723 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -693,6 +693,7 @@ namespace osu.Game.Overlays.Mods
             if (e.Repeat || e.Key != Key.Tab)
                 return false;
 
+            // TODO: should probably eventually support typical platform search shortcuts (`Ctrl-F`, `/`)
             if (SearchTextBox.HasFocus)
                 SearchTextBox.KillFocus();
             else

From 886a1e98da66b381244c114d271e8951456b2a9f Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Sun, 18 Jun 2023 17:32:49 +0200
Subject: [PATCH 0919/1604] test(SkinDeserialisationTest): use more complete
 skin

---
 .../Archives/modified-argon-pro-20230616.osk     | Bin 1234 -> 0 bytes
 .../Archives/modified-argon-pro-20230618.osk     | Bin 0 -> 1628 bytes
 osu.Game.Tests/Skins/SkinDeserialisationTest.cs  |   2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 osu.Game.Tests/Resources/Archives/modified-argon-pro-20230616.osk
 create mode 100644 osu.Game.Tests/Resources/Archives/modified-argon-pro-20230618.osk

diff --git a/osu.Game.Tests/Resources/Archives/modified-argon-pro-20230616.osk b/osu.Game.Tests/Resources/Archives/modified-argon-pro-20230616.osk
deleted file mode 100644
index 5e5d7960dd585f9ed89c16e4b961e12fe968ace3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1234
zcmWIWW@Zs#U|`^2V3>R%?D;~^O|yZ#?GO=$;_S>kz0AB!)iZ{CO%4KX59hU5{|RzT
zIudXx@@8aast#LOL+@_mlt?Fw*{$xMxRTb~pZ>ja?`fgyjTcuI?}~VNah1!oj#jk`
zGFOAQ=vr=X>Pc))YxVogm&RwG_jiTjyNegLxQdos+c+V8%KnuP8O~4SakW}<^6!~L
zjdzrN^=7a9zq-e1{iH;mu02*^p^bM|Z=9PNyyRqNUvrz3d1aU0B(?Ye6b~r1KeVm_
zI({+`^8zu*1DSbg`FdH!`FW<j8@UcS2(bQk_?LKBtFhq3)UqVSOc#OOCfqw)RG;MT
zm=n?Qf1Ucq+QWM)r?Lvhr|{J%Z2P)#ai3~mTVH0U+tmBj@xi9i>zmv5J$tr%PSS)F
z!{~CK4eDkWl6;$%OuBL*X~WwabN36D&lU;jc{fA)dPZf&i}O2m?#ZJ%(z=XQEtiRb
z!4(+rVn9dwCT8Y&gt|EA=N9DWrRJ3sgI)VJJU0K9fk^HAE&l~R@`U;P2vGZYAVK=F
z3GdW0{ZLWMhe9?zz3XIet$0;GpLyW~-P(n^OKv@2om>22?~flbkA8oDFSFdtrR=m5
zWBgN}t9BOOB{LpIteC*b9h1+Pemv*K=@Qmyt2O6N(9hva5mIcplA;sg<reO2)FSEK
zBDo@U1)J7HwhiyzJSlyyzTlbHx0p?p*XK5hs&m+Kb~>uPI%mPj+P}}SYNeP$wUOYW
zF#C+eH74d|owesJ3)2N}En4z&SKjKl1wr1GxsTo*Y(K23KPB<!q)31EGb%|;r?f>|
zDtUjUbnfeU#%1jJUEp7%&9lhZ{{nk2EwKM=J;Sap`&dhxQ*r{&^o{4Lv_+)O?3|&L
zk{x&d&4;~@G>p|JI$7+UnRipHI&W&O&Y{rH8|7U&H)+`Jo!V<I?Q_1mZE>qz#J=AL
zr@Wq8s`fk3-{h;*v;GE7WBI)7`PN6Ta%_x$RblF0D4(pV?sY6V#IWhw^KBa(<FC0)
z|KUFKMu~T<&Y|-s*UnpgTfuGHtmsn-OzUND^<KTUs>Wx&-KJdY)tX=bly$y-%lGl^
z>d?j?m(qUL7i^xyC|CHIGw@;ghIv_^CMGgkmd{yjI5D$w#>?*3pW#NmiJX^Mn!GvA
z%yH+=T)t9t+rKxKK~Aa?Ej-Pp*KM9O%{H0O==wCxMd#|RX*@TiCL9e|)t!^rl5nzs
zQ6gh<-nM=**QQp5Z%;Jk1plqveAD7vLDky-?Vowti+L=9ccd6KZG3d;Mb{k{YuQI>
z=Ck}npFNA-(>L$4;BrUX-xDss3;OlF&OBqYr_HPK)eqKOx9r}0o8NrrhP2DaZ!SKx
ziGM$1fHxzP2m|hd0GLW4pb<pDiUo9C=(!K7hk>E-AXFDTFQRKj&l3o(X^gmXNPssh
Q8%P~95N-w1>?|N200~+DYybcN

diff --git a/osu.Game.Tests/Resources/Archives/modified-argon-pro-20230618.osk b/osu.Game.Tests/Resources/Archives/modified-argon-pro-20230618.osk
new file mode 100644
index 0000000000000000000000000000000000000000..dd25e06c06896c54d4ccbff5448d54d8252d9bb7
GIT binary patch
literal 1628
zcmWIWW@Zs#U|`^2INE(F?D;~^O|yZ#?O+iGhT`nZJiW}kOw}`nd`%7lZV%_RSpNxf
zOga*9De`7yW~vTbSwrt`<CI7zi`lL2pSY6N+@Jova_?!O>x~yz7VnC9d2yA?w2oG_
z3o=)Ox9D1KZ|X^GPHXl1%$LSzpZ9l#;=79%wz!IxT-!Jyeailo4;ju+<Z-oHa`Nw)
zLydQoef4Iq{J*-#Y5k-`o~}JsVWEw8R&Sh}8ocCWW?yrglzC;B-Xyj702B`>wLi43
z0y=&&5c2{t$OD;qY596t#rb)ry&Jg>IS8=+cKDZgSF5q$#MH7R#Y`80-6q^STU4Lq
z?wAwN@qeBA#@fSsDyOmv#;5SrC~W(>adDq&Ut3>hr`y!~)$zfm(d(Pr_C0&Hd`{AY
z6vOCppAG6}7m|FNmQ1>GA!)<g8*}#ymd_Rm=y^9o`g%rX#*6bib?(WdI&wu5+ra`R
z1_ozfz>5JL>6@6D=Mn1SoS$2epO>0fQVe$O+wj2rTLuDk^SAsL_{bCHq#!%FB4I;s
z=Bzfi-P2cf%_&fk>+3z|cYDRF`t{5UCur`uz_ilrQ`5fRkF5XPEx*D4{(fXwa?6)K
zHko~$J9BEb$Q4~UAUK`zDcg=X=4)!3y5iEj4K}ugX#VsPR=6y{*rFutXKb`jYNFto
z%u`<j)EZ?@g=8F9wsoQT+WQS%o)@>De3cpH?CdA_iz%pgiuqbksRFUO_BTO#4qseP
zRW9Bce8@#>*;%36v$_xLb)3`Zd}~{7`K+Y@X-;|5Z$y76EI%0^bUEqdo@H}Sm@JW5
zWjwXRl`lQNtC1tQ)ADJO_`gn_q{@5u^s1IR)Fys6sIJTQ+u0P9xWH6+;;C$HRjFe=
z=LJ5QuFp67F|BaIjLQK^bK-n<XLZN!K4&!T;jWh!9EU|RXUvT|b#1okve)|@E(XbN
zxlvnx?8+sL$^Tc_y2?8LF$`Gu_@dSKov|_e!r!$-*FV>gOHer)(v{I<<P`Agj?lI_
z*F`U??QM3+xjj{D+QaET!j67A*FQloS@_b7LmPc}PrBt1+Vk>q^tSA@t&ex?&1-!X
z+yCXv@?hrQR&QVZe^92&Ym@fNc+nC01e4Gw!bgRQ@~p2XD_LJnD~mgOrv6eS3n$0h
zVzmR;4Y|b+`2;(^`4d~LvD4=wzs9faJ{ubfmu*gBn=*5?;KUQrlP@jb-eA(?6_+8T
z{Dbo->w@(q+iuw{_jzQ(u#b1%qmB>$U(;S+cvfQlfA(jdvzCl=ynR-1Br46kuu9E5
z@Vs(a-Qth049xF8D*ZCYeNNbR-<b7x*V;U)QCRml_D%M?;8(Azu1*hnzhl?B{dYu;
zw0)FYe4a<RwuT8cjn0=3{wB-Fz~BQ+r~JS)8l0b(9-Nw!np^@-oTU?evkx2aw7qZs
z%Raf7Lt8pp;)%f~{$qUF+1tEt9`u}YBxGXK+YQqu{kL15d#i2R4<*}4aeGg^eyy#z
zCtde{O4kQJ*6RMGyUy+2PeK+kf7TUnP7U@A<J~dq_%hymDZB@B7IuhCbv#pgm?gz`
z!huWs6t3ufJbK|}xBLY+Ls#>I&weW9UEC(6)O0PYbKi_@nycP0hjHpRC}j!S{?GV5
zrFWCxqlEJC2&+rpeGg6@ylueq?$B@M_kCaY-8eP(Ud651sX`Cm%sRQ#lrJvgqf6w`
zUHO$3$L2>(?ehDuo$>RkX%pTb=jvp0J9i+eJij>U+^*H%<1a5bvmoh=Blqb=juY5g
zSd)9r%i;{a3Qy*~_Sh?N-NJIq|FRX^dChiq@2(H<W@Hj!z+I{WgA)Q8K@_ZvMc0L1
zltJ|{Ff<;7>Vg++=vvVW7=+d|V3cAnZqUs@PXGurxL7cfLx49c8%O~Q5PkyEA*>)C
E0DO_V8vp<R

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Skins/SkinDeserialisationTest.cs b/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
index d60dd3da1c..82d204f134 100644
--- a/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
+++ b/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Tests.Skins
             // Covers player avatar and flag.
             "Archives/modified-argon-20230305.osk",
             // Covers key counters
-            "Archives/modified-argon-pro-20230616.osk"
+            "Archives/modified-argon-pro-20230618.osk"
         };
 
         /// <summary>

From c8afd057bd2e8781748d9c0a3777773a9647b967 Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Sun, 18 Jun 2023 17:51:17 +0200
Subject: [PATCH 0920/1604] test(TestSceneOsuTouchInput): simplify draw
 hierarchy

An InputTrigger is considered active as long as
---
 .../TestSceneOsuTouchInput.cs                 | 33 +++++++------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuTouchInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuTouchInput.cs
index 4572970011..9510935a31 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuTouchInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuTouchInput.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
 using System.Diagnostics;
 using System.Linq;
 using NUnit.Framework;
@@ -39,8 +38,6 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private DefaultKeyCounter rightKeyCounter = null!;
 
-        private KeyCounterController controller = null!;
-
         private OsuInputManager osuInputManager = null!;
 
         private Container mainContent = null!;
@@ -52,37 +49,31 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             AddStep("Create tests", () =>
             {
+                InputTrigger triggerLeft;
+                InputTrigger triggerRight;
+
                 Children = new Drawable[]
                 {
                     osuInputManager = new OsuInputManager(new OsuRuleset().RulesetInfo)
                     {
-                        Children = new Drawable[]
+                        Child = mainContent = new Container
                         {
-                            controller = new KeyCounterController(),
-                            mainContent = new DependencyProvidingContainer
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Children = new Drawable[]
                             {
-                                Anchor = Anchor.Centre,
-                                Origin = Anchor.Centre,
-                                CachedDependencies = new (Type, object)[] { (typeof(KeyCounterController), controller) },
-                                Children = new Drawable[]
+                                new OsuCursorContainer
                                 {
-                                    new OsuCursorContainer
-                                    {
-                                        Depth = float.MinValue,
-                                    }
+                                    Depth = float.MinValue,
                                 },
+                                triggerLeft = new TestActionKeyCounterTrigger(OsuAction.LeftButton),
+                                triggerRight = new TestActionKeyCounterTrigger(OsuAction.RightButton)
                             },
-                        }
+                        },
                     },
                     new TouchVisualiser(),
                 };
 
-                InputTrigger triggerLeft;
-                InputTrigger triggerRight;
-
-                controller.Add(triggerLeft = new TestActionKeyCounterTrigger(OsuAction.LeftButton));
-                controller.Add(triggerRight = new TestActionKeyCounterTrigger(OsuAction.RightButton));
-
                 mainContent.AddRange(new[]
                 {
                     leftKeyCounter = new DefaultKeyCounter(triggerLeft)

From 425d3c23f5265b136c9a385304897db208b9b6b8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Jun 2023 01:02:16 +0900
Subject: [PATCH 0921/1604] Fix some code layout and NRT some classes

---
 osu.Game/Overlays/Mods/ModState.cs                  |  2 --
 osu.Game/Overlays/Mods/SelectAllModsButton.cs       |  2 --
 osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs | 13 +++++--------
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModState.cs b/osu.Game/Overlays/Mods/ModState.cs
index 1ec517ca11..7a5bc0f3ae 100644
--- a/osu.Game/Overlays/Mods/ModState.cs
+++ b/osu.Game/Overlays/Mods/ModState.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Bindables;
 using osu.Game.Rulesets.Mods;
 
diff --git a/osu.Game/Overlays/Mods/SelectAllModsButton.cs b/osu.Game/Overlays/Mods/SelectAllModsButton.cs
index dd14514a3b..bb61cdc35d 100644
--- a/osu.Game/Overlays/Mods/SelectAllModsButton.cs
+++ b/osu.Game/Overlays/Mods/SelectAllModsButton.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Bindables;
diff --git a/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
index d5e57b9ec9..4d5d724089 100644
--- a/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Game.Overlays;
 using System.Collections.Generic;
@@ -36,11 +34,10 @@ namespace osu.Game.Screens.OnlinePlay
 
         protected override IEnumerable<ShearedButton> CreateFooterButtons()
             => base.CreateFooterButtons()
-                   .Prepend(
-                       SelectAllModsButton = new SelectAllModsButton(this)
-                       {
-                           Anchor = Anchor.BottomLeft,
-                           Origin = Anchor.BottomLeft,
-                       });
+                   .Prepend(SelectAllModsButton = new SelectAllModsButton(this)
+                   {
+                       Anchor = Anchor.BottomLeft,
+                       Origin = Anchor.BottomLeft,
+                   });
     }
 }

From db445660e763b510ce4a7214e9f8614045a87546 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Jun 2023 01:06:45 +0900
Subject: [PATCH 0922/1604] Avoid resolving realm `Live` more than once

---
 osu.Game/Overlays/Mods/ModPresetPanel.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModPresetPanel.cs b/osu.Game/Overlays/Mods/ModPresetPanel.cs
index 607d236781..00f6e36972 100644
--- a/osu.Game/Overlays/Mods/ModPresetPanel.cs
+++ b/osu.Game/Overlays/Mods/ModPresetPanel.cs
@@ -88,10 +88,12 @@ namespace osu.Game.Overlays.Mods
 
         private IEnumerable<LocalisableString> getFilterTerms()
         {
-            yield return Preset.Value.Name;
-            yield return Preset.Value.Description;
+            var preset = Preset.Value;
 
-            foreach (Mod mod in Preset.Value.Mods)
+            yield return preset.Name;
+            yield return preset.Description;
+
+            foreach (Mod mod in preset.Mods)
             {
                 yield return mod.Name;
                 yield return mod.Acronym;

From cf1ee2ba35c69444b99ddbdd103a97154874c29f Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Sun, 18 Jun 2023 18:26:08 +0200
Subject: [PATCH 0923/1604] test(TestSceneOsuTouchInput): fix `InputTrigger`
 depth

---
 osu.Game.Rulesets.Osu.Tests/TestSceneOsuTouchInput.cs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuTouchInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuTouchInput.cs
index 9510935a31..2e62689e2c 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuTouchInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuTouchInput.cs
@@ -66,8 +66,14 @@ namespace osu.Game.Rulesets.Osu.Tests
                                 {
                                     Depth = float.MinValue,
                                 },
-                                triggerLeft = new TestActionKeyCounterTrigger(OsuAction.LeftButton),
+                                triggerLeft = new TestActionKeyCounterTrigger(OsuAction.LeftButton)
+                                {
+                                    Depth = float.MinValue
+                                },
                                 triggerRight = new TestActionKeyCounterTrigger(OsuAction.RightButton)
+                                {
+                                    Depth = float.MinValue
+                                }
                             },
                         },
                     },
@@ -80,14 +86,12 @@ namespace osu.Game.Rulesets.Osu.Tests
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.CentreRight,
-                        Depth = float.MinValue,
                         X = -100,
                     },
                     rightKeyCounter = new DefaultKeyCounter(triggerRight)
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.CentreLeft,
-                        Depth = float.MinValue,
                         X = 100,
                     },
                 });

From bd174b5193f06f81dea4da34fb3e3d596fe39d1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 18 Jun 2023 18:37:04 +0200
Subject: [PATCH 0924/1604] Revert to non-bindable `AccentColour`

Not necessary for now, so let's not incur unnecessary overheads.
---
 .../TestSceneTournamentMatchChatDisplay.cs    |  4 +--
 osu.Game/Overlays/Chat/ChatLine.cs            | 27 +++++++++----------
 .../Overlays/Chat/DrawableChatUsername.cs     | 12 +++------
 3 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs b/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs
index 71d8cbeea7..fada340cf7 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs
@@ -90,7 +90,7 @@ namespace osu.Game.Tournament.Tests.Components
             }));
 
             AddUntilStep("message from team red is red color", () =>
-                this.ChildrenOfType<DrawableChatUsername>().Any(s => s.AccentColour.Value == TournamentGame.COLOUR_RED));
+                this.ChildrenOfType<DrawableChatUsername>().Any(s => s.AccentColour == TournamentGame.COLOUR_RED));
 
             AddStep("message from team red", () => testChannel.AddNewMessages(new Message(nextMessageId())
             {
@@ -105,7 +105,7 @@ namespace osu.Game.Tournament.Tests.Components
             }));
 
             AddUntilStep("message from team blue is blue color", () =>
-                this.ChildrenOfType<DrawableChatUsername>().Any(s => s.AccentColour.Value == TournamentGame.COLOUR_BLUE));
+                this.ChildrenOfType<DrawableChatUsername>().Any(s => s.AccentColour == TournamentGame.COLOUR_BLUE));
 
             AddStep("message from admin", () => testChannel.AddNewMessages(new Message(nextMessageId())
             {
diff --git a/osu.Game/Overlays/Chat/ChatLine.cs b/osu.Game/Overlays/Chat/ChatLine.cs
index 2931685239..13f26e6fcc 100644
--- a/osu.Game/Overlays/Chat/ChatLine.cs
+++ b/osu.Game/Overlays/Chat/ChatLine.cs
@@ -93,19 +93,6 @@ namespace osu.Game.Overlays.Chat
             configManager.BindWith(OsuSetting.Prefer24HourTime, prefer24HourTime);
             prefer24HourTime.BindValueChanged(_ => updateTimestamp());
 
-            drawableUsername = new DrawableChatUsername(message.Sender)
-            {
-                Width = UsernameWidth,
-                FontSize = FontSize,
-                AutoSizeAxes = Axes.Y,
-                Origin = Anchor.TopRight,
-                Anchor = Anchor.TopRight,
-                Margin = new MarginPadding { Horizontal = Spacing },
-                Inverted = !string.IsNullOrEmpty(message.Sender.Colour),
-            };
-
-            drawableUsername.AccentColour.Value = UsernameColour;
-
             InternalChild = new GridContainer
             {
                 RelativeSizeAxes = Axes.X,
@@ -129,7 +116,17 @@ namespace osu.Game.Overlays.Chat
                             Font = OsuFont.GetFont(size: FontSize * 0.75f, weight: FontWeight.SemiBold, fixedWidth: true),
                             AlwaysPresent = true,
                         },
-                        drawableUsername,
+                        drawableUsername = new DrawableChatUsername(message.Sender)
+                        {
+                            Width = UsernameWidth,
+                            FontSize = FontSize,
+                            AutoSizeAxes = Axes.Y,
+                            Origin = Anchor.TopRight,
+                            Anchor = Anchor.TopRight,
+                            Margin = new MarginPadding { Horizontal = Spacing },
+                            AccentColour = UsernameColour,
+                            Inverted = !string.IsNullOrEmpty(message.Sender.Colour),
+                        },
                         drawableContentFlow = new LinkFlowContainer(styleMessageContent)
                         {
                             AutoSizeAxes = Axes.Y,
@@ -175,7 +172,7 @@ namespace osu.Game.Overlays.Chat
                     CornerRadius = 2f,
                     Masking = true,
                     RelativeSizeAxes = Axes.Both,
-                    Colour = drawableUsername.AccentColour.Value.Darken(1f),
+                    Colour = drawableUsername.AccentColour.Darken(1f),
                     Depth = float.MaxValue,
                     Child = new Box { RelativeSizeAxes = Axes.Both }
                 });
diff --git a/osu.Game/Overlays/Chat/DrawableChatUsername.cs b/osu.Game/Overlays/Chat/DrawableChatUsername.cs
index 05772051da..cb5df93e00 100644
--- a/osu.Game/Overlays/Chat/DrawableChatUsername.cs
+++ b/osu.Game/Overlays/Chat/DrawableChatUsername.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Overlays.Chat
     {
         public Action? ReportRequested;
 
-        public Bindable<Color4> AccentColour { get; } = new Bindable<Color4>();
+        public Color4 AccentColour { get; init; }
 
         public bool Inverted { get; init; }
 
@@ -146,11 +146,7 @@ namespace osu.Game.Overlays.Chat
         {
             base.LoadComplete();
             drawableText.Colour = colours.ChatBlue;
-
-            AccentColour.BindValueChanged(c =>
-            {
-                colouredDrawable.Colour = c.NewValue;
-            }, true);
+            colouredDrawable.Colour = AccentColour;
         }
 
         public MenuItem[] ContextMenuItems
@@ -196,7 +192,7 @@ namespace osu.Game.Overlays.Chat
 
         protected override bool OnHover(HoverEvent e)
         {
-            colouredDrawable.FadeColour(AccentColour.Value.Lighten(0.6f), 30, Easing.OutQuint);
+            colouredDrawable.FadeColour(AccentColour.Lighten(0.6f), 30, Easing.OutQuint);
 
             return base.OnHover(e);
         }
@@ -205,7 +201,7 @@ namespace osu.Game.Overlays.Chat
         {
             base.OnHoverLost(e);
 
-            colouredDrawable.FadeColour(AccentColour.Value, 800, Easing.OutQuint);
+            colouredDrawable.FadeColour(AccentColour, 800, Easing.OutQuint);
         }
     }
 }

From dad32817ee49bece00f2cf42e9648e4cbe9e293c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 18 Jun 2023 18:37:28 +0200
Subject: [PATCH 0925/1604] Improve `UsernameColour` documentation

---
 osu.Game/Overlays/Chat/ChatLine.cs | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Chat/ChatLine.cs b/osu.Game/Overlays/Chat/ChatLine.cs
index 13f26e6fcc..b2024e15c7 100644
--- a/osu.Game/Overlays/Chat/ChatLine.cs
+++ b/osu.Game/Overlays/Chat/ChatLine.cs
@@ -70,8 +70,16 @@ namespace osu.Game.Overlays.Chat
         private Container? highlight;
 
         /// <summary>
-        /// if set, it will override <see cref="APIUser.Colour"/> or <see cref="default_colours"/>.
+        /// The colour to use to paint the chat mesasge author's username.
         /// </summary>
+        /// <remarks>
+        /// The colour can be set explicitly by consumers via the property initialiser.
+        /// If unspecified, the colour is by default initialised to:
+        /// <list type="bullet">
+        /// <item><see cref="APIUser.Colour">message.Sender.Colour</see>, if non-empty,</item>
+        /// <item>a random colour from <see cref="default_colours"/> if the above is empty.</item>
+        /// </list>
+        /// </remarks>
         public Color4 UsernameColour { get; init; }
 
         public ChatLine(Message message)
@@ -81,7 +89,8 @@ namespace osu.Game.Overlays.Chat
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
 
-            // If we have custom value, this value will be override.
+            // initialise using sane defaults.
+            // consumers can use the initialiser of `UsernameColour` to override this if they wish to.
             UsernameColour = !string.IsNullOrEmpty(message.Sender.Colour)
                 ? Color4Extensions.FromHex(message.Sender.Colour)
                 : default_colours[message.SenderId % default_colours.Length];

From a2a9823d8400513ed20cdf895931a15c78f8dcc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 18 Jun 2023 18:43:55 +0200
Subject: [PATCH 0926/1604] Rename constant

---
 osu.Game/Overlays/Chat/ChatLine.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Chat/ChatLine.cs b/osu.Game/Overlays/Chat/ChatLine.cs
index b2024e15c7..fdf91dce23 100644
--- a/osu.Game/Overlays/Chat/ChatLine.cs
+++ b/osu.Game/Overlays/Chat/ChatLine.cs
@@ -77,7 +77,7 @@ namespace osu.Game.Overlays.Chat
         /// If unspecified, the colour is by default initialised to:
         /// <list type="bullet">
         /// <item><see cref="APIUser.Colour">message.Sender.Colour</see>, if non-empty,</item>
-        /// <item>a random colour from <see cref="default_colours"/> if the above is empty.</item>
+        /// <item>a random colour from <see cref="default_username_colours"/> if the above is empty.</item>
         /// </list>
         /// </remarks>
         public Color4 UsernameColour { get; init; }
@@ -93,7 +93,7 @@ namespace osu.Game.Overlays.Chat
             // consumers can use the initialiser of `UsernameColour` to override this if they wish to.
             UsernameColour = !string.IsNullOrEmpty(message.Sender.Colour)
                 ? Color4Extensions.FromHex(message.Sender.Colour)
-                : default_colours[message.SenderId % default_colours.Length];
+                : default_username_colours[message.SenderId % default_username_colours.Length];
         }
 
         [BackgroundDependencyLoader]
@@ -220,7 +220,7 @@ namespace osu.Game.Overlays.Chat
             drawableTimestamp.Text = message.Timestamp.LocalDateTime.ToLocalisableString(prefer24HourTime.Value ? @"HH:mm:ss" : @"hh:mm:ss tt");
         }
 
-        private static readonly Color4[] default_colours =
+        private static readonly Color4[] default_username_colours =
         {
             Color4Extensions.FromHex("588c7e"),
             Color4Extensions.FromHex("b2a367"),

From ee08ed414c1c4fa60458fd07fd96150c8d61b10b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 18 Jun 2023 18:45:53 +0200
Subject: [PATCH 0927/1604] Document `DrawableChatUsername` members

---
 osu.Game/Overlays/Chat/DrawableChatUsername.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Overlays/Chat/DrawableChatUsername.cs b/osu.Game/Overlays/Chat/DrawableChatUsername.cs
index cb5df93e00..21c3bd4b40 100644
--- a/osu.Game/Overlays/Chat/DrawableChatUsername.cs
+++ b/osu.Game/Overlays/Chat/DrawableChatUsername.cs
@@ -33,8 +33,15 @@ namespace osu.Game.Overlays.Chat
     {
         public Action? ReportRequested;
 
+        /// <summary>
+        /// The primary colour to use for the username.
+        /// </summary>
         public Color4 AccentColour { get; init; }
 
+        /// <summary>
+        /// If set to <see langword="false"/>, the username will be drawn as plain text in <see cref="AccentColour"/>.
+        /// If set to <see langword="true"/>, the username will be drawn as black text inside a rounded rectangle in <see cref="AccentColour"/>.
+        /// </summary>
         public bool Inverted { get; init; }
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>

From 1a6a66e953b1325561f7a8f0d289cfe8bcc6bdc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 18 Jun 2023 18:48:54 +0200
Subject: [PATCH 0928/1604] Rewrite assertions to be better

---
 .../Components/TestSceneTournamentMatchChatDisplay.cs        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs b/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs
index fada340cf7..b552d49d1d 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs
@@ -4,6 +4,7 @@
 #nullable disable
 
 using System.Linq;
+using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -90,7 +91,7 @@ namespace osu.Game.Tournament.Tests.Components
             }));
 
             AddUntilStep("message from team red is red color", () =>
-                this.ChildrenOfType<DrawableChatUsername>().Any(s => s.AccentColour == TournamentGame.COLOUR_RED));
+                this.ChildrenOfType<DrawableChatUsername>().Last().AccentColour, () => Is.EqualTo(TournamentGame.COLOUR_RED));
 
             AddStep("message from team red", () => testChannel.AddNewMessages(new Message(nextMessageId())
             {
@@ -105,7 +106,7 @@ namespace osu.Game.Tournament.Tests.Components
             }));
 
             AddUntilStep("message from team blue is blue color", () =>
-                this.ChildrenOfType<DrawableChatUsername>().Any(s => s.AccentColour == TournamentGame.COLOUR_BLUE));
+                this.ChildrenOfType<DrawableChatUsername>().Last().AccentColour, () => Is.EqualTo(TournamentGame.COLOUR_BLUE));
 
             AddStep("message from admin", () => testChannel.AddNewMessages(new Message(nextMessageId())
             {

From 1a8219adf6e53f91e2b39487d4854825ff3853bb Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Sun, 18 Jun 2023 20:20:56 +0200
Subject: [PATCH 0929/1604] style: guard event handler unsubscriptions

---
 osu.Game/Screens/Play/HUD/KeyCounter.cs        | 8 ++++++--
 osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs | 5 ++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/KeyCounter.cs b/osu.Game/Screens/Play/HUD/KeyCounter.cs
index f12d2166fc..08d7e79e7c 100644
--- a/osu.Game/Screens/Play/HUD/KeyCounter.cs
+++ b/osu.Game/Screens/Play/HUD/KeyCounter.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics.Containers;
 
 namespace osu.Game.Screens.Play.HUD
@@ -48,8 +49,11 @@ namespace osu.Game.Screens.Play.HUD
         {
             base.Dispose(isDisposing);
 
-            Trigger.OnActivate -= Activate;
-            Trigger.OnDeactivate -= Deactivate;
+            if (Trigger.IsNotNull())
+            {
+                Trigger.OnActivate -= Activate;
+                Trigger.OnDeactivate -= Deactivate;
+            }
         }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs b/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs
index 8b92a5e3b8..efe51d75b0 100644
--- a/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.UI;
@@ -77,7 +78,9 @@ namespace osu.Game.Screens.Play.HUD
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-            controller.OnNewTrigger -= Add;
+
+            if (controller.IsNotNull())
+                controller.OnNewTrigger -= Add;
         }
 
         public bool UsesFixedAnchor { get; set; }

From 141f9efad5cdf663c0d6fe1708dc8144eda272cc Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Sun, 18 Jun 2023 21:26:16 +0200
Subject: [PATCH 0930/1604] style(KeyCounterController): remove reliance on
 `Receptor`

---
 osu.Game/Rulesets/UI/RulesetInputManager.cs   | 23 +-------
 .../Play/HUD/KeyCounterActionTrigger.cs       | 16 ++---
 .../Screens/Play/HUD/KeyCounterController.cs  | 59 +------------------
 osu.Game/Screens/Play/HUDOverlay.cs           |  2 +-
 4 files changed, 13 insertions(+), 87 deletions(-)

diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 889890e711..d3bc381f72 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -180,11 +180,8 @@ namespace osu.Game.Rulesets.UI
 
         private void attachKeyCounter(KeyCounterController keyCounter)
         {
-            var receptor = new ActionReceptor(keyCounter);
+            KeyBindingContainer.Add(keyCounter);
 
-            KeyBindingContainer.Add(receptor);
-
-            keyCounter.SetReceptor(receptor);
             keyCounter.AddRange(KeyBindingContainer.DefaultKeyBindings
                                                    .Select(b => b.GetAction<T>())
                                                    .Distinct()
@@ -192,24 +189,6 @@ namespace osu.Game.Rulesets.UI
                                                    .Select(action => new KeyCounterActionTrigger<T>(action)));
         }
 
-        private partial class ActionReceptor : KeyCounterController.Receptor, IKeyBindingHandler<T>
-        {
-            public ActionReceptor(KeyCounterController target)
-                : base(target)
-            {
-            }
-
-            public bool OnPressed(KeyBindingPressEvent<T> e) => Target.Triggers
-                                                                      .OfType<KeyCounterActionTrigger<T>>()
-                                                                      .Any(c => c.OnPressed(e.Action, Clock.Rate >= 0));
-
-            public void OnReleased(KeyBindingReleaseEvent<T> e)
-            {
-                foreach (var c in Target.Triggers.OfType<KeyCounterActionTrigger<T>>())
-                    c.OnReleased(e.Action, Clock.Rate >= 0);
-            }
-        }
-
         #endregion
 
         #region Keys per second Counter Attachment
diff --git a/osu.Game/Screens/Play/HUD/KeyCounterActionTrigger.cs b/osu.Game/Screens/Play/HUD/KeyCounterActionTrigger.cs
index e5951a8bf4..f2c4487854 100644
--- a/osu.Game/Screens/Play/HUD/KeyCounterActionTrigger.cs
+++ b/osu.Game/Screens/Play/HUD/KeyCounterActionTrigger.cs
@@ -2,10 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public partial class KeyCounterActionTrigger<T> : InputTrigger
+    public partial class KeyCounterActionTrigger<T> : InputTrigger, IKeyBindingHandler<T>
         where T : struct
     {
         public T Action { get; }
@@ -16,21 +18,21 @@ namespace osu.Game.Screens.Play.HUD
             Action = action;
         }
 
-        public bool OnPressed(T action, bool forwards)
+        public bool OnPressed(KeyBindingPressEvent<T> e)
         {
-            if (!EqualityComparer<T>.Default.Equals(action, Action))
+            if (!EqualityComparer<T>.Default.Equals(e.Action, Action))
                 return false;
 
-            Activate(forwards);
+            Activate(Clock.Rate >= 0);
             return false;
         }
 
-        public void OnReleased(T action, bool forwards)
+        public void OnReleased(KeyBindingReleaseEvent<T> e)
         {
-            if (!EqualityComparer<T>.Default.Equals(action, Action))
+            if (!EqualityComparer<T>.Default.Equals(e.Action, Action))
                 return;
 
-            Deactivate(forwards);
+            Deactivate(Clock.Rate >= 0);
         }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/KeyCounterController.cs b/osu.Game/Screens/Play/HUD/KeyCounterController.cs
index b138e64d6f..0fa02afbb4 100644
--- a/osu.Game/Screens/Play/HUD/KeyCounterController.cs
+++ b/osu.Game/Screens/Play/HUD/KeyCounterController.cs
@@ -5,11 +5,8 @@ using System;
 using System.Collections.Generic;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
-using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Input.Events;
 using osu.Game.Rulesets.UI;
-using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
 {
@@ -17,8 +14,6 @@ namespace osu.Game.Screens.Play.HUD
     {
         public readonly Bindable<bool> IsCounting = new BindableBool(true);
 
-        private Receptor? receptor;
-
         public event Action<InputTrigger>? OnNewTrigger;
 
         private readonly Container<InputTrigger> triggers;
@@ -38,58 +33,8 @@ namespace osu.Game.Screens.Play.HUD
         }
 
         public void AddRange(IEnumerable<InputTrigger> inputTriggers) => inputTriggers.ForEach(Add);
+        public override bool HandleNonPositionalInput => true;
 
-        /// <summary>
-        /// Sets a <see cref="Receptor"/> that will populate keybinding events to this <see cref="KeyCounterController"/>.
-        /// </summary>
-        /// <param name="receptor">The receptor to set</param>
-        /// <exception cref="InvalidOperationException">When a <see cref="Receptor"/> is already active on this <see cref="KeyCounterDisplay"/></exception>
-        public void SetReceptor(Receptor receptor)
-        {
-            if (this.receptor != null)
-                throw new InvalidOperationException("Cannot set a new receptor when one is already active");
-
-            this.receptor = receptor;
-        }
-
-        /// <summary>
-        /// Clears any <see cref="KeyCounterController.Receptor"/> active
-        /// </summary>
-        public void ClearReceptor()
-        {
-            receptor = null;
-        }
-
-        public override bool HandleNonPositionalInput => receptor == null;
-
-        public override bool HandlePositionalInput => receptor == null;
-
-        public partial class Receptor : Drawable
-        {
-            protected readonly KeyCounterController Target;
-
-            public Receptor(KeyCounterController target)
-            {
-                RelativeSizeAxes = Axes.Both;
-                Depth = float.MinValue;
-                Target = target;
-            }
-
-            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
-
-            protected override bool Handle(UIEvent e)
-            {
-                switch (e)
-                {
-                    case KeyDownEvent:
-                    case KeyUpEvent:
-                    case MouseDownEvent:
-                    case MouseUpEvent:
-                        return Target.TriggerEvent(e);
-                }
-
-                return base.Handle(e);
-            }
-        }
+        public override bool HandlePositionalInput => true;
     }
 }
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 15a0e0688b..21636ac04c 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -158,8 +158,8 @@ namespace osu.Game.Screens.Play
                     Spacing = new Vector2(5)
                 },
                 clicksPerSecondCalculator = new ClicksPerSecondCalculator(),
-                KeyCounter = new KeyCounterController()
             };
+            KeyCounter = new KeyCounterController();
 
             hideTargets = new List<Drawable> { mainComponents, rulesetComponents, topRightElements };
 

From f83a4f495291a3983c15604d60392fa630cf6e56 Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Sun, 18 Jun 2023 22:57:21 +0200
Subject: [PATCH 0931/1604] refactor: tidy up attachement flow

TODO: find better naming and improve XMLDocs
---
 osu.Game/Rulesets/UI/DrawableRuleset.cs       |  6 +-
 osu.Game/Rulesets/UI/IKeybindingListener.cs   | 50 ++++++++++++
 osu.Game/Rulesets/UI/RulesetInputManager.cs   | 78 +++++++------------
 .../ClicksPerSecondCalculator.cs              | 19 ++++-
 .../Screens/Play/HUD/KeyCounterController.cs  | 21 ++++-
 osu.Game/Screens/Play/HUDOverlay.cs           | 12 +--
 6 files changed, 126 insertions(+), 60 deletions(-)
 create mode 100644 osu.Game/Rulesets/UI/IKeybindingListener.cs

diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index 4fa18f53a7..e0a1533c4b 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.UI
     /// Displays an interactive ruleset gameplay instance.
     /// </summary>
     /// <typeparam name="TObject">The type of HitObject contained by this DrawableRuleset.</typeparam>
-    public abstract partial class DrawableRuleset<TObject> : DrawableRuleset, IProvideCursor, ICanAttachHUDPieces
+    public abstract partial class DrawableRuleset<TObject> : DrawableRuleset, IProvideCursor, IKeybindingEventsEmitter
         where TObject : HitObject
     {
         public override event Action<JudgementResult> NewResult;
@@ -327,8 +327,8 @@ namespace osu.Game.Rulesets.UI
         /// <returns>The representing <see cref="DrawableHitObject{TObject}"/>.</returns>
         public abstract DrawableHitObject<TObject> CreateDrawableRepresentation(TObject h);
 
-        public void Attach(IAttachableSkinComponent skinComponent) =>
-            (KeyBindingInputManager as ICanAttachHUDPieces)?.Attach(skinComponent);
+        public void Attach(IKeybindingListener skinComponent) =>
+            (KeyBindingInputManager as IKeybindingEventsEmitter)?.Attach(skinComponent);
 
         /// <summary>
         /// Creates a key conversion input manager. An exception will be thrown if a valid <see cref="RulesetInputManager{T}"/> is not returned.
diff --git a/osu.Game/Rulesets/UI/IKeybindingListener.cs b/osu.Game/Rulesets/UI/IKeybindingListener.cs
new file mode 100644
index 0000000000..f38ce8643e
--- /dev/null
+++ b/osu.Game/Rulesets/UI/IKeybindingListener.cs
@@ -0,0 +1,50 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+#nullable disable
+using System.Collections.Generic;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
+
+namespace osu.Game.Rulesets.UI
+{
+    /// <summary>
+    /// Listens to <see cref="IKeyBinding"/> events emitted by an <see cref="IKeybindingEventsEmitter"/>.
+    /// Alternative to <see cref="IKeyBindingHandler{T}"/> for classes that need to not depend on type parameters.
+    /// </summary>
+    public interface IKeybindingListener
+    {
+        /// <summary>
+        /// This class or a member of this class can already handle keybindings.
+        /// Signals to the <see cref="IKeybindingEventsEmitter"/> that <see cref="OnPressed{T}"/> and <see cref="OnReleased{T}"/>
+        /// don't necessarily need to be called.
+        /// </summary>
+        /// <remarks>
+        /// This is usually true for <see cref="CompositeDrawable"/>s and <see cref="CompositeComponent"/>s that need to
+        /// pass <see cref="IKeyBinding"/>s events to children that can already handle them.
+        /// </remarks>
+        public bool CanHandleKeybindings { get; }
+
+        /// <summary>
+        /// Prepares this class to receive events.
+        /// </summary>
+        /// <param name="actions">The list of possible actions that can occur.</param>
+        /// <typeparam name="T">The type actions, commonly enums.</typeparam>
+        public void Setup<T>(IEnumerable<T> actions) where T : struct;
+
+        /// <summary>
+        /// Called when an action is pressed.
+        /// </summary>
+        /// <param name="action">The event containing information about the pressed action.</param>
+        /// <typeparam name="T">The type of binding, commonly enums.</typeparam>
+        public void OnPressed<T>(KeyBindingPressEvent<T> action) where T : struct;
+
+        /// <summary>
+        /// Called when an action is released.
+        /// </summary>
+        /// <param name="action">The event containing information about the released action.</param>
+        /// <typeparam name="T">The type of binding, commonly enums.</typeparam>
+        public void OnReleased<T>(KeyBindingReleaseEvent<T> action) where T : struct;
+    }
+}
diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index d3bc381f72..44c1f00cf7 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -19,13 +19,11 @@ using osu.Game.Input;
 using osu.Game.Input.Bindings;
 using osu.Game.Input.Handlers;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Screens.Play.HUD;
-using osu.Game.Screens.Play.HUD.ClicksPerSecond;
 using static osu.Game.Input.Handlers.ReplayInputHandler;
 
 namespace osu.Game.Rulesets.UI
 {
-    public abstract partial class RulesetInputManager<T> : PassThroughInputManager, ICanAttachHUDPieces, IHasReplayHandler, IHasRecordingHandler
+    public abstract partial class RulesetInputManager<T> : PassThroughInputManager, IKeybindingEventsEmitter, IHasReplayHandler, IHasRecordingHandler
         where T : struct
     {
         protected override bool AllowRightClickFromLongTouch => false;
@@ -66,6 +64,7 @@ namespace osu.Game.Rulesets.UI
             InternalChild = KeyBindingContainer =
                 CreateKeyBindingContainer(ruleset, variant, unique)
                     .WithChild(content = new Container { RelativeSizeAxes = Axes.Both });
+            KeyBindingContainer.Add(actionListener = new ActionListener());
         }
 
         [BackgroundDependencyLoader(true)]
@@ -160,63 +159,47 @@ namespace osu.Game.Rulesets.UI
 
         #region Component attachement
 
-        public void Attach(IAttachableSkinComponent skinComponent)
+        private readonly ActionListener actionListener;
+
+        public void Attach(IKeybindingListener skinComponent)
         {
-            switch (skinComponent)
-            {
-                case KeyCounterController keyCounterDisplay:
-                    attachKeyCounter(keyCounterDisplay);
-                    break;
-
-                case ClicksPerSecondCalculator clicksPerSecondCalculator:
-                    attachClicksPerSecond(clicksPerSecondCalculator);
-                    break;
-            }
-        }
-
-        #endregion
-
-        #region Key Counter Attachment
-
-        private void attachKeyCounter(KeyCounterController keyCounter)
-        {
-            KeyBindingContainer.Add(keyCounter);
-
-            keyCounter.AddRange(KeyBindingContainer.DefaultKeyBindings
+            skinComponent.Setup(KeyBindingContainer.DefaultKeyBindings
                                                    .Select(b => b.GetAction<T>())
                                                    .Distinct()
-                                                   .OrderBy(action => action)
-                                                   .Select(action => new KeyCounterActionTrigger<T>(action)));
-        }
+                                                   .OrderBy(a => a));
 
-        #endregion
+            if (skinComponent.CanHandleKeybindings && skinComponent is Drawable component)
+            {
+                try
+                {
+                    KeyBindingContainer.Add(component);
+                    return;
+                }
+                catch (Exception)
+                {
+                    return;
+                }
+            }
 
-        #region Keys per second Counter Attachment
-
-        private void attachClicksPerSecond(ClicksPerSecondCalculator calculator)
-        {
-            var listener = new ActionListener(calculator);
-
-            KeyBindingContainer.Add(listener);
+            actionListener.OnPressedEvent += skinComponent.OnPressed;
+            actionListener.OnReleasedEvent += skinComponent.OnReleased;
         }
 
         private partial class ActionListener : Component, IKeyBindingHandler<T>
         {
-            private readonly ClicksPerSecondCalculator calculator;
+            public event Action<KeyBindingPressEvent<T>> OnPressedEvent;
 
-            public ActionListener(ClicksPerSecondCalculator calculator)
-            {
-                this.calculator = calculator;
-            }
+            public event Action<KeyBindingReleaseEvent<T>> OnReleasedEvent;
 
             public bool OnPressed(KeyBindingPressEvent<T> e)
             {
-                calculator.AddInputTimestamp();
+                OnPressedEvent?.Invoke(e);
                 return false;
             }
 
             public void OnReleased(KeyBindingReleaseEvent<T> e)
             {
+                OnReleasedEvent?.Invoke(e);
             }
         }
 
@@ -257,16 +240,11 @@ namespace osu.Game.Rulesets.UI
     }
 
     /// <summary>
-    /// Supports attaching various HUD pieces.
-    /// Keys will be populated automatically and a receptor will be injected inside.
+    /// Sends <see cref="IKeyBinding"/> events to a <see cref="IKeybindingListener"/>
     /// </summary>
-    public interface ICanAttachHUDPieces
-    {
-        void Attach(IAttachableSkinComponent component);
-    }
-
-    public interface IAttachableSkinComponent
+    public interface IKeybindingEventsEmitter
     {
+        void Attach(IKeybindingListener component);
     }
 
     public class RulesetInputManagerInputState<T> : InputState
diff --git a/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs b/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs
index 3e55e11f1c..e0e93cb66e 100644
--- a/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs
+++ b/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs
@@ -4,11 +4,12 @@
 using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Input.Events;
 using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Screens.Play.HUD.ClicksPerSecond
 {
-    public partial class ClicksPerSecondCalculator : Component, IAttachableSkinComponent
+    public partial class ClicksPerSecondCalculator : Component, IKeybindingListener
     {
         private readonly List<double> timestamps = new List<double>();
 
@@ -53,5 +54,21 @@ namespace osu.Game.Screens.Play.HUD.ClicksPerSecond
 
             Value = count;
         }
+
+        #region IKeybindingListener
+
+        bool IKeybindingListener.CanHandleKeybindings => false;
+
+        void IKeybindingListener.Setup<T>(IEnumerable<T> actions)
+        {
+        }
+
+        void IKeybindingListener.OnPressed<T>(KeyBindingPressEvent<T> action) => AddInputTimestamp();
+
+        void IKeybindingListener.OnReleased<T>(KeyBindingReleaseEvent<T> action)
+        {
+        }
+
+        #endregion
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/KeyCounterController.cs b/osu.Game/Screens/Play/HUD/KeyCounterController.cs
index 0fa02afbb4..2e678e55fc 100644
--- a/osu.Game/Screens/Play/HUD/KeyCounterController.cs
+++ b/osu.Game/Screens/Play/HUD/KeyCounterController.cs
@@ -3,14 +3,16 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Input.Events;
 using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public partial class KeyCounterController : CompositeComponent, IAttachableSkinComponent
+    public partial class KeyCounterController : CompositeComponent, IKeybindingListener
     {
         public readonly Bindable<bool> IsCounting = new BindableBool(true);
 
@@ -36,5 +38,22 @@ namespace osu.Game.Screens.Play.HUD
         public override bool HandleNonPositionalInput => true;
 
         public override bool HandlePositionalInput => true;
+
+        #region IKeybindingListener
+
+        bool IKeybindingListener.CanHandleKeybindings => true;
+
+        void IKeybindingListener.Setup<T>(IEnumerable<T> actions)
+            => AddRange(actions.Select(a => new KeyCounterActionTrigger<T>(a)));
+
+        void IKeybindingListener.OnPressed<T>(KeyBindingPressEvent<T> action)
+        {
+        }
+
+        void IKeybindingListener.OnReleased<T>(KeyBindingReleaseEvent<T> action)
+        {
+        }
+
+        #endregion
     }
 }
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 21636ac04c..b74b5d835a 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -10,6 +10,7 @@ using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.EnumExtensions;
+using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Bindings;
@@ -102,6 +103,8 @@ namespace osu.Game.Screens.Play
 
         private readonly List<Drawable> hideTargets;
 
+        private readonly IEnumerable<IKeybindingListener> actionInjectionCandidates;
+
         public HUDOverlay(DrawableRuleset drawableRuleset, IReadOnlyList<Mod> mods, bool alwaysShowLeaderboard = true)
         {
             Drawable rulesetComponents;
@@ -163,6 +166,8 @@ namespace osu.Game.Screens.Play
 
             hideTargets = new List<Drawable> { mainComponents, rulesetComponents, topRightElements };
 
+            actionInjectionCandidates = new IKeybindingListener[] { clicksPerSecondCalculator, KeyCounter };
+
             if (!alwaysShowLeaderboard)
                 hideTargets.Add(LeaderboardFlow);
         }
@@ -319,11 +324,8 @@ namespace osu.Game.Screens.Play
 
         protected virtual void BindDrawableRuleset(DrawableRuleset drawableRuleset)
         {
-            if (drawableRuleset is ICanAttachHUDPieces attachTarget)
-            {
-                attachTarget.Attach(KeyCounter);
-                attachTarget.Attach(clicksPerSecondCalculator);
-            }
+            if (drawableRuleset is IKeybindingEventsEmitter attachTarget)
+                actionInjectionCandidates.ForEach(attachTarget.Attach);
 
             replayLoaded.BindTo(drawableRuleset.HasReplayLoaded);
         }

From 0900cebc0dc03bd720ff11b5058fe68aa793d0af Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Jun 2023 20:09:53 +0900
Subject: [PATCH 0932/1604] Avoid doing expensive colour fetch operation every
 update

---
 osu.Game.Rulesets.Osu/Mods/OsuModSynesthesia.cs | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModSynesthesia.cs b/osu.Game.Rulesets.Osu/Mods/OsuModSynesthesia.cs
index 2aec416867..6918993696 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModSynesthesia.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModSynesthesia.cs
@@ -7,6 +7,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Screens.Edit;
+using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
@@ -26,14 +27,20 @@ namespace osu.Game.Rulesets.Osu.Mods
                 currentBeatmap = beatmap;
         }
 
-        public void ApplyToDrawableHitObject(DrawableHitObject drawable)
+        public void ApplyToDrawableHitObject(DrawableHitObject d)
         {
             if (currentBeatmap == null) return;
 
-            drawable.OnUpdate += _ =>
-                drawable.AccentColour.Value = BindableBeatDivisor.GetColourFor(
-                    currentBeatmap.ControlPointInfo.GetClosestBeatDivisor(drawable.HitObject.StartTime),
-                    colours);
+            Color4? timingBasedColour = null;
+
+            d.HitObjectApplied += _ => timingBasedColour = BindableBeatDivisor.GetColourFor(currentBeatmap.ControlPointInfo.GetClosestBeatDivisor(d.HitObject.StartTime), colours);
+
+            // Need to set this every update to ensure it doesn't get overwritten by DrawableHitObject.OnApply() -> UpdateComboColour().
+            d.OnUpdate += _ =>
+            {
+                if (timingBasedColour != null)
+                    d.AccentColour.Value = timingBasedColour.Value;
+            };
         }
     }
 }

From 84fc6e92db99d725c24e7e4e6412d629a36a099b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Jun 2023 20:23:46 +0900
Subject: [PATCH 0933/1604] Fix slightly incorrect calculations

---
 .../Edit/Compose/Components/CircularDistanceSnapGrid.cs       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/CircularDistanceSnapGrid.cs b/osu.Game/Screens/Edit/Compose/Components/CircularDistanceSnapGrid.cs
index cf8b0c14ed..602ed6f627 100644
--- a/osu.Game/Screens/Edit/Compose/Components/CircularDistanceSnapGrid.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/CircularDistanceSnapGrid.cs
@@ -65,14 +65,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             for (int i = 0; i < requiredCircles; i++)
             {
-                float diameter = (offset + (i + 1) * DistanceBetweenTicks) * 2;
                 const float thickness = 4;
+                float diameter = (offset + (i + 1) * DistanceBetweenTicks + thickness / 2) * 2;
 
                 AddInternal(new Ring(ReferenceObject, GetColourForIndexFromPlacement(i))
                 {
                     Position = StartPosition,
                     Origin = Anchor.Centre,
-                    Size = new Vector2(diameter + thickness / 2),
+                    Size = new Vector2(diameter),
                     InnerRadius = thickness * 1f / diameter,
                 });
             }

From 69526f25bb9743bb3fdca14a4c105bbd9d8465b7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Jun 2023 20:43:33 +0900
Subject: [PATCH 0934/1604] Add hotkey to save replay

Defaults to `F2` aka stable.
---
 .../Input/Bindings/GlobalActionContainer.cs   |  4 ++++
 .../GlobalActionKeyBindingStrings.cs          |  5 +++++
 .../Screens/Play/SaveFailedScoreButton.cs     | 21 ++++++++++++++++++-
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index fdd96d3890..0ae29ebc8e 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -119,6 +119,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(InputKey.MouseMiddle, GlobalAction.PauseGameplay),
             new KeyBinding(InputKey.Control, GlobalAction.HoldForHUD),
             new KeyBinding(InputKey.Tab, GlobalAction.ToggleChatFocus),
+            new KeyBinding(InputKey.F2, GlobalAction.SaveReplay),
         };
 
         public IEnumerable<KeyBinding> ReplayKeyBindings => new[]
@@ -366,5 +367,8 @@ namespace osu.Game.Input.Bindings
 
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.EditorCycleNextBeatSnapDivisor))]
         EditorCycleNextBeatSnapDivisor,
+
+        [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.SaveReplay))]
+        SaveReplay,
     }
 }
diff --git a/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs b/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
index aa608a603b..708fdaa174 100644
--- a/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
+++ b/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
@@ -324,6 +324,11 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString ToggleChatFocus => new TranslatableString(getKey(@"toggle_chat_focus"), @"Toggle chat focus");
 
+        /// <summary>
+        /// "Save replay"
+        /// </summary>
+        public static LocalisableString SaveReplay => new TranslatableString(getKey(@"save_replay"), @"Save replay");
+
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
 }
diff --git a/osu.Game/Screens/Play/SaveFailedScoreButton.cs b/osu.Game/Screens/Play/SaveFailedScoreButton.cs
index 20d2130e76..c5bb265dcb 100644
--- a/osu.Game/Screens/Play/SaveFailedScoreButton.cs
+++ b/osu.Game/Screens/Play/SaveFailedScoreButton.cs
@@ -8,15 +8,18 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
 using osu.Game.Database;
 using osu.Game.Scoring;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Input.Bindings;
 using osu.Game.Online;
 using osuTK;
 
 namespace osu.Game.Screens.Play
 {
-    public partial class SaveFailedScoreButton : CompositeDrawable
+    public partial class SaveFailedScoreButton : CompositeDrawable, IKeyBindingHandler<GlobalAction>
     {
         private readonly Bindable<DownloadState> state = new Bindable<DownloadState>();
 
@@ -87,5 +90,21 @@ namespace osu.Game.Screens.Play
                 }
             }, true);
         }
+
+        public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
+        {
+            switch (e.Action)
+            {
+                case GlobalAction.SaveReplay:
+                    button.TriggerClick();
+                    return true;
+            }
+
+            return false;
+        }
+
+        public void OnReleased(KeyBindingReleaseEvent<GlobalAction> e)
+        {
+        }
     }
 }

From bfa449e47ae959febca4c73c6edb035aabc99bc9 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 19 Jun 2023 21:38:13 +0900
Subject: [PATCH 0935/1604] Adjust attribute data

---
 .../Difficulty/CatchDifficultyCalculator.cs   |  4 +--
 .../Difficulty/CatchScoreV1Processor.cs       | 31 +++++++++++-------
 .../Difficulty/ManiaDifficultyCalculator.cs   |  5 ---
 .../Difficulty/OsuDifficultyCalculator.cs     |  4 +--
 .../Difficulty/OsuScoreV1Processor.cs         | 32 ++++++++++++-------
 .../Difficulty/TaikoDifficultyCalculator.cs   |  4 +--
 .../Difficulty/TaikoScoreV1Processor.cs       | 32 ++++++++++++-------
 .../Difficulty/DifficultyAttributes.cs        | 27 ++++++++--------
 8 files changed, 82 insertions(+), 57 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
index fb7c4f05f4..36af9fb980 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
@@ -49,9 +49,9 @@ namespace osu.Game.Rulesets.Catch.Difficulty
                 Mods = mods,
                 ApproachRate = preempt > 1200.0 ? -(preempt - 1800.0) / 120.0 : -(preempt - 1200.0) / 150.0 + 5.0,
                 MaxCombo = beatmap.HitObjects.Count(h => h is Fruit) + beatmap.HitObjects.OfType<JuiceStream>().SelectMany(j => j.NestedHitObjects).Count(h => !(h is TinyDroplet)),
-                LegacyTotalScore = sv1Processor.TotalScore,
+                LegacyAccuracyScore = sv1Processor.AccuracyScore,
                 LegacyComboScore = sv1Processor.ComboScore,
-                LegacyBonusScore = sv1Processor.BonusScore
+                LegacyBonusScoreRatio = sv1Processor.BonusScoreRatio
             };
         }
 
diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchScoreV1Processor.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchScoreV1Processor.cs
index b5c3838fdc..3f0ac7a760 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchScoreV1Processor.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchScoreV1Processor.cs
@@ -6,31 +6,34 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Catch.Difficulty
 {
     internal class CatchScoreV1Processor
     {
-        public int TotalScore => BaseScore + ComboScore + BonusScore;
+        /// <summary>
+        /// The accuracy portion of the legacy (ScoreV1) total score.
+        /// </summary>
+        public int AccuracyScore { get; private set; }
 
         /// <summary>
-        /// Amount of score that is combo-and-difficulty-multiplied, excluding mod multipliers.
+        /// The combo-multiplied portion of the legacy (ScoreV1) total score.
         /// </summary>
         public int ComboScore { get; private set; }
 
         /// <summary>
-        /// Amount of score that is NOT combo-and-difficulty-multiplied.
+        /// A ratio of <c>new_bonus_score / old_bonus_score</c> for converting the bonus score of legacy scores to the new scoring.
+        /// This is made up of all judgements that would be <see cref="HitResult.SmallBonus"/> or <see cref="HitResult.LargeBonus"/>.
         /// </summary>
-        public int BaseScore { get; private set; }
-
-        /// <summary>
-        /// Amount of score whose judgements would be treated as "bonus" in ScoreV2.
-        /// </summary>
-        public int BonusScore { get; private set; }
+        public double BonusScoreRatio => legacyBonusScore == 0 ? 0 : (double)modernBonusScore / legacyBonusScore;
 
+        private int legacyBonusScore;
+        private int modernBonusScore;
         private int combo;
 
         private readonly double scoreMultiplier;
@@ -77,7 +80,9 @@ namespace osu.Game.Rulesets.Catch.Difficulty
         {
             bool increaseCombo = true;
             bool addScoreComboMultiplier = false;
+
             bool isBonus = false;
+            HitResult bonusResult = HitResult.None;
 
             int scoreIncrease = 0;
 
@@ -102,6 +107,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
                     scoreIncrease = 1100;
                     increaseCombo = false;
                     isBonus = true;
+                    bonusResult = HitResult.LargeBonus;
                     break;
 
                 case JuiceStream:
@@ -122,9 +128,12 @@ namespace osu.Game.Rulesets.Catch.Difficulty
             }
 
             if (isBonus)
-                BonusScore += scoreIncrease;
+            {
+                legacyBonusScore += scoreIncrease;
+                modernBonusScore += Judgement.ToNumericResult(bonusResult);
+            }
             else
-                BaseScore += scoreIncrease;
+                AccuracyScore += scoreIncrease;
 
             if (increaseCombo)
                 combo++;
diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
index cb41b93deb..d1058a9f8c 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
@@ -33,13 +33,9 @@ namespace osu.Game.Rulesets.Mania.Difficulty
 
         public override int Version => 20220902;
 
-        private readonly IWorkingBeatmap workingBeatmap;
-
         public ManiaDifficultyCalculator(IRulesetInfo ruleset, IWorkingBeatmap beatmap)
             : base(ruleset, beatmap)
         {
-            workingBeatmap = beatmap;
-
             isForCurrentRuleset = beatmap.BeatmapInfo.Ruleset.MatchesOnlineID(ruleset);
             originalOverallDifficulty = beatmap.BeatmapInfo.Difficulty.OverallDifficulty;
         }
@@ -62,7 +58,6 @@ namespace osu.Game.Rulesets.Mania.Difficulty
                 // This is done the way it is to introduce fractional differences in order to match osu-stable for the time being.
                 GreatHitWindow = Math.Ceiling((int)(getHitWindow300(mods) * clockRate) / clockRate),
                 MaxCombo = beatmap.HitObjects.Sum(maxComboForObject),
-                LegacyTotalScore = sv1Processor.TotalScore,
                 LegacyComboScore = sv1Processor.TotalScore
             };
         }
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
index 21ee03d1a5..5d6ed4792d 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
@@ -109,9 +109,9 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                 HitCircleCount = hitCirclesCount,
                 SliderCount = sliderCount,
                 SpinnerCount = spinnerCount,
-                LegacyTotalScore = sv1Processor.TotalScore,
+                LegacyAccuracyScore = sv1Processor.AccuracyScore,
                 LegacyComboScore = sv1Processor.ComboScore,
-                LegacyBonusScore = sv1Processor.BonusScore
+                LegacyBonusScoreRatio = sv1Processor.BonusScoreRatio
             };
         }
 
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuScoreV1Processor.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuScoreV1Processor.cs
index c82928b745..28d029b73a 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuScoreV1Processor.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuScoreV1Processor.cs
@@ -5,32 +5,35 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Difficulty
 {
     internal class OsuScoreV1Processor
     {
-        public int TotalScore => BaseScore + ComboScore + BonusScore;
+        /// <summary>
+        /// The accuracy portion of the legacy (ScoreV1) total score.
+        /// </summary>
+        public int AccuracyScore { get; private set; }
 
         /// <summary>
-        /// Amount of score that is combo-and-difficulty-multiplied, excluding mod multipliers.
+        /// The combo-multiplied portion of the legacy (ScoreV1) total score.
         /// </summary>
         public int ComboScore { get; private set; }
 
         /// <summary>
-        /// Amount of score that is NOT combo-and-difficulty-multiplied.
+        /// A ratio of <c>new_bonus_score / old_bonus_score</c> for converting the bonus score of legacy scores to the new scoring.
+        /// This is made up of all judgements that would be <see cref="HitResult.SmallBonus"/> or <see cref="HitResult.LargeBonus"/>.
         /// </summary>
-        public int BaseScore { get; private set; }
-
-        /// <summary>
-        /// Amount of score whose judgements would be treated as "bonus" in ScoreV2.
-        /// </summary>
-        public int BonusScore { get; private set; }
+        public double BonusScoreRatio => legacyBonusScore == 0 ? 0 : (double)modernBonusScore / legacyBonusScore;
 
+        private int legacyBonusScore;
+        private int modernBonusScore;
         private int combo;
 
         private readonly double scoreMultiplier;
@@ -80,7 +83,9 @@ namespace osu.Game.Rulesets.Osu.Difficulty
         {
             bool increaseCombo = true;
             bool addScoreComboMultiplier = false;
+
             bool isBonus = false;
+            HitResult bonusResult = HitResult.None;
 
             int scoreIncrease = 0;
 
@@ -100,12 +105,14 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                     scoreIncrease = 1100;
                     increaseCombo = false;
                     isBonus = true;
+                    bonusResult = HitResult.LargeBonus;
                     break;
 
                 case SpinnerTick:
                     scoreIncrease = 100;
                     increaseCombo = false;
                     isBonus = true;
+                    bonusResult = HitResult.SmallBonus;
                     break;
 
                 case HitCircle:
@@ -156,9 +163,12 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             }
 
             if (isBonus)
-                BonusScore += scoreIncrease;
+            {
+                legacyBonusScore += scoreIncrease;
+                modernBonusScore += Judgement.ToNumericResult(bonusResult);
+            }
             else
-                BaseScore += scoreIncrease;
+                AccuracyScore += scoreIncrease;
 
             if (increaseCombo)
                 combo++;
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
index 28b07c0d59..49222adc89 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
@@ -101,9 +101,9 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
                 PeakDifficulty = combinedRating,
                 GreatHitWindow = hitWindows.WindowFor(HitResult.Great) / clockRate,
                 MaxCombo = beatmap.HitObjects.Count(h => h is Hit),
-                LegacyTotalScore = sv1Processor.TotalScore,
+                LegacyAccuracyScore = sv1Processor.AccuracyScore,
                 LegacyComboScore = sv1Processor.ComboScore,
-                LegacyBonusScore = sv1Processor.BonusScore
+                LegacyBonusScoreRatio = sv1Processor.BonusScoreRatio
             };
         }
 
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoScoreV1Processor.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoScoreV1Processor.cs
index ee52424b26..23ff9585e8 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoScoreV1Processor.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoScoreV1Processor.cs
@@ -5,32 +5,35 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Difficulty
 {
     internal class TaikoScoreV1Processor
     {
-        public int TotalScore => BaseScore + ComboScore + BonusScore;
+        /// <summary>
+        /// The accuracy portion of the legacy (ScoreV1) total score.
+        /// </summary>
+        public int AccuracyScore { get; private set; }
 
         /// <summary>
-        /// Amount of score that is combo-and-difficulty-multiplied, excluding mod multipliers.
+        /// The combo-multiplied portion of the legacy (ScoreV1) total score.
         /// </summary>
         public int ComboScore { get; private set; }
 
         /// <summary>
-        /// Amount of score that is NOT combo-and-difficulty-multiplied.
+        /// A ratio of <c>new_bonus_score / old_bonus_score</c> for converting the bonus score of legacy scores to the new scoring.
+        /// This is made up of all judgements that would be <see cref="HitResult.SmallBonus"/> or <see cref="HitResult.LargeBonus"/>.
         /// </summary>
-        public int BaseScore { get; private set; }
-
-        /// <summary>
-        /// Amount of score whose judgements would be treated as "bonus" in ScoreV2.
-        /// </summary>
-        public int BonusScore { get; private set; }
+        public double BonusScoreRatio => legacyBonusScore == 0 ? 0 : (double)modernBonusScore / legacyBonusScore;
 
+        private int legacyBonusScore;
+        private int modernBonusScore;
         private int combo;
 
         private readonly double modMultiplier;
@@ -83,7 +86,9 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
         {
             bool increaseCombo = true;
             bool addScoreComboMultiplier = false;
+
             bool isBonus = false;
+            HitResult bonusResult = HitResult.None;
 
             int scoreIncrease = 0;
 
@@ -98,6 +103,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
                     scoreIncrease = 300;
                     increaseCombo = false;
                     isBonus = true;
+                    bonusResult = HitResult.SmallBonus;
                     break;
 
                 case Swell swell:
@@ -123,6 +129,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
                     addScoreComboMultiplier = true;
                     increaseCombo = false;
                     isBonus = true;
+                    bonusResult = HitResult.LargeBonus;
                     break;
 
                 case Hit:
@@ -181,9 +188,12 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
                 ComboScore += comboScoreIncrease;
 
             if (isBonus)
-                BonusScore += scoreIncrease;
+            {
+                legacyBonusScore += scoreIncrease;
+                modernBonusScore += Judgement.ToNumericResult(bonusResult);
+            }
             else
-                BaseScore += scoreIncrease;
+                AccuracyScore += scoreIncrease;
 
             if (increaseCombo)
                 combo++;
diff --git a/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs b/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
index 5a51fb24a6..48e67ff425 100644
--- a/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
+++ b/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
@@ -27,9 +27,9 @@ namespace osu.Game.Rulesets.Difficulty
         protected const int ATTRIB_ID_FLASHLIGHT = 17;
         protected const int ATTRIB_ID_SLIDER_FACTOR = 19;
         protected const int ATTRIB_ID_SPEED_NOTE_COUNT = 21;
-        protected const int ATTRIB_ID_LEGACY_TOTAL_SCORE = 23;
+        protected const int ATTRIB_ID_LEGACY_ACCURACY_SCORE = 23;
         protected const int ATTRIB_ID_LEGACY_COMBO_SCORE = 25;
-        protected const int ATTRIB_ID_LEGACY_BONUS_SCORE = 27;
+        protected const int ATTRIB_ID_LEGACY_BONUS_SCORE_RATIO = 27;
 
         /// <summary>
         /// The mods which were applied to the beatmap.
@@ -49,22 +49,23 @@ namespace osu.Game.Rulesets.Difficulty
         public int MaxCombo { get; set; }
 
         /// <summary>
-        /// The maximum achievable legacy total score.
+        /// The accuracy portion of the legacy (ScoreV1) total score.
         /// </summary>
-        [JsonProperty("legacy_total_score", Order = -5)]
-        public int LegacyTotalScore { get; set; }
+        [JsonProperty("legacy_accuracy_score", Order = -5)]
+        public int LegacyAccuracyScore { get; set; }
 
         /// <summary>
-        /// The combo-multiplied portion of <see cref="LegacyTotalScore"/>.
+        /// The combo-multiplied portion of the legacy (ScoreV1) total score.
         /// </summary>
         [JsonProperty("legacy_combo_score", Order = -4)]
         public int LegacyComboScore { get; set; }
 
         /// <summary>
-        /// The "bonus" portion of <see cref="LegacyTotalScore"/> consisting of all judgements that would be <see cref="HitResult.SmallBonus"/> or <see cref="HitResult.LargeBonus"/>.
+        /// A ratio of <c>new_bonus_score / old_bonus_score</c> for converting the bonus score of legacy scores to the new scoring.
+        /// This is made up of all judgements that would be <see cref="HitResult.SmallBonus"/> or <see cref="HitResult.LargeBonus"/>.
         /// </summary>
-        [JsonProperty("legacy_bonus_score", Order = -3)]
-        public int LegacyBonusScore { get; set; }
+        [JsonProperty("legacy_bonus_score_ratio", Order = -3)]
+        public double LegacyBonusScoreRatio { get; set; }
 
         /// <summary>
         /// Creates new <see cref="DifficultyAttributes"/>.
@@ -93,9 +94,9 @@ namespace osu.Game.Rulesets.Difficulty
         public virtual IEnumerable<(int attributeId, object value)> ToDatabaseAttributes()
         {
             yield return (ATTRIB_ID_MAX_COMBO, MaxCombo);
-            yield return (ATTRIB_ID_LEGACY_TOTAL_SCORE, LegacyTotalScore);
+            yield return (ATTRIB_ID_LEGACY_ACCURACY_SCORE, LegacyAccuracyScore);
             yield return (ATTRIB_ID_LEGACY_COMBO_SCORE, LegacyComboScore);
-            yield return (ATTRIB_ID_LEGACY_BONUS_SCORE, LegacyBonusScore);
+            yield return (ATTRIB_ID_LEGACY_BONUS_SCORE_RATIO, LegacyBonusScoreRatio);
         }
 
         /// <summary>
@@ -106,9 +107,9 @@ namespace osu.Game.Rulesets.Difficulty
         public virtual void FromDatabaseAttributes(IReadOnlyDictionary<int, double> values, IBeatmapOnlineInfo onlineInfo)
         {
             MaxCombo = (int)values[ATTRIB_ID_MAX_COMBO];
-            LegacyTotalScore = (int)values[ATTRIB_ID_LEGACY_TOTAL_SCORE];
+            LegacyAccuracyScore = (int)values[ATTRIB_ID_LEGACY_ACCURACY_SCORE];
             LegacyComboScore = (int)values[ATTRIB_ID_LEGACY_COMBO_SCORE];
-            LegacyBonusScore = (int)values[ATTRIB_ID_LEGACY_BONUS_SCORE];
+            LegacyBonusScoreRatio = (int)values[ATTRIB_ID_LEGACY_BONUS_SCORE_RATIO];
         }
     }
 }

From 6d32206a08e0f854fa67ef751c1032679072938f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 19 Jun 2023 17:47:01 +0200
Subject: [PATCH 0936/1604] Fix slider tails receiving wrong colours

Only visually apparent on legacy skins.
---
 osu.Game.Rulesets.Osu/Mods/OsuModSynesthesia.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModSynesthesia.cs b/osu.Game.Rulesets.Osu/Mods/OsuModSynesthesia.cs
index 6918993696..9537f8b388 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModSynesthesia.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModSynesthesia.cs
@@ -6,6 +6,7 @@ using osu.Game.Graphics;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Screens.Edit;
 using osuTK.Graphics;
 
@@ -33,7 +34,15 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             Color4? timingBasedColour = null;
 
-            d.HitObjectApplied += _ => timingBasedColour = BindableBeatDivisor.GetColourFor(currentBeatmap.ControlPointInfo.GetClosestBeatDivisor(d.HitObject.StartTime), colours);
+            d.HitObjectApplied += _ =>
+            {
+                // slider tails are a painful edge case, as their start time is offset 36ms back (see `LegacyLastTick`).
+                // to work around this, look up the slider tail's parenting slider's end time instead to ensure proper snap.
+                double snapTime = d is DrawableSliderTail tail
+                    ? tail.Slider.GetEndTime()
+                    : d.HitObject.StartTime;
+                timingBasedColour = BindableBeatDivisor.GetColourFor(currentBeatmap.ControlPointInfo.GetClosestBeatDivisor(snapTime), colours);
+            };
 
             // Need to set this every update to ensure it doesn't get overwritten by DrawableHitObject.OnApply() -> UpdateComboColour().
             d.OnUpdate += _ =>

From 9bcd86d66d8514319ce75f14bbd7362eb1a50688 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 19 Jun 2023 18:42:30 +0200
Subject: [PATCH 0937/1604] Fix test failure due to relying on implementation
 detail

---
 .../Editor/TestSceneOsuDistanceSnapGrid.cs          | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs
index 7579e8077b..0c064ecfa6 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs
@@ -185,7 +185,18 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             AddAssert("Ensure cursor is on a grid line", () =>
             {
-                return grid.ChildrenOfType<CircularProgress>().Any(p => Precision.AlmostEquals(p.ScreenSpaceDrawQuad.TopRight.X, grid.ToScreenSpace(cursor.LastSnappedPosition).X));
+                return grid.ChildrenOfType<CircularProgress>().Any(ring =>
+                {
+                    // the grid rings are actually slightly _larger_ than the snapping radii.
+                    // this is done such that the snapping radius falls right in the middle of each grid ring thickness-wise,
+                    // but it does however complicate the following calculations slightly.
+
+                    // we want to calculate the coordinates of the rightmost point on the grid line, which is in the exact middle of the ring thickness-wise.
+                    // for the X component, we take the entire width of the ring, minus one half of the inner radius (since we want the middle of the line on the right side).
+                    // for the Y component, we just take 0.5f.
+                    var rightMiddleOfGridLine = ring.ToScreenSpace(ring.DrawSize * new Vector2(1 - ring.InnerRadius / 2, 0.5f));
+                    return Precision.AlmostEquals(rightMiddleOfGridLine.X, grid.ToScreenSpace(cursor.LastSnappedPosition).X);
+                });
             });
         }
 

From 362fe62b4bbea9b590614b6df05587ad602fb2d0 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Mon, 19 Jun 2023 10:20:56 -0700
Subject: [PATCH 0938/1604] Fix beatmap info not showing individual difficulty
 bpm

---
 osu.Game/Overlays/BeatmapSet/BasicStats.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/BasicStats.cs b/osu.Game/Overlays/BeatmapSet/BasicStats.cs
index 3cc655d561..0b1befe7b9 100644
--- a/osu.Game/Overlays/BeatmapSet/BasicStats.cs
+++ b/osu.Game/Overlays/BeatmapSet/BasicStats.cs
@@ -58,16 +58,18 @@ namespace osu.Game.Overlays.BeatmapSet
 
         private void updateDisplay()
         {
-            bpm.Value = BeatmapSet?.BPM.ToLocalisableString(@"0.##") ?? (LocalisableString)"-";
-
             if (beatmapInfo == null)
             {
+                bpm.Value = "-";
+
                 length.Value = string.Empty;
                 circleCount.Value = string.Empty;
                 sliderCount.Value = string.Empty;
             }
             else
             {
+                bpm.Value = beatmapInfo.BPM.ToLocalisableString(@"0.##");
+
                 length.Value = TimeSpan.FromMilliseconds(beatmapInfo.Length).ToFormattedDuration();
 
                 if (beatmapInfo is not IBeatmapOnlineInfo onlineInfo) return;

From 4a9543092a663a7695368c4fadb691c174a2a3d4 Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Mon, 19 Jun 2023 17:08:04 -0400
Subject: [PATCH 0939/1604] disable posting comments when logged out

---
 osu.Game/Overlays/Comments/CommentEditor.cs   | 25 +++++++++++++++++--
 .../Overlays/Comments/ReplyCommentEditor.cs   |  3 ++-
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Comments/CommentEditor.cs b/osu.Game/Overlays/Comments/CommentEditor.cs
index 2af7dd3093..5c9f78d05f 100644
--- a/osu.Game/Overlays/Comments/CommentEditor.cs
+++ b/osu.Game/Overlays/Comments/CommentEditor.cs
@@ -13,6 +13,9 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Resources.Localisation.Web;
 using osuTK;
 using osuTK.Graphics;
 
@@ -26,6 +29,8 @@ namespace osu.Game.Overlays.Comments
 
         protected abstract LocalisableString CommitButtonText { get; }
 
+        private LocalisableString textBoxPlaceholderLoggedOut => AuthorizationStrings.RequireLogin;
+
         protected abstract LocalisableString TextBoxPlaceholder { get; }
 
         protected FillFlowContainer ButtonsContainer { get; private set; } = null!;
@@ -37,6 +42,13 @@ namespace osu.Game.Overlays.Comments
 
         protected TextBox TextBox { get; private set; } = null!;
 
+        protected readonly IBindable<APIUser> User = new Bindable<APIUser>();
+
+        [Resolved]
+        private IAPIProvider api { get; set; } = null!;
+
+        private LocalisableString placeholderText => api.IsLoggedIn ? TextBoxPlaceholder : textBoxPlaceholderLoggedOut;
+
         protected bool ShowLoadingSpinner
         {
             set
@@ -78,8 +90,9 @@ namespace osu.Game.Overlays.Comments
                         {
                             Height = 40,
                             RelativeSizeAxes = Axes.X,
-                            PlaceholderText = TextBoxPlaceholder,
-                            Current = Current
+                            PlaceholderText = placeholderText,
+                            Current = Current,
+                            ReadOnly = !api.IsLoggedIn
                         },
                         new Container
                         {
@@ -134,12 +147,14 @@ namespace osu.Game.Overlays.Comments
             });
 
             TextBox.OnCommit += (_, _) => commitButton.TriggerClick();
+            User.BindTo(api.LocalUser);
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
             Current.BindValueChanged(_ => updateCommitButtonState(), true);
+            User.BindValueChanged(_ => updateTextBoxState());
         }
 
         protected abstract void OnCommit(string text);
@@ -147,6 +162,12 @@ namespace osu.Game.Overlays.Comments
         private void updateCommitButtonState() =>
             commitButton.Enabled.Value = loadingSpinner.State.Value == Visibility.Hidden && !string.IsNullOrEmpty(Current.Value);
 
+        private void updateTextBoxState()
+        {
+            TextBox.PlaceholderText = placeholderText;
+            TextBox.ReadOnly = !api.IsLoggedIn;
+        }
+
         private partial class EditorTextBox : OsuTextBox
         {
             protected override float LeftRightPadding => side_padding;
diff --git a/osu.Game/Overlays/Comments/ReplyCommentEditor.cs b/osu.Game/Overlays/Comments/ReplyCommentEditor.cs
index 8aca183dee..8c4b25a7dc 100644
--- a/osu.Game/Overlays/Comments/ReplyCommentEditor.cs
+++ b/osu.Game/Overlays/Comments/ReplyCommentEditor.cs
@@ -38,7 +38,8 @@ namespace osu.Game.Overlays.Comments
         {
             base.LoadComplete();
 
-            GetContainingInputManager().ChangeFocus(TextBox);
+            if (!TextBox.ReadOnly)
+                GetContainingInputManager().ChangeFocus(TextBox);
         }
 
         protected override void OnCommit(string text)

From d5d494f07bd7dd97682214f7b386ebfba9ff3655 Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Mon, 19 Jun 2023 17:36:40 -0400
Subject: [PATCH 0940/1604] resolve protected API in comments superclass

---
 osu.Game/Overlays/Comments/CommentEditor.cs      | 10 +++++-----
 osu.Game/Overlays/Comments/CommentsContainer.cs  |  5 +----
 osu.Game/Overlays/Comments/ReplyCommentEditor.cs |  6 +-----
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Overlays/Comments/CommentEditor.cs b/osu.Game/Overlays/Comments/CommentEditor.cs
index 5c9f78d05f..35c96cf531 100644
--- a/osu.Game/Overlays/Comments/CommentEditor.cs
+++ b/osu.Game/Overlays/Comments/CommentEditor.cs
@@ -45,9 +45,9 @@ namespace osu.Game.Overlays.Comments
         protected readonly IBindable<APIUser> User = new Bindable<APIUser>();
 
         [Resolved]
-        private IAPIProvider api { get; set; } = null!;
+        protected IAPIProvider API { get; private set; } = null!;
 
-        private LocalisableString placeholderText => api.IsLoggedIn ? TextBoxPlaceholder : textBoxPlaceholderLoggedOut;
+        private LocalisableString placeholderText => API.IsLoggedIn ? TextBoxPlaceholder : textBoxPlaceholderLoggedOut;
 
         protected bool ShowLoadingSpinner
         {
@@ -92,7 +92,7 @@ namespace osu.Game.Overlays.Comments
                             RelativeSizeAxes = Axes.X,
                             PlaceholderText = placeholderText,
                             Current = Current,
-                            ReadOnly = !api.IsLoggedIn
+                            ReadOnly = !API.IsLoggedIn
                         },
                         new Container
                         {
@@ -147,7 +147,7 @@ namespace osu.Game.Overlays.Comments
             });
 
             TextBox.OnCommit += (_, _) => commitButton.TriggerClick();
-            User.BindTo(api.LocalUser);
+            User.BindTo(API.LocalUser);
         }
 
         protected override void LoadComplete()
@@ -165,7 +165,7 @@ namespace osu.Game.Overlays.Comments
         private void updateTextBoxState()
         {
             TextBox.PlaceholderText = placeholderText;
-            TextBox.ReadOnly = !api.IsLoggedIn;
+            TextBox.ReadOnly = !API.IsLoggedIn;
         }
 
         private partial class EditorTextBox : OsuTextBox
diff --git a/osu.Game/Overlays/Comments/CommentsContainer.cs b/osu.Game/Overlays/Comments/CommentsContainer.cs
index 24536fe460..f50bbb7116 100644
--- a/osu.Game/Overlays/Comments/CommentsContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentsContainer.cs
@@ -405,9 +405,6 @@ namespace osu.Game.Overlays.Comments
             [Resolved]
             private CommentsContainer commentsContainer { get; set; }
 
-            [Resolved]
-            private IAPIProvider api { get; set; }
-
             public Action<CommentBundle> OnPost;
 
             //TODO should match web, left empty due to no multiline support
@@ -432,7 +429,7 @@ namespace osu.Game.Overlays.Comments
                     Current.Value = string.Empty;
                     OnPost?.Invoke(cb);
                 });
-                api.Queue(req);
+                API.Queue(req);
             }
         }
     }
diff --git a/osu.Game/Overlays/Comments/ReplyCommentEditor.cs b/osu.Game/Overlays/Comments/ReplyCommentEditor.cs
index 8c4b25a7dc..7fbf556e1f 100644
--- a/osu.Game/Overlays/Comments/ReplyCommentEditor.cs
+++ b/osu.Game/Overlays/Comments/ReplyCommentEditor.cs
@@ -6,7 +6,6 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Localisation;
 using osu.Framework.Logging;
-using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Resources.Localisation.Web;
@@ -18,9 +17,6 @@ namespace osu.Game.Overlays.Comments
         [Resolved]
         private CommentsContainer commentsContainer { get; set; } = null!;
 
-        [Resolved]
-        private IAPIProvider api { get; set; } = null!;
-
         private readonly Comment parentComment;
 
         public Action<DrawableComment[]>? OnPost;
@@ -52,7 +48,7 @@ namespace osu.Game.Overlays.Comments
                 Logger.Error(e, "Posting reply comment failed.");
             });
             req.Success += cb => Schedule(processPostedComments, cb);
-            api.Queue(req);
+            API.Queue(req);
         }
 
         private void processPostedComments(CommentBundle cb)

From 591277e0f97bc3e2e63219d23c24d38b28daa0eb Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Mon, 19 Jun 2023 18:10:37 -0400
Subject: [PATCH 0941/1604] extract button text properties to methods, show
 login overlay on click

---
 osu.Game/Overlays/Comments/CommentEditor.cs   | 48 ++++++++++++-------
 .../Overlays/Comments/CommentsContainer.cs    |  6 ++-
 .../Overlays/Comments/ReplyCommentEditor.cs   |  8 +++-
 3 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Overlays/Comments/CommentEditor.cs b/osu.Game/Overlays/Comments/CommentEditor.cs
index 35c96cf531..58fba4bb57 100644
--- a/osu.Game/Overlays/Comments/CommentEditor.cs
+++ b/osu.Game/Overlays/Comments/CommentEditor.cs
@@ -15,7 +15,6 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Resources.Localisation.Web;
 using osuTK;
 using osuTK.Graphics;
 
@@ -27,12 +26,6 @@ namespace osu.Game.Overlays.Comments
 
         protected abstract LocalisableString FooterText { get; }
 
-        protected abstract LocalisableString CommitButtonText { get; }
-
-        private LocalisableString textBoxPlaceholderLoggedOut => AuthorizationStrings.RequireLogin;
-
-        protected abstract LocalisableString TextBoxPlaceholder { get; }
-
         protected FillFlowContainer ButtonsContainer { get; private set; } = null!;
 
         protected readonly Bindable<string> Current = new Bindable<string>(string.Empty);
@@ -47,7 +40,12 @@ namespace osu.Game.Overlays.Comments
         [Resolved]
         protected IAPIProvider API { get; private set; } = null!;
 
-        private LocalisableString placeholderText => API.IsLoggedIn ? TextBoxPlaceholder : textBoxPlaceholderLoggedOut;
+        [Resolved]
+        private LoginOverlay? loginOverlay { get; set; }
+
+        protected abstract LocalisableString GetCommitButtonText(bool isLoggedIn);
+
+        protected abstract LocalisableString GetTextBoxPlaceholder(bool isLoggedIn);
 
         protected bool ShowLoadingSpinner
         {
@@ -90,7 +88,7 @@ namespace osu.Game.Overlays.Comments
                         {
                             Height = 40,
                             RelativeSizeAxes = Axes.X,
-                            PlaceholderText = placeholderText,
+                            PlaceholderText = GetTextBoxPlaceholder(API.IsLoggedIn),
                             Current = Current,
                             ReadOnly = !API.IsLoggedIn
                         },
@@ -128,8 +126,8 @@ namespace osu.Game.Overlays.Comments
                                             Spacing = new Vector2(5, 0),
                                             Child = commitButton = new EditorButton
                                             {
-                                                Text = CommitButtonText,
-                                                Action = () => OnCommit(Current.Value)
+                                                Text = GetCommitButtonText(API.IsLoggedIn),
+                                                Action = () => commitOrLogIn(Current.Value)
                                             }
                                         },
                                         loadingSpinner = new LoadingSpinner
@@ -154,18 +152,34 @@ namespace osu.Game.Overlays.Comments
         {
             base.LoadComplete();
             Current.BindValueChanged(_ => updateCommitButtonState(), true);
-            User.BindValueChanged(_ => updateTextBoxState());
+            User.BindValueChanged(_ => updateStateForLoggedIn());
         }
 
         protected abstract void OnCommit(string text);
 
-        private void updateCommitButtonState() =>
-            commitButton.Enabled.Value = loadingSpinner.State.Value == Visibility.Hidden && !string.IsNullOrEmpty(Current.Value);
-
-        private void updateTextBoxState()
+        private void commitOrLogIn(string text)
         {
-            TextBox.PlaceholderText = placeholderText;
+            if (!API.IsLoggedIn)
+            {
+                loginOverlay?.Show();
+                return;
+            }
+
+            OnCommit(text);
+        }
+
+        private void updateCommitButtonState()
+        {
+            bool textBoxValid = loadingSpinner.State.Value == Visibility.Hidden && !string.IsNullOrEmpty(Current.Value);
+            commitButton.Enabled.Value = textBoxValid || !API.IsLoggedIn;
+        }
+
+        private void updateStateForLoggedIn()
+        {
+            TextBox.PlaceholderText = GetTextBoxPlaceholder(API.IsLoggedIn);
             TextBox.ReadOnly = !API.IsLoggedIn;
+            commitButton.Text = GetCommitButtonText(API.IsLoggedIn);
+            updateCommitButtonState();
         }
 
         private partial class EditorTextBox : OsuTextBox
diff --git a/osu.Game/Overlays/Comments/CommentsContainer.cs b/osu.Game/Overlays/Comments/CommentsContainer.cs
index f50bbb7116..1dfcb5f5c6 100644
--- a/osu.Game/Overlays/Comments/CommentsContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentsContainer.cs
@@ -410,9 +410,11 @@ namespace osu.Game.Overlays.Comments
             //TODO should match web, left empty due to no multiline support
             protected override LocalisableString FooterText => default;
 
-            protected override LocalisableString CommitButtonText => CommonStrings.ButtonsPost;
+            protected override LocalisableString GetCommitButtonText(bool isLoggedIn) =>
+                isLoggedIn ? CommonStrings.ButtonsPost : CommentsStrings.GuestButtonNew;
 
-            protected override LocalisableString TextBoxPlaceholder => CommentsStrings.PlaceholderNew;
+            protected override LocalisableString GetTextBoxPlaceholder(bool isLoggedIn) =>
+                isLoggedIn ? CommentsStrings.PlaceholderNew : AuthorizationStrings.RequireLogin;
 
             protected override void OnCommit(string text)
             {
diff --git a/osu.Game/Overlays/Comments/ReplyCommentEditor.cs b/osu.Game/Overlays/Comments/ReplyCommentEditor.cs
index 7fbf556e1f..52e301f0a3 100644
--- a/osu.Game/Overlays/Comments/ReplyCommentEditor.cs
+++ b/osu.Game/Overlays/Comments/ReplyCommentEditor.cs
@@ -22,8 +22,12 @@ namespace osu.Game.Overlays.Comments
         public Action<DrawableComment[]>? OnPost;
 
         protected override LocalisableString FooterText => default;
-        protected override LocalisableString CommitButtonText => CommonStrings.ButtonsReply;
-        protected override LocalisableString TextBoxPlaceholder => CommentsStrings.PlaceholderReply;
+
+        protected override LocalisableString GetCommitButtonText(bool isLoggedIn) =>
+            isLoggedIn ? CommonStrings.ButtonsReply : CommentsStrings.GuestButtonReply;
+
+        protected override LocalisableString GetTextBoxPlaceholder(bool isLoggedIn) =>
+            isLoggedIn ? CommentsStrings.PlaceholderReply : AuthorizationStrings.RequireLogin;
 
         public ReplyCommentEditor(Comment parent)
         {

From f7dde53f9b11afc256c0bb6103be4904ff0a84df Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Mon, 19 Jun 2023 18:20:16 -0400
Subject: [PATCH 0942/1604] use runOnceImmediately instead of duplicating logic

---
 osu.Game/Overlays/Comments/CommentEditor.cs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/Comments/CommentEditor.cs b/osu.Game/Overlays/Comments/CommentEditor.cs
index 58fba4bb57..b139fbefe6 100644
--- a/osu.Game/Overlays/Comments/CommentEditor.cs
+++ b/osu.Game/Overlays/Comments/CommentEditor.cs
@@ -88,9 +88,7 @@ namespace osu.Game.Overlays.Comments
                         {
                             Height = 40,
                             RelativeSizeAxes = Axes.X,
-                            PlaceholderText = GetTextBoxPlaceholder(API.IsLoggedIn),
-                            Current = Current,
-                            ReadOnly = !API.IsLoggedIn
+                            Current = Current
                         },
                         new Container
                         {
@@ -126,7 +124,6 @@ namespace osu.Game.Overlays.Comments
                                             Spacing = new Vector2(5, 0),
                                             Child = commitButton = new EditorButton
                                             {
-                                                Text = GetCommitButtonText(API.IsLoggedIn),
                                                 Action = () => commitOrLogIn(Current.Value)
                                             }
                                         },
@@ -152,7 +149,7 @@ namespace osu.Game.Overlays.Comments
         {
             base.LoadComplete();
             Current.BindValueChanged(_ => updateCommitButtonState(), true);
-            User.BindValueChanged(_ => updateStateForLoggedIn());
+            User.BindValueChanged(_ => updateStateForLoggedIn(), true);
         }
 
         protected abstract void OnCommit(string text);

From 60eedbafd1be892a0e248eabb955090eff6eaf48 Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Mon, 19 Jun 2023 22:05:18 -0400
Subject: [PATCH 0943/1604] rename GetTextBoxPlaceholder to GetPlaceholderText

---
 osu.Game/Overlays/Comments/CommentEditor.cs      | 4 ++--
 osu.Game/Overlays/Comments/CommentsContainer.cs  | 2 +-
 osu.Game/Overlays/Comments/ReplyCommentEditor.cs | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Comments/CommentEditor.cs b/osu.Game/Overlays/Comments/CommentEditor.cs
index b139fbefe6..b363fe5881 100644
--- a/osu.Game/Overlays/Comments/CommentEditor.cs
+++ b/osu.Game/Overlays/Comments/CommentEditor.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Overlays.Comments
 
         protected abstract LocalisableString GetCommitButtonText(bool isLoggedIn);
 
-        protected abstract LocalisableString GetTextBoxPlaceholder(bool isLoggedIn);
+        protected abstract LocalisableString GetPlaceholderText(bool isLoggedIn);
 
         protected bool ShowLoadingSpinner
         {
@@ -173,7 +173,7 @@ namespace osu.Game.Overlays.Comments
 
         private void updateStateForLoggedIn()
         {
-            TextBox.PlaceholderText = GetTextBoxPlaceholder(API.IsLoggedIn);
+            TextBox.PlaceholderText = GetPlaceholderText(API.IsLoggedIn);
             TextBox.ReadOnly = !API.IsLoggedIn;
             commitButton.Text = GetCommitButtonText(API.IsLoggedIn);
             updateCommitButtonState();
diff --git a/osu.Game/Overlays/Comments/CommentsContainer.cs b/osu.Game/Overlays/Comments/CommentsContainer.cs
index 1dfcb5f5c6..e6c69d2090 100644
--- a/osu.Game/Overlays/Comments/CommentsContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentsContainer.cs
@@ -413,7 +413,7 @@ namespace osu.Game.Overlays.Comments
             protected override LocalisableString GetCommitButtonText(bool isLoggedIn) =>
                 isLoggedIn ? CommonStrings.ButtonsPost : CommentsStrings.GuestButtonNew;
 
-            protected override LocalisableString GetTextBoxPlaceholder(bool isLoggedIn) =>
+            protected override LocalisableString GetPlaceholderText(bool isLoggedIn) =>
                 isLoggedIn ? CommentsStrings.PlaceholderNew : AuthorizationStrings.RequireLogin;
 
             protected override void OnCommit(string text)
diff --git a/osu.Game/Overlays/Comments/ReplyCommentEditor.cs b/osu.Game/Overlays/Comments/ReplyCommentEditor.cs
index 52e301f0a3..0d210021b9 100644
--- a/osu.Game/Overlays/Comments/ReplyCommentEditor.cs
+++ b/osu.Game/Overlays/Comments/ReplyCommentEditor.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Overlays.Comments
         protected override LocalisableString GetCommitButtonText(bool isLoggedIn) =>
             isLoggedIn ? CommonStrings.ButtonsReply : CommentsStrings.GuestButtonReply;
 
-        protected override LocalisableString GetTextBoxPlaceholder(bool isLoggedIn) =>
+        protected override LocalisableString GetPlaceholderText(bool isLoggedIn) =>
             isLoggedIn ? CommentsStrings.PlaceholderReply : AuthorizationStrings.RequireLogin;
 
         public ReplyCommentEditor(Comment parent)

From 343052410b1eb83be437e1ed0d49343b474b1c37 Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Mon, 19 Jun 2023 22:08:45 -0400
Subject: [PATCH 0944/1604] update CommentEditor test components

---
 .../Visual/UserInterface/TestSceneCommentEditor.cs        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
index e7840d4a2a..0bc6367d64 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
@@ -125,8 +125,8 @@ namespace osu.Game.Tests.Visual.UserInterface
             }
 
             protected override LocalisableString FooterText => @"Footer text. And it is pretty long. Cool.";
-            protected override LocalisableString CommitButtonText => @"Commit";
-            protected override LocalisableString TextBoxPlaceholder => @"This text box is empty";
+            protected override LocalisableString GetCommitButtonText(bool isLoggedIn) => @"Commit";
+            protected override LocalisableString GetPlaceholderText(bool isLoggedIn) => @"This text box is empty";
         }
 
         private partial class TestCancellableCommentEditor : CancellableCommentEditor
@@ -146,8 +146,8 @@ namespace osu.Game.Tests.Visual.UserInterface
             {
             }
 
-            protected override LocalisableString CommitButtonText => @"Save";
-            protected override LocalisableString TextBoxPlaceholder => @"Multiline textboxes soon";
+            protected override LocalisableString GetCommitButtonText(bool isLoggedIn) => @"Save";
+            protected override LocalisableString GetPlaceholderText(bool isLoggedIn) => @"Multiline textboxes soon";
         }
     }
 }

From 1e0e29847f3404d5f90d52bc467b6d0cf7a55fd9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Jun 2023 16:29:15 +0900
Subject: [PATCH 0945/1604] Apply NRT and hotkey support to save replay button
 at results screen

---
 .../Screens/Ranking/ReplayDownloadButton.cs   | 33 ++++++++++++++-----
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Ranking/ReplayDownloadButton.cs b/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
index 5c5cb61b79..5a1e59403a 100644
--- a/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
+++ b/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
@@ -1,30 +1,31 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Input.Bindings;
 using osu.Game.Online;
 using osu.Game.Scoring;
 using osuTK;
 
 namespace osu.Game.Screens.Ranking
 {
-    public partial class ReplayDownloadButton : CompositeDrawable
+    public partial class ReplayDownloadButton : CompositeDrawable, IKeyBindingHandler<GlobalAction>
     {
         public readonly Bindable<ScoreInfo> Score = new Bindable<ScoreInfo>();
 
         protected readonly Bindable<DownloadState> State = new Bindable<DownloadState>();
 
-        private DownloadButton button;
-        private ShakeContainer shakeContainer;
+        private DownloadButton button = null!;
+        private ShakeContainer shakeContainer = null!;
 
-        private ScoreDownloadTracker downloadTracker;
+        private ScoreDownloadTracker? downloadTracker;
 
         private ReplayAvailability replayAvailability
         {
@@ -46,8 +47,8 @@ namespace osu.Game.Screens.Ranking
             Size = new Vector2(50, 30);
         }
 
-        [BackgroundDependencyLoader(true)]
-        private void load(OsuGame game, ScoreModelDownloader scores)
+        [BackgroundDependencyLoader]
+        private void load(OsuGame? game, ScoreModelDownloader scores)
         {
             InternalChild = shakeContainer = new ShakeContainer
             {
@@ -99,6 +100,22 @@ namespace osu.Game.Screens.Ranking
             }, true);
         }
 
+        public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
+        {
+            switch (e.Action)
+            {
+                case GlobalAction.SaveReplay:
+                    button.TriggerClick();
+                    return true;
+            }
+
+            return false;
+        }
+
+        public void OnReleased(KeyBindingReleaseEvent<GlobalAction> e)
+        {
+        }
+
         private void updateState()
         {
             switch (replayAvailability)

From 7c5813c05af98212a4e6e4eb85ce9ea27dcf5a91 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Jun 2023 16:34:22 +0900
Subject: [PATCH 0946/1604] Fix `OsuAnimatedButton` not flashing when triggered
 via code

---
 osu.Game/Graphics/UserInterface/OsuAnimatedButton.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Graphics/UserInterface/OsuAnimatedButton.cs b/osu.Game/Graphics/UserInterface/OsuAnimatedButton.cs
index 5ef590d253..69e8df0286 100644
--- a/osu.Game/Graphics/UserInterface/OsuAnimatedButton.cs
+++ b/osu.Game/Graphics/UserInterface/OsuAnimatedButton.cs
@@ -111,6 +111,10 @@ namespace osu.Game.Graphics.UserInterface
 
         protected override bool OnClick(ClickEvent e)
         {
+            // Handle case where a click is triggered via TriggerClick().
+            if (!IsHovered)
+                hover.FadeOutFromOne(1600);
+
             hover.FlashColour(FlashColour, 800, Easing.OutQuint);
             return base.OnClick(e);
         }

From 4bd121d3b8eaf17b6df6bc9a8f19bb3c2ba11dfe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Jun 2023 16:38:30 +0900
Subject: [PATCH 0947/1604] Also add hotkey to export replays

---
 .../Input/Bindings/GlobalActionContainer.cs   |  6 ++++-
 .../GlobalActionKeyBindingStrings.cs          |  5 ++++
 .../Screens/Play/SaveFailedScoreButton.cs     | 17 +++++++++++++-
 .../Screens/Ranking/ReplayDownloadButton.cs   | 23 +++++++++++++++++--
 4 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 0ae29ebc8e..64268c73d0 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -119,7 +119,8 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(InputKey.MouseMiddle, GlobalAction.PauseGameplay),
             new KeyBinding(InputKey.Control, GlobalAction.HoldForHUD),
             new KeyBinding(InputKey.Tab, GlobalAction.ToggleChatFocus),
-            new KeyBinding(InputKey.F2, GlobalAction.SaveReplay),
+            new KeyBinding(InputKey.F1, GlobalAction.SaveReplay),
+            new KeyBinding(InputKey.F2, GlobalAction.ExportReplay),
         };
 
         public IEnumerable<KeyBinding> ReplayKeyBindings => new[]
@@ -370,5 +371,8 @@ namespace osu.Game.Input.Bindings
 
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.SaveReplay))]
         SaveReplay,
+
+        [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.ExportReplay))]
+        ExportReplay,
     }
 }
diff --git a/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs b/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
index 708fdaa174..9e53b23180 100644
--- a/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
+++ b/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
@@ -329,6 +329,11 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString SaveReplay => new TranslatableString(getKey(@"save_replay"), @"Save replay");
 
+        /// <summary>
+        /// "Export replay"
+        /// </summary>
+        public static LocalisableString ExportReplay => new TranslatableString(getKey(@"export_replay"), @"Export replay");
+
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
 }
diff --git a/osu.Game/Screens/Play/SaveFailedScoreButton.cs b/osu.Game/Screens/Play/SaveFailedScoreButton.cs
index c5bb265dcb..dc0ac054cb 100644
--- a/osu.Game/Screens/Play/SaveFailedScoreButton.cs
+++ b/osu.Game/Screens/Play/SaveFailedScoreButton.cs
@@ -21,6 +21,12 @@ namespace osu.Game.Screens.Play
 {
     public partial class SaveFailedScoreButton : CompositeDrawable, IKeyBindingHandler<GlobalAction>
     {
+        [Resolved]
+        private RealmAccess realm { get; set; } = null!;
+
+        [Resolved]
+        private ScoreManager scoreManager { get; set; } = null!;
+
         private readonly Bindable<DownloadState> state = new Bindable<DownloadState>();
 
         private readonly Func<Task<ScoreInfo>> importFailedScore;
@@ -37,7 +43,7 @@ namespace osu.Game.Screens.Play
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuGame? game, Player? player, RealmAccess realm)
+        private void load(OsuGame? game, Player? player)
         {
             InternalChild = button = new DownloadButton
             {
@@ -98,6 +104,15 @@ namespace osu.Game.Screens.Play
                 case GlobalAction.SaveReplay:
                     button.TriggerClick();
                     return true;
+
+                case GlobalAction.ExportReplay:
+                    Task.Run(importFailedScore).ContinueWith(t =>
+                    {
+                        importedScore = realm.Run(r => r.Find<ScoreInfo>(t.GetResultSafely().ID)?.Detach());
+                        Schedule(() => state.Value = importedScore != null ? DownloadState.LocallyAvailable : DownloadState.NotDownloaded);
+                        scoreManager.Export(importedScore);
+                    });
+                    return true;
             }
 
             return false;
diff --git a/osu.Game/Screens/Ranking/ReplayDownloadButton.cs b/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
index 5a1e59403a..0772f54860 100644
--- a/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
+++ b/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
@@ -27,6 +27,9 @@ namespace osu.Game.Screens.Ranking
 
         private ScoreDownloadTracker? downloadTracker;
 
+        [Resolved]
+        private ScoreManager scoreManager { get; set; } = null!;
+
         private ReplayAvailability replayAvailability
         {
             get
@@ -48,7 +51,7 @@ namespace osu.Game.Screens.Ranking
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuGame? game, ScoreModelDownloader scores)
+        private void load(OsuGame? game, ScoreModelDownloader scoreDownloader)
         {
             InternalChild = shakeContainer = new ShakeContainer
             {
@@ -68,7 +71,7 @@ namespace osu.Game.Screens.Ranking
                         break;
 
                     case DownloadState.NotDownloaded:
-                        scores.Download(Score.Value);
+                        scoreDownloader.Download(Score.Value);
                         break;
 
                     case DownloadState.Importing:
@@ -107,6 +110,22 @@ namespace osu.Game.Screens.Ranking
                 case GlobalAction.SaveReplay:
                     button.TriggerClick();
                     return true;
+
+                case GlobalAction.ExportReplay:
+                    if (State.Value == DownloadState.NotDownloaded)
+                    {
+                        button.TriggerClick();
+                    }
+
+                    State.ValueChanged += importAfterDownload;
+
+                    void importAfterDownload(ValueChangedEvent<DownloadState> valueChangedEvent)
+                    {
+                        scoreManager.Export(Score.Value);
+                        State.ValueChanged -= importAfterDownload;
+                    }
+
+                    return true;
             }
 
             return false;

From 7b69b92eab65b1692bd17b8a0796a796bdcf7cb4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Jun 2023 16:56:41 +0900
Subject: [PATCH 0948/1604] Allow notifications while the game is paused (or in
 break time)

RFC. This is to allow notifications to show at the pause screen
(specifically for #23967, where exports are now happening).

Not sure about the break time part of this, but might be fine? The
toasts are immediately flushed before break time ends.
---
 osu.Game/Overlays/NotificationOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index 15e6c94b34..beebc9daaf 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -118,7 +118,7 @@ namespace osu.Game.Overlays
 
         private void updateProcessingMode()
         {
-            bool enabled = OverlayActivationMode.Value == OverlayActivation.All || State.Value == Visibility.Visible;
+            bool enabled = OverlayActivationMode.Value != OverlayActivation.Disabled || State.Value == Visibility.Visible;
 
             notificationsEnabler?.Cancel();
 

From ff8350bac6977f701dca04c31a8f5888137609a4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Jun 2023 17:43:52 +0900
Subject: [PATCH 0949/1604] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 522d28dca7..66f518f3d5 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -11,7 +11,7 @@
     <AndroidManifestMerger>manifestmerger.jar</AndroidManifestMerger>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.618.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.620.0" />
   </ItemGroup>
   <ItemGroup>
     <AndroidManifestOverlay Include="$(MSBuildThisFileDirectory)osu.Android\Properties\AndroidManifestOverlay.xml" />
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index d94c4a2df9..9cb20ee364 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,7 +36,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="10.20.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.618.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.620.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.605.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 96396ca4ad..256d1e43c4 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -16,6 +16,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.618.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.620.0" />
   </ItemGroup>
 </Project>

From dc1b4a39aa1fd160a1877ce42da87c5604a0d8e1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Jun 2023 18:23:59 +0900
Subject: [PATCH 0950/1604] Fix presenting beatmaps while in a multiplayer room
 not working

---
 .../Multiplayer/MultiplayerMatchSubScreen.cs   | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index a36c7e801e..c02237bdde 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -49,6 +49,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         [Resolved]
         private MultiplayerClient client { get; set; }
 
+        [Resolved]
+        private OsuGame game { get; set; }
+
         private AddItemButton addItemButton;
 
         public MultiplayerMatchSubScreen(Room room)
@@ -403,18 +406,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             if (!this.IsCurrentScreen())
                 return;
 
-            if (client.Room == null)
-                return;
+            // If there's only one playlist item and we are the host, assume we want to change it. Else we're add a new one.
+            PlaylistItem itemToEdit = client.IsHost && Room.Playlist.Count == 1 ? Room.Playlist.Single() : null;
 
-            if (!client.IsHost)
-            {
-                // todo: should handle this when the request queue is implemented.
-                // if we decide that the presentation should exit the user from the multiplayer game, the PresentBeatmap
-                // flow may need to change to support an "unable to present" return value.
-                return;
-            }
+            OpenSongSelection(itemToEdit);
 
-            this.Push(new MultiplayerMatchSongSelect(Room, Room.Playlist.Single(item => item.ID == client.Room.Settings.PlaylistItemId)));
+            // Re-run PresentBeatmap now that we've pushed a song select that can handle it.
+            game?.PresentBeatmap(beatmap.BeatmapSetInfo, b => b.ID == beatmap.BeatmapInfo.ID);
         }
 
         protected override void Dispose(bool isDisposing)

From 10ed3787a00ac6d277e9032a2566da060a801e15 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Jun 2023 18:27:19 +0900
Subject: [PATCH 0951/1604] Don't show song select screen when local user
 doesn't have permission to add an item

---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index c02237bdde..5fc7099544 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -337,11 +337,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
             updateCurrentItem();
 
-            addItemButton.Alpha = client.IsHost || Room.QueueMode.Value != QueueMode.HostOnly ? 1 : 0;
+            addItemButton.Alpha = localUserCanAddItem ? 1 : 0;
 
             Scheduler.AddOnce(UpdateMods);
         }
 
+        private bool localUserCanAddItem => client.IsHost || Room.QueueMode.Value != QueueMode.HostOnly;
+
         private void updateCurrentItem()
         {
             Debug.Assert(client.Room != null);
@@ -406,6 +408,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             if (!this.IsCurrentScreen())
                 return;
 
+            if (!localUserCanAddItem)
+                return;
+
             // If there's only one playlist item and we are the host, assume we want to change it. Else we're add a new one.
             PlaylistItem itemToEdit = client.IsHost && Room.Playlist.Count == 1 ? Room.Playlist.Single() : null;
 

From 2e02b4a85b628588bdc8af93d92095ddfabbd3fb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Jun 2023 18:35:51 +0900
Subject: [PATCH 0952/1604] Apply more correct fix for double-playing menu
 track

---
 osu.Game/Overlays/MusicController.cs  | 10 ++++------
 osu.Game/Screens/Select/SongSelect.cs |  3 ---
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 1ad5a8c08b..0d175a624c 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -316,6 +316,8 @@ namespace osu.Game.Overlays
             var queuedTrack = getQueuedTrack();
 
             var lastTrack = CurrentTrack;
+            lastTrack.Completed -= onTrackCompleted;
+
             CurrentTrack = queuedTrack;
 
             // At this point we may potentially be in an async context from tests. This is extremely dangerous but we have to make do for now.
@@ -344,16 +346,12 @@ namespace osu.Game.Overlays
             // Important to keep this in its own method to avoid inadvertently capturing unnecessary variables in the callback.
             // Can lead to leaks.
             var queuedTrack = new DrawableTrack(current.LoadTrack());
-            queuedTrack.Completed += () => onTrackCompleted(current);
+            queuedTrack.Completed += onTrackCompleted;
             return queuedTrack;
         }
 
-        private void onTrackCompleted(WorkingBeatmap workingBeatmap)
+        private void onTrackCompleted()
         {
-            // the source of track completion is the audio thread, so the beatmap may have changed before firing.
-            if (current != workingBeatmap)
-                return;
-
             if (!CurrentTrack.Looping && !beatmap.Disabled)
                 NextTrack();
         }
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index c232b7f490..47e5325baf 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -813,9 +813,6 @@ namespace osu.Game.Screens.Select
             if (!ControlGlobalMusic)
                 return;
 
-            if (Beatmap.Value is DummyWorkingBeatmap)
-                return;
-
             ITrack track = music.CurrentTrack;
 
             bool isNewTrack = !lastTrack.TryGetTarget(out var last) || last != track;

From d7b486e2ac306a82e59a8958623c59b6aaed1384 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Jun 2023 19:18:17 +0900
Subject: [PATCH 0953/1604] Disable beatmap skinning when entering the skin
 editor

---
 .../Overlays/SkinEditor/SkinEditorOverlay.cs  | 58 ++++++++++++++++---
 1 file changed, 51 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
index 1c0ece28fe..b120faa45f 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
@@ -3,16 +3,19 @@
 
 using System.Diagnostics;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Game.Configuration;
 using osu.Game.Graphics.Containers;
 using osu.Game.Input.Bindings;
 using osu.Game.Screens;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Components;
+using osu.Game.Screens.Play;
 using osuTK;
 
 namespace osu.Game.Overlays.SkinEditor
@@ -45,6 +48,12 @@ namespace osu.Game.Overlays.SkinEditor
             RelativeSizeAxes = Axes.Both;
         }
 
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            config.BindWith(OsuSetting.BeatmapSkins, beatmapSkins);
+        }
+
         public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
         {
             switch (e.Action)
@@ -147,17 +156,24 @@ namespace osu.Game.Overlays.SkinEditor
         /// </summary>
         public void SetTarget(OsuScreen screen)
         {
-            lastTargetScreen = screen;
+            try
+            {
+                lastTargetScreen = screen;
 
-            if (skinEditor == null) return;
+                if (skinEditor == null) return;
 
-            skinEditor.Save(userTriggered: false);
+                skinEditor.Save(userTriggered: false);
 
-            // ensure the toolbar is re-hidden even if a new screen decides to try and show it.
-            updateComponentVisibility();
+                // ensure the toolbar is re-hidden even if a new screen decides to try and show it.
+                updateComponentVisibility();
 
-            // AddOnce with parameter will ensure the newest target is loaded if there is any overlap.
-            Scheduler.AddOnce(setTarget, screen);
+                // AddOnce with parameter will ensure the newest target is loaded if there is any overlap.
+                Scheduler.AddOnce(setTarget, screen);
+            }
+            finally
+            {
+                globallyReenableBeatmapSkinSetting();
+            }
         }
 
         private void setTarget(OsuScreen? target)
@@ -173,6 +189,9 @@ namespace osu.Game.Overlays.SkinEditor
                 return;
             }
 
+            if (target is Player)
+                globallyDisableBeatmapSkinSetting();
+
             if (skinEditor.State.Value == Visibility.Visible)
                 skinEditor.UpdateTargetScreen(target);
             else
@@ -182,5 +201,30 @@ namespace osu.Game.Overlays.SkinEditor
                 skinEditor = null;
             }
         }
+
+        private readonly Bindable<bool> beatmapSkins = new Bindable<bool>();
+        private bool beatmapSkinsOriginalState;
+
+        private void globallyDisableBeatmapSkinSetting()
+        {
+            if (beatmapSkins.Disabled)
+                return;
+
+            // The skin editor doesn't work well if beatmap skins are being applied to the player screen.
+            // To keep things simple, disable the setting game-wide while using the skin editor.
+            beatmapSkinsOriginalState = beatmapSkins.Value;
+
+            beatmapSkins.Value = false;
+            beatmapSkins.Disabled = true;
+        }
+
+        private void globallyReenableBeatmapSkinSetting()
+        {
+            if (!beatmapSkins.Disabled)
+                return;
+
+            beatmapSkins.Disabled = false;
+            beatmapSkins.Value = beatmapSkinsOriginalState;
+        }
     }
 }

From 555ce7684b9d57183a603f7469dc23bd36354d83 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Jun 2023 20:04:02 +0900
Subject: [PATCH 0954/1604] Adjust `GameplaySampleTriggerSource` to only switch
 samples when close enough to the next hit object

Closes #23963.

To simplify things, I've removed the optimisation of using
`AliveObject`s because it would break the way this whole lookup works.
---
 .../UI/GameplaySampleTriggerSource.cs         | 56 +++++++------------
 1 file changed, 19 insertions(+), 37 deletions(-)

diff --git a/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs b/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
index fbb7a20a5d..909b633a72 100644
--- a/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
+++ b/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
@@ -7,7 +7,7 @@ using System.Linq;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Audio;
 using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.UI
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.UI
             };
         }
 
-        private HitObjectLifetimeEntry fallbackObject;
+        private HitObjectLifetimeEntry mostValidObject;
 
         /// <summary>
         /// Play the most appropriate hit sound for the current point in time.
@@ -67,56 +67,38 @@ namespace osu.Game.Rulesets.UI
 
         protected HitObject GetMostValidObject()
         {
-            // The most optimal lookup case we have is when an object is alive. There are usually very few alive objects so there's no drawbacks in attempting this lookup each time.
-            var drawableHitObject = hitObjectContainer.AliveObjects.FirstOrDefault(h => h.Result?.HasResult != true);
-
-            if (drawableHitObject != null)
-            {
-                // A hit object may have a more valid nested object.
-                drawableHitObject = getMostValidNestedDrawable(drawableHitObject);
-
-                return drawableHitObject.HitObject;
-            }
-
-            // In the case a next object isn't available in drawable form, we need to do a somewhat expensive traversal to get a valid sound to play.
-            // This lookup can be skipped if the last entry is still valid (in the future and not yet hit).
-            if (fallbackObject == null || fallbackObject.Result?.HasResult == true)
+            if (mostValidObject == null || isAlreadyHit(mostValidObject))
             {
                 // We need to use lifetime entries to find the next object (we can't just use `hitObjectContainer.Objects` due to pooling - it may even be empty).
                 // If required, we can make this lookup more efficient by adding support to get next-future-entry in LifetimeEntryManager.
-                fallbackObject = hitObjectContainer.Entries
-                                                   .Where(e => e.Result?.HasResult != true).MinBy(e => e.HitObject.StartTime);
-
-                if (fallbackObject != null)
-                    return getEarliestNestedObject(fallbackObject.HitObject);
+                var candidate = hitObjectContainer.Entries.Where(e => !isAlreadyHit(e)).MinBy(e => e.HitObject.StartTime);
 
                 // In the case there are no non-judged objects, the last hit object should be used instead.
-                fallbackObject ??= hitObjectContainer.Entries.LastOrDefault();
+                if (candidate == null)
+                    mostValidObject = hitObjectContainer.Entries.LastOrDefault();
+                else
+                {
+                    if (isCloseEnoughToCurrentTime(candidate))
+                        mostValidObject = candidate;
+                    else
+                        mostValidObject ??= hitObjectContainer.Entries.FirstOrDefault();
+                }
             }
 
-            if (fallbackObject == null)
+            if (mostValidObject == null)
                 return null;
 
-            bool fallbackHasResult = fallbackObject.Result?.HasResult == true;
-
             // If the fallback has been judged then we want the sample from the object itself.
-            if (fallbackHasResult)
-                return fallbackObject.HitObject;
+            if (isAlreadyHit(mostValidObject))
+                return mostValidObject.HitObject;
 
             // Else we want the earliest (including nested).
             // In cases of nested objects, they will always have earlier sample data than their parent object.
-            return getEarliestNestedObject(fallbackObject.HitObject);
+            return getEarliestNestedObject(mostValidObject.HitObject);
         }
 
-        private DrawableHitObject getMostValidNestedDrawable(DrawableHitObject o)
-        {
-            var nestedWithoutResult = o.NestedHitObjects.FirstOrDefault(n => n.Result?.HasResult != true);
-
-            if (nestedWithoutResult == null)
-                return o;
-
-            return getMostValidNestedDrawable(nestedWithoutResult);
-        }
+        private bool isAlreadyHit(HitObjectLifetimeEntry h) => h.Result?.HasResult == true;
+        private bool isCloseEnoughToCurrentTime(HitObjectLifetimeEntry h) => Time.Current > h.HitObject.StartTime - h.HitObject.HitWindows.WindowFor(HitResult.Miss) * 1.5;
 
         private HitObject getEarliestNestedObject(HitObject hitObject)
         {

From 786d5a394b526db81e5e5435edc486d777a9787a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Jun 2023 20:30:07 +0900
Subject: [PATCH 0955/1604] Add back optimisation and increase time allowance
 slightly

---
 osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs b/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
index 909b633a72..bc410acd9a 100644
--- a/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
+++ b/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
@@ -71,17 +71,26 @@ namespace osu.Game.Rulesets.UI
             {
                 // We need to use lifetime entries to find the next object (we can't just use `hitObjectContainer.Objects` due to pooling - it may even be empty).
                 // If required, we can make this lookup more efficient by adding support to get next-future-entry in LifetimeEntryManager.
-                var candidate = hitObjectContainer.Entries.Where(e => !isAlreadyHit(e)).MinBy(e => e.HitObject.StartTime);
+                var candidate =
+                    // Use alive entries first as an optimisation.
+                    hitObjectContainer.AliveEntries.Select(tuple => tuple.Entry).Where(e => !isAlreadyHit(e)).MinBy(e => e.HitObject.StartTime)
+                    ?? hitObjectContainer.Entries.Where(e => !isAlreadyHit(e)).MinBy(e => e.HitObject.StartTime);
 
                 // In the case there are no non-judged objects, the last hit object should be used instead.
                 if (candidate == null)
+                {
                     mostValidObject = hitObjectContainer.Entries.LastOrDefault();
+                }
                 else
                 {
                     if (isCloseEnoughToCurrentTime(candidate))
+                    {
                         mostValidObject = candidate;
+                    }
                     else
+                    {
                         mostValidObject ??= hitObjectContainer.Entries.FirstOrDefault();
+                    }
                 }
             }
 
@@ -98,7 +107,7 @@ namespace osu.Game.Rulesets.UI
         }
 
         private bool isAlreadyHit(HitObjectLifetimeEntry h) => h.Result?.HasResult == true;
-        private bool isCloseEnoughToCurrentTime(HitObjectLifetimeEntry h) => Time.Current > h.HitObject.StartTime - h.HitObject.HitWindows.WindowFor(HitResult.Miss) * 1.5;
+        private bool isCloseEnoughToCurrentTime(HitObjectLifetimeEntry h) => Time.Current >= h.HitObject.StartTime - h.HitObject.HitWindows.WindowFor(HitResult.Miss) * 2;
 
         private HitObject getEarliestNestedObject(HitObject hitObject)
         {

From 0e861026814443b4fff965674e2805b77e2f63d5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Jun 2023 20:45:02 +0900
Subject: [PATCH 0956/1604] Fix nested lookups

---
 .../Rulesets/UI/GameplaySampleTriggerSource.cs    | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs b/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
index bc410acd9a..8de686a0d6 100644
--- a/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
+++ b/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Audio;
@@ -101,19 +102,23 @@ namespace osu.Game.Rulesets.UI
             if (isAlreadyHit(mostValidObject))
                 return mostValidObject.HitObject;
 
-            // Else we want the earliest (including nested).
+            // Else we want the earliest valid nested.
             // In cases of nested objects, they will always have earlier sample data than their parent object.
-            return getEarliestNestedObject(mostValidObject.HitObject);
+            return getAllNested(mostValidObject.HitObject).OrderBy(h => h.StartTime).FirstOrDefault(h => h.StartTime > Time.Current) ?? mostValidObject.HitObject;
         }
 
         private bool isAlreadyHit(HitObjectLifetimeEntry h) => h.Result?.HasResult == true;
         private bool isCloseEnoughToCurrentTime(HitObjectLifetimeEntry h) => Time.Current >= h.HitObject.StartTime - h.HitObject.HitWindows.WindowFor(HitResult.Miss) * 2;
 
-        private HitObject getEarliestNestedObject(HitObject hitObject)
+        private IEnumerable<HitObject> getAllNested(HitObject hitObject)
         {
-            var nested = hitObject.NestedHitObjects.FirstOrDefault();
+            foreach (var h in hitObject.NestedHitObjects)
+            {
+                yield return h;
 
-            return nested != null ? getEarliestNestedObject(nested) : hitObject;
+                foreach (var n in getAllNested(h))
+                    yield return n;
+            }
         }
 
         private SkinnableSound getNextSample()

From 04dad6c6e8a60dad3e7bcceeb5a13e75c0ac0d61 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Jun 2023 20:47:56 +0900
Subject: [PATCH 0957/1604] Use `IGameplayClock` to ensure our clock source is
 correct

---
 .../Gameplay/TestSceneGameplaySampleTriggerSource.cs     | 2 +-
 osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs      | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs
index e52ec6f8cc..ca4a608114 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs
@@ -101,7 +101,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             base.SetUpSteps();
 
-            AddStep("Add trigger source", () => Player.HUDOverlay.Add(sampleTriggerSource = new TestGameplaySampleTriggerSource(Player.DrawableRuleset.Playfield.HitObjectContainer)));
+            AddStep("Add trigger source", () => Player.GameplayClockContainer.Add(sampleTriggerSource = new TestGameplaySampleTriggerSource(Player.DrawableRuleset.Playfield.HitObjectContainer)));
         }
 
         [Test]
diff --git a/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs b/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
index 8de686a0d6..029cab65ab 100644
--- a/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
+++ b/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
@@ -5,10 +5,12 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Audio;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Screens.Play;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.UI
@@ -29,6 +31,9 @@ namespace osu.Game.Rulesets.UI
 
         private readonly Container<SkinnableSound> hitSounds;
 
+        [Resolved]
+        private IGameplayClock gameplayClock { get; set; }
+
         public GameplaySampleTriggerSource(HitObjectContainer hitObjectContainer)
         {
             this.hitObjectContainer = hitObjectContainer;
@@ -104,11 +109,11 @@ namespace osu.Game.Rulesets.UI
 
             // Else we want the earliest valid nested.
             // In cases of nested objects, they will always have earlier sample data than their parent object.
-            return getAllNested(mostValidObject.HitObject).OrderBy(h => h.StartTime).FirstOrDefault(h => h.StartTime > Time.Current) ?? mostValidObject.HitObject;
+            return getAllNested(mostValidObject.HitObject).OrderBy(h => h.StartTime).FirstOrDefault(h => h.StartTime > gameplayClock.CurrentTime) ?? mostValidObject.HitObject;
         }
 
         private bool isAlreadyHit(HitObjectLifetimeEntry h) => h.Result?.HasResult == true;
-        private bool isCloseEnoughToCurrentTime(HitObjectLifetimeEntry h) => Time.Current >= h.HitObject.StartTime - h.HitObject.HitWindows.WindowFor(HitResult.Miss) * 2;
+        private bool isCloseEnoughToCurrentTime(HitObjectLifetimeEntry h) => gameplayClock.CurrentTime >= h.HitObject.StartTime - h.HitObject.HitWindows.WindowFor(HitResult.Miss) * 2;
 
         private IEnumerable<HitObject> getAllNested(HitObject hitObject)
         {

From 92e89c7df7f3f5894bb0e22de59dec1d5ea1d2ad Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Jun 2023 21:02:34 +0900
Subject: [PATCH 0958/1604] Update test expectations

---
 .../TestSceneGameplaySampleTriggerSource.cs     | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs
index ca4a608114..ca76337568 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs
@@ -18,6 +18,7 @@ using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Storyboards;
 using osuTK;
@@ -62,25 +63,30 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
                 new HitCircle
                 {
+                    HitWindows = new HitWindows(),
                     StartTime = t += spacing,
                     Samples = new[] { new HitSampleInfo(HitSampleInfo.HIT_NORMAL) }
                 },
                 new HitCircle
                 {
+                    HitWindows = new HitWindows(),
                     StartTime = t += spacing,
                     Samples = new[] { new HitSampleInfo(HitSampleInfo.HIT_WHISTLE) }
                 },
                 new HitCircle
                 {
+                    HitWindows = new HitWindows(),
                     StartTime = t += spacing,
                     Samples = new[] { new HitSampleInfo(HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT) },
                 },
                 new HitCircle
                 {
+                    HitWindows = new HitWindows(),
                     StartTime = t += spacing,
                 },
                 new Slider
                 {
+                    HitWindows = new HitWindows(),
                     StartTime = t += spacing,
                     Path = new SliderPath(PathType.Linear, new[] { Vector2.Zero, Vector2.UnitY * 200 }),
                     Samples = new[] { new HitSampleInfo(HitSampleInfo.HIT_WHISTLE, HitSampleInfo.BANK_SOFT) },
@@ -131,7 +137,12 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddAssert("first object hit", () => getNextAliveObject()?.Entry?.Result?.HasResult == true);
 
-            checkValidObjectIndex(1);
+            // next object is too far away, so we still use the already hit object.
+            checkValidObjectIndex(0);
+
+            // still too far away.
+            seekBeforeIndex(1, 400);
+            checkValidObjectIndex(0);
 
             // Still object 1 as it's not hit yet.
             seekBeforeIndex(1);
@@ -168,9 +179,9 @@ namespace osu.Game.Tests.Visual.Gameplay
             checkValidObjectIndex(4);
         }
 
-        private void seekBeforeIndex(int index)
+        private void seekBeforeIndex(int index, double amount = 100)
         {
-            AddStep($"seek to just before object {index}", () => Player.GameplayClockContainer.Seek(beatmap.HitObjects[index].StartTime - 100));
+            AddStep($"seek to {amount} ms before object {index}", () => Player.GameplayClockContainer.Seek(beatmap.HitObjects[index].StartTime - amount));
             waitForCatchUp();
         }
 

From cb07f2399fc584069578e2791fb8ecf7f5fd5674 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Jun 2023 21:03:55 +0900
Subject: [PATCH 0959/1604] Apply NRT to `GameplaySampleTriggerSource`

---
 osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs b/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
index 029cab65ab..472f91ac27 100644
--- a/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
+++ b/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
@@ -31,8 +29,10 @@ namespace osu.Game.Rulesets.UI
 
         private readonly Container<SkinnableSound> hitSounds;
 
+        private HitObjectLifetimeEntry? mostValidObject;
+
         [Resolved]
-        private IGameplayClock gameplayClock { get; set; }
+        private IGameplayClock gameplayClock { get; set; } = null!;
 
         public GameplaySampleTriggerSource(HitObjectContainer hitObjectContainer)
         {
@@ -45,14 +45,12 @@ namespace osu.Game.Rulesets.UI
             };
         }
 
-        private HitObjectLifetimeEntry mostValidObject;
-
         /// <summary>
         /// Play the most appropriate hit sound for the current point in time.
         /// </summary>
         public virtual void Play()
         {
-            var nextObject = GetMostValidObject();
+            HitObject? nextObject = GetMostValidObject();
 
             if (nextObject == null)
                 return;
@@ -71,7 +69,7 @@ namespace osu.Game.Rulesets.UI
             hitSound.Play();
         });
 
-        protected HitObject GetMostValidObject()
+        protected HitObject? GetMostValidObject()
         {
             if (mostValidObject == null || isAlreadyHit(mostValidObject))
             {

From 2f77675fe7f133bb60c26f9e8826f0ea534e2887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 20 Jun 2023 21:57:32 +0200
Subject: [PATCH 0960/1604] Fix errors in tests due to mismatching NRT
 annotations

---
 .../TestSceneDrumSampleTriggerSource.cs                         | 2 +-
 .../Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs
index 287d90b406..23e85d1ae0 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs
@@ -331,7 +331,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
                 LastPlayedSamples = samples;
             }
 
-            public new HitObject GetMostValidObject() => base.GetMostValidObject();
+            public new HitObject? GetMostValidObject() => base.GetMostValidObject();
         }
     }
 }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs
index ca76337568..6701871e8d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs
@@ -215,7 +215,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
             }
 
-            public new HitObject GetMostValidObject() => base.GetMostValidObject();
+            public new HitObject? GetMostValidObject() => base.GetMostValidObject();
         }
     }
 }

From 29697d4999ab144c08a37bc26443f916fd66fd1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 20 Jun 2023 22:00:02 +0200
Subject: [PATCH 0961/1604] Fix taiko test scene failing due to missing
 gameplay clock dependency

`GameplayClock` is inscrutable.

`TestManualClock` is lifted from another test scene because of
`FramedBeatmapClock`'s intensely confusing tendency to not work if it is
given a non-adjustable `ManuelClock` instead.
---
 .../TestSceneDrumSampleTriggerSource.cs       | 141 ++++++++++++++----
 1 file changed, 112 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs
index 23e85d1ae0..f45b4e23e4 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs
@@ -6,7 +6,6 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Timing;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
@@ -17,14 +16,13 @@ using osu.Game.Rulesets.Taiko.Objects.Drawables;
 using osu.Game.Rulesets.Taiko.UI;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Screens.Play;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Taiko.Tests
 {
     public partial class TestSceneDrumSampleTriggerSource : OsuTestScene
     {
-        private readonly ManualClock manualClock = new ManualClock();
-
         [Cached(typeof(IScrollingInfo))]
         private ScrollingTestContainer.TestScrollingInfo info = new ScrollingTestContainer.TestScrollingInfo
         {
@@ -34,23 +32,25 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
         private ScrollingHitObjectContainer hitObjectContainer = null!;
         private TestDrumSampleTriggerSource triggerSource = null!;
+        private readonly ManualClock manualClock = new TestManualClock();
+        private GameplayClockContainer gameplayClock = null!;
 
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
-            hitObjectContainer = new ScrollingHitObjectContainer();
-            manualClock.CurrentTime = 0;
-
-            Child = new Container
+            gameplayClock = new GameplayClockContainer(manualClock)
             {
-                Clock = new FramedClock(manualClock),
                 RelativeSizeAxes = Axes.Both,
                 Children = new Drawable[]
                 {
-                    hitObjectContainer,
+                    hitObjectContainer = new ScrollingHitObjectContainer(),
                     triggerSource = new TestDrumSampleTriggerSource(hitObjectContainer)
                 }
             };
+            gameplayClock.Reset(0);
+
+            hitObjectContainer.Clock = gameplayClock;
+            Child = gameplayClock;
         });
 
         [Test]
@@ -75,7 +75,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
             checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
             checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
 
-            AddStep("seek past hit", () => manualClock.CurrentTime = 200);
+            AddStep("seek past hit", () => gameplayClock.Seek(200));
             AddAssert("most valid object is hit", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Hit>);
             checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
             checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
@@ -103,12 +103,67 @@ namespace osu.Game.Rulesets.Taiko.Tests
             checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT);
             checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT);
 
-            AddStep("seek past hit", () => manualClock.CurrentTime = 200);
+            seekTo(200);
             AddAssert("most valid object is hit", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Hit>);
             checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT);
             checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT);
         }
 
+        [Test]
+        public void TestBetweenHits()
+        {
+            Hit first = null!, second = null!;
+
+            AddStep("add hit with normal samples", () =>
+            {
+                first = new Hit
+                {
+                    StartTime = 100,
+                    Samples = new List<HitSampleInfo>
+                    {
+                        new HitSampleInfo(HitSampleInfo.HIT_NORMAL)
+                    }
+                };
+                first.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+                var drawableHit = new DrawableHit(first);
+                hitObjectContainer.Add(drawableHit);
+            });
+            AddStep("add hit with soft samples", () =>
+            {
+                second = new Hit
+                {
+                    StartTime = 500,
+                    Samples = new List<HitSampleInfo>
+                    {
+                        new HitSampleInfo(HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT),
+                        new HitSampleInfo(HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT)
+                    }
+                };
+                second.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+                var drawableHit = new DrawableHit(second);
+                hitObjectContainer.Add(drawableHit);
+            });
+
+            AddAssert("most valid object is first hit", () => triggerSource.GetMostValidObject(), () => Is.EqualTo(first));
+            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_NORMAL);
+            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_NORMAL);
+
+            seekTo(120);
+            AddAssert("most valid object is first hit", () => triggerSource.GetMostValidObject(), () => Is.EqualTo(first));
+            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_NORMAL);
+            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_NORMAL);
+
+            seekTo(480);
+            AddAssert("most valid object is second hit", () => triggerSource.GetMostValidObject(), () => Is.EqualTo(second));
+            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT);
+            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT);
+
+            seekTo(700);
+            AddAssert("most valid object is second hit", () => triggerSource.GetMostValidObject(), () => Is.EqualTo(second));
+            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT);
+            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT);
+        }
+
         [Test]
         public void TestDrumStrongHit()
         {
@@ -128,11 +183,11 @@ namespace osu.Game.Rulesets.Taiko.Tests
                 hitObjectContainer.Add(drawableHit);
             });
 
-            AddAssert("most valid object is strong nested hit", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Hit.StrongNestedHit>);
+            AddAssert("most valid object is nested strong hit", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Hit.StrongNestedHit>);
             checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, "drum");
             checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, "drum");
 
-            AddStep("seek past hit", () => manualClock.CurrentTime = 200);
+            seekTo(200);
             AddAssert("most valid object is hit", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Hit>);
             checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, "drum");
             checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, "drum");
@@ -161,12 +216,12 @@ namespace osu.Game.Rulesets.Taiko.Tests
             checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
             checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
 
-            AddStep("seek to middle of drum roll", () => manualClock.CurrentTime = 600);
+            seekTo(600);
             AddAssert("most valid object is drum roll tick", () => triggerSource.GetMostValidObject(), Is.InstanceOf<DrumRollTick>);
             checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
             checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
 
-            AddStep("seek past drum roll", () => manualClock.CurrentTime = 1200);
+            seekTo(1200);
             AddAssert("most valid object is drum roll", () => triggerSource.GetMostValidObject(), Is.InstanceOf<DrumRoll>);
             checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
             checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
@@ -195,12 +250,12 @@ namespace osu.Game.Rulesets.Taiko.Tests
             checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT);
             checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT);
 
-            AddStep("seek to middle of drum roll", () => manualClock.CurrentTime = 600);
+            seekTo(600);
             AddAssert("most valid object is drum roll tick", () => triggerSource.GetMostValidObject(), Is.InstanceOf<DrumRollTick>);
             checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT);
             checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT);
 
-            AddStep("seek past drum roll", () => manualClock.CurrentTime = 1200);
+            seekTo(1200);
             AddAssert("most valid object is drum roll", () => triggerSource.GetMostValidObject(), Is.InstanceOf<DrumRoll>);
             checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT);
             checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT);
@@ -226,16 +281,16 @@ namespace osu.Game.Rulesets.Taiko.Tests
                 hitObjectContainer.Add(drawableDrumRoll);
             });
 
-            AddAssert("most valid object is drum roll tick's nested strong hit", () => triggerSource.GetMostValidObject(), Is.InstanceOf<DrumRollTick.StrongNestedHit>);
+            AddAssert("most valid object is drum roll tick", () => triggerSource.GetMostValidObject(), Is.InstanceOf<DrumRollTick>);
             checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, "drum");
             checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, "drum");
 
-            AddStep("seek to middle of drum roll", () => manualClock.CurrentTime = 600);
-            AddAssert("most valid object is drum roll tick's nested strong hit", () => triggerSource.GetMostValidObject(), Is.InstanceOf<DrumRollTick.StrongNestedHit>);
+            seekTo(600);
+            AddAssert("most valid object is drum roll tick", () => triggerSource.GetMostValidObject(), Is.InstanceOf<DrumRollTick>);
             checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, "drum");
             checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, "drum");
 
-            AddStep("seek past drum roll", () => manualClock.CurrentTime = 1200);
+            seekTo(1200);
             AddAssert("most valid object is drum roll", () => triggerSource.GetMostValidObject(), Is.InstanceOf<DrumRoll>);
             checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, "drum");
             checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, "drum");
@@ -260,16 +315,16 @@ namespace osu.Game.Rulesets.Taiko.Tests
                 hitObjectContainer.Add(drawableSwell);
             });
 
-            AddAssert("most valid object is swell tick", () => triggerSource.GetMostValidObject(), Is.InstanceOf<SwellTick>);
+            AddAssert("most valid object is swell", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Swell>);
             checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
             checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
 
-            AddStep("seek to middle of swell", () => manualClock.CurrentTime = 600);
-            AddAssert("most valid object is swell tick", () => triggerSource.GetMostValidObject(), Is.InstanceOf<SwellTick>);
+            seekTo(600);
+            AddAssert("most valid object is swell", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Swell>);
             checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
             checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
 
-            AddStep("seek past swell", () => manualClock.CurrentTime = 1200);
+            seekTo(1200);
             AddAssert("most valid object is swell", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Swell>);
             checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
             checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
@@ -294,16 +349,16 @@ namespace osu.Game.Rulesets.Taiko.Tests
                 hitObjectContainer.Add(drawableSwell);
             });
 
-            AddAssert("most valid object is swell tick", () => triggerSource.GetMostValidObject(), Is.InstanceOf<SwellTick>);
+            AddAssert("most valid object is swell", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Swell>);
             checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, "drum");
             checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, "drum");
 
-            AddStep("seek to middle of swell", () => manualClock.CurrentTime = 600);
-            AddAssert("most valid object is swell tick", () => triggerSource.GetMostValidObject(), Is.InstanceOf<SwellTick>);
+            seekTo(600);
+            AddAssert("most valid object is swell", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Swell>);
             checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, "drum");
             checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, "drum");
 
-            AddStep("seek past swell", () => manualClock.CurrentTime = 1200);
+            seekTo(1200);
             AddAssert("most valid object is swell", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Swell>);
             checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, "drum");
             checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, "drum");
@@ -316,6 +371,8 @@ namespace osu.Game.Rulesets.Taiko.Tests
             AddAssert($"last played sample has {expectedBank} bank", () => triggerSource.LastPlayedSamples!.OfType<HitSampleInfo>().Single().Bank, () => Is.EqualTo(expectedBank));
         }
 
+        private void seekTo(double time) => AddStep($"seek to {time}", () => gameplayClock.Seek(time));
+
         private partial class TestDrumSampleTriggerSource : DrumSampleTriggerSource
         {
             public ISampleInfo[]? LastPlayedSamples { get; private set; }
@@ -333,5 +390,31 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
             public new HitObject? GetMostValidObject() => base.GetMostValidObject();
         }
+
+        private class TestManualClock : ManualClock, IAdjustableClock
+        {
+            public TestManualClock()
+            {
+                IsRunning = true;
+            }
+
+            public void Start() => IsRunning = true;
+
+            public void Stop() => IsRunning = false;
+
+            public bool Seek(double position)
+            {
+                CurrentTime = position;
+                return true;
+            }
+
+            public void Reset()
+            {
+            }
+
+            public void ResetSpeedAdjustments()
+            {
+            }
+        }
     }
 }

From a7172e74699265b34898083317c38632e94599b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 20 Jun 2023 23:32:38 +0200
Subject: [PATCH 0962/1604] Fix one remaining seek

---
 .../TestSceneDrumSampleTriggerSource.cs                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs
index f45b4e23e4..e8da7f6937 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
             checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
             checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
 
-            AddStep("seek past hit", () => gameplayClock.Seek(200));
+            seekTo(200);
             AddAssert("most valid object is hit", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Hit>);
             checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
             checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);

From 8460873e61e5b74e60cf2f39b817862f57a0f322 Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Wed, 21 Jun 2023 00:37:54 -0400
Subject: [PATCH 0963/1604] move commitButton.Text update to appropriate method

---
 osu.Game/Overlays/Comments/CommentEditor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Comments/CommentEditor.cs b/osu.Game/Overlays/Comments/CommentEditor.cs
index b363fe5881..4898d8b7c7 100644
--- a/osu.Game/Overlays/Comments/CommentEditor.cs
+++ b/osu.Game/Overlays/Comments/CommentEditor.cs
@@ -169,13 +169,13 @@ namespace osu.Game.Overlays.Comments
         {
             bool textBoxValid = loadingSpinner.State.Value == Visibility.Hidden && !string.IsNullOrEmpty(Current.Value);
             commitButton.Enabled.Value = textBoxValid || !API.IsLoggedIn;
+            commitButton.Text = GetCommitButtonText(API.IsLoggedIn);
         }
 
         private void updateStateForLoggedIn()
         {
             TextBox.PlaceholderText = GetPlaceholderText(API.IsLoggedIn);
             TextBox.ReadOnly = !API.IsLoggedIn;
-            commitButton.Text = GetCommitButtonText(API.IsLoggedIn);
             updateCommitButtonState();
         }
 

From cc764afe3e6d9c6fd9385ecf13de3314b6dd698c Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Wed, 21 Jun 2023 00:58:43 -0400
Subject: [PATCH 0964/1604] use two separate buttons for posting / login

---
 osu.Game/Overlays/Comments/CommentEditor.cs | 46 ++++++++++++---------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Overlays/Comments/CommentEditor.cs b/osu.Game/Overlays/Comments/CommentEditor.cs
index 4898d8b7c7..8f7c8ced57 100644
--- a/osu.Game/Overlays/Comments/CommentEditor.cs
+++ b/osu.Game/Overlays/Comments/CommentEditor.cs
@@ -31,6 +31,7 @@ namespace osu.Game.Overlays.Comments
         protected readonly Bindable<string> Current = new Bindable<string>(string.Empty);
 
         private RoundedButton commitButton = null!;
+        private RoundedButton logInButton = null!;
         private LoadingSpinner loadingSpinner = null!;
 
         protected TextBox TextBox { get; private set; } = null!;
@@ -122,9 +123,19 @@ namespace osu.Game.Overlays.Comments
                                             AutoSizeAxes = Axes.Both,
                                             Direction = FillDirection.Horizontal,
                                             Spacing = new Vector2(5, 0),
-                                            Child = commitButton = new EditorButton
+                                            Children = new Drawable[]
                                             {
-                                                Action = () => commitOrLogIn(Current.Value)
+                                                commitButton = new EditorButton
+                                                {
+                                                    Action = () => OnCommit(Current.Value),
+                                                    Text = GetCommitButtonText(true)
+                                                },
+                                                logInButton = new EditorButton
+                                                {
+                                                    Width = 100,
+                                                    Action = () => loginOverlay?.Show(),
+                                                    Text = GetCommitButtonText(false)
+                                                }
                                             }
                                         },
                                         loadingSpinner = new LoadingSpinner
@@ -154,29 +165,24 @@ namespace osu.Game.Overlays.Comments
 
         protected abstract void OnCommit(string text);
 
-        private void commitOrLogIn(string text)
-        {
-            if (!API.IsLoggedIn)
-            {
-                loginOverlay?.Show();
-                return;
-            }
-
-            OnCommit(text);
-        }
-
-        private void updateCommitButtonState()
-        {
-            bool textBoxValid = loadingSpinner.State.Value == Visibility.Hidden && !string.IsNullOrEmpty(Current.Value);
-            commitButton.Enabled.Value = textBoxValid || !API.IsLoggedIn;
-            commitButton.Text = GetCommitButtonText(API.IsLoggedIn);
-        }
+        private void updateCommitButtonState() =>
+            commitButton.Enabled.Value = loadingSpinner.State.Value == Visibility.Hidden && !string.IsNullOrEmpty(Current.Value);
 
         private void updateStateForLoggedIn()
         {
             TextBox.PlaceholderText = GetPlaceholderText(API.IsLoggedIn);
             TextBox.ReadOnly = !API.IsLoggedIn;
-            updateCommitButtonState();
+
+            if (API.IsLoggedIn)
+            {
+                commitButton.Show();
+                logInButton.Hide();
+            }
+            else
+            {
+                commitButton.Hide();
+                logInButton.Show();
+            }
         }
 
         private partial class EditorTextBox : OsuTextBox

From dd4f271158b26a739ace7a37d0134a54c2f999bd Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Wed, 21 Jun 2023 02:15:02 -0400
Subject: [PATCH 0965/1604] fix cancel test for new button layout

---
 osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
index 0bc6367d64..97eaa5b9ec 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
@@ -101,7 +101,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         {
             AddStep("click cancel button", () =>
             {
-                InputManager.MoveMouseTo(cancellableCommentEditor.ButtonsContainer[1]);
+                InputManager.MoveMouseTo(cancellableCommentEditor.ButtonsContainer[2]);
                 InputManager.Click(MouseButton.Left);
             });
 

From 6de7328fef4353feb90679bff3dff93c7d2a2d72 Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Wed, 21 Jun 2023 02:17:51 -0400
Subject: [PATCH 0966/1604] add test for comment when logging in and out

---
 .../UserInterface/TestSceneCommentEditor.cs   | 44 +++++++++++++++++--
 1 file changed, 41 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
index 97eaa5b9ec..1dafa2ab0a 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
@@ -11,6 +11,7 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Localisation;
 using osu.Framework.Testing;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Comments;
 using osuTK;
@@ -25,6 +26,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private TestCommentEditor commentEditor = null!;
         private TestCancellableCommentEditor cancellableCommentEditor = null!;
+        private DummyAPIAccess dummyAPI => (DummyAPIAccess)API;
 
         [SetUp]
         public void SetUp() => Schedule(() =>
@@ -96,6 +98,37 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddUntilStep("button is not loading", () => !commentEditor.IsSpinnerShown);
         }
 
+        [Test]
+        public void TestLoggingInAndOut()
+        {
+            void addLoggedInAsserts()
+            {
+                AddAssert("commit button visible", () => commentEditor.ButtonsContainer[0].Alpha == 1);
+                AddAssert("login button hidden", () => commentEditor.ButtonsContainer[1].Alpha == 0);
+                AddAssert("text box editable", () => !commentEditor.TextBox.ReadOnly);
+            }
+
+            void addLoggedOutAsserts()
+            {
+                AddAssert("commit button hidden", () => commentEditor.ButtonsContainer[0].Alpha == 0);
+                AddAssert("login button visible", () => commentEditor.ButtonsContainer[1].Alpha == 1);
+                AddAssert("text box readonly", () => commentEditor.TextBox.ReadOnly);
+            }
+
+            // there's also the case of starting logged out, but more annoying to test.
+
+            // starting logged in
+            addLoggedInAsserts();
+
+            // moving from logged in -> logged out
+            AddStep("log out", () => dummyAPI.Logout());
+            addLoggedOutAsserts();
+
+            // moving from logged out -> logged in
+            AddStep("log back in", () => dummyAPI.Login("username", "password"));
+            addLoggedInAsserts();
+        }
+
         [Test]
         public void TestCancelAction()
         {
@@ -112,6 +145,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         {
             public new Bindable<string> Current => base.Current;
             public new FillFlowContainer ButtonsContainer => base.ButtonsContainer;
+            public new TextBox TextBox => base.TextBox;
 
             public string CommittedText { get; private set; } = string.Empty;
 
@@ -125,8 +159,12 @@ namespace osu.Game.Tests.Visual.UserInterface
             }
 
             protected override LocalisableString FooterText => @"Footer text. And it is pretty long. Cool.";
-            protected override LocalisableString GetCommitButtonText(bool isLoggedIn) => @"Commit";
-            protected override LocalisableString GetPlaceholderText(bool isLoggedIn) => @"This text box is empty";
+
+            protected override LocalisableString GetCommitButtonText(bool isLoggedIn) =>
+                isLoggedIn ? @"Commit" : "You're logged out!";
+
+            protected override LocalisableString GetPlaceholderText(bool isLoggedIn) =>
+                isLoggedIn ? @"This text box is empty" : "Still empty, but now you can't type in it.";
         }
 
         private partial class TestCancellableCommentEditor : CancellableCommentEditor

From 366dd96875f673f7da8c72ed27028143372715ef Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Jun 2023 16:09:54 +0900
Subject: [PATCH 0967/1604] Use bindable lease instead of reimplementing the
 same thing locally

---
 osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
index b120faa45f..4f0028de64 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
@@ -203,7 +203,7 @@ namespace osu.Game.Overlays.SkinEditor
         }
 
         private readonly Bindable<bool> beatmapSkins = new Bindable<bool>();
-        private bool beatmapSkinsOriginalState;
+        private LeasedBindable<bool>? leasedBeatmapSkins;
 
         private void globallyDisableBeatmapSkinSetting()
         {
@@ -212,19 +212,14 @@ namespace osu.Game.Overlays.SkinEditor
 
             // The skin editor doesn't work well if beatmap skins are being applied to the player screen.
             // To keep things simple, disable the setting game-wide while using the skin editor.
-            beatmapSkinsOriginalState = beatmapSkins.Value;
-
-            beatmapSkins.Value = false;
-            beatmapSkins.Disabled = true;
+            leasedBeatmapSkins = beatmapSkins.BeginLease(true);
+            leasedBeatmapSkins.Value = false;
         }
 
         private void globallyReenableBeatmapSkinSetting()
         {
-            if (!beatmapSkins.Disabled)
-                return;
-
-            beatmapSkins.Disabled = false;
-            beatmapSkins.Value = beatmapSkinsOriginalState;
+            leasedBeatmapSkins?.Return();
+            leasedBeatmapSkins = null;
         }
     }
 }

From cb0f642ad786b6dba97b6cca042e9984000795dc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Jun 2023 16:11:19 +0900
Subject: [PATCH 0968/1604] Change skin editor flow to always save on toggle

This also moves the beatmap skin disable toggle to on toggle, in line
with review feedback.

I've decided to always apply the disable, not just on the `Player`
screen. It should be assumed that if a user is in the skin editor they
are never going to need access to this anyway.
---
 .../Overlays/SkinEditor/SkinEditorOverlay.cs  | 34 ++++++++-----------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
index 4f0028de64..2dd30ca633 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
@@ -71,6 +71,8 @@ namespace osu.Game.Overlays.SkinEditor
 
         protected override void PopIn()
         {
+            globallyDisableBeatmapSkinSetting();
+
             if (skinEditor != null)
             {
                 skinEditor.Show();
@@ -96,7 +98,13 @@ namespace osu.Game.Overlays.SkinEditor
             });
         }
 
-        protected override void PopOut() => skinEditor?.Hide();
+        protected override void PopOut()
+        {
+            skinEditor?.Save(false);
+            skinEditor?.Hide();
+
+            globallyReenableBeatmapSkinSetting();
+        }
 
         protected override void Update()
         {
@@ -156,24 +164,15 @@ namespace osu.Game.Overlays.SkinEditor
         /// </summary>
         public void SetTarget(OsuScreen screen)
         {
-            try
-            {
-                lastTargetScreen = screen;
+            lastTargetScreen = screen;
 
-                if (skinEditor == null) return;
+            if (skinEditor == null) return;
 
-                skinEditor.Save(userTriggered: false);
+            // ensure the toolbar is re-hidden even if a new screen decides to try and show it.
+            updateComponentVisibility();
 
-                // ensure the toolbar is re-hidden even if a new screen decides to try and show it.
-                updateComponentVisibility();
-
-                // AddOnce with parameter will ensure the newest target is loaded if there is any overlap.
-                Scheduler.AddOnce(setTarget, screen);
-            }
-            finally
-            {
-                globallyReenableBeatmapSkinSetting();
-            }
+            // AddOnce with parameter will ensure the newest target is loaded if there is any overlap.
+            Scheduler.AddOnce(setTarget, screen);
         }
 
         private void setTarget(OsuScreen? target)
@@ -189,9 +188,6 @@ namespace osu.Game.Overlays.SkinEditor
                 return;
             }
 
-            if (target is Player)
-                globallyDisableBeatmapSkinSetting();
-
             if (skinEditor.State.Value == Visibility.Visible)
                 skinEditor.UpdateTargetScreen(target);
             else

From 4ff52752082f93906df68ef0d8cb1a1048d44f92 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Jun 2023 17:33:42 +0900
Subject: [PATCH 0969/1604] Make `IGameplayClock` optional in
 `GameplaySampleTriggerSource` to ease testing

---
 osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs b/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
index 472f91ac27..b67e977822 100644
--- a/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
+++ b/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.UI
         private HitObjectLifetimeEntry? mostValidObject;
 
         [Resolved]
-        private IGameplayClock gameplayClock { get; set; } = null!;
+        private IGameplayClock? gameplayClock { get; set; }
 
         public GameplaySampleTriggerSource(HitObjectContainer hitObjectContainer)
         {
@@ -87,7 +87,7 @@ namespace osu.Game.Rulesets.UI
                 }
                 else
                 {
-                    if (isCloseEnoughToCurrentTime(candidate))
+                    if (isCloseEnoughToCurrentTime(candidate.HitObject))
                     {
                         mostValidObject = candidate;
                     }
@@ -107,11 +107,13 @@ namespace osu.Game.Rulesets.UI
 
             // Else we want the earliest valid nested.
             // In cases of nested objects, they will always have earlier sample data than their parent object.
-            return getAllNested(mostValidObject.HitObject).OrderBy(h => h.StartTime).FirstOrDefault(h => h.StartTime > gameplayClock.CurrentTime) ?? mostValidObject.HitObject;
+            return getAllNested(mostValidObject.HitObject).OrderBy(h => h.StartTime).FirstOrDefault(h => h.StartTime > getReferenceTime()) ?? mostValidObject.HitObject;
         }
 
         private bool isAlreadyHit(HitObjectLifetimeEntry h) => h.Result?.HasResult == true;
-        private bool isCloseEnoughToCurrentTime(HitObjectLifetimeEntry h) => gameplayClock.CurrentTime >= h.HitObject.StartTime - h.HitObject.HitWindows.WindowFor(HitResult.Miss) * 2;
+        private bool isCloseEnoughToCurrentTime(HitObject h) => getReferenceTime() >= h.StartTime - h.HitWindows.WindowFor(HitResult.Miss) * 2;
+
+        private double getReferenceTime() => (gameplayClock?.CurrentTime ?? Clock.CurrentTime);
 
         private IEnumerable<HitObject> getAllNested(HitObject hitObject)
         {

From 9ca772421d470c8a2a86448413fc15f2c38b2fd2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Jun 2023 17:48:12 +0900
Subject: [PATCH 0970/1604] Improve and combine logic that exists in two
 classes

---
 .../Screens/Play/SaveFailedScoreButton.cs     | 25 +++++++++++++----
 .../Screens/Ranking/ReplayDownloadButton.cs   | 28 +++++++++++--------
 2 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Screens/Play/SaveFailedScoreButton.cs b/osu.Game/Screens/Play/SaveFailedScoreButton.cs
index dc0ac054cb..dd3b2d676d 100644
--- a/osu.Game/Screens/Play/SaveFailedScoreButton.cs
+++ b/osu.Game/Screens/Play/SaveFailedScoreButton.cs
@@ -97,6 +97,8 @@ namespace osu.Game.Screens.Play
             }, true);
         }
 
+        #region Export via hotkey logic (also in ReplayDownloadButton)
+
         public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
         {
             switch (e.Action)
@@ -106,12 +108,12 @@ namespace osu.Game.Screens.Play
                     return true;
 
                 case GlobalAction.ExportReplay:
-                    Task.Run(importFailedScore).ContinueWith(t =>
-                    {
-                        importedScore = realm.Run(r => r.Find<ScoreInfo>(t.GetResultSafely().ID)?.Detach());
-                        Schedule(() => state.Value = importedScore != null ? DownloadState.LocallyAvailable : DownloadState.NotDownloaded);
-                        scoreManager.Export(importedScore);
-                    });
+                    state.BindValueChanged(exportWhenReady, true);
+
+                    // start the import via button
+                    if (state.Value != DownloadState.LocallyAvailable)
+                        button.TriggerClick();
+
                     return true;
             }
 
@@ -121,5 +123,16 @@ namespace osu.Game.Screens.Play
         public void OnReleased(KeyBindingReleaseEvent<GlobalAction> e)
         {
         }
+
+        private void exportWhenReady(ValueChangedEvent<DownloadState> state)
+        {
+            if (state.NewValue != DownloadState.LocallyAvailable) return;
+
+            scoreManager.Export(importedScore);
+
+            this.state.ValueChanged -= exportWhenReady;
+        }
+
+        #endregion
     }
 }
diff --git a/osu.Game/Screens/Ranking/ReplayDownloadButton.cs b/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
index 0772f54860..799041b7de 100644
--- a/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
+++ b/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
@@ -103,6 +103,8 @@ namespace osu.Game.Screens.Ranking
             }, true);
         }
 
+        #region Export via hotkey logic (also in SaveFailedScoreButton)
+
         public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
         {
             switch (e.Action)
@@ -112,18 +114,11 @@ namespace osu.Game.Screens.Ranking
                     return true;
 
                 case GlobalAction.ExportReplay:
-                    if (State.Value == DownloadState.NotDownloaded)
-                    {
+                    State.BindValueChanged(exportWhenReady, true);
+
+                    // start the import via button
+                    if (State.Value != DownloadState.LocallyAvailable)
                         button.TriggerClick();
-                    }
-
-                    State.ValueChanged += importAfterDownload;
-
-                    void importAfterDownload(ValueChangedEvent<DownloadState> valueChangedEvent)
-                    {
-                        scoreManager.Export(Score.Value);
-                        State.ValueChanged -= importAfterDownload;
-                    }
 
                     return true;
             }
@@ -135,6 +130,17 @@ namespace osu.Game.Screens.Ranking
         {
         }
 
+        private void exportWhenReady(ValueChangedEvent<DownloadState> state)
+        {
+            if (state.NewValue != DownloadState.LocallyAvailable) return;
+
+            scoreManager.Export(Score.Value);
+
+            State.ValueChanged -= exportWhenReady;
+        }
+
+        #endregion
+
         private void updateState()
         {
             switch (replayAvailability)

From 1907beb0c9b4c48b32da711c7f762895813f5704 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Jun 2023 17:48:55 +0900
Subject: [PATCH 0971/1604] Add `FireAndForget` to stray `Task.Run`

---
 osu.Game/Screens/Play/SaveFailedScoreButton.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/SaveFailedScoreButton.cs b/osu.Game/Screens/Play/SaveFailedScoreButton.cs
index dd3b2d676d..0a2696339c 100644
--- a/osu.Game/Screens/Play/SaveFailedScoreButton.cs
+++ b/osu.Game/Screens/Play/SaveFailedScoreButton.cs
@@ -15,6 +15,7 @@ using osu.Game.Scoring;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
 using osu.Game.Online;
+using osu.Game.Online.Multiplayer;
 using osuTK;
 
 namespace osu.Game.Screens.Play
@@ -63,7 +64,7 @@ namespace osu.Game.Screens.Play
                             {
                                 importedScore = realm.Run(r => r.Find<ScoreInfo>(t.GetResultSafely().ID)?.Detach());
                                 Schedule(() => state.Value = importedScore != null ? DownloadState.LocallyAvailable : DownloadState.NotDownloaded);
-                            });
+                            }).FireAndForget();
                             break;
                     }
                 }

From 655491ae2d4532de479538d696229bb9095c82f8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Jun 2023 17:50:06 +0900
Subject: [PATCH 0972/1604] Fix potential null ref in `ResultsScreen`

---
 osu.Game/Screens/Ranking/ResultsScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 78239e0dbe..b9f3b65129 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -160,7 +160,7 @@ namespace osu.Game.Screens.Ranking
 
             if (allowWatchingReplay)
             {
-                buttons.Add(new ReplayDownloadButton(null)
+                buttons.Add(new ReplayDownloadButton(SelectedScore.Value)
                 {
                     Score = { BindTarget = SelectedScore },
                     Width = 300

From c3f772f0da35dd16589c993835a5e1da1824d53d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Jun 2023 18:29:34 +0900
Subject: [PATCH 0973/1604] Add method to queue a restart after app is exited
 (when supported)

---
 osu.Desktop/OsuGameDesktop.cs                 | 20 +++++++++++++++++++
 .../Screens/Setup/TournamentSwitcher.cs       |  6 +++++-
 osu.Game/OsuGameBase.cs                       |  6 ++++++
 .../Sections/Graphics/RendererSettings.cs     | 13 +++++++++---
 4 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index 21cea3ba76..efd3d358b7 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -17,6 +17,7 @@ using osu.Game.Updater;
 using osu.Desktop.Windows;
 using osu.Game.IO;
 using osu.Game.IPC;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Utils;
 using SDL2;
 
@@ -108,6 +109,25 @@ namespace osu.Desktop
             }
         }
 
+        public override bool RestartAppWhenExited()
+        {
+            switch (RuntimeInfo.OS)
+            {
+                case RuntimeInfo.Platform.Windows:
+                    Debug.Assert(OperatingSystem.IsWindows());
+
+                    // Of note, this is an async method in squirrel that adds an arbitrary delay before returning
+                    // likely to ensure the external process is in a good state.
+                    //
+                    // We're not waiting on that here, but the outro playing before the actual exit should be enough
+                    // to cover this.
+                    Squirrel.UpdateManager.RestartAppWhenExited().FireAndForget();
+                    return true;
+            }
+
+            return base.RestartAppWhenExited();
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
diff --git a/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs b/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs
index 7a8b03a7aa..01d86274d7 100644
--- a/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs
+++ b/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs
@@ -28,7 +28,11 @@ namespace osu.Game.Tournament.Screens.Setup
             dropdown.Items = storage.ListTournaments();
             dropdown.Current.BindValueChanged(v => Button.Enabled.Value = v.NewValue != startupTournament, true);
 
-            Action = () => game.AttemptExit();
+            Action = () =>
+            {
+                game.RestartAppWhenExited();
+                game.AttemptExit();
+            };
             folderButton.Action = () => storage.PresentExternally();
 
             ButtonText = "Close osu!";
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 63efe0e2c8..6737caa5f9 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -515,6 +515,12 @@ namespace osu.Game
                 Scheduler.AddDelayed(AttemptExit, 2000);
         }
 
+        /// <summary>
+        /// If supported by the platform, the game will automatically restart after the next exit.
+        /// </summary>
+        /// <returns>Whether a restart operation was queued.</returns>
+        public virtual bool RestartAppWhenExited() => false;
+
         public bool Migrate(string path)
         {
             Logger.Log($@"Migrating osu! data from ""{Storage.GetFullPath(string.Empty)}"" to ""{path}""...");
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs
index a1f728ca87..d4cef3f4d1 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs
@@ -67,10 +67,17 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                 if (r.NewValue == RendererType.Automatic && automaticRendererInUse)
                     return;
 
-                dialogOverlay?.Push(new ConfirmDialog(GraphicsSettingsStrings.ChangeRendererConfirmation, () => game?.AttemptExit(), () =>
+                if (game?.RestartAppWhenExited() == true)
                 {
-                    renderer.Value = automaticRendererInUse ? RendererType.Automatic : host.ResolvedRenderer;
-                }));
+                    game.AttemptExit();
+                }
+                else
+                {
+                    dialogOverlay?.Push(new ConfirmDialog(GraphicsSettingsStrings.ChangeRendererConfirmation, () => game?.AttemptExit(), () =>
+                    {
+                        renderer.Value = automaticRendererInUse ? RendererType.Automatic : host.ResolvedRenderer;
+                    }));
+                }
             });
 
             // TODO: remove this once we support SDL+android.

From 59b1f08d530fa1fa254a102ac678d0f34830da6d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Jun 2023 18:27:29 +0900
Subject: [PATCH 0974/1604] Don't require exit confirmation when there are no
 ongoing operations that could be interrupted

---
 osu.Game/OsuGame.cs                      | 16 +++++++++++++---
 osu.Game/Overlays/NotificationOverlay.cs |  2 ++
 osu.Game/Screens/Menu/MainMenu.cs        |  2 ++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index a80639d4ff..7bfe88f248 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -83,7 +83,7 @@ namespace osu.Game
         /// </summary>
         protected const float SIDE_OVERLAY_OFFSET_RATIO = 0.05f;
 
-        public Toolbar Toolbar;
+        public Toolbar Toolbar { get; private set; }
 
         private ChatOverlay chatOverlay;
 
@@ -778,8 +778,18 @@ namespace osu.Game
 
         public override void AttemptExit()
         {
-            // Using PerformFromScreen gives the user a chance to interrupt the exit process if needed.
-            PerformFromScreen(menu => menu.Exit());
+            bool requiresConfirmationToExit = Notifications.HasOngoingOperations;
+
+            PerformFromScreen(menu =>
+            {
+                var mainMenu = ((MainMenu)menu);
+
+                // The main menu exit implementation gives the user a chance to interrupt the exit process if needed.
+                if (requiresConfirmationToExit)
+                    mainMenu.Exit();
+                else
+                    mainMenu.ExitWithoutConfirmation();
+            }, new[] { typeof(MainMenu) });
         }
 
         /// <summary>
diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index 15e6c94b34..c53b6b667c 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -33,6 +33,8 @@ namespace osu.Game.Overlays
 
         public const float TRANSITION_LENGTH = 600;
 
+        public bool HasOngoingOperations => sections.Any(s => s.Children.OfType<ProgressNotification>().Any());
+
         private FlowContainer<NotificationSection> sections = null!;
 
         [Resolved]
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 69b8596474..998e36c2be 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -154,6 +154,8 @@ namespace osu.Game.Screens.Menu
 
         public void ReturnToOsuLogo() => Buttons.State = ButtonSystemState.Initial;
 
+        public void ExitWithoutConfirmation() => confirmAndExit();
+
         private void confirmAndExit()
         {
             if (exitConfirmed) return;

From 7b4cbea362e0d40fd7ca180f6f1146af655dcdb0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Jun 2023 00:01:48 +0900
Subject: [PATCH 0975/1604] Allow nullable to fix test usages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 .../Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 5fc7099544..1f9edfe97c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         [Resolved]
         private MultiplayerClient client { get; set; }
 
-        [Resolved]
+        [Resolved(canBeNull: true)]
         private OsuGame game { get; set; }
 
         private AddItemButton addItemButton;

From 07a00e8afd1aa50cffda6d980f8209d8b72a5973 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Jun 2023 00:02:02 +0900
Subject: [PATCH 0976/1604] Fix typo in comment
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 .../Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 1f9edfe97c..978d77b4f1 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -411,7 +411,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             if (!localUserCanAddItem)
                 return;
 
-            // If there's only one playlist item and we are the host, assume we want to change it. Else we're add a new one.
+            // If there's only one playlist item and we are the host, assume we want to change it. Else add a new one.
             PlaylistItem itemToEdit = client.IsHost && Room.Playlist.Count == 1 ? Room.Playlist.Single() : null;
 
             OpenSongSelection(itemToEdit);

From 4be8eede8834dc473f19629b2ba83c79d1f9003e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Jun 2023 18:46:42 +0900
Subject: [PATCH 0977/1604] Fix combo counter on legacy skins flipping when
 "Floating Fruits" mod is active

Closes #23989.
---
 .../Skinning/Legacy/LegacyCatchComboCounter.cs                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatchComboCounter.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatchComboCounter.cs
index eba837a52d..55b24b3ffa 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatchComboCounter.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatchComboCounter.cs
@@ -2,7 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.Containers;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Skinning;
 using osuTK;
@@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
     /// <summary>
     /// A combo counter implementation that visually behaves almost similar to stable's osu!catch combo counter.
     /// </summary>
-    public partial class LegacyCatchComboCounter : CompositeDrawable, ICatchComboCounter
+    public partial class LegacyCatchComboCounter : UprightAspectMaintainingContainer, ICatchComboCounter
     {
         private readonly LegacyRollingCounter counter;
 

From 79606317ab671c93bc6c8d650f25240d1ed52cfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 22 Jun 2023 20:02:10 +0200
Subject: [PATCH 0978/1604] Remove redundant parentheses

---
 osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs b/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
index b67e977822..d8f421e54f 100644
--- a/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
+++ b/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
@@ -113,7 +113,7 @@ namespace osu.Game.Rulesets.UI
         private bool isAlreadyHit(HitObjectLifetimeEntry h) => h.Result?.HasResult == true;
         private bool isCloseEnoughToCurrentTime(HitObject h) => getReferenceTime() >= h.StartTime - h.HitWindows.WindowFor(HitResult.Miss) * 2;
 
-        private double getReferenceTime() => (gameplayClock?.CurrentTime ?? Clock.CurrentTime);
+        private double getReferenceTime() => gameplayClock?.CurrentTime ?? Clock.CurrentTime;
 
         private IEnumerable<HitObject> getAllNested(HitObject hitObject)
         {

From aea5eb37dca6e2ca7e5ad18e141d48fb49bc3b19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 22 Jun 2023 20:24:44 +0200
Subject: [PATCH 0979/1604] Remove unused using directive

---
 osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
index 2dd30ca633..68d6b7ced5 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
@@ -15,7 +15,6 @@ using osu.Game.Input.Bindings;
 using osu.Game.Screens;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Components;
-using osu.Game.Screens.Play;
 using osuTK;
 
 namespace osu.Game.Overlays.SkinEditor

From 21bed336c681abf31577834ca2fb830ea6a61497 Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Thu, 22 Jun 2023 16:01:12 -0400
Subject: [PATCH 0980/1604] adjust DummyAPIAccess to more closely match
 APIAccess

wrt logging in and out
---
 osu.Game/Online/API/DummyAPIAccess.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/API/DummyAPIAccess.cs b/osu.Game/Online/API/DummyAPIAccess.cs
index 16afef8e30..896fa30ff8 100644
--- a/osu.Game/Online/API/DummyAPIAccess.cs
+++ b/osu.Game/Online/API/DummyAPIAccess.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Online.API
 
         public string AccessToken => "token";
 
-        public bool IsLoggedIn => State.Value == APIState.Online;
+        public bool IsLoggedIn => State.Value > APIState.Offline;
 
         public string ProvidedUsername => LocalUser.Value.Username;
 
@@ -114,8 +114,8 @@ namespace osu.Game.Online.API
 
         public void Logout()
         {
-            LocalUser.Value = new GuestUser();
             state.Value = APIState.Offline;
+            LocalUser.Value = new GuestUser();
         }
 
         public IHubClientConnector GetHubConnector(string clientName, string endpoint, bool preferMessagePack) => null;

From 786deec2964134b6a9ea5af897c0345e2159b090 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 22 Jun 2023 23:00:52 +0200
Subject: [PATCH 0981/1604] Rename and xmldoc members

---
 .../UserInterface/TestSceneCommentEditor.cs       |  4 ++--
 osu.Game/Overlays/Comments/CommentEditor.cs       | 15 ++++++++++++---
 osu.Game/Overlays/Comments/CommentsContainer.cs   |  2 +-
 osu.Game/Overlays/Comments/ReplyCommentEditor.cs  |  2 +-
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
index 1dafa2ab0a..1c3c86442e 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
@@ -160,7 +160,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             protected override LocalisableString FooterText => @"Footer text. And it is pretty long. Cool.";
 
-            protected override LocalisableString GetCommitButtonText(bool isLoggedIn) =>
+            protected override LocalisableString GetButtonText(bool isLoggedIn) =>
                 isLoggedIn ? @"Commit" : "You're logged out!";
 
             protected override LocalisableString GetPlaceholderText(bool isLoggedIn) =>
@@ -184,7 +184,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             {
             }
 
-            protected override LocalisableString GetCommitButtonText(bool isLoggedIn) => @"Save";
+            protected override LocalisableString GetButtonText(bool isLoggedIn) => @"Save";
             protected override LocalisableString GetPlaceholderText(bool isLoggedIn) => @"Multiline textboxes soon";
         }
     }
diff --git a/osu.Game/Overlays/Comments/CommentEditor.cs b/osu.Game/Overlays/Comments/CommentEditor.cs
index 8f7c8ced57..8dbafc0ea8 100644
--- a/osu.Game/Overlays/Comments/CommentEditor.cs
+++ b/osu.Game/Overlays/Comments/CommentEditor.cs
@@ -44,8 +44,17 @@ namespace osu.Game.Overlays.Comments
         [Resolved]
         private LoginOverlay? loginOverlay { get; set; }
 
-        protected abstract LocalisableString GetCommitButtonText(bool isLoggedIn);
+        /// <summary>
+        /// Returns the text content of the main action button.
+        /// When <paramref name="isLoggedIn"/> is <see langword="true"/>, the text will apply to a button that posts a comment.
+        /// When <paramref name="isLoggedIn"/> is <see langword="false"/>, the text will apply to a button that directs the user to the login overlay.
+        /// </summary>
+        protected abstract LocalisableString GetButtonText(bool isLoggedIn);
 
+        /// <summary>
+        /// Returns the placeholder text for the comment box.
+        /// </summary>
+        /// <param name="isLoggedIn">Whether the current user is logged in.</param>
         protected abstract LocalisableString GetPlaceholderText(bool isLoggedIn);
 
         protected bool ShowLoadingSpinner
@@ -128,13 +137,13 @@ namespace osu.Game.Overlays.Comments
                                                 commitButton = new EditorButton
                                                 {
                                                     Action = () => OnCommit(Current.Value),
-                                                    Text = GetCommitButtonText(true)
+                                                    Text = GetButtonText(true)
                                                 },
                                                 logInButton = new EditorButton
                                                 {
                                                     Width = 100,
                                                     Action = () => loginOverlay?.Show(),
-                                                    Text = GetCommitButtonText(false)
+                                                    Text = GetButtonText(false)
                                                 }
                                             }
                                         },
diff --git a/osu.Game/Overlays/Comments/CommentsContainer.cs b/osu.Game/Overlays/Comments/CommentsContainer.cs
index e6c69d2090..af5f4dd280 100644
--- a/osu.Game/Overlays/Comments/CommentsContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentsContainer.cs
@@ -410,7 +410,7 @@ namespace osu.Game.Overlays.Comments
             //TODO should match web, left empty due to no multiline support
             protected override LocalisableString FooterText => default;
 
-            protected override LocalisableString GetCommitButtonText(bool isLoggedIn) =>
+            protected override LocalisableString GetButtonText(bool isLoggedIn) =>
                 isLoggedIn ? CommonStrings.ButtonsPost : CommentsStrings.GuestButtonNew;
 
             protected override LocalisableString GetPlaceholderText(bool isLoggedIn) =>
diff --git a/osu.Game/Overlays/Comments/ReplyCommentEditor.cs b/osu.Game/Overlays/Comments/ReplyCommentEditor.cs
index 0d210021b9..dd4c35ef20 100644
--- a/osu.Game/Overlays/Comments/ReplyCommentEditor.cs
+++ b/osu.Game/Overlays/Comments/ReplyCommentEditor.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Overlays.Comments
 
         protected override LocalisableString FooterText => default;
 
-        protected override LocalisableString GetCommitButtonText(bool isLoggedIn) =>
+        protected override LocalisableString GetButtonText(bool isLoggedIn) =>
             isLoggedIn ? CommonStrings.ButtonsReply : CommentsStrings.GuestButtonReply;
 
         protected override LocalisableString GetPlaceholderText(bool isLoggedIn) =>

From 1672608a87311bde31d35616389d5db9603aa17f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 22 Jun 2023 23:08:30 +0200
Subject: [PATCH 0982/1604] Document why things were done in `DummyAPIAccess`

---
 osu.Game/Online/API/DummyAPIAccess.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Online/API/DummyAPIAccess.cs b/osu.Game/Online/API/DummyAPIAccess.cs
index 896fa30ff8..bf9baa4414 100644
--- a/osu.Game/Online/API/DummyAPIAccess.cs
+++ b/osu.Game/Online/API/DummyAPIAccess.cs
@@ -34,6 +34,7 @@ namespace osu.Game.Online.API
 
         public string AccessToken => "token";
 
+        /// <seealso cref="APIAccess.IsLoggedIn"/>
         public bool IsLoggedIn => State.Value > APIState.Offline;
 
         public string ProvidedUsername => LocalUser.Value.Username;
@@ -115,6 +116,8 @@ namespace osu.Game.Online.API
         public void Logout()
         {
             state.Value = APIState.Offline;
+            // must happen after `state.Value` is changed such that subscribers to that bindable's value changes see the correct user.
+            // compare: `APIAccess.Logout()`.
             LocalUser.Value = new GuestUser();
         }
 

From 2c1c20e0a7b95b2b9805a1126d3ceb5157e3140f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 22 Jun 2023 23:10:16 +0200
Subject: [PATCH 0983/1604] Rename test helpers

---
 .../Visual/UserInterface/TestSceneCommentEditor.cs     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
index 1c3c86442e..b17024ae8f 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
@@ -101,14 +101,14 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Test]
         public void TestLoggingInAndOut()
         {
-            void addLoggedInAsserts()
+            void assertLoggedInState()
             {
                 AddAssert("commit button visible", () => commentEditor.ButtonsContainer[0].Alpha == 1);
                 AddAssert("login button hidden", () => commentEditor.ButtonsContainer[1].Alpha == 0);
                 AddAssert("text box editable", () => !commentEditor.TextBox.ReadOnly);
             }
 
-            void addLoggedOutAsserts()
+            void assertLoggedOutState()
             {
                 AddAssert("commit button hidden", () => commentEditor.ButtonsContainer[0].Alpha == 0);
                 AddAssert("login button visible", () => commentEditor.ButtonsContainer[1].Alpha == 1);
@@ -118,15 +118,15 @@ namespace osu.Game.Tests.Visual.UserInterface
             // there's also the case of starting logged out, but more annoying to test.
 
             // starting logged in
-            addLoggedInAsserts();
+            assertLoggedInState();
 
             // moving from logged in -> logged out
             AddStep("log out", () => dummyAPI.Logout());
-            addLoggedOutAsserts();
+            assertLoggedOutState();
 
             // moving from logged out -> logged in
             AddStep("log back in", () => dummyAPI.Login("username", "password"));
-            addLoggedInAsserts();
+            assertLoggedInState();
         }
 
         [Test]

From 64b726d5ecaaf1ef6c3b71bed4523990117300e9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 23 Jun 2023 13:48:13 +0900
Subject: [PATCH 0984/1604] Fix nested logic not being completely correct
 (favouring already-passed rather than near-future)

---
 osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs b/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
index d8f421e54f..c554318357 100644
--- a/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
+++ b/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
@@ -107,7 +107,7 @@ namespace osu.Game.Rulesets.UI
 
             // Else we want the earliest valid nested.
             // In cases of nested objects, they will always have earlier sample data than their parent object.
-            return getAllNested(mostValidObject.HitObject).OrderBy(h => h.StartTime).FirstOrDefault(h => h.StartTime > getReferenceTime()) ?? mostValidObject.HitObject;
+            return getAllNested(mostValidObject.HitObject).OrderBy(h => h.GetEndTime()).SkipWhile(h => h.GetEndTime() <= getReferenceTime()).FirstOrDefault() ?? mostValidObject.HitObject;
         }
 
         private bool isAlreadyHit(HitObjectLifetimeEntry h) => h.Result?.HasResult == true;

From d53996336cb81a217e06f998ebdc440c17cf1145 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 23 Jun 2023 14:01:10 +0900
Subject: [PATCH 0985/1604] Add note about swells and their ticks

---
 .../TestSceneDrumSampleTriggerSource.cs                     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs
index e8da7f6937..bce855ae45 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs
@@ -315,6 +315,9 @@ namespace osu.Game.Rulesets.Taiko.Tests
                 hitObjectContainer.Add(drawableSwell);
             });
 
+            // You might think that this should be a SwellTick since we're before the swell, but SwellTicks get no StartTime (ie. they are zero).
+            // This works fine in gameplay because they are judged whenever the user pressed, rather than being timed hits.
+            // But for sample playback purposes they can be ignored as noise.
             AddAssert("most valid object is swell", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Swell>);
             checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
             checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
@@ -349,6 +352,9 @@ namespace osu.Game.Rulesets.Taiko.Tests
                 hitObjectContainer.Add(drawableSwell);
             });
 
+            // You might think that this should be a SwellTick since we're before the swell, but SwellTicks get no StartTime (ie. they are zero).
+            // This works fine in gameplay because they are judged whenever the user pressed, rather than being timed hits.
+            // But for sample playback purposes they can be ignored as noise.
             AddAssert("most valid object is swell", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Swell>);
             checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, "drum");
             checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, "drum");

From ce1579f2fead9c2c84ff160dff5025ee41603998 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 23 Jun 2023 14:05:02 +0900
Subject: [PATCH 0986/1604] Bind to `API.State` instead of `API.User`

---
 osu.Game/Overlays/Comments/CommentEditor.cs | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/Comments/CommentEditor.cs b/osu.Game/Overlays/Comments/CommentEditor.cs
index 8dbafc0ea8..05bdac5966 100644
--- a/osu.Game/Overlays/Comments/CommentEditor.cs
+++ b/osu.Game/Overlays/Comments/CommentEditor.cs
@@ -14,7 +14,6 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Online.API;
-using osu.Game.Online.API.Requests.Responses;
 using osuTK;
 using osuTK.Graphics;
 
@@ -36,14 +35,14 @@ namespace osu.Game.Overlays.Comments
 
         protected TextBox TextBox { get; private set; } = null!;
 
-        protected readonly IBindable<APIUser> User = new Bindable<APIUser>();
-
         [Resolved]
         protected IAPIProvider API { get; private set; } = null!;
 
         [Resolved]
         private LoginOverlay? loginOverlay { get; set; }
 
+        private readonly IBindable<APIState> apiState = new Bindable<APIState>();
+
         /// <summary>
         /// Returns the text content of the main action button.
         /// When <paramref name="isLoggedIn"/> is <see langword="true"/>, the text will apply to a button that posts a comment.
@@ -162,14 +161,14 @@ namespace osu.Game.Overlays.Comments
             });
 
             TextBox.OnCommit += (_, _) => commitButton.TriggerClick();
-            User.BindTo(API.LocalUser);
+            apiState.BindTo(API.State);
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
             Current.BindValueChanged(_ => updateCommitButtonState(), true);
-            User.BindValueChanged(_ => updateStateForLoggedIn(), true);
+            apiState.BindValueChanged(updateStateForLoggedIn, true);
         }
 
         protected abstract void OnCommit(string text);
@@ -177,12 +176,14 @@ namespace osu.Game.Overlays.Comments
         private void updateCommitButtonState() =>
             commitButton.Enabled.Value = loadingSpinner.State.Value == Visibility.Hidden && !string.IsNullOrEmpty(Current.Value);
 
-        private void updateStateForLoggedIn()
+        private void updateStateForLoggedIn(ValueChangedEvent<APIState> state)
         {
-            TextBox.PlaceholderText = GetPlaceholderText(API.IsLoggedIn);
-            TextBox.ReadOnly = !API.IsLoggedIn;
+            bool isAvailable = state.NewValue > APIState.Offline;
 
-            if (API.IsLoggedIn)
+            TextBox.PlaceholderText = GetPlaceholderText(isAvailable);
+            TextBox.ReadOnly = !isAvailable;
+
+            if (isAvailable)
             {
                 commitButton.Show();
                 logInButton.Hide();

From 343271751add838bdd6047e5a8c6cfba0bf0e5b1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 23 Jun 2023 14:07:33 +0900
Subject: [PATCH 0987/1604] Add `Schedule` to ensure correct thread for UI code

---
 osu.Game/Overlays/Comments/CommentEditor.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Comments/CommentEditor.cs b/osu.Game/Overlays/Comments/CommentEditor.cs
index 05bdac5966..02bcbb9d05 100644
--- a/osu.Game/Overlays/Comments/CommentEditor.cs
+++ b/osu.Game/Overlays/Comments/CommentEditor.cs
@@ -176,7 +176,7 @@ namespace osu.Game.Overlays.Comments
         private void updateCommitButtonState() =>
             commitButton.Enabled.Value = loadingSpinner.State.Value == Visibility.Hidden && !string.IsNullOrEmpty(Current.Value);
 
-        private void updateStateForLoggedIn(ValueChangedEvent<APIState> state)
+        private void updateStateForLoggedIn(ValueChangedEvent<APIState> state) => Schedule(() =>
         {
             bool isAvailable = state.NewValue > APIState.Offline;
 
@@ -193,7 +193,7 @@ namespace osu.Game.Overlays.Comments
                 commitButton.Hide();
                 logInButton.Show();
             }
-        }
+        });
 
         private partial class EditorTextBox : OsuTextBox
         {

From 08b3c0cce0ba40f250fbc88b86076337b0462d92 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 23 Jun 2023 14:18:11 +0900
Subject: [PATCH 0988/1604] Change "floating fruits" mod to only apply
 adjustments to the playfield

Avoids things like touch screen inputs also being flipped.

Note that these adjustments can't be applied directly to the playfield
due to how playfields are used in various rulesets (basically relying on
the `PlayfieldAdjustContainer` to get things in the right place).

Closes #24000.
---
 osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs | 6 +++---
 osu.Game/Rulesets/UI/DrawableRuleset.cs                | 8 +++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs b/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs
index e12181d051..dd6757eac9 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs
@@ -21,10 +21,10 @@ namespace osu.Game.Rulesets.Catch.Mods
 
         public void ApplyToDrawableRuleset(DrawableRuleset<CatchHitObject> drawableRuleset)
         {
-            drawableRuleset.Anchor = Anchor.Centre;
-            drawableRuleset.Origin = Anchor.Centre;
+            drawableRuleset.PlayfieldAdjustmentContainer.Anchor = Anchor.Centre;
+            drawableRuleset.PlayfieldAdjustmentContainer.Origin = Anchor.Centre;
 
-            drawableRuleset.Scale = new Vector2(1, -1);
+            drawableRuleset.PlayfieldAdjustmentContainer.Scale = new Vector2(1, -1);
         }
     }
 }
diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index 4f22c0c617..cecd6cb26c 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -71,6 +71,12 @@ namespace osu.Game.Rulesets.UI
 
         private readonly AudioContainer audioContainer = new AudioContainer { RelativeSizeAxes = Axes.Both };
 
+        /// <summary>
+        /// A container which encapsulates the <see cref="Playfield"/> and provides any adjustments to
+        /// ensure correct scale and position.
+        /// </summary>
+        public virtual PlayfieldAdjustmentContainer PlayfieldAdjustmentContainer { get; private set; }
+
         public override Container FrameStableComponents { get; } = new Container { RelativeSizeAxes = Axes.Both };
 
         public override IFrameStableClock FrameStableClock => frameStabilityContainer;
@@ -178,7 +184,7 @@ namespace osu.Game.Rulesets.UI
                     audioContainer.WithChild(KeyBindingInputManager
                         .WithChildren(new Drawable[]
                         {
-                            CreatePlayfieldAdjustmentContainer()
+                            PlayfieldAdjustmentContainer = CreatePlayfieldAdjustmentContainer()
                                 .WithChild(Playfield),
                             Overlays
                         })),

From 11a97e1bb88f39571333837385f442ceb21a7b47 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Jun 2023 19:06:47 +0900
Subject: [PATCH 0989/1604] Move confirmation bypass implementation to
 `MainMenu` to allow for more correct logic

---
 .../Visual/Menus/TestSceneToolbar.cs          |  2 +
 .../TestSceneFirstRunSetupOverlay.cs          |  2 +
 osu.Game/OsuGame.cs                           | 14 +-----
 osu.Game/Overlays/INotificationOverlay.cs     |  5 ++
 osu.Game/Screens/Menu/MainMenu.cs             | 47 ++++++++++++++-----
 5 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs b/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
index 22c7bb64b2..471700988c 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
@@ -250,6 +250,8 @@ namespace osu.Game.Tests.Visual.Menus
             }
 
             public virtual IBindable<int> UnreadCount => null;
+
+            public bool HasOngoingOperations => false;
         }
     }
 }
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneFirstRunSetupOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneFirstRunSetupOverlay.cs
index 77ed97e3ed..0b0c29acf6 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneFirstRunSetupOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneFirstRunSetupOverlay.cs
@@ -214,6 +214,8 @@ namespace osu.Game.Tests.Visual.UserInterface
             }
 
             public virtual IBindable<int> UnreadCount => null;
+
+            public bool HasOngoingOperations => false;
         }
 
         // interface mocks break hot reload, mocking this stub implementation instead works around it.
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 7bfe88f248..160dc26790 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -778,18 +778,8 @@ namespace osu.Game
 
         public override void AttemptExit()
         {
-            bool requiresConfirmationToExit = Notifications.HasOngoingOperations;
-
-            PerformFromScreen(menu =>
-            {
-                var mainMenu = ((MainMenu)menu);
-
-                // The main menu exit implementation gives the user a chance to interrupt the exit process if needed.
-                if (requiresConfirmationToExit)
-                    mainMenu.Exit();
-                else
-                    mainMenu.ExitWithoutConfirmation();
-            }, new[] { typeof(MainMenu) });
+            // The main menu exit implementation gives the user a chance to interrupt the exit process if needed.
+            PerformFromScreen(menu => menu.Exit(), new[] { typeof(MainMenu) });
         }
 
         /// <summary>
diff --git a/osu.Game/Overlays/INotificationOverlay.cs b/osu.Game/Overlays/INotificationOverlay.cs
index b9ac466229..0d8f73a1d7 100644
--- a/osu.Game/Overlays/INotificationOverlay.cs
+++ b/osu.Game/Overlays/INotificationOverlay.cs
@@ -30,5 +30,10 @@ namespace osu.Game.Overlays
         /// Current number of unread notifications.
         /// </summary>
         IBindable<int> UnreadCount { get; }
+
+        /// <summary>
+        /// Whether there are any ongoing operations, such as imports or downloads.
+        /// </summary>
+        bool HasOngoingOperations { get; }
     }
 }
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 998e36c2be..5078751823 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -53,6 +53,9 @@ namespace osu.Game.Screens.Menu
         [Resolved]
         private GameHost host { get; set; }
 
+        [Resolved]
+        private INotificationOverlay notifications { get; set; }
+
         [Resolved]
         private MusicController musicController { get; set; }
 
@@ -74,6 +77,9 @@ namespace osu.Game.Screens.Menu
 
         private ExitConfirmOverlay exitConfirmOverlay;
 
+        private bool exitConfirmedViaDialog;
+        private bool exitConfirmedViaHoldOrClick;
+
         private ParallaxContainer buttonsContainer;
         private SongTicker songTicker;
 
@@ -89,10 +95,8 @@ namespace osu.Game.Screens.Menu
                 {
                     Action = () =>
                     {
-                        if (holdDelay.Value > 0)
-                            confirmAndExit();
-                        else
-                            this.Exit();
+                        exitConfirmedViaHoldOrClick = holdDelay.Value > 0;
+                        this.Exit();
                     }
                 });
             }
@@ -114,7 +118,11 @@ namespace osu.Game.Screens.Menu
                             OnSolo = loadSoloSongSelect,
                             OnMultiplayer = () => this.Push(new Multiplayer()),
                             OnPlaylists = () => this.Push(new Playlists()),
-                            OnExit = confirmAndExit,
+                            OnExit = () =>
+                            {
+                                exitConfirmedViaHoldOrClick = true;
+                                this.Exit();
+                            }
                         }
                     }
                 },
@@ -154,13 +162,11 @@ namespace osu.Game.Screens.Menu
 
         public void ReturnToOsuLogo() => Buttons.State = ButtonSystemState.Initial;
 
-        public void ExitWithoutConfirmation() => confirmAndExit();
-
         private void confirmAndExit()
         {
-            if (exitConfirmed) return;
+            if (exitConfirmedViaDialog) return;
 
-            exitConfirmed = true;
+            exitConfirmedViaDialog = true;
             performer?.PerformFromScreen(menu => menu.Exit());
         }
 
@@ -203,8 +209,6 @@ namespace osu.Game.Screens.Menu
                 dialogOverlay?.Push(new StorageErrorDialog(osuStorage, osuStorage.Error));
         }
 
-        private bool exitConfirmed;
-
         protected override void LogoArriving(OsuLogo logo, bool resuming)
         {
             base.LogoArriving(logo, resuming);
@@ -281,12 +285,29 @@ namespace osu.Game.Screens.Menu
 
         public override bool OnExiting(ScreenExitEvent e)
         {
-            if (!exitConfirmed && dialogOverlay != null)
+            bool requiresConfirmation =
+                // we need to have a dialog overlay to confirm in the first place.
+                dialogOverlay != null
+                // if the dialog has already displayed and been accepted by the user, we are good.
+                && !exitConfirmedViaDialog
+                // Only require confirmation if there is either an ongoing operation or the user exited via a non-hold escape press.
+                && (notifications.HasOngoingOperations || !exitConfirmedViaHoldOrClick);
+
+            if (requiresConfirmation)
             {
                 if (dialogOverlay.CurrentDialog is ConfirmExitDialog exitDialog)
                     exitDialog.PerformOkAction();
                 else
-                    dialogOverlay.Push(new ConfirmExitDialog(confirmAndExit, () => exitConfirmOverlay.Abort()));
+                {
+                    dialogOverlay.Push(new ConfirmExitDialog(() =>
+                    {
+                        exitConfirmedViaDialog = true;
+                        this.Exit();
+                    }, () =>
+                    {
+                        exitConfirmOverlay.Abort();
+                    }));
+                }
 
                 return true;
             }

From 6df617d5366b3a8f15ecaa03c9ce52e1d97f71eb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 23 Jun 2023 14:46:38 +0900
Subject: [PATCH 0990/1604] Rename `ExitConfirmOverlay` to be more explicit
 about purpose

---
 .../Visual/UserInterface/TestSceneHoldToConfirmOverlay.cs | 4 ++--
 .../{ExitConfirmOverlay.cs => HoldToExitGameOverlay.cs}   | 6 ++----
 osu.Game/Screens/Menu/MainMenu.cs                         | 8 ++++----
 3 files changed, 8 insertions(+), 10 deletions(-)
 rename osu.Game/Screens/Menu/{ExitConfirmOverlay.cs => HoldToExitGameOverlay.cs} (86%)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneHoldToConfirmOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneHoldToConfirmOverlay.cs
index 801bef62c8..9c29f17382 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneHoldToConfirmOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneHoldToConfirmOverlay.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                 Alpha = 0,
             };
 
-            var overlay = new TestHoldToConfirmOverlay
+            var overlay = new TestHoldToExitGameOverlay
             {
                 Action = () =>
                 {
@@ -59,7 +59,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddUntilStep("wait until fired again", () => overlay.Fired);
         }
 
-        private partial class TestHoldToConfirmOverlay : ExitConfirmOverlay
+        private partial class TestHoldToExitGameOverlay : HoldToExitGameOverlay
         {
             public void Begin() => BeginConfirm();
         }
diff --git a/osu.Game/Screens/Menu/ExitConfirmOverlay.cs b/osu.Game/Screens/Menu/HoldToExitGameOverlay.cs
similarity index 86%
rename from osu.Game/Screens/Menu/ExitConfirmOverlay.cs
rename to osu.Game/Screens/Menu/HoldToExitGameOverlay.cs
index bc2f6ea00f..a8f4913368 100644
--- a/osu.Game/Screens/Menu/ExitConfirmOverlay.cs
+++ b/osu.Game/Screens/Menu/HoldToExitGameOverlay.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Input.Bindings;
@@ -10,13 +8,13 @@ using osu.Game.Overlays;
 
 namespace osu.Game.Screens.Menu
 {
-    public partial class ExitConfirmOverlay : HoldToConfirmOverlay, IKeyBindingHandler<GlobalAction>
+    public partial class HoldToExitGameOverlay : HoldToConfirmOverlay, IKeyBindingHandler<GlobalAction>
     {
         protected override bool AllowMultipleFires => true;
 
         public void Abort() => AbortConfirm();
 
-        public ExitConfirmOverlay()
+        public HoldToExitGameOverlay()
             : base(0.7f)
         {
         }
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 5078751823..2946425998 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Screens.Menu
         private Bindable<double> holdDelay;
         private Bindable<bool> loginDisplayed;
 
-        private ExitConfirmOverlay exitConfirmOverlay;
+        private HoldToExitGameOverlay holdToExitGameOverlay;
 
         private bool exitConfirmedViaDialog;
         private bool exitConfirmedViaHoldOrClick;
@@ -91,7 +91,7 @@ namespace osu.Game.Screens.Menu
 
             if (host.CanExit)
             {
-                AddInternal(exitConfirmOverlay = new ExitConfirmOverlay
+                AddInternal(holdToExitGameOverlay = new HoldToExitGameOverlay
                 {
                     Action = () =>
                     {
@@ -133,7 +133,7 @@ namespace osu.Game.Screens.Menu
                     Origin = Anchor.TopRight,
                     Margin = new MarginPadding { Right = 15, Top = 5 }
                 },
-                exitConfirmOverlay?.CreateProxy() ?? Empty()
+                holdToExitGameOverlay?.CreateProxy() ?? Empty()
             });
 
             Buttons.StateChanged += state =>
@@ -305,7 +305,7 @@ namespace osu.Game.Screens.Menu
                         this.Exit();
                     }, () =>
                     {
-                        exitConfirmOverlay.Abort();
+                        holdToExitGameOverlay.Abort();
                     }));
                 }
 

From 20aedc82ac674b441ee01c31d5b76cf32232564d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 23 Jun 2023 14:47:32 +0900
Subject: [PATCH 0991/1604] Remove unused code

---
 osu.Game/Screens/Menu/MainMenu.cs | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 2946425998..f55c44d427 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -157,19 +157,8 @@ namespace osu.Game.Screens.Menu
             preloadSongSelect();
         }
 
-        [Resolved(canBeNull: true)]
-        private IPerformFromScreenRunner performer { get; set; }
-
         public void ReturnToOsuLogo() => Buttons.State = ButtonSystemState.Initial;
 
-        private void confirmAndExit()
-        {
-            if (exitConfirmedViaDialog) return;
-
-            exitConfirmedViaDialog = true;
-            performer?.PerformFromScreen(menu => menu.Exit());
-        }
-
         private void preloadSongSelect()
         {
             if (songSelect == null)

From 7fa07805b0bffb300ff1e071868294d3fb7d16cc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 23 Jun 2023 14:58:19 +0900
Subject: [PATCH 0992/1604] Expose all notifications from
 `INotificationOverlay`

Also fixes `HasOngoingOperations` not actually working.
---
 osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs    |  3 ++-
 .../UserInterface/TestSceneFirstRunSetupOverlay.cs |  2 +-
 osu.Game/Overlays/INotificationOverlay.cs          | 14 +++++++++++++-
 osu.Game/Overlays/NotificationOverlay.cs           |  4 +++-
 osu.Game/Overlays/NotificationOverlayToastTray.cs  |  5 +++++
 .../Overlays/Notifications/NotificationSection.cs  |  5 +++++
 6 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs b/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
index 471700988c..ce9f80a84f 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
 using Moq;
@@ -251,7 +252,7 @@ namespace osu.Game.Tests.Visual.Menus
 
             public virtual IBindable<int> UnreadCount => null;
 
-            public bool HasOngoingOperations => false;
+            public IEnumerable<Notification> AllNotifications => Enumerable.Empty<Notification>();
         }
     }
 }
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneFirstRunSetupOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneFirstRunSetupOverlay.cs
index 0b0c29acf6..9275f9755f 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneFirstRunSetupOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneFirstRunSetupOverlay.cs
@@ -215,7 +215,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             public virtual IBindable<int> UnreadCount => null;
 
-            public bool HasOngoingOperations => false;
+            public IEnumerable<Notification> AllNotifications => Enumerable.Empty<Notification>();
         }
 
         // interface mocks break hot reload, mocking this stub implementation instead works around it.
diff --git a/osu.Game/Overlays/INotificationOverlay.cs b/osu.Game/Overlays/INotificationOverlay.cs
index 0d8f73a1d7..1dd6dd2c6c 100644
--- a/osu.Game/Overlays/INotificationOverlay.cs
+++ b/osu.Game/Overlays/INotificationOverlay.cs
@@ -3,6 +3,8 @@
 
 #nullable disable
 
+using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Overlays.Notifications;
@@ -34,6 +36,16 @@ namespace osu.Game.Overlays
         /// <summary>
         /// Whether there are any ongoing operations, such as imports or downloads.
         /// </summary>
-        bool HasOngoingOperations { get; }
+        public bool HasOngoingOperations => OngoingOperations.Any();
+
+        /// <summary>
+        /// All current displayed notifications, whether in the toast tray or a section.
+        /// </summary>
+        IEnumerable<Notification> AllNotifications { get; }
+
+        /// <summary>
+        /// All ongoing operations (ie. any <see cref="ProgressNotification"/> not in a completed state).
+        /// </summary>
+        public IEnumerable<ProgressNotification> OngoingOperations => AllNotifications.OfType<ProgressNotification>().Where(p => p.State != ProgressNotificationState.Completed);
     }
 }
diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index c53b6b667c..6ef93fac9e 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
@@ -33,7 +34,8 @@ namespace osu.Game.Overlays
 
         public const float TRANSITION_LENGTH = 600;
 
-        public bool HasOngoingOperations => sections.Any(s => s.Children.OfType<ProgressNotification>().Any());
+        public IEnumerable<Notification> AllNotifications =>
+            toastTray.Notifications.Concat(sections.SelectMany(s => s.Notifications));
 
         private FlowContainer<NotificationSection> sections = null!;
 
diff --git a/osu.Game/Overlays/NotificationOverlayToastTray.cs b/osu.Game/Overlays/NotificationOverlayToastTray.cs
index 7a793ee092..0ebaff9437 100644
--- a/osu.Game/Overlays/NotificationOverlayToastTray.cs
+++ b/osu.Game/Overlays/NotificationOverlayToastTray.cs
@@ -28,6 +28,11 @@ namespace osu.Game.Overlays
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => toastFlow.ReceivePositionalInputAt(screenSpacePos);
 
+        /// <summary>
+        /// All notifications currently being displayed by the toast tray.
+        /// </summary>
+        public IEnumerable<Notification> Notifications => toastFlow;
+
         public bool IsDisplayingToasts => toastFlow.Count > 0;
 
         private FillFlowContainer<Notification> toastFlow = null!;
diff --git a/osu.Game/Overlays/Notifications/NotificationSection.cs b/osu.Game/Overlays/Notifications/NotificationSection.cs
index de4c72e473..4e28ade802 100644
--- a/osu.Game/Overlays/Notifications/NotificationSection.cs
+++ b/osu.Game/Overlays/Notifications/NotificationSection.cs
@@ -19,6 +19,11 @@ namespace osu.Game.Overlays.Notifications
 {
     public partial class NotificationSection : AlwaysUpdateFillFlowContainer<Drawable>
     {
+        /// <summary>
+        /// All notifications currently being displayed in this section.
+        /// </summary>
+        public IEnumerable<Notification> Notifications => notifications;
+
         private OsuSpriteText countDrawable = null!;
 
         private FlowContainer<Notification> notifications = null!;

From 693b7c99067c64f6daa10da3300041a0be0a91b6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 23 Jun 2023 15:19:47 +0900
Subject: [PATCH 0993/1604] Reorganise resolved fields in `MainMenu`

---
 osu.Game/Screens/Menu/MainMenu.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index f55c44d427..f34a1954a5 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -59,12 +59,15 @@ namespace osu.Game.Screens.Menu
         [Resolved]
         private MusicController musicController { get; set; }
 
-        [Resolved(canBeNull: true)]
-        private LoginOverlay login { get; set; }
-
         [Resolved]
         private IAPIProvider api { get; set; }
 
+        [Resolved]
+        private Storage storage { get; set; }
+
+        [Resolved(canBeNull: true)]
+        private LoginOverlay login { get; set; }
+
         [Resolved(canBeNull: true)]
         private IDialogOverlay dialogOverlay { get; set; }
 
@@ -174,9 +177,6 @@ namespace osu.Game.Screens.Menu
             return s;
         }
 
-        [Resolved]
-        private Storage storage { get; set; }
-
         public override void OnEntering(ScreenTransitionEvent e)
         {
             base.OnEntering(e);

From f66b787b12d5f0a449d3d0c1f8bf497d15c7a216 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 23 Jun 2023 15:20:19 +0900
Subject: [PATCH 0994/1604] Show ongoing operations in exit confirmation dialog

Also changes the button to a dangerous button, forcing user acknowledgement
---
 osu.Game/Screens/Menu/ConfirmExitDialog.cs | 63 ++++++++++++++++++----
 1 file changed, 52 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Menu/ConfirmExitDialog.cs b/osu.Game/Screens/Menu/ConfirmExitDialog.cs
index 4906232d21..fb22f7eff8 100644
--- a/osu.Game/Screens/Menu/ConfirmExitDialog.cs
+++ b/osu.Game/Screens/Menu/ConfirmExitDialog.cs
@@ -2,38 +2,79 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Overlays;
 using osu.Game.Overlays.Dialog;
 
 namespace osu.Game.Screens.Menu
 {
     public partial class ConfirmExitDialog : PopupDialog
     {
+        private readonly Action onConfirm;
+        private readonly Action? onCancel;
+
         /// <summary>
         /// Construct a new exit confirmation dialog.
         /// </summary>
         /// <param name="onConfirm">An action to perform on confirmation.</param>
         /// <param name="onCancel">An optional action to perform on cancel.</param>
         public ConfirmExitDialog(Action onConfirm, Action? onCancel = null)
+        {
+            this.onConfirm = onConfirm;
+            this.onCancel = onCancel;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(INotificationOverlay notifications)
         {
             HeaderText = "Are you sure you want to exit osu!?";
-            BodyText = "Last chance to turn back";
 
             Icon = FontAwesome.Solid.ExclamationTriangle;
 
-            Buttons = new PopupDialogButton[]
+            if (notifications.HasOngoingOperations)
             {
-                new PopupDialogOkButton
+                string text = "There are currently some background operations which will be aborted if you continue:\n\n";
+
+                foreach (var n in notifications.OngoingOperations)
+                    text += $"{n.Text} ({n.Progress:0%})\n";
+
+                text += "\nLast chance to turn back";
+
+                BodyText = text;
+
+                Buttons = new PopupDialogButton[]
                 {
-                    Text = @"Let me out!",
-                    Action = onConfirm
-                },
-                new PopupDialogCancelButton
+                    new PopupDialogDangerousButton
+                    {
+                        Text = @"Let me out!",
+                        Action = onConfirm
+                    },
+                    new PopupDialogCancelButton
+                    {
+                        Text = @"Cancel",
+                        Action = onCancel
+                    },
+                };
+            }
+            else
+            {
+                BodyText = "Last chance to turn back";
+
+                Buttons = new PopupDialogButton[]
                 {
-                    Text = @"Just a little more...",
-                    Action = onCancel
-                },
-            };
+                    new PopupDialogOkButton
+                    {
+                        Text = @"Let me out!",
+                        Action = onConfirm
+                    },
+                    new PopupDialogCancelButton
+                    {
+                        Text = @"Just a little more...",
+                        Action = onCancel
+                    },
+                };
+            }
         }
     }
 }

From a76037b6433951f8e5dbe5ab7d6534edb5f37a4c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 23 Jun 2023 15:30:21 +0900
Subject: [PATCH 0995/1604] Add test coverage of confirm-for-operations

---
 .../Navigation/TestSceneScreenNavigation.cs   | 43 ++++++++++++++++++-
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index 18aef99ccd..c3b668f591 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -22,6 +22,7 @@ using osu.Game.Online.Leaderboards;
 using osu.Game.Overlays;
 using osu.Game.Overlays.BeatmapListing;
 using osu.Game.Overlays.Mods;
+using osu.Game.Overlays.Notifications;
 using osu.Game.Overlays.Toolbar;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Mods;
@@ -683,6 +684,44 @@ namespace osu.Game.Tests.Visual.Navigation
             AddStep("center cursor", () => InputManager.MoveMouseTo(Game.ScreenSpaceDrawQuad.Centre));
         }
 
+        [Test]
+        public void TestExitWithOperationInProgress()
+        {
+            AddUntilStep("wait for dialog overlay", () => Game.ChildrenOfType<DialogOverlay>().SingleOrDefault() != null);
+
+            ProgressNotification progressNotification = null!;
+
+            AddStep("start ongoing operation", () =>
+            {
+                progressNotification = new ProgressNotification
+                {
+                    Text = "Something is still running",
+                    Progress = 0.5f,
+                    State = ProgressNotificationState.Active,
+                };
+                Game.Notifications.Post(progressNotification);
+            });
+
+            AddStep("Hold escape", () => InputManager.PressKey(Key.Escape));
+            AddUntilStep("confirmation dialog shown", () => Game.ChildrenOfType<DialogOverlay>().Single().CurrentDialog is ConfirmExitDialog);
+            AddStep("Release escape", () => InputManager.ReleaseKey(Key.Escape));
+
+            AddStep("cancel exit", () => InputManager.Key(Key.Escape));
+            AddAssert("dialog dismissed", () => Game.ChildrenOfType<DialogOverlay>().Single().CurrentDialog == null);
+
+            AddStep("complete operation", () =>
+            {
+                progressNotification.Progress = 100;
+                progressNotification.State = ProgressNotificationState.Completed;
+            });
+
+            AddStep("Hold escape", () => InputManager.PressKey(Key.Escape));
+            AddUntilStep("Wait for intro", () => Game.ScreenStack.CurrentScreen is IntroScreen);
+            AddStep("Release escape", () => InputManager.ReleaseKey(Key.Escape));
+
+            AddUntilStep("Wait for game exit", () => Game.ScreenStack.CurrentScreen == null);
+        }
+
         [Test]
         public void TestExitGameFromSongSelect()
         {
@@ -699,7 +738,7 @@ namespace osu.Game.Tests.Visual.Navigation
         }
 
         [Test]
-        public void TestRapidBackButtonExit()
+        public void TestExitWithHoldDisabled()
         {
             AddStep("set hold delay to 0", () => Game.LocalConfig.SetValue(OsuSetting.UIHoldActivationDelay, 0.0));
 
@@ -711,7 +750,7 @@ namespace osu.Game.Tests.Visual.Navigation
 
             pushEscape();
 
-            AddAssert("exit dialog is shown", () => Game.Dependencies.Get<IDialogOverlay>().CurrentDialog != null);
+            AddAssert("exit dialog is shown", () => Game.Dependencies.Get<IDialogOverlay>().CurrentDialog is ConfirmExitDialog);
         }
 
         private Func<Player> playToResults()

From 87447f41d0f4fb9a527aad577c1b26586fff1a74 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Sat, 24 Jun 2023 00:58:45 +0900
Subject: [PATCH 0996/1604] Fix incorrect calculation of difficulty

---
 .../Difficulty/CatchScoreV1Processor.cs                | 10 +++++++++-
 .../Difficulty/OsuScoreV1Processor.cs                  | 10 +++++++++-
 .../Difficulty/TaikoScoreV1Processor.cs                | 10 +++++++++-
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchScoreV1Processor.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchScoreV1Processor.cs
index 3f0ac7a760..be48763845 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchScoreV1Processor.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchScoreV1Processor.cs
@@ -64,11 +64,19 @@ namespace osu.Game.Rulesets.Catch.Difficulty
 
             int objectCount = countNormal + countSlider + countSpinner;
 
+            int drainLength = 0;
+
+            if (baseBeatmap.HitObjects.Count > 0)
+            {
+                int breakLength = baseBeatmap.Breaks.Select(b => (int)Math.Round(b.EndTime) - (int)Math.Round(b.StartTime)).Sum();
+                drainLength = ((int)Math.Round(baseBeatmap.HitObjects[^1].StartTime) - (int)Math.Round(baseBeatmap.HitObjects[0].StartTime) - breakLength) / 1000;
+            }
+
             int difficultyPeppyStars = (int)Math.Round(
                 (baseBeatmap.Difficulty.DrainRate
                  + baseBeatmap.Difficulty.OverallDifficulty
                  + baseBeatmap.Difficulty.CircleSize
-                 + Math.Clamp(objectCount / baseBeatmap.Difficulty.DrainRate * 8, 0, 16)) / 38 * 5);
+                 + Math.Clamp(objectCount / drainLength * 8, 0, 16)) / 38 * 5);
 
             scoreMultiplier = difficultyPeppyStars * mods.Aggregate(1.0, (current, mod) => current * mod.ScoreMultiplier);
 
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuScoreV1Processor.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuScoreV1Processor.cs
index 28d029b73a..e8231794e0 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuScoreV1Processor.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuScoreV1Processor.cs
@@ -67,11 +67,19 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
             int objectCount = countNormal + countSlider + countSpinner;
 
+            int drainLength = 0;
+
+            if (baseBeatmap.HitObjects.Count > 0)
+            {
+                int breakLength = baseBeatmap.Breaks.Select(b => (int)Math.Round(b.EndTime) - (int)Math.Round(b.StartTime)).Sum();
+                drainLength = ((int)Math.Round(baseBeatmap.HitObjects[^1].StartTime) - (int)Math.Round(baseBeatmap.HitObjects[0].StartTime) - breakLength) / 1000;
+            }
+
             int difficultyPeppyStars = (int)Math.Round(
                 (baseBeatmap.Difficulty.DrainRate
                  + baseBeatmap.Difficulty.OverallDifficulty
                  + baseBeatmap.Difficulty.CircleSize
-                 + Math.Clamp(objectCount / baseBeatmap.Difficulty.DrainRate * 8, 0, 16)) / 38 * 5);
+                 + Math.Clamp(objectCount / drainLength * 8, 0, 16)) / 38 * 5);
 
             scoreMultiplier = difficultyPeppyStars * mods.Aggregate(1.0, (current, mod) => current * mod.ScoreMultiplier);
 
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoScoreV1Processor.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoScoreV1Processor.cs
index 23ff9585e8..f01ca74f4a 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoScoreV1Processor.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoScoreV1Processor.cs
@@ -70,11 +70,19 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
 
             int objectCount = countNormal + countSlider + countSpinner;
 
+            int drainLength = 0;
+
+            if (baseBeatmap.HitObjects.Count > 0)
+            {
+                int breakLength = baseBeatmap.Breaks.Select(b => (int)Math.Round(b.EndTime) - (int)Math.Round(b.StartTime)).Sum();
+                drainLength = ((int)Math.Round(baseBeatmap.HitObjects[^1].StartTime) - (int)Math.Round(baseBeatmap.HitObjects[0].StartTime) - breakLength) / 1000;
+            }
+
             difficultyPeppyStars = (int)Math.Round(
                 (baseBeatmap.Difficulty.DrainRate
                  + baseBeatmap.Difficulty.OverallDifficulty
                  + baseBeatmap.Difficulty.CircleSize
-                 + Math.Clamp(objectCount / baseBeatmap.Difficulty.DrainRate * 8, 0, 16)) / 38 * 5);
+                 + Math.Clamp(objectCount / drainLength * 8, 0, 16)) / 38 * 5);
 
             modMultiplier = mods.Aggregate(1.0, (current, mod) => current * mod.ScoreMultiplier);
 

From 0ab0c52ad577b3e7b406d09fa6056a56ff997c3e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 23 Jun 2023 01:37:25 +0900
Subject: [PATCH 0997/1604] Automated pass

---
 osu.Android/GameplayScreenRotationLocker.cs   |  4 +---
 osu.Android/OsuGameActivity.cs                |  2 --
 osu.Android/OsuGameAndroid.cs                 |  2 --
 osu.Android/Properties/AssemblyInfo.cs        |  4 +---
 .../MainActivity.cs                           |  2 --
 .../CatchBeatmapConversionTest.cs             |  2 --
 .../CatchDifficultyCalculatorTest.cs          |  4 +---
 .../CatchLegacyModConversionTest.cs           |  2 --
 .../CatchSkinColourDecodingTest.cs            |  4 +---
 .../CatchSkinnableTestScene.cs                |  4 +---
 .../Editor/CatchEditorTestSceneContainer.cs   |  4 +---
 .../CatchSelectionBlueprintTestScene.cs       |  4 +---
 ...TestSceneBananaShowerPlacementBlueprint.cs |  4 +---
 .../Editor/TestSceneCatchDistanceSnapGrid.cs  |  4 +---
 .../Editor/TestSceneEditor.cs                 |  4 +---
 .../TestSceneFruitPlacementBlueprint.cs       |  4 +---
 .../JuiceStreamPathTest.cs                    |  4 +---
 .../TestSceneAutoJuiceStream.cs               |  2 --
 .../TestSceneBananaShower.cs                  |  2 --
 .../TestSceneCatchModHidden.cs                |  4 +---
 .../TestSceneCatchPlayer.cs                   |  2 --
 .../TestSceneCatchPlayerLegacySkin.cs         |  4 +---
 .../TestSceneCatchReplay.cs                   |  4 +---
 .../TestSceneCatchStacker.cs                  |  2 --
 .../TestSceneDrawableHitObjectsHidden.cs      |  4 +---
 .../TestSceneFruitObjects.cs                  |  2 --
 .../TestSceneFruitRandomness.cs               |  4 +---
 .../TestSceneFruitVisualChange.cs             |  2 --
 .../TestSceneHyperDash.cs                     |  2 --
 .../TestSceneJuiceStream.cs                   |  4 +---
 .../TestSceneLegacyBeatmapSkin.cs             |  6 ++---
 .../MainActivity.cs                           |  2 --
 .../ManiaSelectionBlueprintTestScene.cs       |  4 +---
 .../Editor/TestSceneEditor.cs                 |  2 --
 .../TestSceneHoldNotePlacementBlueprint.cs    |  4 +---
 .../TestSceneHoldNoteSelectionBlueprint.cs    |  4 +---
 .../Editor/TestSceneManiaBeatSnapGrid.cs      |  4 +---
 .../Editor/TestSceneManiaComposeScreen.cs     |  6 ++---
 .../Editor/TestSceneNoteSelectionBlueprint.cs |  4 +---
 .../ManiaDifficultyCalculatorTest.cs          |  4 +---
 .../ManiaInputTestScene.cs                    |  2 --
 .../ManiaLegacyModConversionTest.cs           |  2 --
 .../ManiaLegacyReplayTest.cs                  |  4 +---
 .../ManiaSpecialColumnTest.cs                 |  4 +---
 .../Skinning/ColumnTestContainer.cs           |  4 +---
 .../Skinning/ManiaHitObjectTestScene.cs       |  4 +---
 .../Skinning/ManiaSkinnableTestScene.cs       |  4 +---
 .../Skinning/TestSceneColumnBackground.cs     |  4 +---
 .../Skinning/TestSceneColumnHitObjectArea.cs  |  4 +---
 .../Skinning/TestSceneDrawableJudgement.cs    |  4 +---
 .../Skinning/TestSceneHitExplosion.cs         |  4 +---
 .../Skinning/TestSceneHoldNote.cs             |  4 +---
 .../Skinning/TestSceneNote.cs                 |  4 +---
 .../Skinning/TestScenePlayfield.cs            |  4 +---
 .../Skinning/TestSceneStage.cs                |  4 +---
 .../Skinning/TestSceneStageBackground.cs      |  4 +---
 .../TestSceneAutoGeneration.cs                |  4 +---
 .../TestSceneColumn.cs                        |  2 --
 .../TestSceneManiaHitObjectSamples.cs         |  4 +---
 .../TestSceneManiaPlayer.cs                   |  4 +---
 .../TestScenePlayfieldCoveringContainer.cs    |  4 +---
 .../Beatmaps/ManiaBeatmap.cs                  |  2 --
 .../Legacy/EndTimeObjectPatternGenerator.cs   |  2 --
 .../Legacy/HitObjectPatternGenerator.cs       |  4 +---
 .../Beatmaps/Patterns/Legacy/PatternType.cs   |  2 --
 .../Beatmaps/Patterns/PatternGenerator.cs     |  2 --
 .../Beatmaps/StageDefinition.cs               |  2 --
 .../Difficulty/ManiaDifficultyCalculator.cs   |  4 +---
 .../Difficulty/ManiaPerformanceAttributes.cs  |  2 --
 .../Difficulty/ManiaPerformanceCalculator.cs  |  2 --
 .../Preprocessing/ManiaDifficultyHitObject.cs |  4 +---
 .../Difficulty/Skills/Strain.cs               |  4 +---
 .../DualStageVariantGenerator.cs              |  4 +---
 .../Blueprints/Components/EditBodyPiece.cs    |  4 +---
 .../Blueprints/Components/EditNotePiece.cs    |  4 +---
 .../Blueprints/HoldNotePlacementBlueprint.cs  |  6 ++---
 .../Blueprints/ManiaSelectionBlueprint.cs     |  8 +++----
 .../Edit/Blueprints/NotePlacementBlueprint.cs |  4 +---
 .../Edit/Blueprints/NoteSelectionBlueprint.cs |  2 --
 .../Edit/DrawableManiaEditorRuleset.cs        |  2 --
 .../Edit/HoldNoteCompositionTool.cs           |  4 +---
 .../Edit/ManiaBeatSnapGrid.cs                 | 12 +++++-----
 .../Edit/ManiaBlueprintContainer.cs           |  4 +---
 .../Edit/ManiaEditorPlayfield.cs              |  2 --
 .../Edit/ManiaSelectionHandler.cs             |  6 ++---
 .../Edit/NoteCompositionTool.cs               |  4 +---
 .../Judgements/HoldNoteTickJudgement.cs       |  4 +---
 .../Judgements/ManiaJudgement.cs              |  2 --
 osu.Game.Rulesets.Mania/ManiaInputManager.cs  |  2 --
 .../Objects/HoldNoteTick.cs                   |  4 +---
 .../Objects/ManiaHitObject.cs                 |  2 --
 osu.Game.Rulesets.Mania/Objects/Note.cs       |  2 --
 osu.Game.Rulesets.Mania/Objects/TailNote.cs   |  4 +---
 .../Properties/AssemblyInfo.cs                |  2 --
 .../Scoring/ManiaHealthProcessor.cs           |  4 +---
 .../Scoring/ManiaHitWindows.cs                |  2 --
 .../SingleStageVariantGenerator.cs            |  4 +---
 .../UI/Components/ColumnHitObjectArea.cs      |  2 --
 .../UI/Components/DefaultStageBackground.cs   |  4 +---
 .../UI/Components/HitObjectArea.cs            |  4 +---
 osu.Game.Rulesets.Mania/UI/IHitExplosion.cs   |  4 +---
 .../UI/ManiaPlayfieldAdjustmentContainer.cs   |  4 +---
 .../UI/ManiaReplayRecorder.cs                 |  4 +---
 .../UI/OrderedHitPolicy.cs                    |  4 +---
 .../UI/PlayfieldCoveringWrapper.cs            |  4 +---
 .../MainActivity.cs                           |  2 --
 .../TestSceneHitCirclePlacementBlueprint.cs   |  4 +---
 .../Editor/TestSceneOsuEditor.cs              |  2 --
 .../Editor/TestSceneOsuEditorGrids.cs         |  4 +---
 .../TestSceneOsuEditorSelectInvalidPath.cs    |  4 +---
 .../TestSceneSpinnerPlacementBlueprint.cs     |  4 +---
 .../TestSceneSpinnerSelectionBlueprint.cs     |  4 +---
 .../OsuBeatmapConversionTest.cs               |  2 --
 .../OsuDifficultyCalculatorTest.cs            |  4 +---
 .../OsuLegacyModConversionTest.cs             |  2 --
 osu.Game.Rulesets.Osu.Tests/StackingTest.cs   |  4 +---
 .../TestPlayfieldBorder.cs                    |  4 +---
 .../TestSceneDrawableJudgement.cs             |  4 +---
 .../TestSceneHitCircle.cs                     |  4 +---
 .../TestSceneHitCircleComboChange.cs          |  4 +---
 .../TestSceneHitCircleHidden.cs               |  2 --
 .../TestSceneHitCircleLongCombo.cs            |  4 +---
 .../TestSceneMissHitWindowJudgements.cs       |  4 +---
 .../TestSceneNoSpinnerStacking.cs             |  2 --
 .../TestSceneOsuHitObjectSamples.cs           |  4 +---
 .../TestSceneOsuPlayer.cs                     |  4 +---
 .../TestSceneResumeOverlay.cs                 |  4 +---
 .../TestSceneShaking.cs                       |  4 +---
 .../TestSceneSliderComboChange.cs             |  4 +---
 .../TestSceneSliderHidden.cs                  |  2 --
 .../TestSceneSpinnerHidden.cs                 |  2 --
 osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmap.cs  |  2 --
 .../Beatmaps/OsuBeatmapConverter.cs           |  2 --
 .../Beatmaps/OsuBeatmapProcessor.cs           |  2 --
 .../Difficulty/Evaluators/AimEvaluator.cs     |  4 +---
 .../Evaluators/FlashlightEvaluator.cs         |  4 +---
 .../Difficulty/Evaluators/RhythmEvaluator.cs  |  4 +---
 .../Difficulty/Evaluators/SpeedEvaluator.cs   |  4 +---
 .../Difficulty/OsuPerformanceAttributes.cs    |  2 --
 .../Difficulty/OsuPerformanceCalculator.cs    |  4 +---
 .../Preprocessing/OsuDifficultyHitObject.cs   |  4 +---
 .../Difficulty/Skills/Aim.cs                  |  2 --
 .../Difficulty/Skills/Flashlight.cs           |  2 --
 .../Difficulty/Skills/OsuStrainSkill.cs       |  2 --
 .../Difficulty/Skills/Speed.cs                |  2 --
 .../Edit/Blueprints/BlueprintPiece.cs         |  4 +---
 .../HitCircles/Components/HitCirclePiece.cs   |  4 +---
 .../HitCircles/HitCirclePlacementBlueprint.cs |  4 +---
 .../HitCircles/HitCircleSelectionBlueprint.cs |  2 --
 .../Edit/Blueprints/OsuSelectionBlueprint.cs  |  6 ++---
 .../Sliders/Components/SliderBodyPiece.cs     |  4 +---
 .../Blueprints/Sliders/SliderCircleOverlay.cs |  4 +---
 .../Spinners/Components/SpinnerPiece.cs       |  4 +---
 .../Spinners/SpinnerSelectionBlueprint.cs     |  4 +---
 .../Edit/HitCircleCompositionTool.cs          |  4 +---
 .../Edit/OsuBeatmapVerifier.cs                |  4 +---
 .../Edit/OsuBlueprintContainer.cs             |  4 +---
 .../Edit/OsuRectangularPositionSnapGrid.cs    |  6 ++---
 .../Edit/SliderCompositionTool.cs             |  4 +---
 .../Edit/SpinnerCompositionTool.cs            |  4 +---
 .../Judgements/ComboResult.cs                 |  4 +---
 .../Judgements/OsuHitCircleJudgementResult.cs |  4 +---
 .../Judgements/OsuIgnoreJudgement.cs          |  4 +---
 .../Judgements/OsuJudgement.cs                |  2 --
 .../Judgements/OsuJudgementResult.cs          |  4 +---
 .../Judgements/OsuSpinnerJudgementResult.cs   |  4 +---
 .../Judgements/SliderTickJudgement.cs         |  4 +---
 .../Drawables/Connections/FollowPoint.cs      |  2 --
 .../Drawables/DrawableSpinnerBonusTick.cs     |  4 +---
 .../Objects/Drawables/ITrackSnaking.cs        |  2 --
 osu.Game.Rulesets.Osu/Objects/HitCircle.cs    |  2 --
 osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs |  2 --
 .../Objects/SliderEndCircle.cs                |  2 --
 .../Objects/SliderHeadCircle.cs               |  4 +---
 osu.Game.Rulesets.Osu/Objects/SliderRepeat.cs |  2 --
 .../Objects/SliderTailCircle.cs               |  4 +---
 osu.Game.Rulesets.Osu/Objects/SliderTick.cs   |  2 --
 osu.Game.Rulesets.Osu/Objects/Spinner.cs      |  2 --
 .../Objects/SpinnerBonusTick.cs               |  4 +---
 osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs  |  4 +---
 .../Properties/AssemblyInfo.cs                |  2 --
 osu.Game.Rulesets.Osu/UI/IHitPolicy.cs        |  4 +---
 .../UI/OsuPlayfieldAdjustmentContainer.cs     |  4 +---
 osu.Game.Rulesets.Osu/UI/OsuReplayRecorder.cs |  4 +---
 .../Utils/OsuHitObjectGenerationUtils.cs      |  4 +---
 .../MainActivity.cs                           |  2 --
 .../DrawableTestHit.cs                        |  4 +---
 .../DrawableTestStrongHit.cs                  |  4 +---
 .../Editor/TestSceneEditor.cs                 |  4 +---
 .../Editor/TestSceneTaikoEditorSaving.cs      |  4 +---
 .../Editor/TestSceneTaikoHitObjectComposer.cs |  4 +---
 .../Skinning/TaikoSkinnableTestScene.cs       |  4 +---
 .../Skinning/TestSceneDrawableBarLine.cs      |  4 +---
 .../Skinning/TestSceneDrawableDrumRoll.cs     |  4 +---
 .../Skinning/TestSceneDrawableHit.cs          |  4 +---
 .../Skinning/TestSceneHitExplosion.cs         |  4 +---
 .../Skinning/TestSceneInputDrum.cs            |  4 +---
 .../Skinning/TestSceneKiaiHitExplosion.cs     |  4 +---
 .../Skinning/TestSceneTaikoPlayfield.cs       |  4 +---
 .../Skinning/TestSceneTaikoScroller.cs        |  4 +---
 .../TaikoBeatmapConversionTest.cs             |  2 --
 .../TaikoDifficultyCalculatorTest.cs          |  4 +---
 .../TaikoLegacyModConversionTest.cs           |  2 --
 .../TestSceneBarLineApplication.cs            |  4 +---
 .../TestSceneDrumRollApplication.cs           |  4 +---
 .../TestSceneHitApplication.cs                |  4 +---
 .../TestSceneHits.cs                          |  2 --
 .../TestSceneSampleOutput.cs                  |  4 +---
 .../TestSceneTaikoPlayer.cs                   |  4 +---
 .../TestSceneTaikoSuddenDeath.cs              |  4 +---
 .../Beatmaps/TaikoBeatmap.cs                  |  2 --
 .../Beatmaps/TaikoBeatmapConverter.cs         |  2 --
 .../Difficulty/Skills/Rhythm.cs               |  2 --
 .../Difficulty/Skills/Stamina.cs              |  2 --
 .../Difficulty/TaikoDifficultyCalculator.cs   |  4 +---
 .../Difficulty/TaikoPerformanceAttributes.cs  |  2 --
 .../Difficulty/TaikoPerformanceCalculator.cs  |  2 --
 .../Blueprints/DrumRollPlacementBlueprint.cs  |  4 +---
 .../Edit/Blueprints/HitPiece.cs               |  4 +---
 .../Edit/Blueprints/LengthPiece.cs            |  4 +---
 .../Blueprints/SwellPlacementBlueprint.cs     |  4 +---
 .../Blueprints/TaikoSelectionBlueprint.cs     |  4 +---
 .../Edit/DrumRollCompositionTool.cs           |  4 +---
 .../Edit/HitCompositionTool.cs                |  4 +---
 .../Edit/SwellCompositionTool.cs              |  4 +---
 .../Edit/TaikoBlueprintContainer.cs           |  4 +---
 .../Edit/TaikoSelectionHandler.cs             |  4 +---
 .../Judgements/TaikoDrumRollTickJudgement.cs  |  2 --
 .../Judgements/TaikoJudgement.cs              |  2 --
 .../Judgements/TaikoStrongJudgement.cs        |  2 --
 .../Judgements/TaikoSwellJudgement.cs         |  2 --
 osu.Game.Rulesets.Taiko/Objects/BarLine.cs    |  2 --
 .../Objects/Drawables/DrawableFlyingHit.cs    |  4 +---
 .../Drawables/DrawableStrongNestedHit.cs      |  4 +---
 .../Objects/DrumRollTick.cs                   |  2 --
 osu.Game.Rulesets.Taiko/Objects/Hit.cs        |  2 --
 osu.Game.Rulesets.Taiko/Objects/IgnoreHit.cs  |  2 --
 .../Objects/StrongNestedHitObject.cs          |  4 +---
 osu.Game.Rulesets.Taiko/Objects/Swell.cs      |  2 --
 osu.Game.Rulesets.Taiko/Objects/SwellTick.cs  |  4 +---
 .../Objects/TaikoHitObject.cs                 |  2 --
 .../Objects/TaikoStrongableHitObject.cs       |  4 +---
 .../Properties/AssemblyInfo.cs                |  2 --
 .../Scoring/TaikoHealthProcessor.cs           |  4 +---
 .../Scoring/TaikoHitWindows.cs                |  2 --
 osu.Game.Rulesets.Taiko/TaikoInputManager.cs  |  2 --
 osu.Game.Tests.Android/MainActivity.cs        |  2 --
 .../Formats/LegacyBeatmapEncoderTest.cs       |  4 +---
 .../Beatmaps/Formats/LegacyDecoderTest.cs     |  4 +---
 .../Beatmaps/IO/LineBufferedReaderTest.cs     |  2 --
 .../Beatmaps/IO/OszArchiveReaderTest.cs       |  2 --
 .../Beatmaps/SliderEventGenerationTest.cs     |  4 +---
 .../Beatmaps/ToStringFormattingTest.cs        |  4 +---
 .../Collections/IO/ImportCollectionsTest.cs   |  4 +---
 .../Database/LegacyBeatmapImporterTest.cs     |  4 +---
 .../Gameplay/TestSceneHitObjectSamples.cs     |  4 +---
 .../Gameplay/TestSceneScoreProcessor.cs       |  4 +---
 osu.Game.Tests/ImportTest.cs                  |  4 +---
 .../Input/ConfineMouseTrackerTest.cs          |  6 ++---
 .../BeatmapMetadataRomanisationTest.cs        |  2 --
 .../NonVisual/BarLineGeneratorTest.cs         |  4 +---
 .../NonVisual/ClosestBeatDivisorTest.cs       |  4 +---
 .../NonVisual/ControlPointInfoTest.cs         |  4 +---
 ...DifficultyAdjustmentModCombinationsTest.cs |  2 --
 osu.Game.Tests/NonVisual/FormatUtilsTest.cs   |  4 +---
 .../StatefulMultiplayerClientTest.cs          |  4 +---
 osu.Game.Tests/NonVisual/PeriodTrackerTest.cs |  4 +---
 .../NonVisual/RulesetInfoOrderingTest.cs      |  4 +---
 osu.Game.Tests/NonVisual/ScoreInfoTest.cs     |  4 +---
 .../NonVisual/TimeDisplayExtensionTest.cs     |  4 +---
 .../Online/Chat/MessageNotifierTest.cs        |  4 +---
 ...TestMultiplayerMessagePackSerialization.cs |  4 +---
 .../TestSoloScoreInfoJsonSerialization.cs     |  4 +---
 .../OnlinePlay/PlaylistExtensionsTest.cs      |  4 +---
 osu.Game.Tests/Scores/IO/TestScoreEquality.cs |  4 +---
 osu.Game.Tests/Skins/IO/ImportSkinTest.cs     |  4 +---
 .../Skins/LegacyManiaSkinDecoderTest.cs       |  4 +---
 .../TestSceneBeatmapCardDifficultyList.cs     |  4 +---
 .../TestSceneBeatmapSetOnlineStatusPill.cs    |  4 +---
 .../Colours/TestSceneStarDifficultyColours.cs |  6 ++---
 .../Editing/TestSceneBlueprintOrdering.cs     |  4 +---
 .../TestSceneEditorComposeRadioButtons.cs     |  4 +---
 .../Visual/Editing/TestSceneEditorMenuBar.cs  |  4 +---
 .../Editing/TestSceneEditorScreenModes.cs     |  4 +---
 .../Visual/Editing/TestSceneEditorSeeking.cs  |  4 +---
 .../Editing/TestSceneEditorSummaryTimeline.cs |  4 +---
 ...ceneHitObjectDifficultyPointAdjustments.cs |  4 +---
 .../TestSceneHitObjectSampleAdjustments.cs    |  4 +---
 .../Visual/Editing/TestSceneSetupScreen.cs    |  4 +---
 .../TestSceneTimelineBlueprintContainer.cs    |  4 +---
 .../TestSceneTimelineHitObjectBlueprint.cs    |  2 --
 .../Editing/TestSceneTimelineTickDisplay.cs   |  4 +---
 .../Visual/Editing/TestSceneTimelineZoom.cs   |  4 +---
 .../Visual/Gameplay/OsuPlayerTestScene.cs     |  4 +---
 .../Visual/Gameplay/TestSceneFailAnimation.cs |  4 +---
 .../Visual/Gameplay/TestSceneFailJudgement.cs |  4 +---
 .../Visual/Gameplay/TestSceneKeyCounter.cs    |  2 --
 .../Visual/Gameplay/TestSceneMedalOverlay.cs  |  4 +---
 .../TestSceneNightcoreBeatContainer.cs        |  4 +---
 .../TestSceneSkinEditorComponentsList.cs      |  4 +---
 .../TestSceneSkinnableAccuracyCounter.cs      |  4 +---
 .../TestSceneSkinnableComboCounter.cs         |  4 +---
 .../TestSceneSkinnableHealthDisplay.cs        |  4 +---
 .../TestSceneSkinnableScoreCounter.cs         |  4 +---
 .../Visual/Gameplay/TestSceneSpectatorHost.cs |  4 +---
 .../Visual/Gameplay/TestSceneStarCounter.cs   |  4 +---
 .../Visual/Gameplay/TestSceneUnknownMod.cs    |  4 +---
 .../Visual/Menus/TestSceneDisclaimer.cs       |  4 +---
 .../Visual/Menus/TestSceneIntroCircles.cs     |  2 --
 .../Visual/Menus/TestSceneIntroTriangles.cs   |  4 +---
 .../Visual/Menus/TestSceneIntroWelcome.cs     |  2 --
 .../Visual/Menus/TestSceneSideOverlays.cs     |  4 +---
 .../Visual/Menus/TestSceneSongTicker.cs       |  4 +---
 .../Visual/Mods/TestSceneModFailCondition.cs  |  4 +---
 .../TestSceneMatchBeatmapDetailArea.cs        |  4 +---
 .../Multiplayer/TestSceneMatchLeaderboard.cs  |  4 +---
 .../Multiplayer/TestSceneMultiHeader.cs       |  2 --
 ...TestSceneMultiplayerGameplayLeaderboard.cs |  4 +---
 ...ceneMultiplayerGameplayLeaderboardTeams.cs |  4 +---
 .../TestSceneMultiplayerMatchFooter.cs        |  4 +---
 .../Multiplayer/TestSceneRankRangePill.cs     |  4 +---
 .../TestSceneStarRatingRangeDisplay.cs        |  4 +---
 .../TestSceneButtonSystemNavigation.cs        |  4 +---
 .../Navigation/TestSceneEditDefaultSkin.cs    |  4 +---
 .../TestSceneStartupBeatmapSetDisplay.cs      |  4 +---
 .../Navigation/TestSceneStartupRuleset.cs     |  2 --
 .../Navigation/TestSettingsMigration.cs       |  4 +---
 .../Online/TestSceneBeatmapAvailability.cs    |  2 --
 .../Online/TestSceneBeatmapSetOverlay.cs      |  4 +---
 .../TestSceneChangelogSupporterPromo.cs       |  4 +---
 .../Visual/Online/TestSceneCommentsHeader.cs  |  2 --
 .../Online/TestSceneDashboardOverlay.cs       |  2 --
 .../Online/TestSceneExternalLinkButton.cs     |  2 --
 .../Visual/Online/TestSceneGraph.cs           |  2 --
 .../Visual/Online/TestSceneHomeNewsPanel.cs   |  2 --
 .../TestSceneLeaderboardScopeSelector.cs      |  2 --
 .../Visual/Online/TestSceneNewsCard.cs        |  2 --
 .../TestSceneOnlineBeatmapListingOverlay.cs   |  2 --
 .../TestSceneOnlineBeatmapSetOverlay.cs       |  2 --
 .../Online/TestSceneOnlineViewContainer.cs    |  2 --
 .../Online/TestSceneRankingsCountryFilter.cs  |  2 --
 .../Visual/Online/TestSceneRankingsHeader.cs  |  2 --
 .../Online/TestSceneSpotlightsLayout.cs       |  2 --
 .../Online/TestSceneTotalCommentsCounter.cs   |  2 --
 .../Visual/Online/TestSceneWikiMainPage.cs    |  4 +---
 .../TestScenePlaylistsParticipantsList.cs     |  4 +---
 .../Playlists/TestScenePlaylistsScreen.cs     |  2 --
 .../Visual/Ranking/TestSceneAccuracyCircle.cs |  4 +---
 .../TestSceneContractedPanelMiddleContent.cs  |  4 +---
 .../TestSceneExpandedPanelTopContent.cs       |  4 +---
 .../Settings/TestSceneDirectorySelector.cs    |  4 +---
 .../Visual/Settings/TestSceneFileSelector.cs  |  6 ++---
 .../Settings/TestSceneMigrationScreens.cs     |  4 +---
 .../Settings/TestSceneSettingsSource.cs       |  2 --
 .../TestSceneBeatmapOptionsOverlay.cs         |  2 --
 .../TestSceneUserTopScoreContainer.cs         |  2 --
 .../UserInterface/TestSceneBackButton.cs      |  4 +---
 .../TestSceneBeatmapListingSortTabControl.cs  |  2 --
 .../TestSceneBeatmapSearchFilter.cs           |  2 --
 .../TestSceneBreadcrumbControl.cs             |  2 --
 .../UserInterface/TestSceneColourPicker.cs    |  4 +---
 .../TestSceneCommentRepliesButton.cs          |  2 --
 .../UserInterface/TestSceneContextMenu.cs     |  2 --
 .../Visual/UserInterface/TestSceneCursors.cs  |  2 --
 .../TestSceneDashboardBeatmapListing.cs       |  2 --
 .../UserInterface/TestSceneDrawableDate.cs    |  4 +---
 .../UserInterface/TestSceneEditorSidebar.cs   |  4 +---
 .../UserInterface/TestSceneExpandingBar.cs    |  2 --
 .../TestSceneFirstRunScreenBehaviour.cs       |  4 +---
 .../TestSceneFirstRunScreenBundledBeatmaps.cs |  4 +---
 ...TestSceneFirstRunScreenImportFromStable.cs |  4 +---
 .../TestSceneFirstRunScreenUIScale.cs         |  4 +---
 .../TestSceneFooterButtonMods.cs              |  4 +---
 .../TestSceneHoldToConfirmOverlay.cs          |  2 --
 .../UserInterface/TestSceneIconButton.cs      |  4 +---
 .../TestSceneLabelledDropdown.cs              |  4 +---
 .../TestSceneLabelledSliderBar.cs             |  4 +---
 .../TestSceneLabelledSwitchButton.cs          |  4 +---
 .../UserInterface/TestSceneLabelledTextBox.cs |  2 --
 .../UserInterface/TestSceneLoadingSpinner.cs  |  2 --
 .../UserInterface/TestSceneLogoAnimation.cs   |  4 +---
 .../UserInterface/TestSceneModDisplay.cs      |  4 +---
 .../UserInterface/TestSceneModSwitchSmall.cs  |  4 +---
 .../UserInterface/TestSceneModSwitchTiny.cs   |  4 +---
 .../UserInterface/TestSceneOnScreenDisplay.cs |  2 --
 .../UserInterface/TestSceneOsuDropdown.cs     |  4 +---
 .../Visual/UserInterface/TestSceneOsuLogo.cs  |  4 +---
 .../UserInterface/TestSceneOsuPopover.cs      |  4 +---
 .../UserInterface/TestSceneOsuTextBox.cs      |  4 +---
 .../UserInterface/TestSceneOverlayHeader.cs   |  2 --
 .../TestSceneOverlayHeaderBackground.cs       |  2 --
 .../TestSceneOverlayRulesetSelector.cs        |  2 --
 .../UserInterface/TestScenePageSelector.cs    |  2 --
 .../TestSceneParallaxContainer.cs             |  2 --
 .../TestSceneRankingsSortTabControl.cs        |  2 --
 .../UserInterface/TestSceneRoundedButton.cs   |  4 +---
 .../TestSceneScreenBreadcrumbControl.cs       |  2 --
 .../TestSceneSettingsCheckbox.cs              |  4 +---
 .../TestSceneShearedOverlayHeader.cs          |  4 +---
 .../TestSceneShearedSearchTextBox.cs          |  4 +---
 .../UserInterface/TestSceneTabControl.cs      |  2 --
 .../UserInterface/TestSceneToggleMenuItem.cs  |  4 +---
 .../UserInterface/TestSceneTwoLayerButton.cs  |  2 --
 .../UserInterface/TestSceneUserListToolbar.cs |  2 --
 .../UserInterface/TestSceneVolumePieces.cs    |  2 --
 .../UserInterface/TestSceneWaveContainer.cs   |  2 --
 .../UserInterface/ThemeComparisonTestScene.cs |  4 +---
 .../TestSceneDrawableTournamentMatch.cs       |  4 +---
 .../TestSceneDrawableTournamentTeam.cs        |  4 +---
 .../Components/TestSceneMatchHeader.cs        |  4 +---
 .../Components/TestSceneMatchScoreDisplay.cs  |  4 +---
 .../Components/TestSceneRoundDisplay.cs       |  4 +---
 .../TestSceneTournamentBeatmapPanel.cs        |  6 ++---
 .../TestSceneTournamentMatchChatDisplay.cs    |  4 +---
 .../NonVisual/CustomTourneyDirectoryTest.cs   |  4 +---
 .../NonVisual/LadderInfoSerialisationTest.cs  |  4 +---
 .../Screens/TestSceneDrawingsScreen.cs        |  4 +---
 .../Screens/TestSceneLadderEditorScreen.cs    |  4 +---
 .../Screens/TestSceneLadderScreen.cs          |  4 +---
 .../Screens/TestSceneRoundEditorScreen.cs     |  4 +---
 .../Screens/TestSceneSeedingEditorScreen.cs   |  4 +---
 .../Screens/TestSceneSeedingScreen.cs         |  4 +---
 .../Screens/TestSceneSetupScreen.cs           |  4 +---
 .../Screens/TestSceneShowcaseScreen.cs        |  4 +---
 .../TestSceneStablePathSelectScreen.cs        |  4 +---
 .../Screens/TestSceneTeamEditorScreen.cs      |  4 +---
 .../Screens/TestSceneTeamIntroScreen.cs       |  4 +---
 .../Screens/TestSceneTeamWinScreen.cs         |  4 +---
 .../TestSceneTournamentSceneManager.cs        |  4 +---
 .../TournamentTestBrowser.cs                  |  4 +---
 .../TournamentTestRunner.cs                   |  4 +---
 .../Components/ControlPanel.cs                |  2 --
 osu.Game.Tournament/Components/DateTextBox.cs |  4 +---
 .../Components/DrawableTeamHeader.cs          |  4 +---
 .../Components/DrawableTeamTitleWithHeader.cs |  4 +---
 .../Components/DrawableTeamWithPlayers.cs     |  4 +---
 .../DrawableTournamentHeaderLogo.cs           |  4 +---
 .../DrawableTournamentHeaderText.cs           |  4 +---
 .../Components/IPCErrorDialog.cs              |  4 +---
 .../Components/RoundDisplay.cs                |  4 +---
 .../Components/TournamentModIcon.cs           |  6 ++---
 .../TournamentSpriteTextWithBackground.cs     |  4 +---
 .../Configuration/TournamentConfigManager.cs  |  4 +---
 .../IO/TournamentVideoResourceStore.cs        |  4 +---
 osu.Game.Tournament/IPC/MatchIPCInfo.cs       |  4 +---
 osu.Game.Tournament/Models/BeatmapChoice.cs   |  4 +---
 .../Models/LadderEditorInfo.cs                |  4 +---
 osu.Game.Tournament/Models/LadderInfo.cs      |  4 +---
 osu.Game.Tournament/Models/SeedingResult.cs   |  4 +---
 .../Models/TournamentProgression.cs           |  4 +---
 osu.Game.Tournament/Models/TournamentRound.cs |  4 +---
 .../Properties/AssemblyInfo.cs                |  2 --
 .../Screens/BeatmapInfoScreen.cs              |  4 +---
 .../Components/DrawingsConfigManager.cs       |  2 --
 .../Screens/Drawings/Components/Group.cs      |  2 --
 .../Drawings/Components/GroupContainer.cs     |  2 --
 .../Screens/Drawings/Components/GroupTeam.cs  |  4 +---
 .../Screens/Drawings/Components/ITeamList.cs  |  2 --
 .../Screens/Editors/IModelBacked.cs           |  4 +---
 .../Screens/Editors/RoundEditorScreen.cs      |  8 +++----
 .../Screens/Editors/SeedingEditorScreen.cs    |  6 ++---
 .../Screens/Editors/TeamEditorScreen.cs       | 14 +++++-------
 .../Gameplay/Components/MatchRoundDisplay.cs  |  4 +---
 .../Gameplay/Components/TeamDisplay.cs        |  4 +---
 .../Screens/Gameplay/Components/TeamScore.cs  |  4 +---
 .../Ladder/Components/ProgressionPath.cs      |  4 +---
 .../Ladder/Components/SettingsTeamDropdown.cs |  4 +---
 .../Screens/Ladder/LadderDragContainer.cs     |  4 +---
 .../Screens/Showcase/ShowcaseScreen.cs        |  4 +---
 .../Screens/Showcase/TournamentLogo.cs        |  4 +---
 .../Screens/TournamentScreen.cs               |  6 ++---
 osu.Game.Tournament/TournamentSpriteText.cs   |  4 +---
 osu.Game.Tournament/TourneyButton.cs          |  4 +---
 osu.Game.Tournament/WarningBox.cs             |  4 +---
 osu.Game/Beatmaps/APIFailTimes.cs             |  2 --
 .../Beatmaps/BeatmapMetadataInfoExtensions.cs |  4 +---
 osu.Game/Beatmaps/BeatmapOnlineStatus.cs      |  2 --
 osu.Game/Beatmaps/BeatmapSetHypeStatus.cs     |  4 +---
 .../Beatmaps/BeatmapSetNominationStatus.cs    |  4 +---
 .../Beatmaps/BeatmapSetOnlineAvailability.cs  |  4 +---
 osu.Game/Beatmaps/BeatmapSetOnlineGenre.cs    |  2 --
 osu.Game/Beatmaps/BeatmapSetOnlineLanguage.cs |  4 +---
 osu.Game/Beatmaps/BeatmapStatisticIcon.cs     |  4 +---
 osu.Game/Beatmaps/CountdownType.cs            |  4 +---
 .../Drawables/BeatmapBackgroundSprite.cs      |  2 --
 .../Cards/BeatmapCardDifficultyList.cs        |  4 +---
 .../Cards/BeatmapCardDownloadProgressBar.cs   |  8 +++----
 .../Drawables/Cards/BeatmapCardThumbnail.cs   |  4 +---
 .../Cards/BeatmapSetFavouriteState.cs         |  4 +---
 .../Cards/Buttons/BeatmapCardIconButton.cs    |  4 +---
 .../Cards/ExpandedContentScrollContainer.cs   |  4 +---
 osu.Game/Beatmaps/Drawables/Cards/IconPill.cs |  2 --
 .../Cards/Statistics/FavouritesStatistic.cs   |  4 +---
 .../Cards/Statistics/PlayCountStatistic.cs    |  4 +---
 .../Drawables/Cards/StoryboardIconPill.cs     |  4 +---
 .../Beatmaps/Drawables/Cards/VideoIconPill.cs |  4 +---
 .../Drawables/DifficultySpectrumDisplay.cs    |  4 +---
 .../Beatmaps/Drawables/DownloadProgressBar.cs |  4 +---
 .../Beatmaps/Drawables/StarRatingDisplay.cs   | 10 ++++-----
 .../UpdateableBeatmapBackgroundSprite.cs      |  6 ++---
 osu.Game/Beatmaps/FlatFileWorkingBeatmap.cs   |  4 +---
 .../Beatmaps/Formats/IHasCustomColours.cs     |  4 +---
 .../Beatmaps/Formats/JsonBeatmapDecoder.cs    |  2 --
 ...egacyDifficultyCalculatorBeatmapDecoder.cs |  4 +---
 osu.Game/Beatmaps/Formats/Parsing.cs          |  4 +---
 osu.Game/Beatmaps/IBeatmap.cs                 |  4 +---
 osu.Game/Beatmaps/IBeatmapConverter.cs        |  2 --
 osu.Game/Beatmaps/IBeatmapProcessor.cs        |  2 --
 osu.Game/Beatmaps/IBeatmapResourceProvider.cs |  4 +---
 .../Beatmaps/Legacy/LegacyControlPointInfo.cs |  4 +---
 osu.Game/Beatmaps/Legacy/LegacyEffectFlags.cs |  4 +---
 osu.Game/Beatmaps/Legacy/LegacyEventType.cs   |  4 +---
 .../Beatmaps/Legacy/LegacyHitObjectType.cs    |  4 +---
 .../Beatmaps/Legacy/LegacyHitSoundType.cs     |  4 +---
 osu.Game/Beatmaps/Legacy/LegacyMods.cs        |  2 --
 osu.Game/Beatmaps/Legacy/LegacySampleBank.cs  |  4 +---
 osu.Game/Beatmaps/Legacy/LegacyStoryLayer.cs  |  4 +---
 osu.Game/Beatmaps/Timing/BreakPeriod.cs       |  2 --
 osu.Game/Configuration/BackgroundSource.cs    |  4 +---
 .../DevelopmentOsuConfigManager.cs            |  4 +---
 .../Configuration/DiscordRichPresenceMode.cs  |  4 +---
 osu.Game/Configuration/HUDVisibilityMode.cs   |  4 +---
 .../Configuration/InMemoryConfigManager.cs    |  2 --
 osu.Game/Configuration/OsuConfigManager.cs    |  4 +---
 .../Configuration/RandomSelectAlgorithm.cs    |  2 --
 osu.Game/Configuration/ScalingMode.cs         |  4 +---
 osu.Game/Configuration/ScreenshotFormat.cs    |  2 --
 .../ScrollVisualisationMethod.cs              |  2 --
 .../Configuration/SeasonalBackgroundMode.cs   |  4 +---
 osu.Game/Configuration/SettingsStore.cs       |  2 --
 .../Configuration/StorageConfigManager.cs     |  4 +---
 osu.Game/Database/ICanAcceptFiles.cs          |  2 --
 osu.Game/Database/IHasFiles.cs                |  2 --
 osu.Game/Database/IHasGuidPrimaryKey.cs       |  4 +---
 osu.Game/Database/IHasNamedFiles.cs           |  4 +---
 osu.Game/Database/IHasPrimaryKey.cs           |  2 --
 osu.Game/Database/IModelFileManager.cs        |  2 --
 osu.Game/Database/IModelManager.cs            |  4 +---
 osu.Game/Database/INamedFileInfo.cs           |  2 --
 osu.Game/Database/IPostNotifications.cs       |  4 +---
 .../Graphics/Backgrounds/BeatmapBackground.cs |  4 +---
 .../Graphics/Backgrounds/SkinBackground.cs    |  4 +---
 .../Containers/ConstrainedIconContainer.cs    |  2 --
 .../Containers/ExpandingButtonContainer.cs    |  4 +---
 osu.Game/Graphics/Containers/IExpandable.cs   |  4 +---
 .../Containers/IExpandingContainer.cs         |  4 +---
 .../Markdown/OsuMarkdownContainer.cs          |  4 +---
 .../Markdown/OsuMarkdownFencedCodeBlock.cs    |  4 +---
 .../Containers/Markdown/OsuMarkdownHeading.cs |  4 +---
 .../Containers/Markdown/OsuMarkdownImage.cs   |  4 +---
 .../Markdown/OsuMarkdownOrderedListItem.cs    |  4 +---
 .../Markdown/OsuMarkdownQuoteBlock.cs         |  4 +---
 .../Markdown/OsuMarkdownSeparator.cs          |  4 +---
 .../Containers/Markdown/OsuMarkdownTable.cs   |  4 +---
 .../Markdown/OsuMarkdownTableCell.cs          |  4 +---
 .../Markdown/OsuMarkdownUnorderedListItem.cs  |  4 +---
 .../Graphics/Containers/OsuHoverContainer.cs  |  2 --
 .../ReverseChildIDFillFlowContainer.cs        |  4 +---
 .../Graphics/Containers/ShakeContainer.cs     |  2 --
 .../Containers/UserTrackingScrollContainer.cs |  4 +---
 osu.Game/Graphics/Containers/WaveContainer.cs |  2 --
 .../Cursor/OsuContextMenuContainer.cs         |  2 --
 .../Graphics/Cursor/OsuTooltipContainer.cs    |  2 --
 osu.Game/Graphics/DateTooltip.cs              |  2 --
 osu.Game/Graphics/DrawableDate.cs             |  2 --
 osu.Game/Graphics/ErrorTextFlowContainer.cs   |  4 +---
 osu.Game/Graphics/IHasAccentColour.cs         |  2 --
 .../Vertices/PositionAndColourVertex.cs       |  4 +---
 osu.Game/Graphics/OsuColour.cs                |  2 --
 osu.Game/Graphics/OsuIcon.cs                  |  4 +---
 osu.Game/Graphics/ParticleExplosion.cs        |  4 +---
 .../Graphics/Sprites/GlowingSpriteText.cs     |  2 --
 osu.Game/Graphics/Sprites/OsuSpriteText.cs    |  2 --
 osu.Game/Graphics/UserInterface/Bar.cs        |  2 --
 osu.Game/Graphics/UserInterface/BarGraph.cs   |  4 +---
 .../UserInterface/BasicSearchTextBox.cs       |  4 +---
 .../CommaSeparatedScoreCounter.cs             |  4 +---
 .../UserInterface/DangerousRoundedButton.cs   |  4 +---
 .../Graphics/UserInterface/DialogButton.cs    |  2 --
 .../UserInterface/DrawableStatefulMenuItem.cs |  4 +---
 .../UserInterface/ExpandableSlider.cs         |  8 +++----
 .../Graphics/UserInterface/ExpandingBar.cs    |  2 --
 .../Graphics/UserInterface/HoverSampleSet.cs  |  4 +---
 osu.Game/Graphics/UserInterface/IconButton.cs |  2 --
 .../Graphics/UserInterface/LoadingButton.cs   |  2 --
 .../Graphics/UserInterface/LoadingSpinner.cs  |  2 --
 .../UserInterface/OsuAnimatedButton.cs        |  4 +---
 .../Graphics/UserInterface/OsuContextMenu.cs  |  4 +---
 .../Graphics/UserInterface/OsuEnumDropdown.cs |  2 --
 .../Graphics/UserInterface/OsuNumberBox.cs    |  4 +---
 .../UserInterface/OsuPasswordTextBox.cs       |  4 +---
 .../Graphics/UserInterface/OsuTabDropdown.cs  |  2 --
 .../PageSelector/PageEllipsis.cs              |  4 +---
 .../PageSelector/PageSelector.cs              |  2 --
 .../UserInterface/PercentageCounter.cs        |  2 --
 .../Graphics/UserInterface/SearchTextBox.cs   |  2 --
 .../UserInterface/SeekLimitedSearchTextBox.cs |  2 --
 .../UserInterface/ShearedSearchTextBox.cs     |  4 +---
 .../UserInterface/SlimEnumDropdown.cs         |  2 --
 .../Graphics/UserInterface/StarCounter.cs     |  2 --
 osu.Game/Graphics/UserInterface/TimeSlider.cs |  4 +---
 .../Graphics/UserInterface/TwoLayerButton.cs  |  2 --
 .../UserInterfaceV2/LabelledColourPalette.cs  |  4 +---
 .../UserInterfaceV2/LabelledComponent.cs      |  4 +---
 .../UserInterfaceV2/LabelledDropdown.cs       |  4 +---
 .../UserInterfaceV2/LabelledEnumDropdown.cs   |  4 +---
 .../UserInterfaceV2/LabelledNumberBox.cs      |  4 +---
 .../UserInterfaceV2/LabelledSliderBar.cs      |  4 +---
 .../UserInterfaceV2/LabelledSwitchButton.cs   |  4 +---
 .../UserInterfaceV2/OsuColourPicker.cs        |  4 +---
 .../OsuDirectorySelectorParentDirectory.cs    |  4 +---
 .../UserInterfaceV2/OsuHSVColourPicker.cs     |  4 +---
 .../UserInterfaceV2/OsuHexColourPicker.cs     |  4 +---
 .../Graphics/UserInterfaceV2/OsuPopover.cs    |  4 +---
 osu.Game/IO/Archives/LegacyByteArrayReader.cs |  4 +---
 .../Archives/LegacyDirectoryArchiveReader.cs  |  2 --
 .../IO/Archives/LegacyFileArchiveReader.cs    |  4 +---
 .../FileAbstraction/StreamFileAbstraction.cs  |  4 +---
 osu.Game/IO/Legacy/ILegacySerializable.cs     |  4 +---
 osu.Game/IO/OsuStorage.cs                     |  4 +---
 .../SnakeCaseStringEnumConverter.cs           |  4 +---
 .../SnakeCaseKeyContractResolver.cs           |  2 --
 osu.Game/Input/IdleTracker.cs                 |  4 +---
 osu.Game/Input/OsuConfineMouseMode.cs         |  4 +---
 osu.Game/Input/OsuUserInputManager.cs         |  4 +---
 osu.Game/Online/API/APIException.cs           |  4 +---
 osu.Game/Online/API/APIMessagesRequest.cs     |  2 --
 .../API/ModSettingsDictionaryFormatter.cs     |  4 +---
 osu.Game/Online/API/OsuJsonWebRequest.cs      |  4 +---
 osu.Game/Online/API/OsuWebRequest.cs          |  4 +---
 .../Online/API/Requests/CommentVoteRequest.cs |  2 --
 .../API/Requests/CreateChannelRequest.cs      |  4 +---
 .../CreateNewPrivateMessageRequest.cs         |  2 --
 osu.Game/Online/API/Requests/Cursor.cs        |  4 +---
 .../API/Requests/DownloadBeatmapSetRequest.cs |  2 --
 .../API/Requests/DownloadReplayRequest.cs     |  2 --
 .../API/Requests/GetBeatmapSetRequest.cs      |  2 --
 .../Online/API/Requests/GetBeatmapsRequest.cs |  4 +---
 .../API/Requests/GetChangelogBuildRequest.cs  |  2 --
 .../API/Requests/GetChangelogRequest.cs       |  2 --
 .../Online/API/Requests/GetCommentsRequest.cs |  2 --
 .../API/Requests/GetCountryRankingsRequest.cs |  2 --
 .../Online/API/Requests/GetFriendsRequest.cs  |  2 --
 .../Online/API/Requests/GetMessagesRequest.cs |  2 --
 .../Online/API/Requests/GetRankingsRequest.cs |  2 --
 .../Requests/GetSeasonalBackgroundsRequest.cs |  2 --
 .../Requests/GetSpotlightRankingsRequest.cs   |  2 --
 .../Online/API/Requests/GetTopUsersRequest.cs |  2 --
 .../API/Requests/GetUserBeatmapsRequest.cs    |  2 --
 .../Requests/GetUserKudosuHistoryRequest.cs   |  2 --
 .../GetUserMostPlayedBeatmapsRequest.cs       |  2 --
 .../API/Requests/GetUserRankingsRequest.cs    |  2 --
 .../GetUserRecentActivitiesRequest.cs         |  2 --
 .../Online/API/Requests/GetWikiRequest.cs     |  4 +---
 .../Online/API/Requests/JoinChannelRequest.cs |  2 --
 .../API/Requests/LeaveChannelRequest.cs       |  2 --
 .../API/Requests/ListChannelsRequest.cs       |  2 --
 .../API/Requests/MarkChannelAsReadRequest.cs  |  2 --
 .../API/Requests/PaginatedAPIRequest.cs       |  4 +---
 .../API/Requests/PaginationParameters.cs      |  4 +---
 .../Requests/PostBeatmapFavouriteRequest.cs   |  2 --
 .../Online/API/Requests/PostMessageRequest.cs |  2 --
 .../API/Requests/Responses/APIPlayStyle.cs    |  4 +---
 .../Requests/Responses/APIUserAchievement.cs  |  4 +---
 .../Requests/Responses/APIUserHistoryCount.cs |  4 +---
 osu.Game/Online/Chat/DrawableLinkCompiler.cs  |  6 ++---
 osu.Game/Online/Chat/ErrorMessage.cs          |  4 +---
 .../DevelopmentEndpointConfiguration.cs       |  4 +---
 osu.Game/Online/Leaderboards/DrawableRank.cs  |  2 --
 .../Multiplayer/IMultiplayerLoungeServer.cs   |  4 +---
 .../Multiplayer/IMultiplayerRoomServer.cs     |  4 +---
 .../Multiplayer/InvalidPasswordException.cs   |  4 +---
 .../InvalidStateChangeException.cs            |  4 +---
 .../Multiplayer/InvalidStateException.cs      |  4 +---
 .../Online/Multiplayer/MatchUserRequest.cs    |  4 +---
 .../Online/Multiplayer/NotHostException.cs    |  4 +---
 .../Multiplayer/NotJoinedRoomException.cs     |  4 +---
 osu.Game/Online/Multiplayer/QueueMode.cs      |  4 +---
 .../Online/Placeholders/LoginPlaceholder.cs   |  6 ++---
 .../Online/Placeholders/MessagePlaceholder.cs |  2 --
 osu.Game/Online/Rooms/APIScoreToken.cs        |  4 +---
 osu.Game/Online/Rooms/CreateRoomRequest.cs    |  4 +---
 .../Online/Rooms/CreateRoomScoreRequest.cs    |  4 +---
 .../Online/Rooms/GetRoomLeaderboardRequest.cs |  4 +---
 osu.Game/Online/Rooms/GetRoomRequest.cs       |  4 +---
 osu.Game/Online/Rooms/GetRoomsRequest.cs      |  4 +---
 osu.Game/Online/Rooms/IndexScoresParams.cs    |  4 +---
 osu.Game/Online/Rooms/ItemAttemptsCount.cs    |  4 +---
 osu.Game/Online/Rooms/JoinRoomRequest.cs      |  4 +---
 osu.Game/Online/Rooms/MatchType.cs            |  4 +---
 osu.Game/Online/Rooms/MultiplayerScores.cs    |  4 +---
 osu.Game/Online/Rooms/PartRoomRequest.cs      |  4 +---
 osu.Game/Online/Rooms/RoomAvailability.cs     |  2 --
 osu.Game/Online/Rooms/RoomCategory.cs         |  4 +---
 .../Rooms/RoomStatuses/RoomStatusEnded.cs     |  4 +---
 .../Rooms/RoomStatuses/RoomStatusOpen.cs      |  4 +---
 .../Rooms/RoomStatuses/RoomStatusPlaying.cs   |  4 +---
 .../Rooms/ShowPlaylistUserScoreRequest.cs     |  4 +---
 .../Online/Rooms/SubmitRoomScoreRequest.cs    |  4 +---
 osu.Game/Online/Rooms/SubmitScoreRequest.cs   |  4 +---
 osu.Game/Online/SignalRWorkaroundTypes.cs     |  4 +---
 .../Online/Solo/CreateSoloScoreRequest.cs     |  4 +---
 .../Online/Solo/SubmitSoloScoreRequest.cs     |  4 +---
 osu.Game/Online/Spectator/ISpectatorClient.cs |  4 +---
 osu.Game/Online/Spectator/ISpectatorServer.cs |  4 +---
 osu.Game/OsuGameBase_Importing.cs             |  4 +---
 .../AccountCreationBackground.cs              |  4 +---
 .../AccountCreation/AccountCreationScreen.cs  |  4 +---
 .../BeatmapListingSortTabControl.cs           |  2 --
 .../BeatmapListing/BeatmapSearchFilterRow.cs  |  2 --
 .../BeatmapSearchRulesetFilterRow.cs          |  2 --
 .../BeatmapSearchScoreFilterRow.cs            |  2 --
 .../Overlays/BeatmapListing/SearchCategory.cs |  4 +---
 .../Overlays/BeatmapListing/SearchExplicit.cs |  4 +---
 .../Overlays/BeatmapListing/SearchExtra.cs    |  2 --
 .../Overlays/BeatmapListing/SearchGeneral.cs  |  4 +---
 .../Overlays/BeatmapListing/SearchGenre.cs    |  4 +---
 .../Overlays/BeatmapListing/SearchLanguage.cs |  4 +---
 .../Overlays/BeatmapListing/SearchPlayed.cs   |  2 --
 .../Overlays/BeatmapListing/SortCriteria.cs   |  4 +---
 .../BeatmapSet/BeatmapRulesetSelector.cs      |  2 --
 .../BeatmapSet/BeatmapSetLayoutSection.cs     |  2 --
 .../BeatmapSet/Buttons/PreviewButton.cs       |  2 --
 osu.Game/Overlays/BeatmapSet/Info.cs          |  2 --
 .../BeatmapSet/LeaderboardScopeSelector.cs    |  2 --
 osu.Game/Overlays/BeatmapSet/MetadataType.cs  |  4 +---
 .../BeatmapSet/Scores/NoScoresPlaceholder.cs  |  2 --
 .../Scores/NotSupporterPlaceholder.cs         |  2 --
 .../Scores/ScoreTableRowBackground.cs         |  4 +---
 .../BeatmapSet/Scores/ScoreboardTime.cs       |  4 +---
 .../BeatmapSet/Scores/TopScoreUserSection.cs  |  4 +---
 .../BreadcrumbControlOverlayHeader.cs         |  2 --
 osu.Game/Overlays/Changelog/ChangelogEntry.cs |  8 +++----
 .../Overlays/Changelog/ChangelogListing.cs    |  4 +---
 .../Changelog/ChangelogSupporterPromo.cs      |  4 +---
 .../Changelog/ChangelogUpdateStreamControl.cs |  2 --
 .../Overlays/Chat/ChannelScrollContainer.cs   |  4 +---
 .../Comments/Buttons/ChevronButton.cs         |  2 --
 .../Comments/Buttons/CommentRepliesButton.cs  |  4 +---
 .../Comments/CommentMarkdownContainer.cs      |  4 +---
 .../Comments/CommentsShowMoreButton.cs        |  2 --
 .../Comments/DeletedCommentsCounter.cs        |  2 --
 osu.Game/Overlays/Comments/HeaderButton.cs    |  2 --
 .../Dashboard/DashboardOverlayHeader.cs       |  2 --
 .../Dashboard/Friends/FriendStream.cs         |  2 --
 .../Friends/FriendsOnlineStatusItem.cs        |  2 --
 .../Dashboard/Friends/OnlineStatus.cs         |  4 +---
 .../Dashboard/Friends/UserListToolbar.cs      |  2 --
 .../Dashboard/Friends/UserSortTabControl.cs   |  2 --
 .../Dashboard/Home/DashboardBeatmapListing.cs |  2 --
 .../Home/DashboardNewBeatmapPanel.cs          |  2 --
 .../Home/DashboardPopularBeatmapPanel.cs      |  2 --
 .../Dashboard/Home/DrawableBeatmapList.cs     |  2 --
 .../Dashboard/Home/DrawableNewBeatmapList.cs  |  2 --
 .../Home/DrawablePopularBeatmapList.cs        |  2 --
 osu.Game/Overlays/Dashboard/Home/HomePanel.cs |  2 --
 .../Home/News/FeaturedNewsItemPanel.cs        |  2 --
 .../Dashboard/Home/News/NewsGroupItem.cs      |  2 --
 .../Dashboard/Home/News/NewsItemGroupPanel.cs |  2 --
 .../Dashboard/Home/News/NewsTitleLink.cs      |  2 --
 osu.Game/Overlays/DashboardOverlay.cs         |  2 --
 osu.Game/Overlays/Dialog/PopupDialog.cs       |  2 --
 osu.Game/Overlays/Dialog/PopupDialogButton.cs |  2 --
 .../Dialog/PopupDialogCancelButton.cs         |  2 --
 .../Overlays/Dialog/PopupDialogOkButton.cs    |  2 --
 osu.Game/Overlays/FullscreenOverlay.cs        |  6 ++---
 osu.Game/Overlays/INamedOverlayComponent.cs   |  4 +---
 osu.Game/Overlays/INotificationOverlay.cs     |  4 +---
 osu.Game/Overlays/IOverlayManager.cs          |  4 +---
 osu.Game/Overlays/Login/UserDropdown.cs       |  4 +---
 .../Overlays/Mods/DeselectAllModsButton.cs    |  4 +---
 .../Mods/DifficultyMultiplierDisplay.cs       |  4 +---
 .../Mods/IncompatibilityDisplayingModPanel.cs |  6 ++---
 .../Mods/IncompatibilityDisplayingTooltip.cs  |  6 ++---
 osu.Game/Overlays/Mods/ModSettingsArea.cs     |  6 ++---
 .../Overlays/Music/MusicKeyBindingHandler.cs  | 16 ++++++--------
 .../Music/NowPlayingCollectionDropdown.cs     |  2 --
 osu.Game/Overlays/News/NewsPostBackground.cs  |  2 --
 .../Notifications/SimpleErrorNotification.cs  |  4 +---
 osu.Game/Overlays/OSD/Toast.cs                |  2 --
 osu.Game/Overlays/OnlineOverlay.cs            |  2 --
 osu.Game/Overlays/OverlayColourProvider.cs    |  2 --
 osu.Game/Overlays/OverlayHeader.cs            |  4 +---
 osu.Game/Overlays/OverlayHeaderBackground.cs  |  2 --
 osu.Game/Overlays/OverlayRulesetSelector.cs   |  2 --
 osu.Game/Overlays/OverlayRulesetTabItem.cs    |  4 +---
 osu.Game/Overlays/OverlaySidebar.cs           |  4 +---
 osu.Game/Overlays/Rankings/CountryFilter.cs   |  4 +---
 osu.Game/Overlays/Rankings/CountryPill.cs     |  2 --
 osu.Game/Overlays/Rankings/RankingsScope.cs   |  4 +---
 .../Rankings/RankingsSortTabControl.cs        |  2 --
 .../Rankings/Tables/CountriesTable.cs         |  8 +++----
 .../Rankings/Tables/PerformanceTable.cs       |  2 --
 .../Overlays/Rankings/Tables/ScoresTable.cs   |  2 --
 .../Rankings/Tables/TableRowBackground.cs     |  4 +---
 .../Settings/DangerousSettingsButton.cs       |  2 --
 osu.Game/Overlays/Settings/ISettingsItem.cs   |  4 +---
 osu.Game/Overlays/Settings/OutlinedTextBox.cs |  4 +---
 .../Settings/Sections/Audio/OffsetSettings.cs |  2 --
 .../Settings/Sections/Audio/VolumeSettings.cs |  2 --
 .../Settings/Sections/AudioSection.cs         |  2 --
 .../Settings/Sections/DebugSection.cs         |  2 --
 .../Sections/DebugSettings/GeneralSettings.cs |  2 --
 .../Sections/DebugSettings/MemorySettings.cs  |  2 --
 .../Sections/Gameplay/AudioSettings.cs        |  4 +---
 .../Sections/Gameplay/BackgroundSettings.cs   |  4 +---
 .../Sections/Gameplay/BeatmapSettings.cs      |  4 +---
 .../Sections/Gameplay/GeneralSettings.cs      |  4 +---
 .../Settings/Sections/Gameplay/HUDSettings.cs |  2 --
 .../Sections/Gameplay/InputSettings.cs        |  4 +---
 .../Sections/Gameplay/ModsSettings.cs         |  2 --
 .../Settings/Sections/GameplaySection.cs      |  2 --
 .../Sections/Graphics/ScreenshotSettings.cs   |  2 --
 .../Settings/Sections/GraphicsSection.cs      |  2 --
 .../Sections/Input/BindingSettings.cs         |  2 --
 .../Sections/Input/KeyBindingPanel.cs         |  4 +---
 .../Sections/Input/RulesetBindingsSection.cs  |  4 +---
 .../Settings/Sections/InputSection.cs         |  2 --
 .../StableDirectoryLocationDialog.cs          |  4 +---
 .../StableDirectorySelectScreen.cs            |  2 --
 .../Online/AlertsAndPrivacySettings.cs        |  2 --
 .../Sections/Online/IntegrationSettings.cs    |  4 +---
 .../Settings/Sections/Online/WebSettings.cs   |  2 --
 .../Settings/Sections/OnlineSection.cs        |  2 --
 .../Overlays/Settings/Sections/SizeSlider.cs  |  4 +---
 .../Sections/UserInterface/GeneralSettings.cs |  2 --
 .../UserInterface/SongSelectSettings.cs       |  2 --
 .../Settings/Sections/UserInterfaceSection.cs |  4 +---
 .../Overlays/Settings/SettingsCheckbox.cs     |  4 +---
 .../Overlays/Settings/SettingsEnumDropdown.cs |  2 --
 osu.Game/Overlays/Settings/SettingsFooter.cs  |  4 +---
 osu.Game/Overlays/Settings/SettingsHeader.cs  |  2 --
 .../Overlays/Settings/SettingsNumberBox.cs    |  4 +---
 osu.Game/Overlays/Settings/SettingsSidebar.cs |  2 --
 osu.Game/Overlays/Settings/SettingsSlider.cs  |  2 --
 .../Overlays/Settings/SettingsSubsection.cs   |  2 --
 osu.Game/Overlays/Settings/SettingsTextBox.cs |  2 --
 osu.Game/Overlays/Settings/SidebarButton.cs   |  6 ++---
 osu.Game/Overlays/TabControlOverlayHeader.cs  |  2 --
 osu.Game/Overlays/Toolbar/ClockDisplay.cs     |  4 +---
 .../Toolbar/ToolbarBeatmapListingButton.cs    |  4 +---
 osu.Game/Overlays/Toolbar/ToolbarButton.cs    |  8 +++----
 .../Toolbar/ToolbarChangelogButton.cs         |  4 +---
 .../Overlays/Toolbar/ToolbarChatButton.cs     |  4 +---
 .../Overlays/Toolbar/ToolbarHomeButton.cs     |  2 --
 .../Overlays/Toolbar/ToolbarNewsButton.cs     |  2 --
 .../Toolbar/ToolbarNotificationButton.cs      |  2 --
 .../Overlays/Toolbar/ToolbarRankingsButton.cs |  2 --
 .../Toolbar/ToolbarRulesetTabButton.cs        |  2 --
 .../Overlays/Toolbar/ToolbarSettingsButton.cs |  2 --
 .../Overlays/Toolbar/ToolbarSocialButton.cs   |  4 +---
 .../Overlays/Toolbar/ToolbarWikiButton.cs     |  4 +---
 osu.Game/Overlays/VersionManager.cs           |  2 --
 osu.Game/Overlays/Volume/MuteButton.cs        |  2 --
 osu.Game/Overlays/WaveOverlayContainer.cs     |  2 --
 .../Wiki/Markdown/WikiMarkdownContainer.cs    |  4 +---
 .../Wiki/Markdown/WikiMarkdownImage.cs        |  4 +---
 .../Wiki/Markdown/WikiMarkdownImageBlock.cs   |  6 ++---
 .../Wiki/Markdown/WikiNoticeContainer.cs      |  6 ++---
 .../Performance/HighPerformanceSession.cs     |  4 +---
 osu.Game/Properties/AssemblyInfo.cs           |  2 --
 .../Difficulty/PerformanceAttributes.cs       |  2 --
 .../Difficulty/PerformanceCalculator.cs       |  4 +---
 .../Difficulty/PerformanceDisplayAttribute.cs |  4 +---
 osu.Game/Rulesets/Difficulty/Skills/Skill.cs  |  4 +---
 .../Difficulty/Skills/StrainDecaySkill.cs     |  4 +---
 .../Rulesets/Difficulty/Skills/StrainSkill.cs |  4 +---
 osu.Game/Rulesets/Edit/BeatmapVerifier.cs     |  4 +---
 .../Edit/DrawableEditorRulesetWrapper.cs      | 10 ++++-----
 osu.Game/Rulesets/Edit/EditorToolboxGroup.cs  |  4 +---
 .../Edit/ExpandingToolboxContainer.cs         |  4 +---
 osu.Game/Rulesets/Edit/IBeatmapVerifier.cs    |  4 +---
 .../Rulesets/Edit/IDistanceSnapProvider.cs    |  4 +---
 .../Rulesets/Edit/IPositionSnapProvider.cs    |  4 +---
 osu.Game/Rulesets/Edit/SnapType.cs            |  4 +---
 .../Rulesets/Judgements/IgnoreJudgement.cs    |  4 +---
 osu.Game/Rulesets/Judgements/Judgement.cs     |  2 --
 .../Rulesets/Judgements/JudgementResult.cs    |  4 +---
 osu.Game/Rulesets/Objects/HitObjectParser.cs  |  2 --
 .../Objects/Legacy/Catch/ConvertHit.cs        |  2 --
 .../Objects/Legacy/Catch/ConvertSlider.cs     |  2 --
 .../Objects/Legacy/Catch/ConvertSpinner.cs    |  2 --
 .../Objects/Legacy/ConvertHitObject.cs        |  4 +---
 .../Legacy/Mania/ConvertHitObjectParser.cs    |  2 --
 .../Objects/Legacy/Mania/ConvertHold.cs       |  2 --
 .../Objects/Legacy/Mania/ConvertSpinner.cs    |  2 --
 .../Rulesets/Objects/Legacy/Osu/ConvertHit.cs |  2 --
 .../Objects/Legacy/Osu/ConvertSlider.cs       |  2 --
 .../Objects/Legacy/Osu/ConvertSpinner.cs      |  2 --
 .../Objects/Legacy/Taiko/ConvertSpinner.cs    |  2 --
 .../Rulesets/Objects/SliderEventGenerator.cs  |  4 +---
 osu.Game/Rulesets/Objects/SliderPath.cs       |  4 +---
 .../Objects/SyntheticHitObjectEntry.cs        |  4 +---
 .../Objects/Types/IHasDisplayColour.cs        |  4 +---
 osu.Game/Rulesets/Objects/Types/IHasPath.cs   |  4 +---
 .../Objects/Types/IHasPathWithRepeats.cs      |  2 --
 .../Rulesets/Objects/Types/IHasPosition.cs    |  2 --
 .../Rulesets/Objects/Types/IHasRepeats.cs     |  2 --
 osu.Game/Rulesets/RulesetLoadException.cs     |  4 +---
 .../Scoring/AccumulatingHealthProcessor.cs    |  4 +---
 .../Rulesets/Scoring/HitEventExtensions.cs    |  4 +---
 osu.Game/Rulesets/Scoring/HitWindows.cs       |  2 --
 .../Rulesets/UI/GameplayCursorContainer.cs    |  4 +---
 osu.Game/Rulesets/UI/IHitObjectContainer.cs   |  4 +---
 .../Rulesets/UI/IPooledHitObjectProvider.cs   |  4 +---
 osu.Game/Rulesets/UI/JudgementContainer.cs    |  2 --
 .../UI/PlayfieldAdjustmentContainer.cs        |  4 +---
 osu.Game/Rulesets/UI/PlayfieldBorder.cs       |  2 --
 osu.Game/Rulesets/UI/PlayfieldBorderStyle.cs  |  4 +---
 .../Algorithms/ConstantScrollAlgorithm.cs     |  2 --
 .../Rulesets/UI/Scrolling/IScrollingInfo.cs   |  2 --
 .../UI/Scrolling/ScrollingPlayfield.cs        |  6 ++---
 osu.Game/Scoring/HitResultDisplayStatistic.cs |  4 +---
 osu.Game/Scoring/IScoreInfo.cs                |  4 +---
 .../Scoring/Legacy/ScoreInfoExtensions.cs     |  4 +---
 osu.Game/Scoring/Score.cs                     |  4 +---
 osu.Game/Scoring/ScoreRank.cs                 |  2 --
 osu.Game/Screens/BackgroundScreenStack.cs     |  4 +---
 .../Backgrounds/BackgroundScreenBlack.cs      |  2 --
 .../Backgrounds/BackgroundScreenCustom.cs     |  2 --
 .../Components/BeatDivisorPresetCollection.cs |  4 +---
 .../Components/CircularDistanceSnapGrid.cs    | 12 +++++-----
 .../Components/EditorSelectionHandler.cs      |  6 ++---
 .../HitObjectOrderedSelectionContainer.cs     |  6 ++---
 .../Compose/Components/MoveSelectionEvent.cs  |  4 +---
 .../Components/RectangularPositionSnapGrid.cs |  4 +---
 .../Components/Timeline/CentreMarker.cs       |  2 --
 .../Components/Timeline/TimelineButton.cs     |  2 --
 .../Timeline/TimelineControlPointDisplay.cs   |  4 +---
 .../Timeline/TimelineControlPointGroup.cs     |  4 +---
 .../Components/Timeline/TimelineDragBox.cs    |  6 ++---
 .../Timeline/TimelineTickDisplay.cs           | 22 +++++++++----------
 .../Components/Timeline/TimingPointPiece.cs   |  4 +---
 .../Timeline/ZoomableScrollContainer.cs       |  6 ++---
 .../Screens/Edit/Compose/IPlacementHandler.cs |  4 +---
 osu.Game/Screens/Edit/EditorClipboard.cs      |  4 +---
 .../Edit/EditorRoundedScreenSettings.cs       |  4 +---
 osu.Game/Screens/Edit/EditorScreen.cs         |  6 ++---
 .../Edit/GameplayTest/EditorPlayerLoader.cs   |  6 ++---
 .../SaveBeforeGameplayTestDialog.cs           |  4 +---
 .../Screens/Edit/HitAnimationsMenuItem.cs     |  4 +---
 .../Edit/Verify/InterpretationSection.cs      |  4 +---
 osu.Game/Screens/Edit/Verify/IssueSettings.cs |  4 +---
 .../Screens/Edit/WaveformOpacityMenuItem.cs   |  4 +---
 osu.Game/Screens/IHandlePresentBeatmap.cs     |  4 +---
 osu.Game/Screens/IHasSubScreenStack.cs        |  4 +---
 osu.Game/Screens/IOsuScreen.cs                |  4 +---
 osu.Game/Screens/Menu/ExitConfirmOverlay.cs   |  4 +---
 osu.Game/Screens/Menu/SongTicker.cs           |  4 +---
 osu.Game/Screens/Menu/StorageErrorDialog.cs   |  6 ++---
 .../BeatmapDetailAreaPlaylistTabItem.cs       |  4 +---
 .../OnlinePlay/Components/BeatmapTitle.cs     |  4 +---
 .../Components/DisableableTabControl.cs       |  4 +---
 .../OnlinePlay/Components/DrawableGameType.cs |  6 ++---
 .../OnlinePlay/Components/OverlinedHeader.cs  |  4 +---
 .../Components/OverlinedPlaylistHeader.cs     |  4 +---
 .../Components/ParticipantsDisplay.cs         |  4 +---
 .../OnlinePlay/Components/ReadyButton.cs      |  4 +---
 .../Components/RoomPollingComponent.cs        |  8 +++----
 .../OnlinePlay/FooterButtonFreeMods.cs        |  4 +---
 .../OnlinePlay/IOnlinePlaySubScreen.cs        |  4 +---
 .../Lounge/Components/EndDateInfo.cs          |  4 +---
 .../Lounge/Components/MatchTypePill.cs        |  4 +---
 .../Lounge/Components/PillContainer.cs        |  4 +---
 .../Lounge/Components/PlaylistCountPill.cs    |  4 +---
 .../Lounge/Components/QueueModePill.cs        |  4 +---
 .../Components/RoomSpecialCategoryPill.cs     |  6 ++---
 .../Lounge/Components/RoomStatusFilter.cs     |  4 +---
 .../Lounge/Components/RoomStatusPill.cs       |  6 ++---
 .../Match/Components/CreateRoomButton.cs      |  4 +---
 .../Match/Components/MatchChatDisplay.cs      |  8 +++----
 .../OnlinePlay/Match/RoomBackgroundScreen.cs  |  4 +---
 .../Multiplayer/GameplayMatchScoreDisplay.cs  |  4 +---
 .../Match/Playlist/MultiplayerHistoryList.cs  |  4 +---
 .../Playlist/MultiplayerPlaylistTabControl.cs |  2 --
 .../OnlinePlay/Multiplayer/Multiplayer.cs     |  6 ++---
 .../Multiplayer/MultiplayerResultsScreen.cs   |  4 +---
 .../Participants/ParticipantsListHeader.cs    |  6 ++---
 .../Spectate/MultiSpectatorPlayerLoader.cs    |  4 +---
 .../Multiplayer/Spectate/PlayerGrid.cs        |  4 +---
 .../Multiplayer/Spectate/PlayerGrid_Facade.cs |  4 +---
 .../OnlinePlay/OnlinePlaySubScreenStack.cs    |  4 +---
 .../Playlists/CreatePlaylistsRoomButton.cs    |  4 +---
 .../Screens/OnlinePlay/Playlists/Playlists.cs |  4 +---
 .../PlaylistsRoomSettingsPlaylist.cs          |  4 +---
 osu.Game/Screens/OsuScreenStack.cs            |  4 +---
 osu.Game/Screens/Play/Break/BlurredIcon.cs    |  2 --
 osu.Game/Screens/Play/Break/BreakArrows.cs    |  2 --
 osu.Game/Screens/Play/Break/BreakInfo.cs      |  2 --
 osu.Game/Screens/Play/Break/GlowIcon.cs       |  2 --
 .../Play/Break/RemainingTimeCounter.cs        |  2 --
 .../Play/HUD/DefaultAccuracyCounter.cs        |  4 +---
 .../Screens/Play/HUD/DefaultHealthDisplay.cs  |  2 --
 .../Screens/Play/HUD/DefaultScoreCounter.cs   |  4 +---
 osu.Game/Screens/Play/HUD/HealthDisplay.cs    |  8 +++----
 osu.Game/Screens/Play/HUD/ModDisplay.cs       |  2 --
 osu.Game/Screens/Play/HUD/ModFlowDisplay.cs   |  4 +---
 .../Screens/Play/HUD/PlayerSettingsOverlay.cs |  2 --
 .../Screens/Play/HUD/UnstableRateCounter.cs   |  6 ++---
 osu.Game/Screens/Play/HotkeyExitOverlay.cs    |  2 --
 osu.Game/Screens/Play/HotkeyRetryOverlay.cs   |  2 --
 osu.Game/Screens/Play/ILocalUserPlayInfo.cs   |  4 +---
 osu.Game/Screens/Play/PlayerConfiguration.cs  |  4 +---
 .../Play/PlayerSettings/DiscussionSettings.cs |  2 --
 .../Play/PlayerSettings/InputSettings.cs      |  2 --
 .../Play/PlayerSettings/PlaybackSettings.cs   |  2 --
 .../Play/PlayerSettings/PlayerSliderBar.cs    |  4 +---
 osu.Game/Screens/Play/ReplayPlayerLoader.cs   |  4 +---
 .../Screens/Play/SpectatorPlayerLoader.cs     |  4 +---
 .../Screens/Play/SpectatorResultsScreen.cs    |  6 ++---
 osu.Game/Screens/Ranking/AspectContainer.cs   |  4 +---
 .../ContractedPanelMiddleContent.cs           |  6 ++---
 .../Ranking/Expanded/Accuracy/RankNotch.cs    |  4 +---
 .../Expanded/Statistics/HitResultStatistic.cs |  4 +---
 .../Expanded/Statistics/StatisticCounter.cs   |  2 --
 osu.Game/Screens/Ranking/RetryButton.cs       |  6 ++---
 .../Ranking/ScorePanelTrackingContainer.cs    |  4 +---
 .../Ranking/Statistics/AverageHitError.cs     |  4 +---
 .../Ranking/Statistics/StatisticContainer.cs  |  4 +---
 .../Ranking/Statistics/StatisticItem.cs       |  4 +---
 .../Ranking/Statistics/UnstableRate.cs        |  4 +---
 .../Select/BeatmapDetailAreaDetailTabItem.cs  |  4 +---
 .../BeatmapDetailAreaLeaderboardTabItem.cs    |  4 +---
 .../Select/BeatmapInfoWedgeBackground.cs      |  2 --
 osu.Game/Screens/Select/Filter/GroupMode.cs   |  2 --
 osu.Game/Screens/Select/Filter/SortMode.cs    |  2 --
 .../Screens/Select/FooterButtonOptions.cs     |  4 +---
 .../Leaderboards/BeatmapLeaderboardScope.cs   |  2 --
 .../Select/Options/BeatmapOptionsButton.cs    |  2 --
 .../Spectate/SpectatorGameplayState.cs        |  4 +---
 osu.Game/Screens/StartupScreen.cs             |  4 +---
 .../Skinning/LegacyManiaSkinConfiguration.cs  |  4 +---
 osu.Game/Storyboards/CommandLoop.cs           |  2 --
 osu.Game/Storyboards/CommandTimelineGroup.cs  |  2 --
 osu.Game/Storyboards/CommandTrigger.cs        |  2 --
 .../Drawables/DrawableStoryboardLayer.cs      |  2 --
 .../Drawables/DrawableStoryboardSample.cs     |  6 ++---
 .../Drawables/DrawableStoryboardSprite.cs     |  4 +---
 .../Drawables/DrawablesExtensions.cs          |  2 --
 osu.Game/Storyboards/Drawables/IFlippable.cs  |  2 --
 .../Storyboards/Drawables/IVectorScalable.cs  |  4 +---
 osu.Game/Storyboards/IStoryboardElement.cs    |  2 --
 .../IStoryboardElementWithDuration.cs         |  4 +---
 osu.Game/Storyboards/StoryboardExtensions.cs  |  4 +---
 osu.Game/Storyboards/StoryboardLayer.cs       |  2 --
 osu.Game/Storyboards/StoryboardSample.cs      |  2 --
 osu.Game/Storyboards/StoryboardVideo.cs       |  2 --
 osu.Game/Storyboards/StoryboardVideoLayer.cs  |  4 +---
 .../Tests/Beatmaps/LegacyModConversionTest.cs |  2 --
 osu.Game/Tests/Beatmaps/TestBeatmap.cs        |  2 --
 osu.Game/Tests/CleanRunHeadlessGameHost.cs    |  2 --
 osu.Game/Tests/OsuTestBrowser.cs              |  2 --
 .../Visual/DependencyProvidingContainer.cs    |  4 +---
 osu.Game/Tests/Visual/ModPerfectTestScene.cs  |  4 +---
 .../IMultiplayerTestSceneDependencies.cs      |  4 +---
 .../MultiplayerTestSceneDependencies.cs       |  4 +---
 .../IOnlinePlayTestSceneDependencies.cs       |  4 +---
 .../OnlinePlayTestSceneDependencies.cs        |  4 +---
 osu.Game/Tests/Visual/OsuGridTestScene.cs     |  4 +---
 .../Visual/OsuManualInputManagerTestScene.cs  |  2 --
 osu.Game/Tests/Visual/ScreenTestScene.cs      |  2 --
 osu.Game/Tests/Visual/TestReplayPlayer.cs     |  4 +---
 osu.Game/Tests/VisualTestRunner.cs            |  2 --
 osu.Game/Users/CountryStatistics.cs           |  2 --
 osu.Game/Users/Drawables/DrawableFlag.cs      |  2 --
 osu.Game/Users/UserActivity.cs                |  2 --
 osu.Game/Users/UserBrickPanel.cs              |  2 --
 osu.Game/Users/UserGridPanel.cs               |  2 --
 osu.Game/Users/UserListPanel.cs               |  2 --
 osu.Game/Users/UserStatus.cs                  |  4 +---
 osu.Game/Utils/LimitedCapacityQueue.cs        |  4 +---
 osu.iOS/OsuGameIOS.cs                         |  2 --
 1072 files changed, 786 insertions(+), 2930 deletions(-)

diff --git a/osu.Android/GameplayScreenRotationLocker.cs b/osu.Android/GameplayScreenRotationLocker.cs
index 3c39a820cc..d77b24722a 100644
--- a/osu.Android/GameplayScreenRotationLocker.cs
+++ b/osu.Android/GameplayScreenRotationLocker.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using Android.Content.PM;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -16,7 +14,7 @@ namespace osu.Android
         private Bindable<bool> localUserPlaying;
 
         [Resolved]
-        private OsuGameActivity gameActivity { get; set; }
+        private OsuGameActivity gameActivity { get; set; } = null!;
 
         [BackgroundDependencyLoader]
         private void load(OsuGame game)
diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index f0a6e4733c..81b218436e 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/osu.Android/OsuGameAndroid.cs b/osu.Android/OsuGameAndroid.cs
index 0227d2aec2..96f81c209c 100644
--- a/osu.Android/OsuGameAndroid.cs
+++ b/osu.Android/OsuGameAndroid.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using Android.App;
 using Microsoft.Maui.Devices;
diff --git a/osu.Android/Properties/AssemblyInfo.cs b/osu.Android/Properties/AssemblyInfo.cs
index f65b1b239f..1632087fb1 100644
--- a/osu.Android/Properties/AssemblyInfo.cs
+++ b/osu.Android/Properties/AssemblyInfo.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using Android;
 using Android.App;
 
diff --git a/osu.Game.Rulesets.Catch.Tests.Android/MainActivity.cs b/osu.Game.Rulesets.Catch.Tests.Android/MainActivity.cs
index 64c71c9ecd..d8b729576d 100644
--- a/osu.Game.Rulesets.Catch.Tests.Android/MainActivity.cs
+++ b/osu.Game.Rulesets.Catch.Tests.Android/MainActivity.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using Android.App;
 using osu.Framework.Android;
 using osu.Game.Tests;
diff --git a/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs b/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
index b6cb351c1e..baca8166d1 100644
--- a/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
diff --git a/osu.Game.Rulesets.Catch.Tests/CatchDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Catch.Tests/CatchDifficultyCalculatorTest.cs
index cf030f6e13..880316f177 100644
--- a/osu.Game.Rulesets.Catch.Tests/CatchDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Catch.Tests/CatchDifficultyCalculatorTest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Difficulty;
diff --git a/osu.Game.Rulesets.Catch.Tests/CatchLegacyModConversionTest.cs b/osu.Game.Rulesets.Catch.Tests/CatchLegacyModConversionTest.cs
index b9d6f28228..b74120fa3c 100644
--- a/osu.Game.Rulesets.Catch.Tests/CatchLegacyModConversionTest.cs
+++ b/osu.Game.Rulesets.Catch.Tests/CatchLegacyModConversionTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using NUnit.Framework;
 using osu.Game.Beatmaps.Legacy;
diff --git a/osu.Game.Rulesets.Catch.Tests/CatchSkinColourDecodingTest.cs b/osu.Game.Rulesets.Catch.Tests/CatchSkinColourDecodingTest.cs
index f30b216d8d..72011042bc 100644
--- a/osu.Game.Rulesets.Catch.Tests/CatchSkinColourDecodingTest.cs
+++ b/osu.Game.Rulesets.Catch.Tests/CatchSkinColourDecodingTest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.IO.Stores;
 using osu.Game.Rulesets.Catch.Skinning;
diff --git a/osu.Game.Rulesets.Catch.Tests/CatchSkinnableTestScene.cs b/osu.Game.Rulesets.Catch.Tests/CatchSkinnableTestScene.cs
index 2af851a561..4306cc7d9d 100644
--- a/osu.Game.Rulesets.Catch.Tests/CatchSkinnableTestScene.cs
+++ b/osu.Game.Rulesets.Catch.Tests/CatchSkinnableTestScene.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Catch.Tests
diff --git a/osu.Game.Rulesets.Catch.Tests/Editor/CatchEditorTestSceneContainer.cs b/osu.Game.Rulesets.Catch.Tests/Editor/CatchEditorTestSceneContainer.cs
index 39508359a4..058d4eb6b9 100644
--- a/osu.Game.Rulesets.Catch.Tests/Editor/CatchEditorTestSceneContainer.cs
+++ b/osu.Game.Rulesets.Catch.Tests/Editor/CatchEditorTestSceneContainer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game.Rulesets.Catch.Tests/Editor/CatchSelectionBlueprintTestScene.cs b/osu.Game.Rulesets.Catch.Tests/Editor/CatchSelectionBlueprintTestScene.cs
index 033dca587e..6dfc74e75c 100644
--- a/osu.Game.Rulesets.Catch.Tests/Editor/CatchSelectionBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Catch.Tests/Editor/CatchSelectionBlueprintTestScene.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneBananaShowerPlacementBlueprint.cs b/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneBananaShowerPlacementBlueprint.cs
index 2db4102513..ed37ff4ef3 100644
--- a/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneBananaShowerPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneBananaShowerPlacementBlueprint.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Testing;
diff --git a/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneCatchDistanceSnapGrid.cs b/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneCatchDistanceSnapGrid.cs
index 1e057cf3fb..8052b8e3f7 100644
--- a/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneCatchDistanceSnapGrid.cs
+++ b/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneCatchDistanceSnapGrid.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneEditor.cs b/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneEditor.cs
index 5593f3d319..c9ba127569 100644
--- a/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneEditor.cs
+++ b/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneEditor.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Game.Tests.Visual;
 
diff --git a/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneFruitPlacementBlueprint.cs b/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneFruitPlacementBlueprint.cs
index 93b24d92fb..75d3c3753a 100644
--- a/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneFruitPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneFruitPlacementBlueprint.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Utils;
diff --git a/osu.Game.Rulesets.Catch.Tests/JuiceStreamPathTest.cs b/osu.Game.Rulesets.Catch.Tests/JuiceStreamPathTest.cs
index 0de992c1df..95b4fdc07e 100644
--- a/osu.Game.Rulesets.Catch.Tests/JuiceStreamPathTest.cs
+++ b/osu.Game.Rulesets.Catch.Tests/JuiceStreamPathTest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
index f21825668f..3261fb656e 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Audio;
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneBananaShower.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneBananaShower.cs
index 402f8f548d..569c69a633 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneBananaShower.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneBananaShower.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs
index 05d3361dc3..a44575a46e 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchPlayer.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchPlayer.cs
index 01cce88d9d..a82edc1df8 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchPlayer.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchPlayer.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Game.Tests.Visual;
 
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchPlayerLegacySkin.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchPlayerLegacySkin.cs
index 4c1ba33aa2..5406230359 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchPlayerLegacySkin.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchPlayerLegacySkin.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Extensions.IEnumerableExtensions;
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchReplay.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchReplay.cs
index cbf900ebc0..1d2ea4610d 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchReplay.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchReplay.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchStacker.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchStacker.cs
index c8979381fe..af38956002 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchStacker.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchStacker.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjectsHidden.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjectsHidden.cs
index 007f309f3f..23fcd49863 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjectsHidden.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjectsHidden.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Game.Rulesets.Catch.Mods;
 
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
index 223c4e57fc..fda4136a37 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs
index 995daaceb1..de3d9d6530 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitVisualChange.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitVisualChange.cs
index 4b2873e0a8..1534d91e77 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitVisualChange.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitVisualChange.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Bindables;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
index f8c43a221e..3c222662f5 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Linq;
 using NUnit.Framework;
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs
index c91f07891c..c31a7ca99f 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneLegacyBeatmapSkin.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneLegacyBeatmapSkin.cs
index aa66fc8741..871da28142 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneLegacyBeatmapSkin.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneLegacyBeatmapSkin.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
@@ -21,7 +19,7 @@ namespace osu.Game.Rulesets.Catch.Tests
     public partial class TestSceneLegacyBeatmapSkin : LegacyBeatmapSkinColourTest
     {
         [Resolved]
-        private AudioManager audio { get; set; }
+        private AudioManager audio { get; set; } = null!;
 
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
diff --git a/osu.Game.Rulesets.Mania.Tests.Android/MainActivity.cs b/osu.Game.Rulesets.Mania.Tests.Android/MainActivity.cs
index 789fc9e22d..518071fd49 100644
--- a/osu.Game.Rulesets.Mania.Tests.Android/MainActivity.cs
+++ b/osu.Game.Rulesets.Mania.Tests.Android/MainActivity.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using Android.App;
 using osu.Framework.Android;
 using osu.Game.Tests;
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
index 2fda012f07..281dec3c79 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneEditor.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneEditor.cs
index 0a21098d0d..762238be47 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneEditor.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneEditor.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNotePlacementBlueprint.cs
index 4b332c3faa..b79bcb7682 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNotePlacementBlueprint.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Edit.Blueprints;
 using osu.Game.Rulesets.Mania.Objects;
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNoteSelectionBlueprint.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNoteSelectionBlueprint.cs
index a65f949cec..c75095237e 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNoteSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNoteSelectionBlueprint.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Mania.Edit.Blueprints;
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaBeatSnapGrid.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaBeatSnapGrid.cs
index aca555552f..fbc0ed1785 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaBeatSnapGrid.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaBeatSnapGrid.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaComposeScreen.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaComposeScreen.cs
index a1f4b234c4..8f623d1fc6 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaComposeScreen.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaComposeScreen.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Linq;
 using NUnit.Framework;
@@ -25,7 +23,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
     public partial class TestSceneManiaComposeScreen : EditorClockTestScene
     {
         [Resolved]
-        private SkinManager skins { get; set; }
+        private SkinManager skins { get; set; } = null!;
 
         [Cached]
         private EditorClipboard clipboard = new EditorClipboard();
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNoteSelectionBlueprint.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNoteSelectionBlueprint.cs
index 86e87e7486..9d56d31329 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNoteSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNoteSelectionBlueprint.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Mania.Edit.Blueprints;
diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Mania.Tests/ManiaDifficultyCalculatorTest.cs
index 4ae6cb9c7c..7b0171a9ee 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaDifficultyCalculatorTest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Difficulty;
diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs b/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs
index c85583c1fd..ec249f6ae9 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaLegacyModConversionTest.cs b/osu.Game.Rulesets.Mania.Tests/ManiaLegacyModConversionTest.cs
index 9dee861e66..3a9639e04d 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaLegacyModConversionTest.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaLegacyModConversionTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using NUnit.Framework;
 using osu.Game.Beatmaps.Legacy;
diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaLegacyReplayTest.cs b/osu.Game.Rulesets.Mania.Tests/ManiaLegacyReplayTest.cs
index 7d1a934456..641631d05e 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaLegacyReplayTest.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaLegacyReplayTest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Replays;
diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaSpecialColumnTest.cs b/osu.Game.Rulesets.Mania.Tests/ManiaSpecialColumnTest.cs
index 3bd654e75e..ff1f9e6894 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaSpecialColumnTest.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaSpecialColumnTest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using NUnit.Framework;
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs
index 0c55cebf0d..465d4a49f0 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaHitObjectTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaHitObjectTestScene.cs
index 25e120edc5..dd494dfc82 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaHitObjectTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaHitObjectTestScene.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
index 30bd600d9d..ba0c97a121 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneColumnBackground.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneColumnBackground.cs
index 3881aae22e..47923d0733 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneColumnBackground.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneColumnHitObjectArea.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneColumnHitObjectArea.cs
index 9cccc2dd86..d4bbc8acb6 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneColumnHitObjectArea.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneColumnHitObjectArea.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneDrawableJudgement.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneDrawableJudgement.cs
index 2a9727dbd4..c993ba0e0a 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneDrawableJudgement.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneDrawableJudgement.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Linq;
 using osu.Framework.Extensions;
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHitExplosion.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHitExplosion.cs
index 30dd83123d..483c468c1e 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHitExplosion.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.cs
index 0b9ca42af8..a9d18ba401 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneNote.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneNote.cs
index d049d88ea8..2c978c1148 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneNote.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneNote.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Mania.Objects;
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestScenePlayfield.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestScenePlayfield.cs
index 6485cbb76b..29c47ca93a 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestScenePlayfield.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestScenePlayfield.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStage.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStage.cs
index 25e24929c9..d44a38fdec 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStage.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStage.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.UI;
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageBackground.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageBackground.cs
index 0557a201c8..11c3ab3cd3 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageBackground.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageBackground.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Mania.UI.Components;
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs
index 9fdd93bcc9..e3846e8213 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Testing;
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs
index b96fab9ec0..cb9fcca5b0 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using NUnit.Framework;
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectSamples.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectSamples.cs
index 7021c081b7..36ecbdb098 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectSamples.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectSamples.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Reflection;
 using NUnit.Framework;
 using osu.Framework.IO.Stores;
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaPlayer.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaPlayer.cs
index 4e50fd924c..073bef5061 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaPlayer.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaPlayer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.UI;
diff --git a/osu.Game.Rulesets.Mania.Tests/TestScenePlayfieldCoveringContainer.cs b/osu.Game.Rulesets.Mania.Tests/TestScenePlayfieldCoveringContainer.cs
index f497c88bcc..2a8dc715f9 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestScenePlayfieldCoveringContainer.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestScenePlayfieldCoveringContainer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmap.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmap.cs
index b5655a4579..28cdf8907e 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmap.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmap.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs
index 630fdf7ae2..2265d3d347 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs
index 912cac4fe4..27cb681300 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/PatternType.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/PatternType.cs
index bf54dc3179..e4a28167ec 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/PatternType.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/PatternType.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 
 namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/PatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/PatternGenerator.cs
index 931673f337..3d3c35773b 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/PatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/PatternGenerator.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using osu.Game.Rulesets.Objects;
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/StageDefinition.cs b/osu.Game.Rulesets.Mania/Beatmaps/StageDefinition.cs
index 898b558eb3..48b3ce010f 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/StageDefinition.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/StageDefinition.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Game.Rulesets.Mania.UI;
 
diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
index 63e61f17e3..bbb31ab98c 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaPerformanceAttributes.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaPerformanceAttributes.cs
index 01474e6e00..64f8b026c2 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/ManiaPerformanceAttributes.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaPerformanceAttributes.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using osu.Game.Rulesets.Difficulty;
diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaPerformanceCalculator.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaPerformanceCalculator.cs
index 440dec82af..d9f9479247 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/ManiaPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaPerformanceCalculator.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/osu.Game.Rulesets.Mania/Difficulty/Preprocessing/ManiaDifficultyHitObject.cs b/osu.Game.Rulesets.Mania/Difficulty/Preprocessing/ManiaDifficultyHitObject.cs
index df95654319..a67d38b29f 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/Preprocessing/ManiaDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/Preprocessing/ManiaDifficultyHitObject.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Mania.Objects;
diff --git a/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs b/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
index 2c7c84de97..06c825e37d 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
diff --git a/osu.Game.Rulesets.Mania/DualStageVariantGenerator.cs b/osu.Game.Rulesets.Mania/DualStageVariantGenerator.cs
index 262247e244..e9d26b4aa1 100644
--- a/osu.Game.Rulesets.Mania/DualStageVariantGenerator.cs
+++ b/osu.Game.Rulesets.Mania/DualStageVariantGenerator.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Input.Bindings;
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/Components/EditBodyPiece.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/Components/EditBodyPiece.cs
index be1cc9a7fe..6a12ec5088 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/Components/EditBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/Components/EditBodyPiece.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/Components/EditNotePiece.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/Components/EditNotePiece.cs
index ef7ce9073c..48dde29a9f 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/Components/EditNotePiece.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/Components/EditNotePiece.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
index 381af8be7f..cb275a9aa4 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -23,7 +21,7 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         private readonly EditNotePiece tailPiece;
 
         [Resolved]
-        private IScrollingInfo scrollingInfo { get; set; }
+        private IScrollingInfo scrollingInfo { get; set; } = null!;
 
         protected override bool IsValidForPlacement => HitObject.Duration > 0;
 
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
index cf4bca0030..4c356367d3 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Edit;
@@ -17,10 +15,10 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         where T : ManiaHitObject
     {
         [Resolved]
-        private Playfield playfield { get; set; }
+        private Playfield playfield { get; set; } = null!;
 
         [Resolved]
-        private IScrollingInfo scrollingInfo { get; set; }
+        private IScrollingInfo scrollingInfo { get; set; } = null!;
 
         protected ScrollingHitObjectContainer HitObjectContainer => ((ManiaPlayfield)playfield).GetColumn(HitObject.Column).HitObjectContainer;
 
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
index d77abca350..b3ec3ef3e4 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Edit;
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/NoteSelectionBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/NoteSelectionBlueprint.cs
index a1392f09fa..01c7bd502a 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/NoteSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/NoteSelectionBlueprint.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Mania.Edit.Blueprints.Components;
 using osu.Game.Rulesets.Mania.Objects;
diff --git a/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs b/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs
index 4a070e70b4..1e9085bb2f 100644
--- a/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs
+++ b/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Framework.Graphics;
 using osuTK;
diff --git a/osu.Game.Rulesets.Mania/Edit/HoldNoteCompositionTool.cs b/osu.Game.Rulesets.Mania/Edit/HoldNoteCompositionTool.cs
index 960a08eeeb..99e1ce04b1 100644
--- a/osu.Game.Rulesets.Mania/Edit/HoldNoteCompositionTool.cs
+++ b/osu.Game.Rulesets.Mania/Edit/HoldNoteCompositionTool.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
index 2d4b5f718c..9cc84450cc 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -45,13 +43,13 @@ namespace osu.Game.Rulesets.Mania.Edit
         }
 
         [Resolved]
-        private EditorBeatmap beatmap { get; set; }
+        private EditorBeatmap beatmap { get; set; } = null!;
 
         [Resolved]
-        private OsuColour colours { get; set; }
+        private OsuColour colours { get; set; } = null!;
 
         [Resolved]
-        private BindableBeatDivisor beatDivisor { get; set; }
+        private BindableBeatDivisor beatDivisor { get; set; } = null!;
 
         private readonly List<ScrollingHitObjectContainer> grids = new List<ScrollingHitObjectContainer>();
 
@@ -169,7 +167,7 @@ namespace osu.Game.Rulesets.Mania.Edit
         private partial class DrawableGridLine : DrawableHitObject
         {
             [Resolved]
-            private IScrollingInfo scrollingInfo { get; set; }
+            private IScrollingInfo scrollingInfo { get; set; } = null!;
 
             private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs
index 05d8ccc73f..fb3e2d494e 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Edit.Blueprints;
 using osu.Game.Rulesets.Mania.Objects;
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaEditorPlayfield.cs b/osu.Game.Rulesets.Mania/Edit/ManiaEditorPlayfield.cs
index 0a697ca986..77e372d1d6 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaEditorPlayfield.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaEditorPlayfield.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.UI;
 using System.Collections.Generic;
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
index 5e6ae9bb11..8fdbada04f 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Linq;
 using osu.Framework.Allocation;
@@ -16,7 +14,7 @@ namespace osu.Game.Rulesets.Mania.Edit
     public partial class ManiaSelectionHandler : EditorSelectionHandler
     {
         [Resolved]
-        private HitObjectComposer composer { get; set; }
+        private HitObjectComposer composer { get; set; } = null!;
 
         public override bool HandleMovement(MoveSelectionEvent<HitObject> moveEvent)
         {
diff --git a/osu.Game.Rulesets.Mania/Edit/NoteCompositionTool.cs b/osu.Game.Rulesets.Mania/Edit/NoteCompositionTool.cs
index 179f920c2f..08ee05ad3f 100644
--- a/osu.Game.Rulesets.Mania/Edit/NoteCompositionTool.cs
+++ b/osu.Game.Rulesets.Mania/Edit/NoteCompositionTool.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
diff --git a/osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs b/osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs
index 4b94198c4d..ae9e8bd287 100644
--- a/osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs
+++ b/osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mania.Judgements
diff --git a/osu.Game.Rulesets.Mania/Judgements/ManiaJudgement.cs b/osu.Game.Rulesets.Mania/Judgements/ManiaJudgement.cs
index 32f9689d7e..d28b7bdf58 100644
--- a/osu.Game.Rulesets.Mania/Judgements/ManiaJudgement.cs
+++ b/osu.Game.Rulesets.Mania/Judgements/ManiaJudgement.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 
diff --git a/osu.Game.Rulesets.Mania/ManiaInputManager.cs b/osu.Game.Rulesets.Mania/ManiaInputManager.cs
index 9ad24d6256..a41e72660b 100644
--- a/osu.Game.Rulesets.Mania/ManiaInputManager.cs
+++ b/osu.Game.Rulesets.Mania/ManiaInputManager.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.ComponentModel;
 using osu.Framework.Allocation;
 using osu.Framework.Input.Bindings;
diff --git a/osu.Game.Rulesets.Mania/Objects/HoldNoteTick.cs b/osu.Game.Rulesets.Mania/Objects/HoldNoteTick.cs
index 9117c60dcd..e5c5260a49 100644
--- a/osu.Game.Rulesets.Mania/Objects/HoldNoteTick.cs
+++ b/osu.Game.Rulesets.Mania/Objects/HoldNoteTick.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Judgements;
 using osu.Game.Rulesets.Scoring;
diff --git a/osu.Game.Rulesets.Mania/Objects/ManiaHitObject.cs b/osu.Game.Rulesets.Mania/Objects/ManiaHitObject.cs
index ebff5cf4e9..25ad6b997d 100644
--- a/osu.Game.Rulesets.Mania/Objects/ManiaHitObject.cs
+++ b/osu.Game.Rulesets.Mania/Objects/ManiaHitObject.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Bindables;
 using osu.Game.Rulesets.Mania.Scoring;
 using osu.Game.Rulesets.Objects;
diff --git a/osu.Game.Rulesets.Mania/Objects/Note.cs b/osu.Game.Rulesets.Mania/Objects/Note.cs
index 578b46a7aa..0035960c63 100644
--- a/osu.Game.Rulesets.Mania/Objects/Note.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Note.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Judgements;
 
diff --git a/osu.Game.Rulesets.Mania/Objects/TailNote.cs b/osu.Game.Rulesets.Mania/Objects/TailNote.cs
index d6dc25079a..71a594c6ce 100644
--- a/osu.Game.Rulesets.Mania/Objects/TailNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/TailNote.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Judgements;
 
diff --git a/osu.Game.Rulesets.Mania/Properties/AssemblyInfo.cs b/osu.Game.Rulesets.Mania/Properties/AssemblyInfo.cs
index 1bc20f7ef3..ca1f7036c7 100644
--- a/osu.Game.Rulesets.Mania/Properties/AssemblyInfo.cs
+++ b/osu.Game.Rulesets.Mania/Properties/AssemblyInfo.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Runtime.CompilerServices;
 
 // We publish our internal attributes to other sub-projects of the framework.
diff --git a/osu.Game.Rulesets.Mania/Scoring/ManiaHealthProcessor.cs b/osu.Game.Rulesets.Mania/Scoring/ManiaHealthProcessor.cs
index 16f7af0d0a..e63a037ca9 100644
--- a/osu.Game.Rulesets.Mania/Scoring/ManiaHealthProcessor.cs
+++ b/osu.Game.Rulesets.Mania/Scoring/ManiaHealthProcessor.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 
diff --git a/osu.Game.Rulesets.Mania/Scoring/ManiaHitWindows.cs b/osu.Game.Rulesets.Mania/Scoring/ManiaHitWindows.cs
index c46a1b5ab6..289f8a00ef 100644
--- a/osu.Game.Rulesets.Mania/Scoring/ManiaHitWindows.cs
+++ b/osu.Game.Rulesets.Mania/Scoring/ManiaHitWindows.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mania.Scoring
diff --git a/osu.Game.Rulesets.Mania/SingleStageVariantGenerator.cs b/osu.Game.Rulesets.Mania/SingleStageVariantGenerator.cs
index 765fd11dd5..44ffeb5ec2 100644
--- a/osu.Game.Rulesets.Mania/SingleStageVariantGenerator.cs
+++ b/osu.Game.Rulesets.Mania/SingleStageVariantGenerator.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Framework.Input.Bindings;
 
diff --git a/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs b/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs
index c93be91a84..91e0f2c19b 100644
--- a/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs
+++ b/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.UI;
diff --git a/osu.Game.Rulesets.Mania/UI/Components/DefaultStageBackground.cs b/osu.Game.Rulesets.Mania/UI/Components/DefaultStageBackground.cs
index ef34fc04ee..a5c6f10907 100644
--- a/osu.Game.Rulesets.Mania/UI/Components/DefaultStageBackground.cs
+++ b/osu.Game.Rulesets.Mania/UI/Components/DefaultStageBackground.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game.Rulesets.Mania/UI/Components/HitObjectArea.cs b/osu.Game.Rulesets.Mania/UI/Components/HitObjectArea.cs
index 41b2dba173..2ad6e4f076 100644
--- a/osu.Game.Rulesets.Mania/UI/Components/HitObjectArea.cs
+++ b/osu.Game.Rulesets.Mania/UI/Components/HitObjectArea.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Rulesets.Mania/UI/IHitExplosion.cs b/osu.Game.Rulesets.Mania/UI/IHitExplosion.cs
index 74ddceeeef..bbae055b84 100644
--- a/osu.Game.Rulesets.Mania/UI/IHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/UI/IHitExplosion.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Judgements;
 
 namespace osu.Game.Rulesets.Mania.UI
diff --git a/osu.Game.Rulesets.Mania/UI/ManiaPlayfieldAdjustmentContainer.cs b/osu.Game.Rulesets.Mania/UI/ManiaPlayfieldAdjustmentContainer.cs
index d4621ab8f3..1183b616f5 100644
--- a/osu.Game.Rulesets.Mania/UI/ManiaPlayfieldAdjustmentContainer.cs
+++ b/osu.Game.Rulesets.Mania/UI/ManiaPlayfieldAdjustmentContainer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.UI;
 
diff --git a/osu.Game.Rulesets.Mania/UI/ManiaReplayRecorder.cs b/osu.Game.Rulesets.Mania/UI/ManiaReplayRecorder.cs
index 56ac38a737..65dc43af0b 100644
--- a/osu.Game.Rulesets.Mania/UI/ManiaReplayRecorder.cs
+++ b/osu.Game.Rulesets.Mania/UI/ManiaReplayRecorder.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Game.Rulesets.Mania.Replays;
 using osu.Game.Rulesets.Replays;
diff --git a/osu.Game.Rulesets.Mania/UI/OrderedHitPolicy.cs b/osu.Game.Rulesets.Mania/UI/OrderedHitPolicy.cs
index c39e21bace..b6e8fb7191 100644
--- a/osu.Game.Rulesets.Mania/UI/OrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Mania/UI/OrderedHitPolicy.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
diff --git a/osu.Game.Rulesets.Mania/UI/PlayfieldCoveringWrapper.cs b/osu.Game.Rulesets.Mania/UI/PlayfieldCoveringWrapper.cs
index 46cba01771..92f471e36b 100644
--- a/osu.Game.Rulesets.Mania/UI/PlayfieldCoveringWrapper.cs
+++ b/osu.Game.Rulesets.Mania/UI/PlayfieldCoveringWrapper.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
diff --git a/osu.Game.Rulesets.Osu.Tests.Android/MainActivity.cs b/osu.Game.Rulesets.Osu.Tests.Android/MainActivity.cs
index 9b4226d5b6..46c60f06a5 100644
--- a/osu.Game.Rulesets.Osu.Tests.Android/MainActivity.cs
+++ b/osu.Game.Rulesets.Osu.Tests.Android/MainActivity.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using Android.App;
 using osu.Framework.Android;
 using osu.Game.Tests;
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneHitCirclePlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneHitCirclePlacementBlueprint.cs
index 587bd2de44..a49afd82f3 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneHitCirclePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneHitCirclePlacementBlueprint.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuEditor.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuEditor.cs
index 41a099e6e9..03ab7ebbf7 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuEditor.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuEditor.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Game.Tests.Visual;
 
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuEditorGrids.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuEditorGrids.cs
index 59146bc05e..d14e593587 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuEditorGrids.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuEditorGrids.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Testing;
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuEditorSelectInvalidPath.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuEditorSelectInvalidPath.cs
index bb29504ec3..37a109de18 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuEditorSelectInvalidPath.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuEditorSelectInvalidPath.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Objects;
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSpinnerPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSpinnerPlacementBlueprint.cs
index 6378097800..0e8673319e 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSpinnerPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSpinnerPlacementBlueprint.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSpinnerSelectionBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSpinnerSelectionBlueprint.cs
index c899f58c5a..8468995e86 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSpinnerSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSpinnerSelectionBlueprint.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
diff --git a/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
index bee46da1ba..4c11efcc7c 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using NUnit.Framework;
diff --git a/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
index 7e995f2dde..cda330afe5 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Difficulty;
diff --git a/osu.Game.Rulesets.Osu.Tests/OsuLegacyModConversionTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuLegacyModConversionTest.cs
index b4727b3c02..05366e9444 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuLegacyModConversionTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuLegacyModConversionTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using NUnit.Framework;
 using osu.Game.Beatmaps.Legacy;
diff --git a/osu.Game.Rulesets.Osu.Tests/StackingTest.cs b/osu.Game.Rulesets.Osu.Tests/StackingTest.cs
index a2ab7b564c..e370807bca 100644
--- a/osu.Game.Rulesets.Osu.Tests/StackingTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/StackingTest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.IO;
 using System.Linq;
diff --git a/osu.Game.Rulesets.Osu.Tests/TestPlayfieldBorder.cs b/osu.Game.Rulesets.Osu.Tests/TestPlayfieldBorder.cs
index 5366a86bc0..323df75daf 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestPlayfieldBorder.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestPlayfieldBorder.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
index ff71300733..5da54f8fcf 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -25,7 +23,7 @@ namespace osu.Game.Rulesets.Osu.Tests
     public partial class TestSceneDrawableJudgement : OsuSkinnableTestScene
     {
         [Resolved]
-        private OsuConfigManager config { get; set; }
+        private OsuConfigManager config { get; set; } = null!;
 
         private readonly List<DrawablePool<TestDrawableOsuJudgement>> pools;
 
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
index 50f9c5e775..0314afc1ac 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
@@ -25,7 +23,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         private int depthIndex;
 
         [Resolved]
-        private OsuConfigManager config { get; set; }
+        private OsuConfigManager config { get; set; } = null!;
 
         [Test]
         public void TestHits()
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleComboChange.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleComboChange.cs
index 34c67e8b9c..b7c3097864 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleComboChange.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleComboChange.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Bindables;
 using osu.Game.Rulesets.Osu.Objects;
 
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleHidden.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleHidden.cs
index b3498b9651..c113993d31 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleHidden.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleHidden.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Game.Rulesets.Osu.Mods;
 
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLongCombo.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLongCombo.cs
index 93f1123341..bfb31d5b31 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLongCombo.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLongCombo.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Osu.Objects;
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs
index 0d3fd77568..c37660831b 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneNoSpinnerStacking.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneNoSpinnerStacking.cs
index 1f0e264cf7..30d9aff83a 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneNoSpinnerStacking.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneNoSpinnerStacking.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Osu.Objects;
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuHitObjectSamples.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuHitObjectSamples.cs
index 4d0b2cc406..61cc10f284 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuHitObjectSamples.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuHitObjectSamples.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Reflection;
 using NUnit.Framework;
 using osu.Framework.IO.Stores;
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuPlayer.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuPlayer.cs
index 53c4e49807..44efc94d7b 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuPlayer.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuPlayer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Game.Tests.Visual;
 
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneResumeOverlay.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneResumeOverlay.cs
index b66974d4b1..0bb27cff0f 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneResumeOverlay.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneResumeOverlay.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneShaking.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneShaking.cs
index bee7831625..0599517899 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneShaking.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneShaking.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Diagnostics;
 using osu.Framework.Threading;
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderComboChange.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderComboChange.cs
index dc8842a20a..863cc24920 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderComboChange.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderComboChange.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Bindables;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderHidden.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderHidden.cs
index eb13995ad0..671285831f 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderHidden.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderHidden.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Game.Rulesets.Osu.Mods;
 
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerHidden.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerHidden.cs
index 1aaba23e56..42cbb96813 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerHidden.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerHidden.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Game.Rulesets.Osu.Mods;
 
diff --git a/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmap.cs b/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmap.cs
index df146a9511..a5282877ee 100644
--- a/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmap.cs
+++ b/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmap.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
diff --git a/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs b/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
index d03ee81f0d..9e786caf0c 100644
--- a/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osuTK;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Objects;
diff --git a/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapProcessor.cs b/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapProcessor.cs
index da66669550..f51f04bf87 100644
--- a/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapProcessor.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
diff --git a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/AimEvaluator.cs b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/AimEvaluator.cs
index 6d1b4d1a15..cf35b08822 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/AimEvaluator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/AimEvaluator.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Osu.Difficulty.Preprocessing;
diff --git a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/FlashlightEvaluator.cs b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/FlashlightEvaluator.cs
index dabbfcd2fb..5cb5a8f934 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/FlashlightEvaluator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/FlashlightEvaluator.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Osu.Difficulty.Preprocessing;
diff --git a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/RhythmEvaluator.cs b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/RhythmEvaluator.cs
index 3bec2346ce..05939bb3ab 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/RhythmEvaluator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/RhythmEvaluator.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Osu.Difficulty.Preprocessing;
diff --git a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/SpeedEvaluator.cs b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/SpeedEvaluator.cs
index c98f875eb5..1ae500ec78 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/SpeedEvaluator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/SpeedEvaluator.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Osu.Difficulty.Preprocessing;
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceAttributes.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceAttributes.cs
index efb3ade220..0aeaf7669f 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceAttributes.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceAttributes.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using osu.Game.Rulesets.Difficulty;
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 30b56ff769..b31f4ff519 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs b/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
index 6aea00fd35..5215920ea0 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
diff --git a/osu.Game.Rulesets.Osu/Difficulty/Skills/Aim.cs b/osu.Game.Rulesets.Osu/Difficulty/Skills/Aim.cs
index 38e0e5b677..3f6b22bbb1 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Skills/Aim.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Skills/Aim.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Mods;
diff --git a/osu.Game.Rulesets.Osu/Difficulty/Skills/Flashlight.cs b/osu.Game.Rulesets.Osu/Difficulty/Skills/Flashlight.cs
index 40448c444c..3d6d3f99c1 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Skills/Flashlight.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Skills/Flashlight.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Linq;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
diff --git a/osu.Game.Rulesets.Osu/Difficulty/Skills/OsuStrainSkill.cs b/osu.Game.Rulesets.Osu/Difficulty/Skills/OsuStrainSkill.cs
index d6683ade05..15b20a5572 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Skills/OsuStrainSkill.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Skills/OsuStrainSkill.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using osu.Game.Rulesets.Difficulty.Skills;
diff --git a/osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs b/osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs
index efe0e136bf..40aac013ab 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Mods;
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/BlueprintPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/BlueprintPiece.cs
index 41ab5a81b8..cdd11c53d2 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/BlueprintPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/BlueprintPiece.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Osu.Objects;
 
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/Components/HitCirclePiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/Components/HitCirclePiece.cs
index 1fed19da03..670e98ca50 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/Components/HitCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/Components/HitCirclePiece.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs
index 26d18c7a17..20ad99baa2 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components;
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCircleSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCircleSelectionBlueprint.cs
index 1b3e7f3a8f..0608f8c929 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCircleSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCircleSelectionBlueprint.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Primitives;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components;
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/OsuSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/OsuSelectionBlueprint.cs
index d6409279a4..bdd19f9106 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/OsuSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/OsuSelectionBlueprint.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
@@ -17,7 +15,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints
         where T : OsuHitObject
     {
         [Resolved]
-        private EditorClock editorClock { get; set; }
+        private EditorClock editorClock { get; set; } = null!;
 
         protected new DrawableOsuHitObject DrawableObject => (DrawableOsuHitObject)base.DrawableObject;
 
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs
index 68a44eb2f8..075e9e6aa1 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Game.Graphics;
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleOverlay.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleOverlay.cs
index 3341a632c1..d47cf6bf23 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleOverlay.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleOverlay.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components;
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/Components/SpinnerPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/Components/SpinnerPiece.cs
index cc58acdc80..17e838b4e7 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/Components/SpinnerPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/Components/SpinnerPiece.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerSelectionBlueprint.cs
index a80ec68c10..b273292f8a 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerSelectionBlueprint.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners.Components;
 using osu.Game.Rulesets.Osu.Objects;
 using osuTK;
diff --git a/osu.Game.Rulesets.Osu/Edit/HitCircleCompositionTool.cs b/osu.Game.Rulesets.Osu/Edit/HitCircleCompositionTool.cs
index 69187875d7..c41ae10b2e 100644
--- a/osu.Game.Rulesets.Osu/Edit/HitCircleCompositionTool.cs
+++ b/osu.Game.Rulesets.Osu/Edit/HitCircleCompositionTool.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
index 2c67f0bf97..325e9ed4cb 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Rulesets.Edit;
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs b/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs
index 173a664902..ed149d004c 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles;
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuRectangularPositionSnapGrid.cs b/osu.Game.Rulesets.Osu/Edit/OsuRectangularPositionSnapGrid.cs
index 3234b03a3e..efc6668ebf 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuRectangularPositionSnapGrid.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuRectangularPositionSnapGrid.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Input.Bindings;
@@ -22,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         private int currentGridSizeIndex = grid_sizes.Length - 1;
 
         [Resolved]
-        private EditorBeatmap editorBeatmap { get; set; }
+        private EditorBeatmap editorBeatmap { get; set; } = null!;
 
         public OsuRectangularPositionSnapGrid()
             : base(OsuPlayfield.BASE_SIZE / 2)
diff --git a/osu.Game.Rulesets.Osu/Edit/SliderCompositionTool.cs b/osu.Game.Rulesets.Osu/Edit/SliderCompositionTool.cs
index 0a3fc176ad..676205c8d7 100644
--- a/osu.Game.Rulesets.Osu/Edit/SliderCompositionTool.cs
+++ b/osu.Game.Rulesets.Osu/Edit/SliderCompositionTool.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
diff --git a/osu.Game.Rulesets.Osu/Edit/SpinnerCompositionTool.cs b/osu.Game.Rulesets.Osu/Edit/SpinnerCompositionTool.cs
index 3c0cf34010..c8160617c9 100644
--- a/osu.Game.Rulesets.Osu/Edit/SpinnerCompositionTool.cs
+++ b/osu.Game.Rulesets.Osu/Edit/SpinnerCompositionTool.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
diff --git a/osu.Game.Rulesets.Osu/Judgements/ComboResult.cs b/osu.Game.Rulesets.Osu/Judgements/ComboResult.cs
index 9762c676c5..556eb94f38 100644
--- a/osu.Game.Rulesets.Osu/Judgements/ComboResult.cs
+++ b/osu.Game.Rulesets.Osu/Judgements/ComboResult.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.ComponentModel;
 
 namespace osu.Game.Rulesets.Osu.Judgements
diff --git a/osu.Game.Rulesets.Osu/Judgements/OsuHitCircleJudgementResult.cs b/osu.Game.Rulesets.Osu/Judgements/OsuHitCircleJudgementResult.cs
index 5f9faaceb2..7a9a868b9b 100644
--- a/osu.Game.Rulesets.Osu/Judgements/OsuHitCircleJudgementResult.cs
+++ b/osu.Game.Rulesets.Osu/Judgements/OsuHitCircleJudgementResult.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Objects;
diff --git a/osu.Game.Rulesets.Osu/Judgements/OsuIgnoreJudgement.cs b/osu.Game.Rulesets.Osu/Judgements/OsuIgnoreJudgement.cs
index 1bdb74cd3b..7c7f16779e 100644
--- a/osu.Game.Rulesets.Osu/Judgements/OsuIgnoreJudgement.cs
+++ b/osu.Game.Rulesets.Osu/Judgements/OsuIgnoreJudgement.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Judgements
diff --git a/osu.Game.Rulesets.Osu/Judgements/OsuJudgement.cs b/osu.Game.Rulesets.Osu/Judgements/OsuJudgement.cs
index a5503d3273..1a88e2a8b2 100644
--- a/osu.Game.Rulesets.Osu/Judgements/OsuJudgement.cs
+++ b/osu.Game.Rulesets.Osu/Judgements/OsuJudgement.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 
diff --git a/osu.Game.Rulesets.Osu/Judgements/OsuJudgementResult.cs b/osu.Game.Rulesets.Osu/Judgements/OsuJudgementResult.cs
index 50d73fa19d..3bc2cacb43 100644
--- a/osu.Game.Rulesets.Osu/Judgements/OsuJudgementResult.cs
+++ b/osu.Game.Rulesets.Osu/Judgements/OsuJudgementResult.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 
diff --git a/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerJudgementResult.cs b/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerJudgementResult.cs
index 4229c87b58..941cb667cf 100644
--- a/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerJudgementResult.cs
+++ b/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerJudgementResult.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Objects;
diff --git a/osu.Game.Rulesets.Osu/Judgements/SliderTickJudgement.cs b/osu.Game.Rulesets.Osu/Judgements/SliderTickJudgement.cs
index 270c1f31fb..21b024a720 100644
--- a/osu.Game.Rulesets.Osu/Judgements/SliderTickJudgement.cs
+++ b/osu.Game.Rulesets.Osu/Judgements/SliderTickJudgement.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Judgements
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPoint.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPoint.cs
index d588127cb9..52edfb1422 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPoint.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPoint.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Bindables;
 using osuTK;
 using osuTK.Graphics;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerBonusTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerBonusTick.cs
index f1f4ec983e..889a9bd816 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerBonusTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerBonusTick.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
     public partial class DrawableSpinnerBonusTick : DrawableSpinnerTick
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/ITrackSnaking.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/ITrackSnaking.cs
index 9e8035a1ee..cae2a7c36d 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/ITrackSnaking.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/ITrackSnaking.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
diff --git a/osu.Game.Rulesets.Osu/Objects/HitCircle.cs b/osu.Game.Rulesets.Osu/Objects/HitCircle.cs
index 5f43e57ed8..d652db0fd4 100644
--- a/osu.Game.Rulesets.Osu/Objects/HitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/HitCircle.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Osu.Judgements;
 
diff --git a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
index 7b98fc48e0..fd5741698a 100644
--- a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Linq;
 using osu.Framework.Bindables;
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderEndCircle.cs b/osu.Game.Rulesets.Osu/Objects/SliderEndCircle.cs
index f52c3ab382..ddbbb300ca 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderEndCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderEndCircle.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Scoring;
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs b/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs
index 2a84b04030..73c222653e 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Osu.Judgements;
 
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/SliderRepeat.cs
index 7b9316f8ac..cca86361c2 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderRepeat.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Scoring;
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs b/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
index 87c8117b6b..b4574791d2 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Judgements;
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderTick.cs b/osu.Game.Rulesets.Osu/Objects/SliderTick.cs
index 676ff62455..74ec4d6eb3 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderTick.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Judgements;
diff --git a/osu.Game.Rulesets.Osu/Objects/Spinner.cs b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
index ba0981e781..b800b03c92 100644
--- a/osu.Game.Rulesets.Osu/Objects/Spinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs b/osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs
index 00ceccaf7b..8d53100529 100644
--- a/osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 
diff --git a/osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs b/osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs
index c890f3771b..7989c9b7ff 100644
--- a/osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SpinnerTick.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Scoring;
diff --git a/osu.Game.Rulesets.Osu/Properties/AssemblyInfo.cs b/osu.Game.Rulesets.Osu/Properties/AssemblyInfo.cs
index 7fffb1871f..c842874635 100644
--- a/osu.Game.Rulesets.Osu/Properties/AssemblyInfo.cs
+++ b/osu.Game.Rulesets.Osu/Properties/AssemblyInfo.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Runtime.CompilerServices;
 
 // We publish our internal attributes to other sub-projects of the framework.
diff --git a/osu.Game.Rulesets.Osu/UI/IHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/IHitPolicy.cs
index 0dac3307c2..b509796742 100644
--- a/osu.Game.Rulesets.Osu/UI/IHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/IHitPolicy.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfieldAdjustmentContainer.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfieldAdjustmentContainer.cs
index b45d552c7f..2c3a77a6bc 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfieldAdjustmentContainer.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfieldAdjustmentContainer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.UI;
diff --git a/osu.Game.Rulesets.Osu/UI/OsuReplayRecorder.cs b/osu.Game.Rulesets.Osu/UI/OsuReplayRecorder.cs
index 66a4f467a9..545b31bf29 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuReplayRecorder.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuReplayRecorder.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Game.Rulesets.Osu.Replays;
 using osu.Game.Rulesets.Replays;
diff --git a/osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs b/osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs
index aa4cd0af14..e936c24c08 100644
--- a/osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs
+++ b/osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Linq;
 using osu.Framework.Extensions.IEnumerableExtensions;
diff --git a/osu.Game.Rulesets.Taiko.Tests.Android/MainActivity.cs b/osu.Game.Rulesets.Taiko.Tests.Android/MainActivity.cs
index a55b461876..e4f4bbfd53 100644
--- a/osu.Game.Rulesets.Taiko.Tests.Android/MainActivity.cs
+++ b/osu.Game.Rulesets.Taiko.Tests.Android/MainActivity.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using Android.App;
 using osu.Framework.Android;
 using osu.Game.Tests;
diff --git a/osu.Game.Rulesets.Taiko.Tests/DrawableTestHit.cs b/osu.Game.Rulesets.Taiko.Tests/DrawableTestHit.cs
index 157a96eec8..68517166e7 100644
--- a/osu.Game.Rulesets.Taiko.Tests/DrawableTestHit.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/DrawableTestHit.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
diff --git a/osu.Game.Rulesets.Taiko.Tests/DrawableTestStrongHit.cs b/osu.Game.Rulesets.Taiko.Tests/DrawableTestStrongHit.cs
index 747c599721..878f451fd2 100644
--- a/osu.Game.Rulesets.Taiko.Tests/DrawableTestStrongHit.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/DrawableTestStrongHit.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Scoring;
diff --git a/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneEditor.cs b/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneEditor.cs
index 3ee9171e7e..822219db29 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneEditor.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneEditor.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Game.Tests.Visual;
 
diff --git a/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoEditorSaving.cs b/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoEditorSaving.cs
index 93b26624de..af7db2251b 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoEditorSaving.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoEditorSaving.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Taiko.Beatmaps;
diff --git a/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoHitObjectComposer.cs b/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoHitObjectComposer.cs
index ed73730c4a..64a29ce866 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoHitObjectComposer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TaikoSkinnableTestScene.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TaikoSkinnableTestScene.cs
index 38530282b7..b11501535f 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TaikoSkinnableTestScene.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TaikoSkinnableTestScene.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Taiko.Tests.Skinning
diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableBarLine.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableBarLine.cs
index 7fd90685e3..497c788ce8 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableBarLine.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableBarLine.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableDrumRoll.cs
index 3b2f4f2fb2..bef8be4cb5 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableDrumRoll.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableHit.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableHit.cs
index 9567eac80f..863ca4a07d 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableHit.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
index 924f903ce9..f8dd53c834 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneInputDrum.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneInputDrum.cs
index cb5d0d1f91..3c6319ddf9 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneInputDrum.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneInputDrum.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneKiaiHitExplosion.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneKiaiHitExplosion.cs
index 5f98f2f27a..fbdc4132ec 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneKiaiHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneKiaiHitExplosion.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs
index eb2762cb2d..c89e2b727b 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using NUnit.Framework;
 using osu.Framework.Allocation;
diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs
index 826cf2acab..2535058c29 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Testing;
 using osu.Framework.Timing;
diff --git a/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs b/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
index 781a686700..a528a7f9d1 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using NUnit.Framework;
diff --git a/osu.Game.Rulesets.Taiko.Tests/TaikoDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Taiko.Tests/TaikoDifficultyCalculatorTest.cs
index 5685ac0f60..09d6540f72 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TaikoDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TaikoDifficultyCalculatorTest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Difficulty;
diff --git a/osu.Game.Rulesets.Taiko.Tests/TaikoLegacyModConversionTest.cs b/osu.Game.Rulesets.Taiko.Tests/TaikoLegacyModConversionTest.cs
index c86f8cb8d2..541987d63e 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TaikoLegacyModConversionTest.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TaikoLegacyModConversionTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using NUnit.Framework;
 using osu.Game.Beatmaps.Legacy;
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneBarLineApplication.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneBarLineApplication.cs
index 00292d5473..44bc611d92 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneBarLineApplication.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneBarLineApplication.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.Taiko.Objects.Drawables;
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumRollApplication.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumRollApplication.cs
index b01bd11149..0a178ec69f 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumRollApplication.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumRollApplication.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.Taiko.Objects.Drawables;
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneHitApplication.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneHitApplication.cs
index 301620edc9..24aa4f2ef0 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneHitApplication.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneHitApplication.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.Taiko.Objects.Drawables;
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
index 91209e5ec5..fd850a9a67 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneSampleOutput.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneSampleOutput.cs
index dcdda6014c..2429b71095 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneSampleOutput.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneSampleOutput.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Testing;
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoPlayer.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoPlayer.cs
index 8c903f748c..d2cf691c7f 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoPlayer.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoPlayer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Taiko.Tests
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoSuddenDeath.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoSuddenDeath.cs
index 08c06b08f2..9e45197b04 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoSuddenDeath.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoSuddenDeath.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmap.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmap.cs
index 6ff5cdf7e5..41fe63a553 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmap.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmap.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index 1c2e7abafe..dddd1e3c5a 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
index ff187a133a..e76af13686 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Skills;
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs
index d04c028fec..e528c70699 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Skills;
 using osu.Game.Rulesets.Mods;
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
index 24b5f5939a..8e988c4154 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceAttributes.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceAttributes.cs
index b61c13a2df..b12c0ca29d 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceAttributes.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceAttributes.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using osu.Game.Rulesets.Difficulty;
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs
index 2d1b2903c9..a193bacde5 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/osu.Game.Rulesets.Taiko/Edit/Blueprints/DrumRollPlacementBlueprint.cs b/osu.Game.Rulesets.Taiko/Edit/Blueprints/DrumRollPlacementBlueprint.cs
index 4b4e2b5847..2f3c722fda 100644
--- a/osu.Game.Rulesets.Taiko/Edit/Blueprints/DrumRollPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/Blueprints/DrumRollPlacementBlueprint.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Taiko.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Edit.Blueprints
diff --git a/osu.Game.Rulesets.Taiko/Edit/Blueprints/HitPiece.cs b/osu.Game.Rulesets.Taiko/Edit/Blueprints/HitPiece.cs
index 84bc547372..3401f944e4 100644
--- a/osu.Game.Rulesets.Taiko/Edit/Blueprints/HitPiece.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/Blueprints/HitPiece.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
diff --git a/osu.Game.Rulesets.Taiko/Edit/Blueprints/LengthPiece.cs b/osu.Game.Rulesets.Taiko/Edit/Blueprints/LengthPiece.cs
index af02522a05..a56f92a026 100644
--- a/osu.Game.Rulesets.Taiko/Edit/Blueprints/LengthPiece.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/Blueprints/LengthPiece.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
diff --git a/osu.Game.Rulesets.Taiko/Edit/Blueprints/SwellPlacementBlueprint.cs b/osu.Game.Rulesets.Taiko/Edit/Blueprints/SwellPlacementBlueprint.cs
index 2080293428..9b5ef640d7 100644
--- a/osu.Game.Rulesets.Taiko/Edit/Blueprints/SwellPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/Blueprints/SwellPlacementBlueprint.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Taiko.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Edit.Blueprints
diff --git a/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSelectionBlueprint.cs b/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSelectionBlueprint.cs
index 34695cbdd6..93b7c7061b 100644
--- a/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSelectionBlueprint.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
diff --git a/osu.Game.Rulesets.Taiko/Edit/DrumRollCompositionTool.cs b/osu.Game.Rulesets.Taiko/Edit/DrumRollCompositionTool.cs
index acb17fc455..f332441875 100644
--- a/osu.Game.Rulesets.Taiko/Edit/DrumRollCompositionTool.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/DrumRollCompositionTool.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
diff --git a/osu.Game.Rulesets.Taiko/Edit/HitCompositionTool.cs b/osu.Game.Rulesets.Taiko/Edit/HitCompositionTool.cs
index e52dae4b0c..fa50841893 100644
--- a/osu.Game.Rulesets.Taiko/Edit/HitCompositionTool.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/HitCompositionTool.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
diff --git a/osu.Game.Rulesets.Taiko/Edit/SwellCompositionTool.cs b/osu.Game.Rulesets.Taiko/Edit/SwellCompositionTool.cs
index dd0ff61c10..4d4ee8effe 100644
--- a/osu.Game.Rulesets.Taiko/Edit/SwellCompositionTool.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/SwellCompositionTool.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoBlueprintContainer.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoBlueprintContainer.cs
index 6be22f3af0..027723c02c 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoBlueprintContainer.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoBlueprintContainer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Taiko.Edit.Blueprints;
diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
index b727c0a61b..7ab8a54b02 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
diff --git a/osu.Game.Rulesets.Taiko/Judgements/TaikoDrumRollTickJudgement.cs b/osu.Game.Rulesets.Taiko/Judgements/TaikoDrumRollTickJudgement.cs
index de56c76f56..4fc455fb23 100644
--- a/osu.Game.Rulesets.Taiko/Judgements/TaikoDrumRollTickJudgement.cs
+++ b/osu.Game.Rulesets.Taiko/Judgements/TaikoDrumRollTickJudgement.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Taiko.Judgements
diff --git a/osu.Game.Rulesets.Taiko/Judgements/TaikoJudgement.cs b/osu.Game.Rulesets.Taiko/Judgements/TaikoJudgement.cs
index f8e3303752..e272c1a4ef 100644
--- a/osu.Game.Rulesets.Taiko/Judgements/TaikoJudgement.cs
+++ b/osu.Game.Rulesets.Taiko/Judgements/TaikoJudgement.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 
diff --git a/osu.Game.Rulesets.Taiko/Judgements/TaikoStrongJudgement.cs b/osu.Game.Rulesets.Taiko/Judgements/TaikoStrongJudgement.cs
index bafe7dfbaf..1fc50c8751 100644
--- a/osu.Game.Rulesets.Taiko/Judgements/TaikoStrongJudgement.cs
+++ b/osu.Game.Rulesets.Taiko/Judgements/TaikoStrongJudgement.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Taiko.Judgements
diff --git a/osu.Game.Rulesets.Taiko/Judgements/TaikoSwellJudgement.cs b/osu.Game.Rulesets.Taiko/Judgements/TaikoSwellJudgement.cs
index 146621997d..d22ac6bf5e 100644
--- a/osu.Game.Rulesets.Taiko/Judgements/TaikoSwellJudgement.cs
+++ b/osu.Game.Rulesets.Taiko/Judgements/TaikoSwellJudgement.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Taiko.Judgements
diff --git a/osu.Game.Rulesets.Taiko/Objects/BarLine.cs b/osu.Game.Rulesets.Taiko/Objects/BarLine.cs
index d2eba0eb54..46b3f13501 100644
--- a/osu.Game.Rulesets.Taiko/Objects/BarLine.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/BarLine.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Bindables;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingHit.cs
index 0cd265ecab..a039ce3407 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingHit.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs
index 4ea30453d1..6ee29fa014 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using JetBrains.Annotations;
 using osu.Game.Rulesets.Taiko.Judgements;
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
index 206e8ecb5a..eb333d9ec5 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Judgements;
diff --git a/osu.Game.Rulesets.Taiko/Objects/Hit.cs b/osu.Game.Rulesets.Taiko/Objects/Hit.cs
index ec23079ed9..156e890607 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Hit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Hit.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
diff --git a/osu.Game.Rulesets.Taiko/Objects/IgnoreHit.cs b/osu.Game.Rulesets.Taiko/Objects/IgnoreHit.cs
index 18f47b7cff..302f940ef4 100644
--- a/osu.Game.Rulesets.Taiko/Objects/IgnoreHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/IgnoreHit.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Judgements;
 
 namespace osu.Game.Rulesets.Taiko.Objects
diff --git a/osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs
index 316115f44d..14cbe338ed 100644
--- a/osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Judgements;
diff --git a/osu.Game.Rulesets.Taiko/Objects/Swell.cs b/osu.Game.Rulesets.Taiko/Objects/Swell.cs
index 9ad783ba7e..a8db8df021 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Swell.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Swell.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Threading;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Judgements;
diff --git a/osu.Game.Rulesets.Taiko/Objects/SwellTick.cs b/osu.Game.Rulesets.Taiko/Objects/SwellTick.cs
index 43830cb528..41fb9cac7e 100644
--- a/osu.Game.Rulesets.Taiko/Objects/SwellTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/SwellTick.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs
index 3aba5c571b..1a1fde1990 100644
--- a/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
diff --git a/osu.Game.Rulesets.Taiko/Objects/TaikoStrongableHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/TaikoStrongableHitObject.cs
index 479ad8369a..228179f94b 100644
--- a/osu.Game.Rulesets.Taiko/Objects/TaikoStrongableHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/TaikoStrongableHitObject.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using System.Threading;
 using osu.Framework.Bindables;
diff --git a/osu.Game.Rulesets.Taiko/Properties/AssemblyInfo.cs b/osu.Game.Rulesets.Taiko/Properties/AssemblyInfo.cs
index 5b66e18a6d..ca7d04876e 100644
--- a/osu.Game.Rulesets.Taiko/Properties/AssemblyInfo.cs
+++ b/osu.Game.Rulesets.Taiko/Properties/AssemblyInfo.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Runtime.CompilerServices;
 
 // We publish our internal attributes to other sub-projects of the framework.
diff --git a/osu.Game.Rulesets.Taiko/Scoring/TaikoHealthProcessor.cs b/osu.Game.Rulesets.Taiko/Scoring/TaikoHealthProcessor.cs
index 7c70beb0a4..d75906f3aa 100644
--- a/osu.Game.Rulesets.Taiko/Scoring/TaikoHealthProcessor.cs
+++ b/osu.Game.Rulesets.Taiko/Scoring/TaikoHealthProcessor.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Linq;
 using osu.Game.Beatmaps;
diff --git a/osu.Game.Rulesets.Taiko/Scoring/TaikoHitWindows.cs b/osu.Game.Rulesets.Taiko/Scoring/TaikoHitWindows.cs
index 896af24772..cf806c0c97 100644
--- a/osu.Game.Rulesets.Taiko/Scoring/TaikoHitWindows.cs
+++ b/osu.Game.Rulesets.Taiko/Scoring/TaikoHitWindows.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Taiko.Scoring
diff --git a/osu.Game.Rulesets.Taiko/TaikoInputManager.cs b/osu.Game.Rulesets.Taiko/TaikoInputManager.cs
index ca06a0a77e..4292d461bf 100644
--- a/osu.Game.Rulesets.Taiko/TaikoInputManager.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoInputManager.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.ComponentModel;
 using osu.Framework.Allocation;
 using osu.Framework.Input.Bindings;
diff --git a/osu.Game.Tests.Android/MainActivity.cs b/osu.Game.Tests.Android/MainActivity.cs
index bdb947fbb4..ab43a6766c 100644
--- a/osu.Game.Tests.Android/MainActivity.cs
+++ b/osu.Game.Tests.Android/MainActivity.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Reflection;
 using Android.App;
 using Android.OS;
diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
index fac5e098b9..5d9049ead7 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections;
 using System.Collections.Generic;
diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyDecoderTest.cs
index c1c9e0d118..39bb616563 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyDecoderTest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using NUnit.Framework;
 using osu.Game.Beatmaps.Formats;
diff --git a/osu.Game.Tests/Beatmaps/IO/LineBufferedReaderTest.cs b/osu.Game.Tests/Beatmaps/IO/LineBufferedReaderTest.cs
index 8f20fd7a68..5e37f01c81 100644
--- a/osu.Game.Tests/Beatmaps/IO/LineBufferedReaderTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/LineBufferedReaderTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.IO;
 using System.Text;
diff --git a/osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs b/osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs
index 04eb9a3fa2..810ea5dbd0 100644
--- a/osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.IO;
 using System.Linq;
 using NUnit.Framework;
diff --git a/osu.Game.Tests/Beatmaps/SliderEventGenerationTest.cs b/osu.Game.Tests/Beatmaps/SliderEventGenerationTest.cs
index d30ab3dea1..a26c8121dd 100644
--- a/osu.Game.Tests/Beatmaps/SliderEventGenerationTest.cs
+++ b/osu.Game.Tests/Beatmaps/SliderEventGenerationTest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using NUnit.Framework;
 using osu.Game.Rulesets.Objects;
diff --git a/osu.Game.Tests/Beatmaps/ToStringFormattingTest.cs b/osu.Game.Tests/Beatmaps/ToStringFormattingTest.cs
index b4a205b478..f3c05d8970 100644
--- a/osu.Game.Tests/Beatmaps/ToStringFormattingTest.cs
+++ b/osu.Game.Tests/Beatmaps/ToStringFormattingTest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Models;
diff --git a/osu.Game.Tests/Collections/IO/ImportCollectionsTest.cs b/osu.Game.Tests/Collections/IO/ImportCollectionsTest.cs
index 9079ecdc48..d034e69957 100644
--- a/osu.Game.Tests/Collections/IO/ImportCollectionsTest.cs
+++ b/osu.Game.Tests/Collections/IO/ImportCollectionsTest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.IO;
 using System.Linq;
diff --git a/osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs b/osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs
index e7fdb52d2f..b237556d11 100644
--- a/osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs
+++ b/osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs b/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
index 769ca1f9a9..d198ef5074 100644
--- a/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.IO.Stores;
 using osu.Game.Rulesets;
diff --git a/osu.Game.Tests/Gameplay/TestSceneScoreProcessor.cs b/osu.Game.Tests/Gameplay/TestSceneScoreProcessor.cs
index a261185473..1cf72cf937 100644
--- a/osu.Game.Tests/Gameplay/TestSceneScoreProcessor.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneScoreProcessor.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/osu.Game.Tests/ImportTest.cs b/osu.Game.Tests/ImportTest.cs
index 9e2c9cd7e0..3f0f8a4f14 100644
--- a/osu.Game.Tests/ImportTest.cs
+++ b/osu.Game.Tests/ImportTest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/osu.Game.Tests/Input/ConfineMouseTrackerTest.cs b/osu.Game.Tests/Input/ConfineMouseTrackerTest.cs
index 3c296b2ff5..6b43ab83c5 100644
--- a/osu.Game.Tests/Input/ConfineMouseTrackerTest.cs
+++ b/osu.Game.Tests/Input/ConfineMouseTrackerTest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Configuration;
@@ -18,7 +16,7 @@ namespace osu.Game.Tests.Input
     public partial class ConfineMouseTrackerTest : OsuGameTestScene
     {
         [Resolved]
-        private FrameworkConfigManager frameworkConfigManager { get; set; }
+        private FrameworkConfigManager frameworkConfigManager { get; set; } = null!;
 
         [TestCase(WindowMode.Windowed)]
         [TestCase(WindowMode.Borderless)]
diff --git a/osu.Game.Tests/Localisation/BeatmapMetadataRomanisationTest.cs b/osu.Game.Tests/Localisation/BeatmapMetadataRomanisationTest.cs
index d01eaca714..9926acf772 100644
--- a/osu.Game.Tests/Localisation/BeatmapMetadataRomanisationTest.cs
+++ b/osu.Game.Tests/Localisation/BeatmapMetadataRomanisationTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 
diff --git a/osu.Game.Tests/NonVisual/BarLineGeneratorTest.cs b/osu.Game.Tests/NonVisual/BarLineGeneratorTest.cs
index e7827a7398..0f5c13ca0e 100644
--- a/osu.Game.Tests/NonVisual/BarLineGeneratorTest.cs
+++ b/osu.Game.Tests/NonVisual/BarLineGeneratorTest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using NUnit.Framework;
 using osu.Framework.Utils;
diff --git a/osu.Game.Tests/NonVisual/ClosestBeatDivisorTest.cs b/osu.Game.Tests/NonVisual/ClosestBeatDivisorTest.cs
index 8ebf34b1ca..8a53759323 100644
--- a/osu.Game.Tests/NonVisual/ClosestBeatDivisorTest.cs
+++ b/osu.Game.Tests/NonVisual/ClosestBeatDivisorTest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
diff --git a/osu.Game.Tests/NonVisual/ControlPointInfoTest.cs b/osu.Game.Tests/NonVisual/ControlPointInfoTest.cs
index a2ded643fa..2d5d425ee8 100644
--- a/osu.Game.Tests/NonVisual/ControlPointInfoTest.cs
+++ b/osu.Game.Tests/NonVisual/ControlPointInfoTest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using NUnit.Framework;
 using osu.Game.Beatmaps.ControlPoints;
diff --git a/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs b/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs
index 6637d640b2..6b1b883ce7 100644
--- a/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs
+++ b/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/osu.Game.Tests/NonVisual/FormatUtilsTest.cs b/osu.Game.Tests/NonVisual/FormatUtilsTest.cs
index 4d2fc53bc3..a12658bd8b 100644
--- a/osu.Game.Tests/NonVisual/FormatUtilsTest.cs
+++ b/osu.Game.Tests/NonVisual/FormatUtilsTest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Game.Utils;
 
diff --git a/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs b/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs
index ae6a76f6cd..b4bbe274a5 100644
--- a/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs
+++ b/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using Humanizer;
 using NUnit.Framework;
diff --git a/osu.Game.Tests/NonVisual/PeriodTrackerTest.cs b/osu.Game.Tests/NonVisual/PeriodTrackerTest.cs
index b589f7c9f1..664a499cc3 100644
--- a/osu.Game.Tests/NonVisual/PeriodTrackerTest.cs
+++ b/osu.Game.Tests/NonVisual/PeriodTrackerTest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Linq;
 using NUnit.Framework;
diff --git a/osu.Game.Tests/NonVisual/RulesetInfoOrderingTest.cs b/osu.Game.Tests/NonVisual/RulesetInfoOrderingTest.cs
index 8654abd49d..335e7d25a2 100644
--- a/osu.Game.Tests/NonVisual/RulesetInfoOrderingTest.cs
+++ b/osu.Game.Tests/NonVisual/RulesetInfoOrderingTest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using NUnit.Framework;
 using osu.Game.Rulesets;
diff --git a/osu.Game.Tests/NonVisual/ScoreInfoTest.cs b/osu.Game.Tests/NonVisual/ScoreInfoTest.cs
index dcc4f91dba..ad3b5b6f66 100644
--- a/osu.Game.Tests/NonVisual/ScoreInfoTest.cs
+++ b/osu.Game.Tests/NonVisual/ScoreInfoTest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Game.Online.API;
 using osu.Game.Rulesets.Mania;
diff --git a/osu.Game.Tests/NonVisual/TimeDisplayExtensionTest.cs b/osu.Game.Tests/NonVisual/TimeDisplayExtensionTest.cs
index 861e342cdb..10d592364d 100644
--- a/osu.Game.Tests/NonVisual/TimeDisplayExtensionTest.cs
+++ b/osu.Game.Tests/NonVisual/TimeDisplayExtensionTest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using NUnit.Framework;
 using osu.Game.Extensions;
diff --git a/osu.Game.Tests/Online/Chat/MessageNotifierTest.cs b/osu.Game.Tests/Online/Chat/MessageNotifierTest.cs
index 13f1ed5c57..e4118a23b4 100644
--- a/osu.Game.Tests/Online/Chat/MessageNotifierTest.cs
+++ b/osu.Game.Tests/Online/Chat/MessageNotifierTest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Game.Online.Chat;
 
diff --git a/osu.Game.Tests/Online/TestMultiplayerMessagePackSerialization.cs b/osu.Game.Tests/Online/TestMultiplayerMessagePackSerialization.cs
index aea579a82d..c440f375fd 100644
--- a/osu.Game.Tests/Online/TestMultiplayerMessagePackSerialization.cs
+++ b/osu.Game.Tests/Online/TestMultiplayerMessagePackSerialization.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using MessagePack;
 using NUnit.Framework;
 using osu.Game.Online;
diff --git a/osu.Game.Tests/Online/TestSoloScoreInfoJsonSerialization.cs b/osu.Game.Tests/Online/TestSoloScoreInfoJsonSerialization.cs
index 8ff0b67b5b..19bc96c677 100644
--- a/osu.Game.Tests/Online/TestSoloScoreInfoJsonSerialization.cs
+++ b/osu.Game.Tests/Online/TestSoloScoreInfoJsonSerialization.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using Newtonsoft.Json;
 using NUnit.Framework;
 using osu.Game.IO.Serialization;
diff --git a/osu.Game.Tests/OnlinePlay/PlaylistExtensionsTest.cs b/osu.Game.Tests/OnlinePlay/PlaylistExtensionsTest.cs
index 73ed2bb868..274681b413 100644
--- a/osu.Game.Tests/OnlinePlay/PlaylistExtensionsTest.cs
+++ b/osu.Game.Tests/OnlinePlay/PlaylistExtensionsTest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using NUnit.Framework;
 using osu.Game.Online.API.Requests.Responses;
diff --git a/osu.Game.Tests/Scores/IO/TestScoreEquality.cs b/osu.Game.Tests/Scores/IO/TestScoreEquality.cs
index d44fd786d7..5aa07260ef 100644
--- a/osu.Game.Tests/Scores/IO/TestScoreEquality.cs
+++ b/osu.Game.Tests/Scores/IO/TestScoreEquality.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using NUnit.Framework;
 using osu.Game.Scoring;
diff --git a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
index 0c25934d52..1c1ebe271e 100644
--- a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
+++ b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.IO;
 using System.Linq;
diff --git a/osu.Game.Tests/Skins/LegacyManiaSkinDecoderTest.cs b/osu.Game.Tests/Skins/LegacyManiaSkinDecoderTest.cs
index 6da335a9b7..b96bf09255 100644
--- a/osu.Game.Tests/Skins/LegacyManiaSkinDecoderTest.cs
+++ b/osu.Game.Tests/Skins/LegacyManiaSkinDecoderTest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Game.IO;
 using osu.Game.Skinning;
diff --git a/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapCardDifficultyList.cs b/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapCardDifficultyList.cs
index 9f3e36ad76..9e5bd53b13 100644
--- a/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapCardDifficultyList.cs
+++ b/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapCardDifficultyList.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapSetOnlineStatusPill.cs b/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapSetOnlineStatusPill.cs
index 8a11d60875..88e47ea560 100644
--- a/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapSetOnlineStatusPill.cs
+++ b/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapSetOnlineStatusPill.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/osu.Game.Tests/Visual/Colours/TestSceneStarDifficultyColours.cs b/osu.Game.Tests/Visual/Colours/TestSceneStarDifficultyColours.cs
index 55a2efa89d..7f07563dfd 100644
--- a/osu.Game.Tests/Visual/Colours/TestSceneStarDifficultyColours.cs
+++ b/osu.Game.Tests/Visual/Colours/TestSceneStarDifficultyColours.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
@@ -19,7 +17,7 @@ namespace osu.Game.Tests.Visual.Colours
     public partial class TestSceneStarDifficultyColours : OsuTestScene
     {
         [Resolved]
-        private OsuColour colours { get; set; }
+        private OsuColour colours { get; set; } = null!;
 
         [Test]
         public void TestColours()
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneBlueprintOrdering.cs b/osu.Game.Tests/Visual/Editing/TestSceneBlueprintOrdering.cs
index 8b598a6a24..fdb3513e66 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneBlueprintOrdering.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneBlueprintOrdering.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Testing;
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorComposeRadioButtons.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorComposeRadioButtons.cs
index e11d2e9dbf..2a822b3f1f 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorComposeRadioButtons.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorComposeRadioButtons.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorMenuBar.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorMenuBar.cs
index 699b99c57f..dbcf66f005 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorMenuBar.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorMenuBar.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorScreenModes.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorScreenModes.cs
index a9d054881b..c0d64f4030 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorScreenModes.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorScreenModes.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Linq;
 using NUnit.Framework;
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorSeeking.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSeeking.cs
index b2b3dd9632..da4f159cae 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorSeeking.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSeeking.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs
index f255dd08a8..ddca2f8553 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectDifficultyPointAdjustments.cs b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectDifficultyPointAdjustments.cs
index c874b39028..c78f50c821 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectDifficultyPointAdjustments.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectDifficultyPointAdjustments.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using Humanizer;
 using NUnit.Framework;
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSampleAdjustments.cs b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSampleAdjustments.cs
index b0b51a5dbd..29de0bff79 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSampleAdjustments.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSampleAdjustments.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using System.Collections.Generic;
 using Humanizer;
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneSetupScreen.cs b/osu.Game.Tests/Visual/Editing/TestSceneSetupScreen.cs
index c0e681b8b4..534b813ddc 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneSetupScreen.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneSetupScreen.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneTimelineBlueprintContainer.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimelineBlueprintContainer.cs
index b63296a48d..79ca8ee20c 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneTimelineBlueprintContainer.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimelineBlueprintContainer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Screens.Edit.Compose.Components.Timeline;
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
index 08e036248b..7a5243f6e8 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneTimelineTickDisplay.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimelineTickDisplay.cs
index 41fb3ed8b9..1376ba23fb 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneTimelineTickDisplay.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimelineTickDisplay.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneTimelineZoom.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimelineZoom.cs
index 19f4678c15..b493845ad4 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneTimelineZoom.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimelineZoom.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Graphics;
 
diff --git a/osu.Game.Tests/Visual/Gameplay/OsuPlayerTestScene.cs b/osu.Game.Tests/Visual/Gameplay/OsuPlayerTestScene.cs
index 7ff059ff77..7252fbc474 100644
--- a/osu.Game.Tests/Visual/Gameplay/OsuPlayerTestScene.cs
+++ b/osu.Game.Tests/Visual/Gameplay/OsuPlayerTestScene.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneFailAnimation.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneFailAnimation.cs
index 6cb1101173..b251253b7c 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneFailAnimation.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneFailAnimation.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using NUnit.Framework;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneFailJudgement.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneFailJudgement.cs
index e779c6c1cb..6297b062dd 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneFailJudgement.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneFailJudgement.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Linq;
 using osu.Game.Rulesets;
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
index 22f7111f68..f978653f2a 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneMedalOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneMedalOverlay.cs
index 626406e4d2..71ed0a14a2 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneMedalOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneMedalOverlay.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Game.Overlays;
 using osu.Game.Users;
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneNightcoreBeatContainer.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneNightcoreBeatContainer.cs
index 84334ba0a9..0e03f253a9 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneNightcoreBeatContainer.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneNightcoreBeatContainer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Game.Beatmaps.Timing;
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorComponentsList.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorComponentsList.cs
index 2ae5e6f998..515bc09bbb 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorComponentsList.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorComponentsList.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs
index 6f079778c5..59a1f938e6 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableComboCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableComboCounter.cs
index 93fa953ef4..0c351a93bb 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableComboCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableComboCounter.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
index 7f6c9d7804..b4ebb7c410 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs
index 2cb3303dd6..7079b93d3e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorHost.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorHost.cs
index 1c09c29748..f1ee5cc414 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorHost.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorHost.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Screens;
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStarCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStarCounter.cs
index 699c8ea20a..b002e90bb0 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStarCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStarCounter.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Utils;
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneUnknownMod.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneUnknownMod.cs
index cb5631e599..1d85643adf 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneUnknownMod.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneUnknownMod.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
diff --git a/osu.Game.Tests/Visual/Menus/TestSceneDisclaimer.cs b/osu.Game.Tests/Visual/Menus/TestSceneDisclaimer.cs
index 45e5a7c270..fb82b0df80 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneDisclaimer.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneDisclaimer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
diff --git a/osu.Game.Tests/Visual/Menus/TestSceneIntroCircles.cs b/osu.Game.Tests/Visual/Menus/TestSceneIntroCircles.cs
index 0c024248ea..c0ced9057a 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneIntroCircles.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneIntroCircles.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Game.Screens.Menu;
 
diff --git a/osu.Game.Tests/Visual/Menus/TestSceneIntroTriangles.cs b/osu.Game.Tests/Visual/Menus/TestSceneIntroTriangles.cs
index 23373892d1..e8859400d5 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneIntroTriangles.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneIntroTriangles.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Game.Screens.Menu;
 
diff --git a/osu.Game.Tests/Visual/Menus/TestSceneIntroWelcome.cs b/osu.Game.Tests/Visual/Menus/TestSceneIntroWelcome.cs
index 2ccf184525..cb4a52a3b9 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneIntroWelcome.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneIntroWelcome.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Utils;
 using osu.Game.Screens.Menu;
diff --git a/osu.Game.Tests/Visual/Menus/TestSceneSideOverlays.cs b/osu.Game.Tests/Visual/Menus/TestSceneSideOverlays.cs
index e5e092b382..4f01dcffd9 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneSideOverlays.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneSideOverlays.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Linq;
 using NUnit.Framework;
diff --git a/osu.Game.Tests/Visual/Menus/TestSceneSongTicker.cs b/osu.Game.Tests/Visual/Menus/TestSceneSongTicker.cs
index c54c66df7e..e4add64da2 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneSongTicker.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneSongTicker.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Overlays;
diff --git a/osu.Game.Tests/Visual/Mods/TestSceneModFailCondition.cs b/osu.Game.Tests/Visual/Mods/TestSceneModFailCondition.cs
index 49256c7a01..f4732234a7 100644
--- a/osu.Game.Tests/Visual/Mods/TestSceneModFailCondition.cs
+++ b/osu.Game.Tests/Visual/Mods/TestSceneModFailCondition.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
index 63a0ada3dc..24d1b51ff8 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs
index defb3006cc..ea8fe8873d 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Framework.Graphics;
 using osu.Game.Online.API;
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs
index 3d85a47ca9..46d409e6f1 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Screens;
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
index a612167d57..bafe373d57 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboardTeams.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboardTeams.cs
index 48f74cf308..37662ffce8 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboardTeams.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboardTeams.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using osu.Framework.Graphics;
 using osu.Game.Online.Multiplayer;
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchFooter.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchFooter.cs
index d636373fbd..c2d3b17ccb 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchFooter.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchFooter.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneRankRangePill.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneRankRangePill.cs
index aaf1a850af..d5f53bc354 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneRankRangePill.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneRankRangePill.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using Moq;
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneStarRatingRangeDisplay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneStarRatingRangeDisplay.cs
index e46ae978d7..b53a61f881 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneStarRatingRangeDisplay.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneStarRatingRangeDisplay.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneButtonSystemNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneButtonSystemNavigation.cs
index 64ea6003bc..c6d67f2bc6 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneButtonSystemNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneButtonSystemNavigation.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Testing;
diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneEditDefaultSkin.cs b/osu.Game.Tests/Visual/Navigation/TestSceneEditDefaultSkin.cs
index bd75825da2..1633a778ab 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneEditDefaultSkin.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneEditDefaultSkin.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneStartupBeatmapSetDisplay.cs b/osu.Game.Tests/Visual/Navigation/TestSceneStartupBeatmapSetDisplay.cs
index f885c2f44c..0bfe02cb16 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneStartupBeatmapSetDisplay.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneStartupBeatmapSetDisplay.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneStartupRuleset.cs b/osu.Game.Tests/Visual/Navigation/TestSceneStartupRuleset.cs
index 621dabe869..d70eaf16f6 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneStartupRuleset.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneStartupRuleset.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Development;
 using osu.Game.Configuration;
diff --git a/osu.Game.Tests/Visual/Navigation/TestSettingsMigration.cs b/osu.Game.Tests/Visual/Navigation/TestSettingsMigration.cs
index c32aa7f5f9..820df02b66 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSettingsMigration.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSettingsMigration.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Utils;
 using osu.Game.Configuration;
diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapAvailability.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapAvailability.cs
index 36f8d2d9bd..ccd3d7f4d6 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapAvailability.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapAvailability.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API.Requests.Responses;
diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
index d9763ef6c8..60fb6b8c86 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Game.Beatmaps;
@@ -39,7 +37,7 @@ namespace osu.Game.Tests.Visual.Online
         }
 
         [Resolved]
-        private IRulesetStore rulesets { get; set; }
+        private IRulesetStore rulesets { get; set; } = null!;
 
         [SetUp]
         public void SetUp() => Schedule(() => SelectedMods.Value = Array.Empty<Mod>());
diff --git a/osu.Game.Tests/Visual/Online/TestSceneChangelogSupporterPromo.cs b/osu.Game.Tests/Visual/Online/TestSceneChangelogSupporterPromo.cs
index 96996db940..fbd3b3a728 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChangelogSupporterPromo.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChangelogSupporterPromo.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game.Tests/Visual/Online/TestSceneCommentsHeader.cs b/osu.Game.Tests/Visual/Online/TestSceneCommentsHeader.cs
index 43d80ee0ac..89b8a8c079 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCommentsHeader.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCommentsHeader.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
diff --git a/osu.Game.Tests/Visual/Online/TestSceneDashboardOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneDashboardOverlay.cs
index 504be45b44..9407941da6 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneDashboardOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneDashboardOverlay.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Game.Overlays;
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneExternalLinkButton.cs b/osu.Game.Tests/Visual/Online/TestSceneExternalLinkButton.cs
index 90ec3160d8..84f245afb6 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneExternalLinkButton.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneExternalLinkButton.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Graphics.UserInterface;
diff --git a/osu.Game.Tests/Visual/Online/TestSceneGraph.cs b/osu.Game.Tests/Visual/Online/TestSceneGraph.cs
index 357ed7548c..4f19003638 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneGraph.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneGraph.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Linq;
 using NUnit.Framework;
diff --git a/osu.Game.Tests/Visual/Online/TestSceneHomeNewsPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneHomeNewsPanel.cs
index a58845ca7e..5c726bd69e 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneHomeNewsPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneHomeNewsPanel.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics;
 using osu.Game.Online.API.Requests.Responses;
diff --git a/osu.Game.Tests/Visual/Online/TestSceneLeaderboardScopeSelector.cs b/osu.Game.Tests/Visual/Online/TestSceneLeaderboardScopeSelector.cs
index 0231775189..4c67f778a2 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneLeaderboardScopeSelector.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneLeaderboardScopeSelector.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Overlays.BeatmapSet;
 using osu.Framework.Graphics;
 using osu.Framework.Bindables;
diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsCard.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsCard.cs
index 001e6d925e..2d91df8a6d 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsCard.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsCard.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics;
 using osu.Game.Overlays.News;
diff --git a/osu.Game.Tests/Visual/Online/TestSceneOnlineBeatmapListingOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneOnlineBeatmapListingOverlay.cs
index ecfa76f395..f332575fb4 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneOnlineBeatmapListingOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneOnlineBeatmapListingOverlay.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Overlays;
 using NUnit.Framework;
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneOnlineBeatmapSetOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneOnlineBeatmapSetOverlay.cs
index 01b0b39661..3a4d0b97db 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneOnlineBeatmapSetOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneOnlineBeatmapSetOverlay.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Game.Overlays;
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
index 6c8430e955..df29b33f17 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsCountryFilter.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsCountryFilter.cs
index dfefcd735e..3b38cf47d8 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsCountryFilter.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsCountryFilter.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Overlays.Rankings;
diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsHeader.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsHeader.cs
index 5aef91bef1..eb2a451c9b 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsHeader.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsHeader.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Overlays;
diff --git a/osu.Game.Tests/Visual/Online/TestSceneSpotlightsLayout.cs b/osu.Game.Tests/Visual/Online/TestSceneSpotlightsLayout.cs
index 4cbcaaac85..5ce82a8766 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneSpotlightsLayout.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneSpotlightsLayout.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Tests/Visual/Online/TestSceneTotalCommentsCounter.cs b/osu.Game.Tests/Visual/Online/TestSceneTotalCommentsCounter.cs
index 8af87dd597..cbd8ffa91c 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneTotalCommentsCounter.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneTotalCommentsCounter.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Bindables;
 using osu.Game.Overlays.Comments;
diff --git a/osu.Game.Tests/Visual/Online/TestSceneWikiMainPage.cs b/osu.Game.Tests/Visual/Online/TestSceneWikiMainPage.cs
index 8876f0fd3b..9967be73e8 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneWikiMainPage.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneWikiMainPage.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsParticipantsList.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsParticipantsList.cs
index c4a1200cb1..3b60c28dc0 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsParticipantsList.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Online.API.Requests.Responses;
diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsScreen.cs
index 71e284ecfe..891dd3bb1a 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsScreen.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 
 namespace osu.Game.Tests.Visual.Playlists
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs
index bf18bd3e51..03b168c72c 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using NUnit.Framework;
 using osu.Framework.Extensions.Color4Extensions;
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneContractedPanelMiddleContent.cs b/osu.Game.Tests/Visual/Ranking/TestSceneContractedPanelMiddleContent.cs
index e92e74598d..3004cb8a0c 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneContractedPanelMiddleContent.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneContractedPanelMiddleContent.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelTopContent.cs b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelTopContent.cs
index be7be6d4f1..27d66ea2a2 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelTopContent.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelTopContent.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game.Tests/Visual/Settings/TestSceneDirectorySelector.cs b/osu.Game.Tests/Visual/Settings/TestSceneDirectorySelector.cs
index ce6973aacf..3ef0ffc13a 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneDirectorySelector.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneDirectorySelector.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Tests.Visual.UserInterface;
diff --git a/osu.Game.Tests/Visual/Settings/TestSceneFileSelector.cs b/osu.Game.Tests/Visual/Settings/TestSceneFileSelector.cs
index f61e3ca557..e8f74a2f1b 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneFileSelector.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneFileSelector.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -16,7 +14,7 @@ namespace osu.Game.Tests.Visual.Settings
     public partial class TestSceneFileSelector : ThemeComparisonTestScene
     {
         [Resolved]
-        private OsuColour colours { get; set; }
+        private OsuColour colours { get; set; } = null!;
 
         [Test]
         public void TestJpgFilesOnly()
diff --git a/osu.Game.Tests/Visual/Settings/TestSceneMigrationScreens.cs b/osu.Game.Tests/Visual/Settings/TestSceneMigrationScreens.cs
index 91320fdb1c..22f185cbd3 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneMigrationScreens.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneMigrationScreens.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.IO;
 using System.Threading;
 using NUnit.Framework;
diff --git a/osu.Game.Tests/Visual/Settings/TestSceneSettingsSource.cs b/osu.Game.Tests/Visual/Settings/TestSceneSettingsSource.cs
index 30811bab32..309438e51c 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneSettingsSource.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneSettingsSource.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapOptionsOverlay.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapOptionsOverlay.cs
index 46a26d2e98..fa4981c137 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapOptionsOverlay.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapOptionsOverlay.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.ComponentModel;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneUserTopScoreContainer.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneUserTopScoreContainer.cs
index 0476198e41..30f1803795 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneUserTopScoreContainer.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneUserTopScoreContainer.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBackButton.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBackButton.cs
index 837de60053..494268b158 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBackButton.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBackButton.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSortTabControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSortTabControl.cs
index dd7bf48791..343378ccfb 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSortTabControl.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSortTabControl.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapSearchFilter.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapSearchFilter.cs
index 7f7ba6966b..5e22450ba8 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapSearchFilter.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapSearchFilter.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBreadcrumbControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBreadcrumbControl.cs
index eeb2d1e70f..92bf2448b1 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBreadcrumbControl.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBreadcrumbControl.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneColourPicker.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneColourPicker.cs
index d2acf89dc8..bc3f1d0070 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneColourPicker.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneColourPicker.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentRepliesButton.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentRepliesButton.cs
index 1bfa389a25..eaaf40fb36 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentRepliesButton.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentRepliesButton.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Overlays.Comments.Buttons;
 using osu.Framework.Graphics;
 using osu.Framework.Allocation;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneContextMenu.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneContextMenu.cs
index 3491b7dbc1..7b80549854 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneContextMenu.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneContextMenu.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneCursors.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneCursors.cs
index 01d4eb83f3..a8eaabe758 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneCursors.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneCursors.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneDashboardBeatmapListing.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneDashboardBeatmapListing.cs
index 6092f35050..77658dc482 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneDashboardBeatmapListing.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneDashboardBeatmapListing.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics;
 using osu.Game.Overlays.Dashboard.Home;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneDrawableDate.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneDrawableDate.cs
index 108ad8b7c1..b590abf4e5 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneDrawableDate.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneDrawableDate.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneEditorSidebar.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneEditorSidebar.cs
index 72dacb7558..7d1b3a4bb7 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneEditorSidebar.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneEditorSidebar.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneExpandingBar.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneExpandingBar.cs
index 9d850c0fc5..ed0fd340e7 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneExpandingBar.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneExpandingBar.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneFirstRunScreenBehaviour.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneFirstRunScreenBehaviour.cs
index ec8ef0ad50..4b589ffe4c 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneFirstRunScreenBehaviour.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneFirstRunScreenBehaviour.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Screens;
 using osu.Game.Overlays;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneFirstRunScreenBundledBeatmaps.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneFirstRunScreenBundledBeatmaps.cs
index e9460e45d3..30a36652c2 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneFirstRunScreenBundledBeatmaps.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneFirstRunScreenBundledBeatmaps.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Screens;
 using osu.Game.Overlays;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneFirstRunScreenImportFromStable.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneFirstRunScreenImportFromStable.cs
index e6fc889a70..680b54f637 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneFirstRunScreenImportFromStable.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneFirstRunScreenImportFromStable.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Threading;
 using System.Threading.Tasks;
 using Moq;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneFirstRunScreenUIScale.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneFirstRunScreenUIScale.cs
index 8ba94cf9ae..2dee57f4cb 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneFirstRunScreenUIScale.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneFirstRunScreenUIScale.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Screens;
 using osu.Game.Overlays;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneFooterButtonMods.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneFooterButtonMods.cs
index 24b4060a42..4e1bf1390a 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneFooterButtonMods.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneFooterButtonMods.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneHoldToConfirmOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneHoldToConfirmOverlay.cs
index 801bef62c8..91c1f58155 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneHoldToConfirmOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneHoldToConfirmOverlay.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneIconButton.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneIconButton.cs
index 454fa7cd05..a1910570dd 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneIconButton.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneIconButton.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledDropdown.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledDropdown.cs
index a2cfae3c7f..300b451cf5 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledDropdown.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledDropdown.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterfaceV2;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledSliderBar.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledSliderBar.cs
index 6181891e13..726f13861b 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledSliderBar.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledSliderBar.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Linq;
 using NUnit.Framework;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledSwitchButton.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledSwitchButton.cs
index c4af47bd0f..bec517af2c 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledSwitchButton.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledSwitchButton.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledTextBox.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledTextBox.cs
index 8046554819..a9f6b812df 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledTextBox.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledTextBox.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingSpinner.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingSpinner.cs
index 40e786592a..bd36be846b 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingSpinner.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingSpinner.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics.UserInterface;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLogoAnimation.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLogoAnimation.cs
index f9d92aabc6..863e59f6a7 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneLogoAnimation.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLogoAnimation.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModDisplay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModDisplay.cs
index bd5a0d8645..1bb83eeddf 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModDisplay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModDisplay.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Mods;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSwitchSmall.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSwitchSmall.cs
index 07312379b3..83dc96d0d7 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSwitchSmall.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSwitchSmall.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Linq;
 using NUnit.Framework;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSwitchTiny.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSwitchTiny.cs
index 34dd139428..2d953fe9ad 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSwitchTiny.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSwitchTiny.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Linq;
 using NUnit.Framework;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOnScreenDisplay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOnScreenDisplay.cs
index f2123061e5..4bd3a883f1 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOnScreenDisplay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOnScreenDisplay.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Configuration;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuDropdown.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuDropdown.cs
index 770b9dece1..b0548d7e9f 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuDropdown.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuDropdown.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuLogo.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuLogo.cs
index 24a27f71e8..62a493815b 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuLogo.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuLogo.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Screens.Menu;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuPopover.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuPopover.cs
index 4ff7befe71..98ae50c915 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuPopover.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuPopover.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuTextBox.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuTextBox.cs
index 929537e675..69fe8ad105 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuTextBox.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuTextBox.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs
index e90041774e..a927b0931b 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics.Containers;
 using osu.Game.Overlays;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeaderBackground.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeaderBackground.cs
index 7a445427f5..5a43c5ae69 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeaderBackground.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeaderBackground.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics.Containers;
 using osu.Game.Overlays;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayRulesetSelector.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayRulesetSelector.cs
index 432e448038..d83e922edf 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayRulesetSelector.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayRulesetSelector.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Catch;
 using osu.Game.Rulesets.Mania;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestScenePageSelector.cs b/osu.Game.Tests/Visual/UserInterface/TestScenePageSelector.cs
index b9e3592389..3f3b6d8267 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestScenePageSelector.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestScenePageSelector.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneParallaxContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneParallaxContainer.cs
index 92d4981d4a..38f65b3a17 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneParallaxContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneParallaxContainer.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Screens;
 using osu.Game.Graphics.Containers;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneRankingsSortTabControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneRankingsSortTabControl.cs
index f364a48616..59600e639f 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneRankingsSortTabControl.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneRankingsSortTabControl.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Overlays;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneRoundedButton.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneRoundedButton.cs
index cbf67c49a6..8c2651f71d 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneRoundedButton.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneRoundedButton.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Bindables;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneScreenBreadcrumbControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneScreenBreadcrumbControl.cs
index 3d35f2c9cc..968cf9f9db 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneScreenBreadcrumbControl.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneScreenBreadcrumbControl.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneSettingsCheckbox.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneSettingsCheckbox.cs
index a0fe5fce32..1101f27139 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneSettingsCheckbox.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneSettingsCheckbox.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Linq;
 using NUnit.Framework;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneShearedOverlayHeader.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneShearedOverlayHeader.cs
index aeea0681eb..27b128e709 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneShearedOverlayHeader.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneShearedOverlayHeader.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneShearedSearchTextBox.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneShearedSearchTextBox.cs
index 0072864335..f3a7f1481a 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneShearedSearchTextBox.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneShearedSearchTextBox.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Linq;
 using NUnit.Framework;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneTabControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneTabControl.cs
index 24c4ed79b1..94117ff7e3 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneTabControl.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneTabControl.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.ComponentModel;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Sprites;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneToggleMenuItem.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneToggleMenuItem.cs
index 41a6f35624..f564f561ec 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneToggleMenuItem.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneToggleMenuItem.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Game.Graphics.UserInterface;
 
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneTwoLayerButton.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneTwoLayerButton.cs
index 20b0ab5801..524119f34d 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneTwoLayerButton.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneTwoLayerButton.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneUserListToolbar.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneUserListToolbar.cs
index 8737f7312e..a373fbbc51 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneUserListToolbar.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneUserListToolbar.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneVolumePieces.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneVolumePieces.cs
index 7cedef96e3..311bae0d50 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneVolumePieces.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneVolumePieces.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Game.Overlays.Volume;
 using osuTK;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneWaveContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneWaveContainer.cs
index 7851571b36..e1f8357a36 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneWaveContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneWaveContainer.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
diff --git a/osu.Game.Tests/Visual/UserInterface/ThemeComparisonTestScene.cs b/osu.Game.Tests/Visual/UserInterface/ThemeComparisonTestScene.cs
index 05ffd1fbef..2c894eacab 100644
--- a/osu.Game.Tests/Visual/UserInterface/ThemeComparisonTestScene.cs
+++ b/osu.Game.Tests/Visual/UserInterface/ThemeComparisonTestScene.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Linq;
 using NUnit.Framework;
diff --git a/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentMatch.cs b/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentMatch.cs
index cb923a1f9a..3dac550bd6 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentMatch.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentMatch.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Tournament.Models;
diff --git a/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.cs b/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.cs
index dd7c613c6c..a809d0747a 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Tests.Visual;
diff --git a/osu.Game.Tournament.Tests/Components/TestSceneMatchHeader.cs b/osu.Game.Tournament.Tests/Components/TestSceneMatchHeader.cs
index 2347c84ba8..ae4c5ec685 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneMatchHeader.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneMatchHeader.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
diff --git a/osu.Game.Tournament.Tests/Components/TestSceneMatchScoreDisplay.cs b/osu.Game.Tournament.Tests/Components/TestSceneMatchScoreDisplay.cs
index 9b1fc17591..3007232077 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneMatchScoreDisplay.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneMatchScoreDisplay.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Utils;
diff --git a/osu.Game.Tournament.Tests/Components/TestSceneRoundDisplay.cs b/osu.Game.Tournament.Tests/Components/TestSceneRoundDisplay.cs
index cb22e7e7c7..431b6eff63 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneRoundDisplay.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneRoundDisplay.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
diff --git a/osu.Game.Tournament.Tests/Components/TestSceneTournamentBeatmapPanel.cs b/osu.Game.Tournament.Tests/Components/TestSceneTournamentBeatmapPanel.cs
index 057566d426..4fa90437c8 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneTournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneTournamentBeatmapPanel.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Online.API;
@@ -21,7 +19,7 @@ namespace osu.Game.Tournament.Tests.Components
         /// It cannot be trivially replaced because setting <see cref="OsuTestScene.UseOnlineAPI"/> to <see langword="true"/> causes <see cref="OsuTestScene.API"/> to no longer be usable.
         /// </remarks>
         [Resolved]
-        private IAPIProvider api { get; set; }
+        private IAPIProvider api { get; set; } = null!;
 
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs b/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs
index d9ae8df651..ddae626305 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs b/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
index 45dffdc94a..3ae1400a99 100644
--- a/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
+++ b/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.IO;
 using System.Linq;
 using NUnit.Framework;
diff --git a/osu.Game.Tournament.Tests/NonVisual/LadderInfoSerialisationTest.cs b/osu.Game.Tournament.Tests/NonVisual/LadderInfoSerialisationTest.cs
index f1e0966293..962a6fbd6c 100644
--- a/osu.Game.Tournament.Tests/NonVisual/LadderInfoSerialisationTest.cs
+++ b/osu.Game.Tournament.Tests/NonVisual/LadderInfoSerialisationTest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using Newtonsoft.Json;
 using NUnit.Framework;
 using osu.Game.Tournament.Models;
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneDrawingsScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneDrawingsScreen.cs
index 10ed850002..cd15550931 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneDrawingsScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneDrawingsScreen.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.IO;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs
index 5c4e1b2a5a..839730f3ca 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Cursor;
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneLadderScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneLadderScreen.cs
index 20f729bb8d..ecc741ddc1 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneLadderScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneLadderScreen.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Cursor;
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneRoundEditorScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneRoundEditorScreen.cs
index ebeb69012d..2e7bf364f7 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneRoundEditorScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneRoundEditorScreen.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Tournament.Screens.Editors;
 
 namespace osu.Game.Tournament.Tests.Screens
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneSeedingEditorScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneSeedingEditorScreen.cs
index cfb533149d..0d06b0352f 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneSeedingEditorScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneSeedingEditorScreen.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Game.Tournament.Models;
 using osu.Game.Tournament.Screens.Editors;
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneSeedingScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneSeedingScreen.cs
index c9620bc0b9..f656934239 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneSeedingScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneSeedingScreen.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneSetupScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneSetupScreen.cs
index 84c8b9a141..6af2af7732 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneSetupScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneSetupScreen.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Game.Tournament.Screens.Setup;
 
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneShowcaseScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneShowcaseScreen.cs
index 6287679c27..e50a2a0c07 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneShowcaseScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneShowcaseScreen.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Game.Tournament.Screens.Showcase;
 
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneStablePathSelectScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneStablePathSelectScreen.cs
index dbd9cb2817..db49bc960a 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneStablePathSelectScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneStablePathSelectScreen.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Tournament.Screens.Setup;
 
 namespace osu.Game.Tournament.Tests.Screens
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneTeamEditorScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneTeamEditorScreen.cs
index 63c08800ad..7b371ed78b 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneTeamEditorScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneTeamEditorScreen.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Tournament.Screens.Editors;
 
 namespace osu.Game.Tournament.Tests.Screens
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneTeamIntroScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneTeamIntroScreen.cs
index 5c26bc203c..02762ab5c7 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneTeamIntroScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneTeamIntroScreen.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs
index 43e16873c6..8096988864 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Tournament.Tests/TestSceneTournamentSceneManager.cs b/osu.Game.Tournament.Tests/TestSceneTournamentSceneManager.cs
index 859d0591c3..f580b2e455 100644
--- a/osu.Game.Tournament.Tests/TestSceneTournamentSceneManager.cs
+++ b/osu.Game.Tournament.Tests/TestSceneTournamentSceneManager.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 
 namespace osu.Game.Tournament.Tests
diff --git a/osu.Game.Tournament.Tests/TournamentTestBrowser.cs b/osu.Game.Tournament.Tests/TournamentTestBrowser.cs
index f29272fbb8..037afd8690 100644
--- a/osu.Game.Tournament.Tests/TournamentTestBrowser.cs
+++ b/osu.Game.Tournament.Tests/TournamentTestBrowser.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Testing;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;
diff --git a/osu.Game.Tournament.Tests/TournamentTestRunner.cs b/osu.Game.Tournament.Tests/TournamentTestRunner.cs
index f95fcbf487..f6aef53514 100644
--- a/osu.Game.Tournament.Tests/TournamentTestRunner.cs
+++ b/osu.Game.Tournament.Tests/TournamentTestRunner.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework;
 using osu.Framework.Platform;
diff --git a/osu.Game.Tournament/Components/ControlPanel.cs b/osu.Game.Tournament/Components/ControlPanel.cs
index c3e66e80eb..b5912349a0 100644
--- a/osu.Game.Tournament/Components/ControlPanel.cs
+++ b/osu.Game.Tournament/Components/ControlPanel.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
diff --git a/osu.Game.Tournament/Components/DateTextBox.cs b/osu.Game.Tournament/Components/DateTextBox.cs
index 192d8c9fd1..4fa94b6c63 100644
--- a/osu.Game.Tournament/Components/DateTextBox.cs
+++ b/osu.Game.Tournament/Components/DateTextBox.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Bindables;
 using osu.Game.Graphics.UserInterface;
diff --git a/osu.Game.Tournament/Components/DrawableTeamHeader.cs b/osu.Game.Tournament/Components/DrawableTeamHeader.cs
index 1648e7373b..e9ce9f3759 100644
--- a/osu.Game.Tournament/Components/DrawableTeamHeader.cs
+++ b/osu.Game.Tournament/Components/DrawableTeamHeader.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Tournament.Models;
 using osuTK;
 
diff --git a/osu.Game.Tournament/Components/DrawableTeamTitleWithHeader.cs b/osu.Game.Tournament/Components/DrawableTeamTitleWithHeader.cs
index 27113b0d21..59e261a7dd 100644
--- a/osu.Game.Tournament/Components/DrawableTeamTitleWithHeader.cs
+++ b/osu.Game.Tournament/Components/DrawableTeamTitleWithHeader.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Tournament.Models;
diff --git a/osu.Game.Tournament/Components/DrawableTeamWithPlayers.cs b/osu.Game.Tournament/Components/DrawableTeamWithPlayers.cs
index 9606670ad8..5ebed34e6a 100644
--- a/osu.Game.Tournament/Components/DrawableTeamWithPlayers.cs
+++ b/osu.Game.Tournament/Components/DrawableTeamWithPlayers.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game.Tournament/Components/DrawableTournamentHeaderLogo.cs b/osu.Game.Tournament/Components/DrawableTournamentHeaderLogo.cs
index c83fceb01d..671d2ffb65 100644
--- a/osu.Game.Tournament/Components/DrawableTournamentHeaderLogo.cs
+++ b/osu.Game.Tournament/Components/DrawableTournamentHeaderLogo.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game.Tournament/Components/DrawableTournamentHeaderText.cs b/osu.Game.Tournament/Components/DrawableTournamentHeaderText.cs
index 7a1f448cb4..ef576f5b02 100644
--- a/osu.Game.Tournament/Components/DrawableTournamentHeaderText.cs
+++ b/osu.Game.Tournament/Components/DrawableTournamentHeaderText.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game.Tournament/Components/IPCErrorDialog.cs b/osu.Game.Tournament/Components/IPCErrorDialog.cs
index 995bbffffc..07aeb65ee6 100644
--- a/osu.Game.Tournament/Components/IPCErrorDialog.cs
+++ b/osu.Game.Tournament/Components/IPCErrorDialog.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Overlays.Dialog;
 
diff --git a/osu.Game.Tournament/Components/RoundDisplay.cs b/osu.Game.Tournament/Components/RoundDisplay.cs
index 6018cc6ffb..4c72209d12 100644
--- a/osu.Game.Tournament/Components/RoundDisplay.cs
+++ b/osu.Game.Tournament/Components/RoundDisplay.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
diff --git a/osu.Game.Tournament/Components/TournamentModIcon.cs b/osu.Game.Tournament/Components/TournamentModIcon.cs
index 76b6151519..28114e64fe 100644
--- a/osu.Game.Tournament/Components/TournamentModIcon.cs
+++ b/osu.Game.Tournament/Components/TournamentModIcon.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -23,7 +21,7 @@ namespace osu.Game.Tournament.Components
         private readonly string modAcronym;
 
         [Resolved]
-        private IRulesetStore rulesets { get; set; }
+        private IRulesetStore rulesets { get; set; } = null!;
 
         public TournamentModIcon(string modAcronym)
         {
diff --git a/osu.Game.Tournament/Components/TournamentSpriteTextWithBackground.cs b/osu.Game.Tournament/Components/TournamentSpriteTextWithBackground.cs
index 3a16662463..97cb610021 100644
--- a/osu.Game.Tournament/Components/TournamentSpriteTextWithBackground.cs
+++ b/osu.Game.Tournament/Components/TournamentSpriteTextWithBackground.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
diff --git a/osu.Game.Tournament/Configuration/TournamentConfigManager.cs b/osu.Game.Tournament/Configuration/TournamentConfigManager.cs
index 8f256ba9c3..b76b18cb5f 100644
--- a/osu.Game.Tournament/Configuration/TournamentConfigManager.cs
+++ b/osu.Game.Tournament/Configuration/TournamentConfigManager.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Configuration;
 using osu.Framework.Platform;
 
diff --git a/osu.Game.Tournament/IO/TournamentVideoResourceStore.cs b/osu.Game.Tournament/IO/TournamentVideoResourceStore.cs
index ba584f1d3e..ba0e593eae 100644
--- a/osu.Game.Tournament/IO/TournamentVideoResourceStore.cs
+++ b/osu.Game.Tournament/IO/TournamentVideoResourceStore.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.IO.Stores;
 using osu.Framework.Platform;
 
diff --git a/osu.Game.Tournament/IPC/MatchIPCInfo.cs b/osu.Game.Tournament/IPC/MatchIPCInfo.cs
index 3bf790d58e..ff557717d5 100644
--- a/osu.Game.Tournament/IPC/MatchIPCInfo.cs
+++ b/osu.Game.Tournament/IPC/MatchIPCInfo.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps.Legacy;
diff --git a/osu.Game.Tournament/Models/BeatmapChoice.cs b/osu.Game.Tournament/Models/BeatmapChoice.cs
index ddd4597722..c8ba989fa7 100644
--- a/osu.Game.Tournament/Models/BeatmapChoice.cs
+++ b/osu.Game.Tournament/Models/BeatmapChoice.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
diff --git a/osu.Game.Tournament/Models/LadderEditorInfo.cs b/osu.Game.Tournament/Models/LadderEditorInfo.cs
index 84ebeff3db..7b36096e3f 100644
--- a/osu.Game.Tournament/Models/LadderEditorInfo.cs
+++ b/osu.Game.Tournament/Models/LadderEditorInfo.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Bindables;
 
 namespace osu.Game.Tournament.Models
diff --git a/osu.Game.Tournament/Models/LadderInfo.cs b/osu.Game.Tournament/Models/LadderInfo.cs
index cb4e8bc16a..b5bc5fd307 100644
--- a/osu.Game.Tournament/Models/LadderInfo.cs
+++ b/osu.Game.Tournament/Models/LadderInfo.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
diff --git a/osu.Game.Tournament/Models/SeedingResult.cs b/osu.Game.Tournament/Models/SeedingResult.cs
index 2a404153e6..865f65294e 100644
--- a/osu.Game.Tournament/Models/SeedingResult.cs
+++ b/osu.Game.Tournament/Models/SeedingResult.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Framework.Bindables;
 
diff --git a/osu.Game.Tournament/Models/TournamentProgression.cs b/osu.Game.Tournament/Models/TournamentProgression.cs
index 6c3ba1922a..f119605026 100644
--- a/osu.Game.Tournament/Models/TournamentProgression.cs
+++ b/osu.Game.Tournament/Models/TournamentProgression.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 
 namespace osu.Game.Tournament.Models
diff --git a/osu.Game.Tournament/Models/TournamentRound.cs b/osu.Game.Tournament/Models/TournamentRound.cs
index 480d6c37c3..a92bab690e 100644
--- a/osu.Game.Tournament/Models/TournamentRound.cs
+++ b/osu.Game.Tournament/Models/TournamentRound.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
diff --git a/osu.Game.Tournament/Properties/AssemblyInfo.cs b/osu.Game.Tournament/Properties/AssemblyInfo.cs
index 2eb8c3e1d6..70e42bcafb 100644
--- a/osu.Game.Tournament/Properties/AssemblyInfo.cs
+++ b/osu.Game.Tournament/Properties/AssemblyInfo.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Runtime.CompilerServices;
 
 // We publish our internal attributes to other sub-projects of the framework.
diff --git a/osu.Game.Tournament/Screens/BeatmapInfoScreen.cs b/osu.Game.Tournament/Screens/BeatmapInfoScreen.cs
index 6f7234b8c3..e977012803 100644
--- a/osu.Game.Tournament/Screens/BeatmapInfoScreen.cs
+++ b/osu.Game.Tournament/Screens/BeatmapInfoScreen.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Tournament/Screens/Drawings/Components/DrawingsConfigManager.cs b/osu.Game.Tournament/Screens/Drawings/Components/DrawingsConfigManager.cs
index ac1d599851..1a2f5a1ff4 100644
--- a/osu.Game.Tournament/Screens/Drawings/Components/DrawingsConfigManager.cs
+++ b/osu.Game.Tournament/Screens/Drawings/Components/DrawingsConfigManager.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Configuration;
 using osu.Framework.Platform;
 
diff --git a/osu.Game.Tournament/Screens/Drawings/Components/Group.cs b/osu.Game.Tournament/Screens/Drawings/Components/Group.cs
index b397f807f0..a79e2253a4 100644
--- a/osu.Game.Tournament/Screens/Drawings/Components/Group.cs
+++ b/osu.Game.Tournament/Screens/Drawings/Components/Group.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/osu.Game.Tournament/Screens/Drawings/Components/GroupContainer.cs b/osu.Game.Tournament/Screens/Drawings/Components/GroupContainer.cs
index 37e15b7e45..0a2fa3f207 100644
--- a/osu.Game.Tournament/Screens/Drawings/Components/GroupContainer.cs
+++ b/osu.Game.Tournament/Screens/Drawings/Components/GroupContainer.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/osu.Game.Tournament/Screens/Drawings/Components/GroupTeam.cs b/osu.Game.Tournament/Screens/Drawings/Components/GroupTeam.cs
index 167a576424..137003a126 100644
--- a/osu.Game.Tournament/Screens/Drawings/Components/GroupTeam.cs
+++ b/osu.Game.Tournament/Screens/Drawings/Components/GroupTeam.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
diff --git a/osu.Game.Tournament/Screens/Drawings/Components/ITeamList.cs b/osu.Game.Tournament/Screens/Drawings/Components/ITeamList.cs
index 7e0ac89c83..09208818a9 100644
--- a/osu.Game.Tournament/Screens/Drawings/Components/ITeamList.cs
+++ b/osu.Game.Tournament/Screens/Drawings/Components/ITeamList.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Game.Tournament.Models;
 
diff --git a/osu.Game.Tournament/Screens/Editors/IModelBacked.cs b/osu.Game.Tournament/Screens/Editors/IModelBacked.cs
index ca59afa2cb..867055f9ea 100644
--- a/osu.Game.Tournament/Screens/Editors/IModelBacked.cs
+++ b/osu.Game.Tournament/Screens/Editors/IModelBacked.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Tournament.Screens.Editors
 {
     /// <summary>
diff --git a/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs
index 75131c282d..4a3b5c0846 100644
--- a/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -29,7 +27,7 @@ namespace osu.Game.Tournament.Screens.Editors
             public TournamentRound Model { get; }
 
             [Resolved]
-            private LadderInfo ladderInfo { get; set; }
+            private LadderInfo ladderInfo { get; set; } = null!;
 
             public RoundRow(TournamentRound round)
             {
@@ -146,7 +144,7 @@ namespace osu.Game.Tournament.Screens.Editors
                     public RoundBeatmap Model { get; }
 
                     [Resolved]
-                    protected IAPIProvider API { get; private set; }
+                    protected IAPIProvider API { get; private set; } = null!;
 
                     private readonly Bindable<int?> beatmapId = new Bindable<int?>();
 
diff --git a/osu.Game.Tournament/Screens/Editors/SeedingEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/SeedingEditorScreen.cs
index a4358b4396..9927dd56a0 100644
--- a/osu.Game.Tournament/Screens/Editors/SeedingEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/SeedingEditorScreen.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -140,7 +138,7 @@ namespace osu.Game.Tournament.Screens.Editors
                     public SeedingBeatmap Model { get; }
 
                     [Resolved]
-                    protected IAPIProvider API { get; private set; }
+                    protected IAPIProvider API { get; private set; } = null!;
 
                     private readonly Bindable<int?> beatmapId = new Bindable<int?>();
 
diff --git a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
index c9d897ca11..93fbfba0e3 100644
--- a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -63,11 +61,11 @@ namespace osu.Game.Tournament.Screens.Editors
 
             private readonly Container drawableContainer;
 
-            [Resolved(canBeNull: true)]
-            private TournamentSceneManager sceneManager { get; set; }
+            [Resolved]
+            private TournamentSceneManager? sceneManager { get; set; }
 
             [Resolved]
-            private LadderInfo ladderInfo { get; set; }
+            private LadderInfo ladderInfo { get; set; } = null!;
 
             public TeamRow(TournamentTeam team, TournamentScreen parent)
             {
@@ -211,10 +209,10 @@ namespace osu.Game.Tournament.Screens.Editors
                     private readonly TournamentUser user;
 
                     [Resolved]
-                    protected IAPIProvider API { get; private set; }
+                    protected IAPIProvider API { get; private set; } = null!;
 
                     [Resolved]
-                    private TournamentGameBase game { get; set; }
+                    private TournamentGameBase game { get; set; } = null!;
 
                     private readonly Bindable<int?> playerId = new Bindable<int?>();
 
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/MatchRoundDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/MatchRoundDisplay.cs
index d2b61220f0..79de4e465e 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/MatchRoundDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/MatchRoundDisplay.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Tournament.Components;
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
index 60d1678326..c23327a43f 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TeamScore.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TeamScore.cs
index 8b3786fa1f..c154e4fcef 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TeamScore.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TeamScore.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/ProgressionPath.cs b/osu.Game.Tournament/Screens/Ladder/Components/ProgressionPath.cs
index c79dbc26be..3d59bd8349 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/ProgressionPath.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/ProgressionPath.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Lines;
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/SettingsTeamDropdown.cs b/osu.Game.Tournament/Screens/Ladder/Components/SettingsTeamDropdown.cs
index f7a42e4f50..00e5353edd 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/SettingsTeamDropdown.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/SettingsTeamDropdown.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Diagnostics;
diff --git a/osu.Game.Tournament/Screens/Ladder/LadderDragContainer.cs b/osu.Game.Tournament/Screens/Ladder/LadderDragContainer.cs
index 10d58612f4..80b46007e7 100644
--- a/osu.Game.Tournament/Screens/Ladder/LadderDragContainer.cs
+++ b/osu.Game.Tournament/Screens/Ladder/LadderDragContainer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs b/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs
index 35d63f4fcf..db4d6198e6 100644
--- a/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs
+++ b/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Tournament/Screens/Showcase/TournamentLogo.cs b/osu.Game.Tournament/Screens/Showcase/TournamentLogo.cs
index d04059118f..5d9ab5fa8f 100644
--- a/osu.Game.Tournament/Screens/Showcase/TournamentLogo.cs
+++ b/osu.Game.Tournament/Screens/Showcase/TournamentLogo.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game.Tournament/Screens/TournamentScreen.cs b/osu.Game.Tournament/Screens/TournamentScreen.cs
index 02903a637c..1e119e0336 100644
--- a/osu.Game.Tournament/Screens/TournamentScreen.cs
+++ b/osu.Game.Tournament/Screens/TournamentScreen.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -15,7 +13,7 @@ namespace osu.Game.Tournament.Screens
         public const double FADE_DELAY = 200;
 
         [Resolved]
-        protected LadderInfo LadderInfo { get; private set; }
+        protected LadderInfo LadderInfo { get; private set; } = null!;
 
         protected TournamentScreen()
         {
diff --git a/osu.Game.Tournament/TournamentSpriteText.cs b/osu.Game.Tournament/TournamentSpriteText.cs
index 7ecb31ff15..227231a310 100644
--- a/osu.Game.Tournament/TournamentSpriteText.cs
+++ b/osu.Game.Tournament/TournamentSpriteText.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 
diff --git a/osu.Game.Tournament/TourneyButton.cs b/osu.Game.Tournament/TourneyButton.cs
index 558bd476c3..67426c1d58 100644
--- a/osu.Game.Tournament/TourneyButton.cs
+++ b/osu.Game.Tournament/TourneyButton.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics.UserInterface;
 
diff --git a/osu.Game.Tournament/WarningBox.cs b/osu.Game.Tournament/WarningBox.cs
index 4a196446f6..a79e97914b 100644
--- a/osu.Game.Tournament/WarningBox.cs
+++ b/osu.Game.Tournament/WarningBox.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
diff --git a/osu.Game/Beatmaps/APIFailTimes.cs b/osu.Game/Beatmaps/APIFailTimes.cs
index 441d30d06b..7218906b38 100644
--- a/osu.Game/Beatmaps/APIFailTimes.cs
+++ b/osu.Game/Beatmaps/APIFailTimes.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using Newtonsoft.Json;
 
diff --git a/osu.Game/Beatmaps/BeatmapMetadataInfoExtensions.cs b/osu.Game/Beatmaps/BeatmapMetadataInfoExtensions.cs
index fe4e815e62..be96a66614 100644
--- a/osu.Game/Beatmaps/BeatmapMetadataInfoExtensions.cs
+++ b/osu.Game/Beatmaps/BeatmapMetadataInfoExtensions.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Framework.Localisation;
 
diff --git a/osu.Game/Beatmaps/BeatmapOnlineStatus.cs b/osu.Game/Beatmaps/BeatmapOnlineStatus.cs
index cdd99d4432..41393a8a39 100644
--- a/osu.Game/Beatmaps/BeatmapOnlineStatus.cs
+++ b/osu.Game/Beatmaps/BeatmapOnlineStatus.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.ComponentModel;
 using osu.Framework.Localisation;
 using osu.Game.Localisation;
diff --git a/osu.Game/Beatmaps/BeatmapSetHypeStatus.cs b/osu.Game/Beatmaps/BeatmapSetHypeStatus.cs
index b2d4cac210..4dd08203fc 100644
--- a/osu.Game/Beatmaps/BeatmapSetHypeStatus.cs
+++ b/osu.Game/Beatmaps/BeatmapSetHypeStatus.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using Newtonsoft.Json;
 
 namespace osu.Game.Beatmaps
diff --git a/osu.Game/Beatmaps/BeatmapSetNominationStatus.cs b/osu.Game/Beatmaps/BeatmapSetNominationStatus.cs
index cea0063814..8cf43ab320 100644
--- a/osu.Game/Beatmaps/BeatmapSetNominationStatus.cs
+++ b/osu.Game/Beatmaps/BeatmapSetNominationStatus.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using Newtonsoft.Json;
 
 namespace osu.Game.Beatmaps
diff --git a/osu.Game/Beatmaps/BeatmapSetOnlineAvailability.cs b/osu.Game/Beatmaps/BeatmapSetOnlineAvailability.cs
index 12424b797c..8d519158b6 100644
--- a/osu.Game/Beatmaps/BeatmapSetOnlineAvailability.cs
+++ b/osu.Game/Beatmaps/BeatmapSetOnlineAvailability.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using Newtonsoft.Json;
 
 namespace osu.Game.Beatmaps
diff --git a/osu.Game/Beatmaps/BeatmapSetOnlineGenre.cs b/osu.Game/Beatmaps/BeatmapSetOnlineGenre.cs
index ad2e994d3e..e727e2c37f 100644
--- a/osu.Game/Beatmaps/BeatmapSetOnlineGenre.cs
+++ b/osu.Game/Beatmaps/BeatmapSetOnlineGenre.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Beatmaps
 {
     public struct BeatmapSetOnlineGenre
diff --git a/osu.Game/Beatmaps/BeatmapSetOnlineLanguage.cs b/osu.Game/Beatmaps/BeatmapSetOnlineLanguage.cs
index c71c279086..5656fab721 100644
--- a/osu.Game/Beatmaps/BeatmapSetOnlineLanguage.cs
+++ b/osu.Game/Beatmaps/BeatmapSetOnlineLanguage.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Beatmaps
 {
     public struct BeatmapSetOnlineLanguage
diff --git a/osu.Game/Beatmaps/BeatmapStatisticIcon.cs b/osu.Game/Beatmaps/BeatmapStatisticIcon.cs
index ca07e5f365..b2d59646ae 100644
--- a/osu.Game/Beatmaps/BeatmapStatisticIcon.cs
+++ b/osu.Game/Beatmaps/BeatmapStatisticIcon.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
diff --git a/osu.Game/Beatmaps/CountdownType.cs b/osu.Game/Beatmaps/CountdownType.cs
index 7fb3de74fb..bbe9b648f7 100644
--- a/osu.Game/Beatmaps/CountdownType.cs
+++ b/osu.Game/Beatmaps/CountdownType.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.ComponentModel;
 
 namespace osu.Game.Beatmaps
diff --git a/osu.Game/Beatmaps/Drawables/BeatmapBackgroundSprite.cs b/osu.Game/Beatmaps/Drawables/BeatmapBackgroundSprite.cs
index 5b9cf6846c..052fae160f 100644
--- a/osu.Game/Beatmaps/Drawables/BeatmapBackgroundSprite.cs
+++ b/osu.Game/Beatmaps/Drawables/BeatmapBackgroundSprite.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
diff --git a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardDifficultyList.cs b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardDifficultyList.cs
index 84445dc14c..5d0e3891c9 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardDifficultyList.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardDifficultyList.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardDownloadProgressBar.cs b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardDownloadProgressBar.cs
index 3737715a7d..5ea42fe4b1 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardDownloadProgressBar.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardDownloadProgressBar.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -30,10 +28,10 @@ namespace osu.Game.Beatmaps.Drawables.Cards
         private readonly Box foregroundFill;
 
         [Resolved]
-        private OsuColour colours { get; set; }
+        private OsuColour colours { get; set; } = null!;
 
         [Resolved]
-        private OverlayColourProvider colourProvider { get; set; }
+        private OverlayColourProvider colourProvider { get; set; } = null!;
 
         public BeatmapCardDownloadProgressBar()
         {
diff --git a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardThumbnail.cs b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardThumbnail.cs
index c99d1f0c76..ad91615031 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardThumbnail.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardThumbnail.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Beatmaps/Drawables/Cards/BeatmapSetFavouriteState.cs b/osu.Game/Beatmaps/Drawables/Cards/BeatmapSetFavouriteState.cs
index 8f8a47c199..4645ca822c 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/BeatmapSetFavouriteState.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/BeatmapSetFavouriteState.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Beatmaps.Drawables.Cards.Buttons;
 using osu.Game.Beatmaps.Drawables.Cards.Statistics;
 
diff --git a/osu.Game/Beatmaps/Drawables/Cards/Buttons/BeatmapCardIconButton.cs b/osu.Game/Beatmaps/Drawables/Cards/Buttons/BeatmapCardIconButton.cs
index ee45d56b6e..e78fd651fe 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/Buttons/BeatmapCardIconButton.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/Buttons/BeatmapCardIconButton.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Beatmaps/Drawables/Cards/ExpandedContentScrollContainer.cs b/osu.Game/Beatmaps/Drawables/Cards/ExpandedContentScrollContainer.cs
index 9a2a37a09a..b4298e493a 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/ExpandedContentScrollContainer.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/ExpandedContentScrollContainer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
diff --git a/osu.Game/Beatmaps/Drawables/Cards/IconPill.cs b/osu.Game/Beatmaps/Drawables/Cards/IconPill.cs
index 3cabbba98d..16be57ac95 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/IconPill.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/IconPill.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
diff --git a/osu.Game/Beatmaps/Drawables/Cards/Statistics/FavouritesStatistic.cs b/osu.Game/Beatmaps/Drawables/Cards/Statistics/FavouritesStatistic.cs
index 439e6acd22..6a329011f3 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/Statistics/FavouritesStatistic.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/Statistics/FavouritesStatistic.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using Humanizer;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.LocalisationExtensions;
diff --git a/osu.Game/Beatmaps/Drawables/Cards/Statistics/PlayCountStatistic.cs b/osu.Game/Beatmaps/Drawables/Cards/Statistics/PlayCountStatistic.cs
index 45ab6ddb40..4ce37b8659 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/Statistics/PlayCountStatistic.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/Statistics/PlayCountStatistic.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using Humanizer;
 using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics.Sprites;
diff --git a/osu.Game/Beatmaps/Drawables/Cards/StoryboardIconPill.cs b/osu.Game/Beatmaps/Drawables/Cards/StoryboardIconPill.cs
index 6de16da2b1..6cb19696f8 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/StoryboardIconPill.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/StoryboardIconPill.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
 using osu.Game.Resources.Localisation.Web;
diff --git a/osu.Game/Beatmaps/Drawables/Cards/VideoIconPill.cs b/osu.Game/Beatmaps/Drawables/Cards/VideoIconPill.cs
index 63b5e95b12..b96ed23826 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/VideoIconPill.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/VideoIconPill.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
 using osu.Game.Resources.Localisation.Web;
diff --git a/osu.Game/Beatmaps/Drawables/DifficultySpectrumDisplay.cs b/osu.Game/Beatmaps/Drawables/DifficultySpectrumDisplay.cs
index efce0f80f1..2fb3a8eee4 100644
--- a/osu.Game/Beatmaps/Drawables/DifficultySpectrumDisplay.cs
+++ b/osu.Game/Beatmaps/Drawables/DifficultySpectrumDisplay.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
diff --git a/osu.Game/Beatmaps/Drawables/DownloadProgressBar.cs b/osu.Game/Beatmaps/Drawables/DownloadProgressBar.cs
index 9877b628db..55af57a45f 100644
--- a/osu.Game/Beatmaps/Drawables/DownloadProgressBar.cs
+++ b/osu.Game/Beatmaps/Drawables/DownloadProgressBar.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Beatmaps/Drawables/StarRatingDisplay.cs b/osu.Game/Beatmaps/Drawables/StarRatingDisplay.cs
index 36fff1dc3c..df8953d57c 100644
--- a/osu.Game/Beatmaps/Drawables/StarRatingDisplay.cs
+++ b/osu.Game/Beatmaps/Drawables/StarRatingDisplay.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
@@ -47,10 +45,10 @@ namespace osu.Game.Beatmaps.Drawables
         public IBindable<double> DisplayedStars => displayedStars;
 
         [Resolved]
-        private OsuColour colours { get; set; }
+        private OsuColour colours { get; set; } = null!;
 
-        [Resolved(canBeNull: true)]
-        private OverlayColourProvider colourProvider { get; set; }
+        [Resolved]
+        private OverlayColourProvider? colourProvider { get; set; }
 
         /// <summary>
         /// Creates a new <see cref="StarRatingDisplay"/> using an already computed <see cref="StarDifficulty"/>.
diff --git a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs
index 2cd9785048..72f37143d0 100644
--- a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs
+++ b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -21,7 +19,7 @@ namespace osu.Game.Beatmaps.Drawables
         protected override double LoadDelay => 500;
 
         [Resolved]
-        private BeatmapManager beatmaps { get; set; }
+        private BeatmapManager beatmaps { get; set; } = null!;
 
         private readonly BeatmapSetCoverType beatmapSetCoverType;
 
diff --git a/osu.Game/Beatmaps/FlatFileWorkingBeatmap.cs b/osu.Game/Beatmaps/FlatFileWorkingBeatmap.cs
index 0b53278ab3..d20baf1edb 100644
--- a/osu.Game/Beatmaps/FlatFileWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/FlatFileWorkingBeatmap.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.IO;
 using osu.Framework.Audio.Track;
diff --git a/osu.Game/Beatmaps/Formats/IHasCustomColours.cs b/osu.Game/Beatmaps/Formats/IHasCustomColours.cs
index b651ef9515..9f2eeff253 100644
--- a/osu.Game/Beatmaps/Formats/IHasCustomColours.cs
+++ b/osu.Game/Beatmaps/Formats/IHasCustomColours.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osuTK.Graphics;
 
diff --git a/osu.Game/Beatmaps/Formats/JsonBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/JsonBeatmapDecoder.cs
index 4f292a9a1f..a758e10f7c 100644
--- a/osu.Game/Beatmaps/Formats/JsonBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/JsonBeatmapDecoder.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.IO;
 using osu.Game.IO.Serialization;
 
diff --git a/osu.Game/Beatmaps/Formats/LegacyDifficultyCalculatorBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDifficultyCalculatorBeatmapDecoder.cs
index bf69100361..b3815569ec 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDifficultyCalculatorBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDifficultyCalculatorBeatmapDecoder.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 
 namespace osu.Game.Beatmaps.Formats
diff --git a/osu.Game/Beatmaps/Formats/Parsing.cs b/osu.Game/Beatmaps/Formats/Parsing.cs
index 9b0d200077..a1683ced0d 100644
--- a/osu.Game/Beatmaps/Formats/Parsing.cs
+++ b/osu.Game/Beatmaps/Formats/Parsing.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Globalization;
 
diff --git a/osu.Game/Beatmaps/IBeatmap.cs b/osu.Game/Beatmaps/IBeatmap.cs
index 9dc3084cb5..fbe1a9b462 100644
--- a/osu.Game/Beatmaps/IBeatmap.cs
+++ b/osu.Game/Beatmaps/IBeatmap.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps.ControlPoints;
diff --git a/osu.Game/Beatmaps/IBeatmapConverter.cs b/osu.Game/Beatmaps/IBeatmapConverter.cs
index f84188c5e2..2833af8ca2 100644
--- a/osu.Game/Beatmaps/IBeatmapConverter.cs
+++ b/osu.Game/Beatmaps/IBeatmapConverter.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Threading;
diff --git a/osu.Game/Beatmaps/IBeatmapProcessor.cs b/osu.Game/Beatmaps/IBeatmapProcessor.cs
index 0a4a98c606..014dccf5e3 100644
--- a/osu.Game/Beatmaps/IBeatmapProcessor.cs
+++ b/osu.Game/Beatmaps/IBeatmapProcessor.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Objects;
 
diff --git a/osu.Game/Beatmaps/IBeatmapResourceProvider.cs b/osu.Game/Beatmaps/IBeatmapResourceProvider.cs
index 9e79e03785..fe9dada9d5 100644
--- a/osu.Game/Beatmaps/IBeatmapResourceProvider.cs
+++ b/osu.Game/Beatmaps/IBeatmapResourceProvider.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
 using osu.Game.IO;
diff --git a/osu.Game/Beatmaps/Legacy/LegacyControlPointInfo.cs b/osu.Game/Beatmaps/Legacy/LegacyControlPointInfo.cs
index 5c3c72c9e4..fc80f0db6f 100644
--- a/osu.Game/Beatmaps/Legacy/LegacyControlPointInfo.cs
+++ b/osu.Game/Beatmaps/Legacy/LegacyControlPointInfo.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
diff --git a/osu.Game/Beatmaps/Legacy/LegacyEffectFlags.cs b/osu.Game/Beatmaps/Legacy/LegacyEffectFlags.cs
index b3717c81dc..78368daf09 100644
--- a/osu.Game/Beatmaps/Legacy/LegacyEffectFlags.cs
+++ b/osu.Game/Beatmaps/Legacy/LegacyEffectFlags.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 
 namespace osu.Game.Beatmaps.Legacy
diff --git a/osu.Game/Beatmaps/Legacy/LegacyEventType.cs b/osu.Game/Beatmaps/Legacy/LegacyEventType.cs
index 42d21d14f6..c4a9566110 100644
--- a/osu.Game/Beatmaps/Legacy/LegacyEventType.cs
+++ b/osu.Game/Beatmaps/Legacy/LegacyEventType.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Beatmaps.Legacy
 {
     internal enum LegacyEventType
diff --git a/osu.Game/Beatmaps/Legacy/LegacyHitObjectType.cs b/osu.Game/Beatmaps/Legacy/LegacyHitObjectType.cs
index ec947c6dc2..07f170f996 100644
--- a/osu.Game/Beatmaps/Legacy/LegacyHitObjectType.cs
+++ b/osu.Game/Beatmaps/Legacy/LegacyHitObjectType.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 
 namespace osu.Game.Beatmaps.Legacy
diff --git a/osu.Game/Beatmaps/Legacy/LegacyHitSoundType.cs b/osu.Game/Beatmaps/Legacy/LegacyHitSoundType.cs
index d1782ec862..808a85b621 100644
--- a/osu.Game/Beatmaps/Legacy/LegacyHitSoundType.cs
+++ b/osu.Game/Beatmaps/Legacy/LegacyHitSoundType.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 
 namespace osu.Game.Beatmaps.Legacy
diff --git a/osu.Game/Beatmaps/Legacy/LegacyMods.cs b/osu.Game/Beatmaps/Legacy/LegacyMods.cs
index 27b2e313ec..0e517ea3df 100644
--- a/osu.Game/Beatmaps/Legacy/LegacyMods.cs
+++ b/osu.Game/Beatmaps/Legacy/LegacyMods.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 
 namespace osu.Game.Beatmaps.Legacy
diff --git a/osu.Game/Beatmaps/Legacy/LegacySampleBank.cs b/osu.Game/Beatmaps/Legacy/LegacySampleBank.cs
index f8a57c3ac9..70eb941a73 100644
--- a/osu.Game/Beatmaps/Legacy/LegacySampleBank.cs
+++ b/osu.Game/Beatmaps/Legacy/LegacySampleBank.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Beatmaps.Legacy
 {
     internal enum LegacySampleBank
diff --git a/osu.Game/Beatmaps/Legacy/LegacyStoryLayer.cs b/osu.Game/Beatmaps/Legacy/LegacyStoryLayer.cs
index 69d0c96b57..5352fb65ed 100644
--- a/osu.Game/Beatmaps/Legacy/LegacyStoryLayer.cs
+++ b/osu.Game/Beatmaps/Legacy/LegacyStoryLayer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Beatmaps.Legacy
 {
     internal enum LegacyStoryLayer
diff --git a/osu.Game/Beatmaps/Timing/BreakPeriod.cs b/osu.Game/Beatmaps/Timing/BreakPeriod.cs
index 274b56a862..4c90b16745 100644
--- a/osu.Game/Beatmaps/Timing/BreakPeriod.cs
+++ b/osu.Game/Beatmaps/Timing/BreakPeriod.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Screens.Play;
 
 namespace osu.Game.Beatmaps.Timing
diff --git a/osu.Game/Configuration/BackgroundSource.cs b/osu.Game/Configuration/BackgroundSource.cs
index f08b29cffe..2d9ed6df2c 100644
--- a/osu.Game/Configuration/BackgroundSource.cs
+++ b/osu.Game/Configuration/BackgroundSource.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Localisation;
 using osu.Game.Localisation;
 
diff --git a/osu.Game/Configuration/DevelopmentOsuConfigManager.cs b/osu.Game/Configuration/DevelopmentOsuConfigManager.cs
index 33329002a9..c979ebf453 100644
--- a/osu.Game/Configuration/DevelopmentOsuConfigManager.cs
+++ b/osu.Game/Configuration/DevelopmentOsuConfigManager.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Platform;
 
 namespace osu.Game.Configuration
diff --git a/osu.Game/Configuration/DiscordRichPresenceMode.cs b/osu.Game/Configuration/DiscordRichPresenceMode.cs
index 150d23447e..6bec4fcc74 100644
--- a/osu.Game/Configuration/DiscordRichPresenceMode.cs
+++ b/osu.Game/Configuration/DiscordRichPresenceMode.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Localisation;
 using osu.Game.Localisation;
 
diff --git a/osu.Game/Configuration/HUDVisibilityMode.cs b/osu.Game/Configuration/HUDVisibilityMode.cs
index 9c69f33220..5ba7cbbe99 100644
--- a/osu.Game/Configuration/HUDVisibilityMode.cs
+++ b/osu.Game/Configuration/HUDVisibilityMode.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Localisation;
 using osu.Game.Localisation;
 
diff --git a/osu.Game/Configuration/InMemoryConfigManager.cs b/osu.Game/Configuration/InMemoryConfigManager.cs
index d8879daa3f..ccf697f680 100644
--- a/osu.Game/Configuration/InMemoryConfigManager.cs
+++ b/osu.Game/Configuration/InMemoryConfigManager.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Configuration;
 
diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 193068193a..309a5818ae 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Diagnostics;
 using osu.Framework.Bindables;
diff --git a/osu.Game/Configuration/RandomSelectAlgorithm.cs b/osu.Game/Configuration/RandomSelectAlgorithm.cs
index 052c6b4c55..985b4a8c55 100644
--- a/osu.Game/Configuration/RandomSelectAlgorithm.cs
+++ b/osu.Game/Configuration/RandomSelectAlgorithm.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Localisation;
 using osu.Game.Localisation;
 
diff --git a/osu.Game/Configuration/ScalingMode.cs b/osu.Game/Configuration/ScalingMode.cs
index e0ad59746b..3ad46d771c 100644
--- a/osu.Game/Configuration/ScalingMode.cs
+++ b/osu.Game/Configuration/ScalingMode.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Localisation;
 using osu.Game.Localisation;
 
diff --git a/osu.Game/Configuration/ScreenshotFormat.cs b/osu.Game/Configuration/ScreenshotFormat.cs
index 13d0b64fd2..f043781c45 100644
--- a/osu.Game/Configuration/ScreenshotFormat.cs
+++ b/osu.Game/Configuration/ScreenshotFormat.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Localisation;
 using osu.Game.Localisation;
 
diff --git a/osu.Game/Configuration/ScrollVisualisationMethod.cs b/osu.Game/Configuration/ScrollVisualisationMethod.cs
index 111bb95e67..5f48fe8bfd 100644
--- a/osu.Game/Configuration/ScrollVisualisationMethod.cs
+++ b/osu.Game/Configuration/ScrollVisualisationMethod.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.ComponentModel;
 
 namespace osu.Game.Configuration
diff --git a/osu.Game/Configuration/SeasonalBackgroundMode.cs b/osu.Game/Configuration/SeasonalBackgroundMode.cs
index 3e6d9e42aa..4ef71ef09c 100644
--- a/osu.Game/Configuration/SeasonalBackgroundMode.cs
+++ b/osu.Game/Configuration/SeasonalBackgroundMode.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Localisation;
 using osu.Game.Localisation;
 
diff --git a/osu.Game/Configuration/SettingsStore.cs b/osu.Game/Configuration/SettingsStore.cs
index fda7193fea..e5d2d572c8 100644
--- a/osu.Game/Configuration/SettingsStore.cs
+++ b/osu.Game/Configuration/SettingsStore.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Database;
 
 namespace osu.Game.Configuration
diff --git a/osu.Game/Configuration/StorageConfigManager.cs b/osu.Game/Configuration/StorageConfigManager.cs
index c8781918e1..40c0e70488 100644
--- a/osu.Game/Configuration/StorageConfigManager.cs
+++ b/osu.Game/Configuration/StorageConfigManager.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Configuration;
 using osu.Framework.Platform;
 
diff --git a/osu.Game/Database/ICanAcceptFiles.cs b/osu.Game/Database/ICanAcceptFiles.cs
index da970a29d4..bdbcebeaf5 100644
--- a/osu.Game/Database/ICanAcceptFiles.cs
+++ b/osu.Game/Database/ICanAcceptFiles.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
diff --git a/osu.Game/Database/IHasFiles.cs b/osu.Game/Database/IHasFiles.cs
index 9f8ce05218..3f6531832f 100644
--- a/osu.Game/Database/IHasFiles.cs
+++ b/osu.Game/Database/IHasFiles.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using JetBrains.Annotations;
 
diff --git a/osu.Game/Database/IHasGuidPrimaryKey.cs b/osu.Game/Database/IHasGuidPrimaryKey.cs
index 9cf7cf0683..8520707bd2 100644
--- a/osu.Game/Database/IHasGuidPrimaryKey.cs
+++ b/osu.Game/Database/IHasGuidPrimaryKey.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using Newtonsoft.Json;
 using Realms;
diff --git a/osu.Game/Database/IHasNamedFiles.cs b/osu.Game/Database/IHasNamedFiles.cs
index 3524eb4c99..34f6560f75 100644
--- a/osu.Game/Database/IHasNamedFiles.cs
+++ b/osu.Game/Database/IHasNamedFiles.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 
 namespace osu.Game.Database
diff --git a/osu.Game/Database/IHasPrimaryKey.cs b/osu.Game/Database/IHasPrimaryKey.cs
index 84709ccd26..51a49948fe 100644
--- a/osu.Game/Database/IHasPrimaryKey.cs
+++ b/osu.Game/Database/IHasPrimaryKey.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.ComponentModel.DataAnnotations.Schema;
 using Newtonsoft.Json;
 
diff --git a/osu.Game/Database/IModelFileManager.cs b/osu.Game/Database/IModelFileManager.cs
index c40b57f663..390be4a69d 100644
--- a/osu.Game/Database/IModelFileManager.cs
+++ b/osu.Game/Database/IModelFileManager.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.IO;
 
 namespace osu.Game.Database
diff --git a/osu.Game/Database/IModelManager.cs b/osu.Game/Database/IModelManager.cs
index 988178818d..ce79aac966 100644
--- a/osu.Game/Database/IModelManager.cs
+++ b/osu.Game/Database/IModelManager.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 
 namespace osu.Game.Database
diff --git a/osu.Game/Database/INamedFileInfo.cs b/osu.Game/Database/INamedFileInfo.cs
index 9df4a0869c..d95f228440 100644
--- a/osu.Game/Database/INamedFileInfo.cs
+++ b/osu.Game/Database/INamedFileInfo.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.IO;
 
 namespace osu.Game.Database
diff --git a/osu.Game/Database/IPostNotifications.cs b/osu.Game/Database/IPostNotifications.cs
index 8bb2c54945..205350b80c 100644
--- a/osu.Game/Database/IPostNotifications.cs
+++ b/osu.Game/Database/IPostNotifications.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Game.Overlays.Notifications;
 
diff --git a/osu.Game/Graphics/Backgrounds/BeatmapBackground.cs b/osu.Game/Graphics/Backgrounds/BeatmapBackground.cs
index 3ace67f410..beb7c5a4df 100644
--- a/osu.Game/Graphics/Backgrounds/BeatmapBackground.cs
+++ b/osu.Game/Graphics/Backgrounds/BeatmapBackground.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Beatmaps;
diff --git a/osu.Game/Graphics/Backgrounds/SkinBackground.cs b/osu.Game/Graphics/Backgrounds/SkinBackground.cs
index e30bb961a0..17af5e6991 100644
--- a/osu.Game/Graphics/Backgrounds/SkinBackground.cs
+++ b/osu.Game/Graphics/Backgrounds/SkinBackground.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Game.Skinning;
 
diff --git a/osu.Game/Graphics/Containers/ConstrainedIconContainer.cs b/osu.Game/Graphics/Containers/ConstrainedIconContainer.cs
index 55160e14af..7722374c69 100644
--- a/osu.Game/Graphics/Containers/ConstrainedIconContainer.cs
+++ b/osu.Game/Graphics/Containers/ConstrainedIconContainer.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game/Graphics/Containers/ExpandingButtonContainer.cs b/osu.Game/Graphics/Containers/ExpandingButtonContainer.cs
index a06af61125..5abb4096ac 100644
--- a/osu.Game/Graphics/Containers/ExpandingButtonContainer.cs
+++ b/osu.Game/Graphics/Containers/ExpandingButtonContainer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Graphics.Containers
 {
     /// <summary>
diff --git a/osu.Game/Graphics/Containers/IExpandable.cs b/osu.Game/Graphics/Containers/IExpandable.cs
index 05d569775c..8549d3bf2c 100644
--- a/osu.Game/Graphics/Containers/IExpandable.cs
+++ b/osu.Game/Graphics/Containers/IExpandable.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 
diff --git a/osu.Game/Graphics/Containers/IExpandingContainer.cs b/osu.Game/Graphics/Containers/IExpandingContainer.cs
index dbd9274ae7..6a36372e88 100644
--- a/osu.Game/Graphics/Containers/IExpandingContainer.cs
+++ b/osu.Game/Graphics/Containers/IExpandingContainer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers;
 
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
index 5b1780a068..4a61ee2043 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using Markdig;
 using Markdig.Extensions.Footnotes;
 using Markdig.Extensions.Tables;
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownFencedCodeBlock.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownFencedCodeBlock.cs
index b5bbe3e2cc..7d84d368ad 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownFencedCodeBlock.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownFencedCodeBlock.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using Markdig.Syntax;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs
index 800a0e1fc3..da4273c9b9 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using Markdig.Syntax;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers.Markdown;
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownImage.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownImage.cs
index 8ccac158eb..10207dd389 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownImage.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownImage.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using Markdig.Syntax.Inlines;
 using osu.Framework.Graphics.Containers.Markdown;
 using osu.Framework.Graphics.Cursor;
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownOrderedListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownOrderedListItem.cs
index 6eac9378ae..1812a9529c 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownOrderedListItem.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownOrderedListItem.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs
index 447085a48c..d2e6f4d370 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using Markdig.Syntax;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownSeparator.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownSeparator.cs
index 343a1d1015..b785b748a7 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownSeparator.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownSeparator.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers.Markdown;
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTable.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTable.cs
index c9c1098e05..652d3d9e3e 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTable.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTable.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using Markdig.Extensions.Tables;
 using osu.Framework.Graphics.Containers.Markdown;
 
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs
index dbf15a2546..4ffdeb179c 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using Markdig.Extensions.Tables;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownUnorderedListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownUnorderedListItem.cs
index 64e98511c2..cdd6bc6ed5 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownUnorderedListItem.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownUnorderedListItem.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 
diff --git a/osu.Game/Graphics/Containers/OsuHoverContainer.cs b/osu.Game/Graphics/Containers/OsuHoverContainer.cs
index b4b80f7574..3b5e48d23e 100644
--- a/osu.Game/Graphics/Containers/OsuHoverContainer.cs
+++ b/osu.Game/Graphics/Containers/OsuHoverContainer.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Graphics/Containers/ReverseChildIDFillFlowContainer.cs b/osu.Game/Graphics/Containers/ReverseChildIDFillFlowContainer.cs
index e37d23fe97..892edf8551 100644
--- a/osu.Game/Graphics/Containers/ReverseChildIDFillFlowContainer.cs
+++ b/osu.Game/Graphics/Containers/ReverseChildIDFillFlowContainer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 
diff --git a/osu.Game/Graphics/Containers/ShakeContainer.cs b/osu.Game/Graphics/Containers/ShakeContainer.cs
index 9a1ddac40d..bb9be2b939 100644
--- a/osu.Game/Graphics/Containers/ShakeContainer.cs
+++ b/osu.Game/Graphics/Containers/ShakeContainer.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics.Containers;
 using osu.Game.Extensions;
 
diff --git a/osu.Game/Graphics/Containers/UserTrackingScrollContainer.cs b/osu.Game/Graphics/Containers/UserTrackingScrollContainer.cs
index 715677aec1..6934c95385 100644
--- a/osu.Game/Graphics/Containers/UserTrackingScrollContainer.cs
+++ b/osu.Game/Graphics/Containers/UserTrackingScrollContainer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 
 namespace osu.Game.Graphics.Containers
diff --git a/osu.Game/Graphics/Containers/WaveContainer.cs b/osu.Game/Graphics/Containers/WaveContainer.cs
index 05a666721a..9fd3d103c9 100644
--- a/osu.Game/Graphics/Containers/WaveContainer.cs
+++ b/osu.Game/Graphics/Containers/WaveContainer.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Graphics/Cursor/OsuContextMenuContainer.cs b/osu.Game/Graphics/Cursor/OsuContextMenuContainer.cs
index 27700e71d9..c5bcfcd2df 100644
--- a/osu.Game/Graphics/Cursor/OsuContextMenuContainer.cs
+++ b/osu.Game/Graphics/Cursor/OsuContextMenuContainer.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.UserInterface;
diff --git a/osu.Game/Graphics/Cursor/OsuTooltipContainer.cs b/osu.Game/Graphics/Cursor/OsuTooltipContainer.cs
index dc75d626b9..aab5b3ee36 100644
--- a/osu.Game/Graphics/Cursor/OsuTooltipContainer.cs
+++ b/osu.Game/Graphics/Cursor/OsuTooltipContainer.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osuTK;
 using osuTK.Graphics;
 using osu.Framework.Allocation;
diff --git a/osu.Game/Graphics/DateTooltip.cs b/osu.Game/Graphics/DateTooltip.cs
index c62f53f1d4..c084f498fe 100644
--- a/osu.Game/Graphics/DateTooltip.cs
+++ b/osu.Game/Graphics/DateTooltip.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Graphics/DrawableDate.cs b/osu.Game/Graphics/DrawableDate.cs
index 553b27acb1..0e5bcc8019 100644
--- a/osu.Game/Graphics/DrawableDate.cs
+++ b/osu.Game/Graphics/DrawableDate.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Graphics/ErrorTextFlowContainer.cs b/osu.Game/Graphics/ErrorTextFlowContainer.cs
index 65a90534e5..7386baf83f 100644
--- a/osu.Game/Graphics/ErrorTextFlowContainer.cs
+++ b/osu.Game/Graphics/ErrorTextFlowContainer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.Containers;
diff --git a/osu.Game/Graphics/IHasAccentColour.cs b/osu.Game/Graphics/IHasAccentColour.cs
index fc722375ce..af497da70f 100644
--- a/osu.Game/Graphics/IHasAccentColour.cs
+++ b/osu.Game/Graphics/IHasAccentColour.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osuTK.Graphics;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Transforms;
diff --git a/osu.Game/Graphics/OpenGL/Vertices/PositionAndColourVertex.cs b/osu.Game/Graphics/OpenGL/Vertices/PositionAndColourVertex.cs
index 78c8cbb79e..2428eebbe5 100644
--- a/osu.Game/Graphics/OpenGL/Vertices/PositionAndColourVertex.cs
+++ b/osu.Game/Graphics/OpenGL/Vertices/PositionAndColourVertex.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Runtime.InteropServices;
 using osu.Framework.Graphics.Rendering.Vertices;
diff --git a/osu.Game/Graphics/OsuColour.cs b/osu.Game/Graphics/OsuColour.cs
index e06f6b3fd0..1b21f79c0a 100644
--- a/osu.Game/Graphics/OsuColour.cs
+++ b/osu.Game/Graphics/OsuColour.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics.Colour;
diff --git a/osu.Game/Graphics/OsuIcon.cs b/osu.Game/Graphics/OsuIcon.cs
index 0a099f1fcc..1f4d6a62da 100644
--- a/osu.Game/Graphics/OsuIcon.cs
+++ b/osu.Game/Graphics/OsuIcon.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics.Sprites;
 
 namespace osu.Game.Graphics
diff --git a/osu.Game/Graphics/ParticleExplosion.cs b/osu.Game/Graphics/ParticleExplosion.cs
index 56e1568441..e16913c6c9 100644
--- a/osu.Game/Graphics/ParticleExplosion.cs
+++ b/osu.Game/Graphics/ParticleExplosion.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Graphics/Sprites/GlowingSpriteText.cs b/osu.Game/Graphics/Sprites/GlowingSpriteText.cs
index ae594ddfe2..1355bfc272 100644
--- a/osu.Game/Graphics/Sprites/GlowingSpriteText.cs
+++ b/osu.Game/Graphics/Sprites/GlowingSpriteText.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
diff --git a/osu.Game/Graphics/Sprites/OsuSpriteText.cs b/osu.Game/Graphics/Sprites/OsuSpriteText.cs
index afbec0eab4..6ce64a9052 100644
--- a/osu.Game/Graphics/Sprites/OsuSpriteText.cs
+++ b/osu.Game/Graphics/Sprites/OsuSpriteText.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Graphics.Sprites;
 
diff --git a/osu.Game/Graphics/UserInterface/Bar.cs b/osu.Game/Graphics/UserInterface/Bar.cs
index 53217e2120..9b63cabeda 100644
--- a/osu.Game/Graphics/UserInterface/Bar.cs
+++ b/osu.Game/Graphics/UserInterface/Bar.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osuTK;
 using osuTK.Graphics;
diff --git a/osu.Game/Graphics/UserInterface/BarGraph.cs b/osu.Game/Graphics/UserInterface/BarGraph.cs
index c394e58d87..27a41eb7e3 100644
--- a/osu.Game/Graphics/UserInterface/BarGraph.cs
+++ b/osu.Game/Graphics/UserInterface/BarGraph.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osuTK;
 using osu.Framework.Graphics;
 using System.Collections.Generic;
diff --git a/osu.Game/Graphics/UserInterface/BasicSearchTextBox.cs b/osu.Game/Graphics/UserInterface/BasicSearchTextBox.cs
index c4e03133dc..2e76951e7b 100644
--- a/osu.Game/Graphics/UserInterface/BasicSearchTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/BasicSearchTextBox.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osuTK;
diff --git a/osu.Game/Graphics/UserInterface/CommaSeparatedScoreCounter.cs b/osu.Game/Graphics/UserInterface/CommaSeparatedScoreCounter.cs
index ba76a17fc6..e0a5409683 100644
--- a/osu.Game/Graphics/UserInterface/CommaSeparatedScoreCounter.cs
+++ b/osu.Game/Graphics/UserInterface/CommaSeparatedScoreCounter.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
diff --git a/osu.Game/Graphics/UserInterface/DangerousRoundedButton.cs b/osu.Game/Graphics/UserInterface/DangerousRoundedButton.cs
index 5855a66ae1..b237dd9b71 100644
--- a/osu.Game/Graphics/UserInterface/DangerousRoundedButton.cs
+++ b/osu.Game/Graphics/UserInterface/DangerousRoundedButton.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Game.Graphics.UserInterfaceV2;
 
diff --git a/osu.Game/Graphics/UserInterface/DialogButton.cs b/osu.Game/Graphics/UserInterface/DialogButton.cs
index 670778b07b..06ebe48850 100644
--- a/osu.Game/Graphics/UserInterface/DialogButton.cs
+++ b/osu.Game/Graphics/UserInterface/DialogButton.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework;
 using osu.Framework.Extensions.Color4Extensions;
diff --git a/osu.Game/Graphics/UserInterface/DrawableStatefulMenuItem.cs b/osu.Game/Graphics/UserInterface/DrawableStatefulMenuItem.cs
index ec3a5744f8..5af275c9e7 100644
--- a/osu.Game/Graphics/UserInterface/DrawableStatefulMenuItem.cs
+++ b/osu.Game/Graphics/UserInterface/DrawableStatefulMenuItem.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
diff --git a/osu.Game/Graphics/UserInterface/ExpandableSlider.cs b/osu.Game/Graphics/UserInterface/ExpandableSlider.cs
index 5bc17303d8..121a1eef49 100644
--- a/osu.Game/Graphics/UserInterface/ExpandableSlider.cs
+++ b/osu.Game/Graphics/UserInterface/ExpandableSlider.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -106,8 +104,8 @@ namespace osu.Game.Graphics.UserInterface
             };
         }
 
-        [Resolved(canBeNull: true)]
-        private IExpandingContainer expandingContainer { get; set; }
+        [Resolved]
+        private IExpandingContainer? expandingContainer { get; set; }
 
         protected override void LoadComplete()
         {
diff --git a/osu.Game/Graphics/UserInterface/ExpandingBar.cs b/osu.Game/Graphics/UserInterface/ExpandingBar.cs
index 6d7c41ee7c..bec4e6e49c 100644
--- a/osu.Game/Graphics/UserInterface/ExpandingBar.cs
+++ b/osu.Game/Graphics/UserInterface/ExpandingBar.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osuTK;
diff --git a/osu.Game/Graphics/UserInterface/HoverSampleSet.cs b/osu.Game/Graphics/UserInterface/HoverSampleSet.cs
index f0ff76b35d..72d50eb042 100644
--- a/osu.Game/Graphics/UserInterface/HoverSampleSet.cs
+++ b/osu.Game/Graphics/UserInterface/HoverSampleSet.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.ComponentModel;
 
 namespace osu.Game.Graphics.UserInterface
diff --git a/osu.Game/Graphics/UserInterface/IconButton.cs b/osu.Game/Graphics/UserInterface/IconButton.cs
index 47f06715b5..0268fa59c2 100644
--- a/osu.Game/Graphics/UserInterface/IconButton.cs
+++ b/osu.Game/Graphics/UserInterface/IconButton.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osuTK;
 using osuTK.Graphics;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Graphics/UserInterface/LoadingButton.cs b/osu.Game/Graphics/UserInterface/LoadingButton.cs
index 8a841ffc94..4a37811114 100644
--- a/osu.Game/Graphics/UserInterface/LoadingButton.cs
+++ b/osu.Game/Graphics/UserInterface/LoadingButton.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game/Graphics/UserInterface/LoadingSpinner.cs b/osu.Game/Graphics/UserInterface/LoadingSpinner.cs
index 0ea44dfe49..df921c5c81 100644
--- a/osu.Game/Graphics/UserInterface/LoadingSpinner.cs
+++ b/osu.Game/Graphics/UserInterface/LoadingSpinner.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
diff --git a/osu.Game/Graphics/UserInterface/OsuAnimatedButton.cs b/osu.Game/Graphics/UserInterface/OsuAnimatedButton.cs
index 69e8df0286..de4df96942 100644
--- a/osu.Game/Graphics/UserInterface/OsuAnimatedButton.cs
+++ b/osu.Game/Graphics/UserInterface/OsuAnimatedButton.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -41,7 +39,7 @@ namespace osu.Game.Graphics.UserInterface
         }
 
         [Resolved]
-        private OsuColour colours { get; set; }
+        private OsuColour colours { get; set; } = null!;
 
         protected override Container<Drawable> Content => content;
 
diff --git a/osu.Game/Graphics/UserInterface/OsuContextMenu.cs b/osu.Game/Graphics/UserInterface/OsuContextMenu.cs
index 1b5f7cc4b5..96797e5d01 100644
--- a/osu.Game/Graphics/UserInterface/OsuContextMenu.cs
+++ b/osu.Game/Graphics/UserInterface/OsuContextMenu.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osuTK.Graphics;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
@@ -17,7 +15,7 @@ namespace osu.Game.Graphics.UserInterface
         private const int fade_duration = 250;
 
         [Resolved]
-        private OsuContextMenuSamples samples { get; set; }
+        private OsuContextMenuSamples samples { get; set; } = null!;
 
         // todo: this shouldn't be required after https://github.com/ppy/osu-framework/issues/4519 is fixed.
         private bool wasOpened;
diff --git a/osu.Game/Graphics/UserInterface/OsuEnumDropdown.cs b/osu.Game/Graphics/UserInterface/OsuEnumDropdown.cs
index dc089e3410..14f8f6f3c5 100644
--- a/osu.Game/Graphics/UserInterface/OsuEnumDropdown.cs
+++ b/osu.Game/Graphics/UserInterface/OsuEnumDropdown.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 
 namespace osu.Game.Graphics.UserInterface
diff --git a/osu.Game/Graphics/UserInterface/OsuNumberBox.cs b/osu.Game/Graphics/UserInterface/OsuNumberBox.cs
index f6a3abdaae..df92863797 100644
--- a/osu.Game/Graphics/UserInterface/OsuNumberBox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuNumberBox.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Extensions;
 
 namespace osu.Game.Graphics.UserInterface
diff --git a/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs b/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
index 9de9eceb07..123854a2dd 100644
--- a/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osuTK;
 using osuTK.Graphics;
 using osuTK.Input;
@@ -39,7 +37,7 @@ namespace osu.Game.Graphics.UserInterface
         private readonly CapsWarning warning;
 
         [Resolved]
-        private GameHost host { get; set; }
+        private GameHost host { get; set; } = null!;
 
         public OsuPasswordTextBox()
         {
diff --git a/osu.Game/Graphics/UserInterface/OsuTabDropdown.cs b/osu.Game/Graphics/UserInterface/OsuTabDropdown.cs
index 01d072b6d7..6272f95510 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabDropdown.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabDropdown.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osuTK;
 using osuTK.Graphics;
 using osu.Framework.Extensions.Color4Extensions;
diff --git a/osu.Game/Graphics/UserInterface/PageSelector/PageEllipsis.cs b/osu.Game/Graphics/UserInterface/PageSelector/PageEllipsis.cs
index 068e477d79..0f3b09f2dc 100644
--- a/osu.Game/Graphics/UserInterface/PageSelector/PageEllipsis.cs
+++ b/osu.Game/Graphics/UserInterface/PageSelector/PageEllipsis.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game/Graphics/UserInterface/PageSelector/PageSelector.cs b/osu.Game/Graphics/UserInterface/PageSelector/PageSelector.cs
index 63f35d5f89..416cd4b8ff 100644
--- a/osu.Game/Graphics/UserInterface/PageSelector/PageSelector.cs
+++ b/osu.Game/Graphics/UserInterface/PageSelector/PageSelector.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Graphics/UserInterface/PercentageCounter.cs b/osu.Game/Graphics/UserInterface/PercentageCounter.cs
index de93d9b2b4..ed06211e8f 100644
--- a/osu.Game/Graphics/UserInterface/PercentageCounter.cs
+++ b/osu.Game/Graphics/UserInterface/PercentageCounter.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
diff --git a/osu.Game/Graphics/UserInterface/SearchTextBox.cs b/osu.Game/Graphics/UserInterface/SearchTextBox.cs
index 2d09a239bb..a2e0ab6482 100644
--- a/osu.Game/Graphics/UserInterface/SearchTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/SearchTextBox.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Input;
 using osu.Framework.Input.Events;
 using osu.Game.Resources.Localisation.Web;
diff --git a/osu.Game/Graphics/UserInterface/SeekLimitedSearchTextBox.cs b/osu.Game/Graphics/UserInterface/SeekLimitedSearchTextBox.cs
index a85cd36808..11cf88c20e 100644
--- a/osu.Game/Graphics/UserInterface/SeekLimitedSearchTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/SeekLimitedSearchTextBox.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Graphics.UserInterface
 {
     /// <summary>
diff --git a/osu.Game/Graphics/UserInterface/ShearedSearchTextBox.cs b/osu.Game/Graphics/UserInterface/ShearedSearchTextBox.cs
index fb0a66cb8d..3940bf8bca 100644
--- a/osu.Game/Graphics/UserInterface/ShearedSearchTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/ShearedSearchTextBox.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Graphics/UserInterface/SlimEnumDropdown.cs b/osu.Game/Graphics/UserInterface/SlimEnumDropdown.cs
index e3f5bc65e6..33382305cf 100644
--- a/osu.Game/Graphics/UserInterface/SlimEnumDropdown.cs
+++ b/osu.Game/Graphics/UserInterface/SlimEnumDropdown.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.UserInterface;
diff --git a/osu.Game/Graphics/UserInterface/StarCounter.cs b/osu.Game/Graphics/UserInterface/StarCounter.cs
index d7d088d798..82f6f8e0a4 100644
--- a/osu.Game/Graphics/UserInterface/StarCounter.cs
+++ b/osu.Game/Graphics/UserInterface/StarCounter.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osuTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game/Graphics/UserInterface/TimeSlider.cs b/osu.Game/Graphics/UserInterface/TimeSlider.cs
index e6e7ae9305..7652eda7be 100644
--- a/osu.Game/Graphics/UserInterface/TimeSlider.cs
+++ b/osu.Game/Graphics/UserInterface/TimeSlider.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Localisation;
 
 namespace osu.Game.Graphics.UserInterface
diff --git a/osu.Game/Graphics/UserInterface/TwoLayerButton.cs b/osu.Game/Graphics/UserInterface/TwoLayerButton.cs
index aa542b8f49..5532e5c6a7 100644
--- a/osu.Game/Graphics/UserInterface/TwoLayerButton.cs
+++ b/osu.Game/Graphics/UserInterface/TwoLayerButton.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
diff --git a/osu.Game/Graphics/UserInterfaceV2/LabelledColourPalette.cs b/osu.Game/Graphics/UserInterfaceV2/LabelledColourPalette.cs
index 721d8990ba..163d1fb2b9 100644
--- a/osu.Game/Graphics/UserInterfaceV2/LabelledColourPalette.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/LabelledColourPalette.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
diff --git a/osu.Game/Graphics/UserInterfaceV2/LabelledComponent.cs b/osu.Game/Graphics/UserInterfaceV2/LabelledComponent.cs
index 8fd9a62ad7..59a1812e5d 100644
--- a/osu.Game/Graphics/UserInterfaceV2/LabelledComponent.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/LabelledComponent.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.UserInterface;
diff --git a/osu.Game/Graphics/UserInterfaceV2/LabelledDropdown.cs b/osu.Game/Graphics/UserInterfaceV2/LabelledDropdown.cs
index 0e2ea362da..dbbae390a7 100644
--- a/osu.Game/Graphics/UserInterfaceV2/LabelledDropdown.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/LabelledDropdown.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.UserInterface;
diff --git a/osu.Game/Graphics/UserInterfaceV2/LabelledEnumDropdown.cs b/osu.Game/Graphics/UserInterfaceV2/LabelledEnumDropdown.cs
index 3ca460be90..9c2c8397ed 100644
--- a/osu.Game/Graphics/UserInterfaceV2/LabelledEnumDropdown.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/LabelledEnumDropdown.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Game.Graphics.UserInterface;
 
diff --git a/osu.Game/Graphics/UserInterfaceV2/LabelledNumberBox.cs b/osu.Game/Graphics/UserInterfaceV2/LabelledNumberBox.cs
index 2643db0547..4926afd7a3 100644
--- a/osu.Game/Graphics/UserInterfaceV2/LabelledNumberBox.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/LabelledNumberBox.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Graphics.UserInterfaceV2
diff --git a/osu.Game/Graphics/UserInterfaceV2/LabelledSliderBar.cs b/osu.Game/Graphics/UserInterfaceV2/LabelledSliderBar.cs
index 00f4ef1a30..4585d3a4c9 100644
--- a/osu.Game/Graphics/UserInterfaceV2/LabelledSliderBar.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/LabelledSliderBar.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Graphics;
 using osu.Game.Overlays.Settings;
diff --git a/osu.Game/Graphics/UserInterfaceV2/LabelledSwitchButton.cs b/osu.Game/Graphics/UserInterfaceV2/LabelledSwitchButton.cs
index 3c27829de3..d25bcbfbe9 100644
--- a/osu.Game/Graphics/UserInterfaceV2/LabelledSwitchButton.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/LabelledSwitchButton.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Graphics.UserInterfaceV2
 {
     public partial class LabelledSwitchButton : LabelledComponent<SwitchButton, bool>
diff --git a/osu.Game/Graphics/UserInterfaceV2/OsuColourPicker.cs b/osu.Game/Graphics/UserInterfaceV2/OsuColourPicker.cs
index fed17eaf20..cf86206f5c 100644
--- a/osu.Game/Graphics/UserInterfaceV2/OsuColourPicker.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/OsuColourPicker.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics.UserInterface;
 
 namespace osu.Game.Graphics.UserInterfaceV2
diff --git a/osu.Game/Graphics/UserInterfaceV2/OsuDirectorySelectorParentDirectory.cs b/osu.Game/Graphics/UserInterfaceV2/OsuDirectorySelectorParentDirectory.cs
index beaeb86243..c0ac9f21ca 100644
--- a/osu.Game/Graphics/UserInterfaceV2/OsuDirectorySelectorParentDirectory.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/OsuDirectorySelectorParentDirectory.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.IO;
 using osu.Framework.Graphics.Sprites;
 
diff --git a/osu.Game/Graphics/UserInterfaceV2/OsuHSVColourPicker.cs b/osu.Game/Graphics/UserInterfaceV2/OsuHSVColourPicker.cs
index ff51f3aa92..75ff1e5665 100644
--- a/osu.Game/Graphics/UserInterfaceV2/OsuHSVColourPicker.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/OsuHSVColourPicker.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
diff --git a/osu.Game/Graphics/UserInterfaceV2/OsuHexColourPicker.cs b/osu.Game/Graphics/UserInterfaceV2/OsuHexColourPicker.cs
index 9aa650d88d..6633ba0eb2 100644
--- a/osu.Game/Graphics/UserInterfaceV2/OsuHexColourPicker.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/OsuHexColourPicker.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Graphics/UserInterfaceV2/OsuPopover.cs b/osu.Game/Graphics/UserInterfaceV2/OsuPopover.cs
index d89322cecd..9153d5253d 100644
--- a/osu.Game/Graphics/UserInterfaceV2/OsuPopover.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/OsuPopover.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions;
diff --git a/osu.Game/IO/Archives/LegacyByteArrayReader.cs b/osu.Game/IO/Archives/LegacyByteArrayReader.cs
index e58dbb48ce..06db02b335 100644
--- a/osu.Game/IO/Archives/LegacyByteArrayReader.cs
+++ b/osu.Game/IO/Archives/LegacyByteArrayReader.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.IO;
 
diff --git a/osu.Game/IO/Archives/LegacyDirectoryArchiveReader.cs b/osu.Game/IO/Archives/LegacyDirectoryArchiveReader.cs
index e26f6af081..dfae58aed7 100644
--- a/osu.Game/IO/Archives/LegacyDirectoryArchiveReader.cs
+++ b/osu.Game/IO/Archives/LegacyDirectoryArchiveReader.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/osu.Game/IO/Archives/LegacyFileArchiveReader.cs b/osu.Game/IO/Archives/LegacyFileArchiveReader.cs
index aee1add2f6..c317cae5fc 100644
--- a/osu.Game/IO/Archives/LegacyFileArchiveReader.cs
+++ b/osu.Game/IO/Archives/LegacyFileArchiveReader.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.IO;
 
diff --git a/osu.Game/IO/FileAbstraction/StreamFileAbstraction.cs b/osu.Game/IO/FileAbstraction/StreamFileAbstraction.cs
index d47f936eb3..8d14385707 100644
--- a/osu.Game/IO/FileAbstraction/StreamFileAbstraction.cs
+++ b/osu.Game/IO/FileAbstraction/StreamFileAbstraction.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.IO;
 
diff --git a/osu.Game/IO/Legacy/ILegacySerializable.cs b/osu.Game/IO/Legacy/ILegacySerializable.cs
index f21e67a34b..e5518a0a30 100644
--- a/osu.Game/IO/Legacy/ILegacySerializable.cs
+++ b/osu.Game/IO/Legacy/ILegacySerializable.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.IO.Legacy
 {
     public interface ILegacySerializable
diff --git a/osu.Game/IO/OsuStorage.cs b/osu.Game/IO/OsuStorage.cs
index f4c55e4b0e..a2b89b6d97 100644
--- a/osu.Game/IO/OsuStorage.cs
+++ b/osu.Game/IO/OsuStorage.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Diagnostics;
 using System.Linq;
 using JetBrains.Annotations;
diff --git a/osu.Game/IO/Serialization/Converters/SnakeCaseStringEnumConverter.cs b/osu.Game/IO/Serialization/Converters/SnakeCaseStringEnumConverter.cs
index 65283d0d82..450eebd736 100644
--- a/osu.Game/IO/Serialization/Converters/SnakeCaseStringEnumConverter.cs
+++ b/osu.Game/IO/Serialization/Converters/SnakeCaseStringEnumConverter.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Serialization;
 
diff --git a/osu.Game/IO/Serialization/SnakeCaseKeyContractResolver.cs b/osu.Game/IO/Serialization/SnakeCaseKeyContractResolver.cs
index b51a8473ca..d01e8de26d 100644
--- a/osu.Game/IO/Serialization/SnakeCaseKeyContractResolver.cs
+++ b/osu.Game/IO/Serialization/SnakeCaseKeyContractResolver.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using Newtonsoft.Json.Serialization;
 using osu.Game.Extensions;
 
diff --git a/osu.Game/Input/IdleTracker.cs b/osu.Game/Input/IdleTracker.cs
index 54157c9e3d..40f270c234 100644
--- a/osu.Game/Input/IdleTracker.cs
+++ b/osu.Game/Input/IdleTracker.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -68,7 +66,7 @@ namespace osu.Game.Input
         public void OnReleased(KeyBindingReleaseEvent<GlobalAction> e) => updateLastInteractionTime();
 
         [Resolved]
-        private GameHost host { get; set; }
+        private GameHost host { get; set; } = null!;
 
         protected override bool Handle(UIEvent e)
         {
diff --git a/osu.Game/Input/OsuConfineMouseMode.cs b/osu.Game/Input/OsuConfineMouseMode.cs
index 2d914ac6e0..e875ceebd9 100644
--- a/osu.Game/Input/OsuConfineMouseMode.cs
+++ b/osu.Game/Input/OsuConfineMouseMode.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Input;
 using osu.Framework.Localisation;
 using osu.Game.Localisation;
diff --git a/osu.Game/Input/OsuUserInputManager.cs b/osu.Game/Input/OsuUserInputManager.cs
index c205636ab9..b8fd0bb11c 100644
--- a/osu.Game/Input/OsuUserInputManager.cs
+++ b/osu.Game/Input/OsuUserInputManager.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Bindables;
 using osu.Framework.Input;
 using osuTK.Input;
diff --git a/osu.Game/Online/API/APIException.cs b/osu.Game/Online/API/APIException.cs
index 21a9c761c7..7491e375df 100644
--- a/osu.Game/Online/API/APIException.cs
+++ b/osu.Game/Online/API/APIException.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 
 namespace osu.Game.Online.API
diff --git a/osu.Game/Online/API/APIMessagesRequest.cs b/osu.Game/Online/API/APIMessagesRequest.cs
index 5bb3e29621..3ad6b1d7c8 100644
--- a/osu.Game/Online/API/APIMessagesRequest.cs
+++ b/osu.Game/Online/API/APIMessagesRequest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Framework.IO.Network;
 using osu.Game.Online.Chat;
diff --git a/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs b/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
index df64984c7a..8df2d3fc2d 100644
--- a/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
+++ b/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Buffers;
 using System.Collections.Generic;
 using System.Text;
diff --git a/osu.Game/Online/API/OsuJsonWebRequest.cs b/osu.Game/Online/API/OsuJsonWebRequest.cs
index 2d402edd3f..eb0be57d9f 100644
--- a/osu.Game/Online/API/OsuJsonWebRequest.cs
+++ b/osu.Game/Online/API/OsuJsonWebRequest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.IO.Network;
 
 namespace osu.Game.Online.API
diff --git a/osu.Game/Online/API/OsuWebRequest.cs b/osu.Game/Online/API/OsuWebRequest.cs
index 9a7cf45a2f..ee7115fa96 100644
--- a/osu.Game/Online/API/OsuWebRequest.cs
+++ b/osu.Game/Online/API/OsuWebRequest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.IO.Network;
 
 namespace osu.Game.Online.API
diff --git a/osu.Game/Online/API/Requests/CommentVoteRequest.cs b/osu.Game/Online/API/Requests/CommentVoteRequest.cs
index a835b0365c..06a3b1126e 100644
--- a/osu.Game/Online/API/Requests/CommentVoteRequest.cs
+++ b/osu.Game/Online/API/Requests/CommentVoteRequest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.IO.Network;
 using osu.Game.Online.API.Requests.Responses;
 using System.Net.Http;
diff --git a/osu.Game/Online/API/Requests/CreateChannelRequest.cs b/osu.Game/Online/API/Requests/CreateChannelRequest.cs
index 130210b1c3..e660c4a883 100644
--- a/osu.Game/Online/API/Requests/CreateChannelRequest.cs
+++ b/osu.Game/Online/API/Requests/CreateChannelRequest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using System.Net.Http;
 using osu.Framework.IO.Network;
diff --git a/osu.Game/Online/API/Requests/CreateNewPrivateMessageRequest.cs b/osu.Game/Online/API/Requests/CreateNewPrivateMessageRequest.cs
index 6b7192dbf4..0429a30b0b 100644
--- a/osu.Game/Online/API/Requests/CreateNewPrivateMessageRequest.cs
+++ b/osu.Game/Online/API/Requests/CreateNewPrivateMessageRequest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Net.Http;
 using osu.Framework.IO.Network;
 using osu.Game.Online.API.Requests.Responses;
diff --git a/osu.Game/Online/API/Requests/Cursor.cs b/osu.Game/Online/API/Requests/Cursor.cs
index c7bb119bd8..8ddbce39ca 100644
--- a/osu.Game/Online/API/Requests/Cursor.cs
+++ b/osu.Game/Online/API/Requests/Cursor.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
diff --git a/osu.Game/Online/API/Requests/DownloadBeatmapSetRequest.cs b/osu.Game/Online/API/Requests/DownloadBeatmapSetRequest.cs
index f190b6e821..5254dc3cf8 100644
--- a/osu.Game/Online/API/Requests/DownloadBeatmapSetRequest.cs
+++ b/osu.Game/Online/API/Requests/DownloadBeatmapSetRequest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.IO.Network;
 using osu.Game.Beatmaps;
 
diff --git a/osu.Game/Online/API/Requests/DownloadReplayRequest.cs b/osu.Game/Online/API/Requests/DownloadReplayRequest.cs
index 5635c4728e..77174f0bb5 100644
--- a/osu.Game/Online/API/Requests/DownloadReplayRequest.cs
+++ b/osu.Game/Online/API/Requests/DownloadReplayRequest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Scoring;
 
 namespace osu.Game.Online.API.Requests
diff --git a/osu.Game/Online/API/Requests/GetBeatmapSetRequest.cs b/osu.Game/Online/API/Requests/GetBeatmapSetRequest.cs
index f3690c934d..158ae03b8d 100644
--- a/osu.Game/Online/API/Requests/GetBeatmapSetRequest.cs
+++ b/osu.Game/Online/API/Requests/GetBeatmapSetRequest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Online.API.Requests
diff --git a/osu.Game/Online/API/Requests/GetBeatmapsRequest.cs b/osu.Game/Online/API/Requests/GetBeatmapsRequest.cs
index e118d1bddc..6cb9e6dd44 100644
--- a/osu.Game/Online/API/Requests/GetBeatmapsRequest.cs
+++ b/osu.Game/Online/API/Requests/GetBeatmapsRequest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 
diff --git a/osu.Game/Online/API/Requests/GetChangelogBuildRequest.cs b/osu.Game/Online/API/Requests/GetChangelogBuildRequest.cs
index 2d2d241b86..baa15c70c4 100644
--- a/osu.Game/Online/API/Requests/GetChangelogBuildRequest.cs
+++ b/osu.Game/Online/API/Requests/GetChangelogBuildRequest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Online.API.Requests
diff --git a/osu.Game/Online/API/Requests/GetChangelogRequest.cs b/osu.Game/Online/API/Requests/GetChangelogRequest.cs
index 82ed42615f..97799ff66a 100644
--- a/osu.Game/Online/API/Requests/GetChangelogRequest.cs
+++ b/osu.Game/Online/API/Requests/GetChangelogRequest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Online.API.Requests
diff --git a/osu.Game/Online/API/Requests/GetCommentsRequest.cs b/osu.Game/Online/API/Requests/GetCommentsRequest.cs
index 1aa08f2ed8..1e033a58a7 100644
--- a/osu.Game/Online/API/Requests/GetCommentsRequest.cs
+++ b/osu.Game/Online/API/Requests/GetCommentsRequest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.IO.Network;
 using osu.Game.Extensions;
 using osu.Game.Online.API.Requests.Responses;
diff --git a/osu.Game/Online/API/Requests/GetCountryRankingsRequest.cs b/osu.Game/Online/API/Requests/GetCountryRankingsRequest.cs
index 9d037ab116..d8a1198627 100644
--- a/osu.Game/Online/API/Requests/GetCountryRankingsRequest.cs
+++ b/osu.Game/Online/API/Requests/GetCountryRankingsRequest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets;
 
 namespace osu.Game.Online.API.Requests
diff --git a/osu.Game/Online/API/Requests/GetFriendsRequest.cs b/osu.Game/Online/API/Requests/GetFriendsRequest.cs
index 640ddcbb9e..63a221d91a 100644
--- a/osu.Game/Online/API/Requests/GetFriendsRequest.cs
+++ b/osu.Game/Online/API/Requests/GetFriendsRequest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Game.Online.API.Requests.Responses;
 
diff --git a/osu.Game/Online/API/Requests/GetMessagesRequest.cs b/osu.Game/Online/API/Requests/GetMessagesRequest.cs
index 2f9879c63f..651f8a06c5 100644
--- a/osu.Game/Online/API/Requests/GetMessagesRequest.cs
+++ b/osu.Game/Online/API/Requests/GetMessagesRequest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Game.Online.Chat;
 
diff --git a/osu.Game/Online/API/Requests/GetRankingsRequest.cs b/osu.Game/Online/API/Requests/GetRankingsRequest.cs
index f42da69dcc..ddc3298ca7 100644
--- a/osu.Game/Online/API/Requests/GetRankingsRequest.cs
+++ b/osu.Game/Online/API/Requests/GetRankingsRequest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.IO.Network;
 using osu.Game.Rulesets;
 
diff --git a/osu.Game/Online/API/Requests/GetSeasonalBackgroundsRequest.cs b/osu.Game/Online/API/Requests/GetSeasonalBackgroundsRequest.cs
index 0ecce90749..941b47244a 100644
--- a/osu.Game/Online/API/Requests/GetSeasonalBackgroundsRequest.cs
+++ b/osu.Game/Online/API/Requests/GetSeasonalBackgroundsRequest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Online.API.Requests
diff --git a/osu.Game/Online/API/Requests/GetSpotlightRankingsRequest.cs b/osu.Game/Online/API/Requests/GetSpotlightRankingsRequest.cs
index 2d8a8b3b61..59b2928a2a 100644
--- a/osu.Game/Online/API/Requests/GetSpotlightRankingsRequest.cs
+++ b/osu.Game/Online/API/Requests/GetSpotlightRankingsRequest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.IO.Network;
 using osu.Game.Overlays.Rankings;
 using osu.Game.Rulesets;
diff --git a/osu.Game/Online/API/Requests/GetTopUsersRequest.cs b/osu.Game/Online/API/Requests/GetTopUsersRequest.cs
index 7f05cd5eab..dbbd2119db 100644
--- a/osu.Game/Online/API/Requests/GetTopUsersRequest.cs
+++ b/osu.Game/Online/API/Requests/GetTopUsersRequest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Online.API.Requests
 {
     public class GetTopUsersRequest : APIRequest<GetTopUsersResponse>
diff --git a/osu.Game/Online/API/Requests/GetUserBeatmapsRequest.cs b/osu.Game/Online/API/Requests/GetUserBeatmapsRequest.cs
index e4134980b1..226bc6bf1e 100644
--- a/osu.Game/Online/API/Requests/GetUserBeatmapsRequest.cs
+++ b/osu.Game/Online/API/Requests/GetUserBeatmapsRequest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Game.Extensions;
 using osu.Game.Online.API.Requests.Responses;
diff --git a/osu.Game/Online/API/Requests/GetUserKudosuHistoryRequest.cs b/osu.Game/Online/API/Requests/GetUserKudosuHistoryRequest.cs
index 3d0ee23080..67d3ad26b0 100644
--- a/osu.Game/Online/API/Requests/GetUserKudosuHistoryRequest.cs
+++ b/osu.Game/Online/API/Requests/GetUserKudosuHistoryRequest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Game.Online.API.Requests.Responses;
 
diff --git a/osu.Game/Online/API/Requests/GetUserMostPlayedBeatmapsRequest.cs b/osu.Game/Online/API/Requests/GetUserMostPlayedBeatmapsRequest.cs
index e5e65415f7..bef3df42fb 100644
--- a/osu.Game/Online/API/Requests/GetUserMostPlayedBeatmapsRequest.cs
+++ b/osu.Game/Online/API/Requests/GetUserMostPlayedBeatmapsRequest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Game.Online.API.Requests.Responses;
 
diff --git a/osu.Game/Online/API/Requests/GetUserRankingsRequest.cs b/osu.Game/Online/API/Requests/GetUserRankingsRequest.cs
index c27a83b695..628fc1be96 100644
--- a/osu.Game/Online/API/Requests/GetUserRankingsRequest.cs
+++ b/osu.Game/Online/API/Requests/GetUserRankingsRequest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.IO.Network;
 using osu.Game.Rulesets;
 using osu.Game.Users;
diff --git a/osu.Game/Online/API/Requests/GetUserRecentActivitiesRequest.cs b/osu.Game/Online/API/Requests/GetUserRecentActivitiesRequest.cs
index 82cf0a508a..79f0549d4a 100644
--- a/osu.Game/Online/API/Requests/GetUserRecentActivitiesRequest.cs
+++ b/osu.Game/Online/API/Requests/GetUserRecentActivitiesRequest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Game.Online.API.Requests.Responses;
 
diff --git a/osu.Game/Online/API/Requests/GetWikiRequest.cs b/osu.Game/Online/API/Requests/GetWikiRequest.cs
index 7c84e1f790..f6bd80e210 100644
--- a/osu.Game/Online/API/Requests/GetWikiRequest.cs
+++ b/osu.Game/Online/API/Requests/GetWikiRequest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Extensions;
 using osu.Game.Localisation;
 using osu.Game.Online.API.Requests.Responses;
diff --git a/osu.Game/Online/API/Requests/JoinChannelRequest.cs b/osu.Game/Online/API/Requests/JoinChannelRequest.cs
index 30b8fafd57..33eab7e355 100644
--- a/osu.Game/Online/API/Requests/JoinChannelRequest.cs
+++ b/osu.Game/Online/API/Requests/JoinChannelRequest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Net.Http;
 using osu.Framework.IO.Network;
 using osu.Game.Online.Chat;
diff --git a/osu.Game/Online/API/Requests/LeaveChannelRequest.cs b/osu.Game/Online/API/Requests/LeaveChannelRequest.cs
index 4e77055e67..7dfc9a0aed 100644
--- a/osu.Game/Online/API/Requests/LeaveChannelRequest.cs
+++ b/osu.Game/Online/API/Requests/LeaveChannelRequest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Net.Http;
 using osu.Framework.IO.Network;
 using osu.Game.Online.Chat;
diff --git a/osu.Game/Online/API/Requests/ListChannelsRequest.cs b/osu.Game/Online/API/Requests/ListChannelsRequest.cs
index 6f8fb427dc..9660695c14 100644
--- a/osu.Game/Online/API/Requests/ListChannelsRequest.cs
+++ b/osu.Game/Online/API/Requests/ListChannelsRequest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Game.Online.Chat;
 
diff --git a/osu.Game/Online/API/Requests/MarkChannelAsReadRequest.cs b/osu.Game/Online/API/Requests/MarkChannelAsReadRequest.cs
index afdc8a47f4..b24669e6d5 100644
--- a/osu.Game/Online/API/Requests/MarkChannelAsReadRequest.cs
+++ b/osu.Game/Online/API/Requests/MarkChannelAsReadRequest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Net.Http;
 using osu.Framework.IO.Network;
 using osu.Game.Online.Chat;
diff --git a/osu.Game/Online/API/Requests/PaginatedAPIRequest.cs b/osu.Game/Online/API/Requests/PaginatedAPIRequest.cs
index 4af1f58180..44b2b17d66 100644
--- a/osu.Game/Online/API/Requests/PaginatedAPIRequest.cs
+++ b/osu.Game/Online/API/Requests/PaginatedAPIRequest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Globalization;
 using osu.Framework.IO.Network;
 
diff --git a/osu.Game/Online/API/Requests/PaginationParameters.cs b/osu.Game/Online/API/Requests/PaginationParameters.cs
index 6dacb009bd..cab56bcf2e 100644
--- a/osu.Game/Online/API/Requests/PaginationParameters.cs
+++ b/osu.Game/Online/API/Requests/PaginationParameters.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Online.API.Requests
 {
     /// <summary>
diff --git a/osu.Game/Online/API/Requests/PostBeatmapFavouriteRequest.cs b/osu.Game/Online/API/Requests/PostBeatmapFavouriteRequest.cs
index 1438c9c436..9fdc3382aa 100644
--- a/osu.Game/Online/API/Requests/PostBeatmapFavouriteRequest.cs
+++ b/osu.Game/Online/API/Requests/PostBeatmapFavouriteRequest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.IO.Network;
 using System.Net.Http;
 
diff --git a/osu.Game/Online/API/Requests/PostMessageRequest.cs b/osu.Game/Online/API/Requests/PostMessageRequest.cs
index e3709d8f13..64b88f0340 100644
--- a/osu.Game/Online/API/Requests/PostMessageRequest.cs
+++ b/osu.Game/Online/API/Requests/PostMessageRequest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Net.Http;
 using osu.Framework.IO.Network;
 using osu.Game.Online.Chat;
diff --git a/osu.Game/Online/API/Requests/Responses/APIPlayStyle.cs b/osu.Game/Online/API/Requests/Responses/APIPlayStyle.cs
index 4a877f392a..be43fc8ae7 100644
--- a/osu.Game/Online/API/Requests/Responses/APIPlayStyle.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIPlayStyle.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Localisation;
 using osu.Game.Resources.Localisation.Web;
 
diff --git a/osu.Game/Online/API/Requests/Responses/APIUserAchievement.cs b/osu.Game/Online/API/Requests/Responses/APIUserAchievement.cs
index 65001dd6cf..836a5bc485 100644
--- a/osu.Game/Online/API/Requests/Responses/APIUserAchievement.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIUserAchievement.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using Newtonsoft.Json;
 
diff --git a/osu.Game/Online/API/Requests/Responses/APIUserHistoryCount.cs b/osu.Game/Online/API/Requests/Responses/APIUserHistoryCount.cs
index 6eb3c8b8a4..9a34699a1b 100644
--- a/osu.Game/Online/API/Requests/Responses/APIUserHistoryCount.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIUserHistoryCount.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using Newtonsoft.Json;
 
diff --git a/osu.Game/Online/Chat/DrawableLinkCompiler.cs b/osu.Game/Online/Chat/DrawableLinkCompiler.cs
index ee53c00668..883a2496f7 100644
--- a/osu.Game/Online/Chat/DrawableLinkCompiler.cs
+++ b/osu.Game/Online/Chat/DrawableLinkCompiler.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
@@ -27,8 +25,8 @@ namespace osu.Game.Online.Chat
         /// </summary>
         public readonly List<Drawable> Parts;
 
-        [Resolved(CanBeNull = true)]
-        private OverlayColourProvider overlayColourProvider { get; set; }
+        [Resolved]
+        private OverlayColourProvider? overlayColourProvider { get; set; }
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => Parts.Any(d => d.ReceivePositionalInputAt(screenSpacePos));
 
diff --git a/osu.Game/Online/Chat/ErrorMessage.cs b/osu.Game/Online/Chat/ErrorMessage.cs
index 9cd91a0927..ccfc0e29b4 100644
--- a/osu.Game/Online/Chat/ErrorMessage.cs
+++ b/osu.Game/Online/Chat/ErrorMessage.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Online.Chat
 {
     public class ErrorMessage : InfoMessage
diff --git a/osu.Game/Online/DevelopmentEndpointConfiguration.cs b/osu.Game/Online/DevelopmentEndpointConfiguration.cs
index 3171d15fc2..69276f452a 100644
--- a/osu.Game/Online/DevelopmentEndpointConfiguration.cs
+++ b/osu.Game/Online/DevelopmentEndpointConfiguration.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Online
 {
     public class DevelopmentEndpointConfiguration : EndpointConfiguration
diff --git a/osu.Game/Online/Leaderboards/DrawableRank.cs b/osu.Game/Online/Leaderboards/DrawableRank.cs
index 5a65c15444..5177f35478 100644
--- a/osu.Game/Online/Leaderboards/DrawableRank.cs
+++ b/osu.Game/Online/Leaderboards/DrawableRank.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Extensions;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Online/Multiplayer/IMultiplayerLoungeServer.cs b/osu.Game/Online/Multiplayer/IMultiplayerLoungeServer.cs
index 68bf3cfaec..f266c38b8b 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerLoungeServer.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerLoungeServer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Threading.Tasks;
 
 namespace osu.Game.Online.Multiplayer
diff --git a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
index a2608f1564..b7a5faf7c9 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using osu.Game.Online.API;
diff --git a/osu.Game/Online/Multiplayer/InvalidPasswordException.cs b/osu.Game/Online/Multiplayer/InvalidPasswordException.cs
index 305c41e69b..d3da8f491b 100644
--- a/osu.Game/Online/Multiplayer/InvalidPasswordException.cs
+++ b/osu.Game/Online/Multiplayer/InvalidPasswordException.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Runtime.Serialization;
 using Microsoft.AspNetCore.SignalR;
diff --git a/osu.Game/Online/Multiplayer/InvalidStateChangeException.cs b/osu.Game/Online/Multiplayer/InvalidStateChangeException.cs
index ab513e71ee..4c793dba68 100644
--- a/osu.Game/Online/Multiplayer/InvalidStateChangeException.cs
+++ b/osu.Game/Online/Multiplayer/InvalidStateChangeException.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Runtime.Serialization;
 using Microsoft.AspNetCore.SignalR;
diff --git a/osu.Game/Online/Multiplayer/InvalidStateException.cs b/osu.Game/Online/Multiplayer/InvalidStateException.cs
index ba3b84ffe4..27b111a781 100644
--- a/osu.Game/Online/Multiplayer/InvalidStateException.cs
+++ b/osu.Game/Online/Multiplayer/InvalidStateException.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Runtime.Serialization;
 using Microsoft.AspNetCore.SignalR;
diff --git a/osu.Game/Online/Multiplayer/MatchUserRequest.cs b/osu.Game/Online/Multiplayer/MatchUserRequest.cs
index 7fc1790434..8515256581 100644
--- a/osu.Game/Online/Multiplayer/MatchUserRequest.cs
+++ b/osu.Game/Online/Multiplayer/MatchUserRequest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using MessagePack;
 using osu.Game.Online.Multiplayer.Countdown;
diff --git a/osu.Game/Online/Multiplayer/NotHostException.cs b/osu.Game/Online/Multiplayer/NotHostException.cs
index 9f789f1e81..cd43b13e52 100644
--- a/osu.Game/Online/Multiplayer/NotHostException.cs
+++ b/osu.Game/Online/Multiplayer/NotHostException.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Runtime.Serialization;
 using Microsoft.AspNetCore.SignalR;
diff --git a/osu.Game/Online/Multiplayer/NotJoinedRoomException.cs b/osu.Game/Online/Multiplayer/NotJoinedRoomException.cs
index c749e4615a..0a96406c16 100644
--- a/osu.Game/Online/Multiplayer/NotJoinedRoomException.cs
+++ b/osu.Game/Online/Multiplayer/NotJoinedRoomException.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Runtime.Serialization;
 using Microsoft.AspNetCore.SignalR;
diff --git a/osu.Game/Online/Multiplayer/QueueMode.cs b/osu.Game/Online/Multiplayer/QueueMode.cs
index a7bc4ae00a..adc975539f 100644
--- a/osu.Game/Online/Multiplayer/QueueMode.cs
+++ b/osu.Game/Online/Multiplayer/QueueMode.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.ComponentModel;
 
 namespace osu.Game.Online.Multiplayer
diff --git a/osu.Game/Online/Placeholders/LoginPlaceholder.cs b/osu.Game/Online/Placeholders/LoginPlaceholder.cs
index de7ac6e936..60c9ecbcdc 100644
--- a/osu.Game/Online/Placeholders/LoginPlaceholder.cs
+++ b/osu.Game/Online/Placeholders/LoginPlaceholder.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
@@ -12,8 +10,8 @@ namespace osu.Game.Online.Placeholders
 {
     public sealed partial class LoginPlaceholder : ClickablePlaceholder
     {
-        [Resolved(CanBeNull = true)]
-        private LoginOverlay login { get; set; }
+        [Resolved]
+        private LoginOverlay? login { get; set; }
 
         public LoginPlaceholder(LocalisableString actionMessage)
             : base(actionMessage, FontAwesome.Solid.UserLock)
diff --git a/osu.Game/Online/Placeholders/MessagePlaceholder.cs b/osu.Game/Online/Placeholders/MessagePlaceholder.cs
index 07a111a10f..bef889a576 100644
--- a/osu.Game/Online/Placeholders/MessagePlaceholder.cs
+++ b/osu.Game/Online/Placeholders/MessagePlaceholder.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
diff --git a/osu.Game/Online/Rooms/APIScoreToken.cs b/osu.Game/Online/Rooms/APIScoreToken.cs
index 58a633f3cf..542f972d3f 100644
--- a/osu.Game/Online/Rooms/APIScoreToken.cs
+++ b/osu.Game/Online/Rooms/APIScoreToken.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using Newtonsoft.Json;
 
 namespace osu.Game.Online.Rooms
diff --git a/osu.Game/Online/Rooms/CreateRoomRequest.cs b/osu.Game/Online/Rooms/CreateRoomRequest.cs
index b22780490b..63a3b7bfa8 100644
--- a/osu.Game/Online/Rooms/CreateRoomRequest.cs
+++ b/osu.Game/Online/Rooms/CreateRoomRequest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Net.Http;
 using Newtonsoft.Json;
 using osu.Framework.IO.Network;
diff --git a/osu.Game/Online/Rooms/CreateRoomScoreRequest.cs b/osu.Game/Online/Rooms/CreateRoomScoreRequest.cs
index 65731b2b68..c31c6a929a 100644
--- a/osu.Game/Online/Rooms/CreateRoomScoreRequest.cs
+++ b/osu.Game/Online/Rooms/CreateRoomScoreRequest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Net.Http;
 using osu.Framework.IO.Network;
 using osu.Game.Online.API;
diff --git a/osu.Game/Online/Rooms/GetRoomLeaderboardRequest.cs b/osu.Game/Online/Rooms/GetRoomLeaderboardRequest.cs
index 6b5ed2d024..e016074f5d 100644
--- a/osu.Game/Online/Rooms/GetRoomLeaderboardRequest.cs
+++ b/osu.Game/Online/Rooms/GetRoomLeaderboardRequest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Online.API;
 
 namespace osu.Game.Online.Rooms
diff --git a/osu.Game/Online/Rooms/GetRoomRequest.cs b/osu.Game/Online/Rooms/GetRoomRequest.cs
index 237d427509..b968f4e864 100644
--- a/osu.Game/Online/Rooms/GetRoomRequest.cs
+++ b/osu.Game/Online/Rooms/GetRoomRequest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Online.API;
 
 namespace osu.Game.Online.Rooms
diff --git a/osu.Game/Online/Rooms/GetRoomsRequest.cs b/osu.Game/Online/Rooms/GetRoomsRequest.cs
index afab83b5be..7feb709acb 100644
--- a/osu.Game/Online/Rooms/GetRoomsRequest.cs
+++ b/osu.Game/Online/Rooms/GetRoomsRequest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Framework.IO.Network;
 using osu.Game.Extensions;
diff --git a/osu.Game/Online/Rooms/IndexScoresParams.cs b/osu.Game/Online/Rooms/IndexScoresParams.cs
index 253caa13a1..b69af27e8b 100644
--- a/osu.Game/Online/Rooms/IndexScoresParams.cs
+++ b/osu.Game/Online/Rooms/IndexScoresParams.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
diff --git a/osu.Game/Online/Rooms/ItemAttemptsCount.cs b/osu.Game/Online/Rooms/ItemAttemptsCount.cs
index 71f50b9898..dc86897660 100644
--- a/osu.Game/Online/Rooms/ItemAttemptsCount.cs
+++ b/osu.Game/Online/Rooms/ItemAttemptsCount.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using Newtonsoft.Json;
 
 namespace osu.Game.Online.Rooms
diff --git a/osu.Game/Online/Rooms/JoinRoomRequest.cs b/osu.Game/Online/Rooms/JoinRoomRequest.cs
index 0a687312e7..a1d6ed1e82 100644
--- a/osu.Game/Online/Rooms/JoinRoomRequest.cs
+++ b/osu.Game/Online/Rooms/JoinRoomRequest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Net.Http;
 using osu.Framework.IO.Network;
 using osu.Game.Online.API;
diff --git a/osu.Game/Online/Rooms/MatchType.cs b/osu.Game/Online/Rooms/MatchType.cs
index fd2f583f83..28f2da897a 100644
--- a/osu.Game/Online/Rooms/MatchType.cs
+++ b/osu.Game/Online/Rooms/MatchType.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Localisation;
 using osu.Game.Resources.Localisation.Web;
 
diff --git a/osu.Game/Online/Rooms/MultiplayerScores.cs b/osu.Game/Online/Rooms/MultiplayerScores.cs
index 4c13579b3e..3331a2155c 100644
--- a/osu.Game/Online/Rooms/MultiplayerScores.cs
+++ b/osu.Game/Online/Rooms/MultiplayerScores.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using osu.Game.Online.API.Requests;
diff --git a/osu.Game/Online/Rooms/PartRoomRequest.cs b/osu.Game/Online/Rooms/PartRoomRequest.cs
index da4e9a44c5..09ba6f65c3 100644
--- a/osu.Game/Online/Rooms/PartRoomRequest.cs
+++ b/osu.Game/Online/Rooms/PartRoomRequest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Net.Http;
 using osu.Framework.IO.Network;
 using osu.Game.Online.API;
diff --git a/osu.Game/Online/Rooms/RoomAvailability.cs b/osu.Game/Online/Rooms/RoomAvailability.cs
index fada111826..3aea0e5948 100644
--- a/osu.Game/Online/Rooms/RoomAvailability.cs
+++ b/osu.Game/Online/Rooms/RoomAvailability.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.ComponentModel;
 
 namespace osu.Game.Online.Rooms
diff --git a/osu.Game/Online/Rooms/RoomCategory.cs b/osu.Game/Online/Rooms/RoomCategory.cs
index ba17fb2121..17afb0dc7f 100644
--- a/osu.Game/Online/Rooms/RoomCategory.cs
+++ b/osu.Game/Online/Rooms/RoomCategory.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.ComponentModel;
 
 namespace osu.Game.Online.Rooms
diff --git a/osu.Game/Online/Rooms/RoomStatuses/RoomStatusEnded.cs b/osu.Game/Online/Rooms/RoomStatuses/RoomStatusEnded.cs
index 9aa6424592..0fc27d26b8 100644
--- a/osu.Game/Online/Rooms/RoomStatuses/RoomStatusEnded.cs
+++ b/osu.Game/Online/Rooms/RoomStatuses/RoomStatusEnded.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Graphics;
 using osuTK.Graphics;
 
diff --git a/osu.Game/Online/Rooms/RoomStatuses/RoomStatusOpen.cs b/osu.Game/Online/Rooms/RoomStatuses/RoomStatusOpen.cs
index c37b93ea1b..5cc664cf36 100644
--- a/osu.Game/Online/Rooms/RoomStatuses/RoomStatusOpen.cs
+++ b/osu.Game/Online/Rooms/RoomStatuses/RoomStatusOpen.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Graphics;
 using osuTK.Graphics;
 
diff --git a/osu.Game/Online/Rooms/RoomStatuses/RoomStatusPlaying.cs b/osu.Game/Online/Rooms/RoomStatuses/RoomStatusPlaying.cs
index 9eb61a82ec..4d0c93b8ab 100644
--- a/osu.Game/Online/Rooms/RoomStatuses/RoomStatusPlaying.cs
+++ b/osu.Game/Online/Rooms/RoomStatuses/RoomStatusPlaying.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Graphics;
 using osuTK.Graphics;
 
diff --git a/osu.Game/Online/Rooms/ShowPlaylistUserScoreRequest.cs b/osu.Game/Online/Rooms/ShowPlaylistUserScoreRequest.cs
index affb2846a2..8e6a1ac7c7 100644
--- a/osu.Game/Online/Rooms/ShowPlaylistUserScoreRequest.cs
+++ b/osu.Game/Online/Rooms/ShowPlaylistUserScoreRequest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Online.API;
 
 namespace osu.Game.Online.Rooms
diff --git a/osu.Game/Online/Rooms/SubmitRoomScoreRequest.cs b/osu.Game/Online/Rooms/SubmitRoomScoreRequest.cs
index f4cadc3fde..3f404386c3 100644
--- a/osu.Game/Online/Rooms/SubmitRoomScoreRequest.cs
+++ b/osu.Game/Online/Rooms/SubmitRoomScoreRequest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Scoring;
 
 namespace osu.Game.Online.Rooms
diff --git a/osu.Game/Online/Rooms/SubmitScoreRequest.cs b/osu.Game/Online/Rooms/SubmitScoreRequest.cs
index 48a7780a03..b4a91a5892 100644
--- a/osu.Game/Online/Rooms/SubmitScoreRequest.cs
+++ b/osu.Game/Online/Rooms/SubmitScoreRequest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Net.Http;
 using Newtonsoft.Json;
 using osu.Framework.IO.Network;
diff --git a/osu.Game/Online/SignalRWorkaroundTypes.cs b/osu.Game/Online/SignalRWorkaroundTypes.cs
index 0b545821ee..0e3eb0aab0 100644
--- a/osu.Game/Online/SignalRWorkaroundTypes.cs
+++ b/osu.Game/Online/SignalRWorkaroundTypes.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using osu.Game.Online.Multiplayer;
diff --git a/osu.Game/Online/Solo/CreateSoloScoreRequest.cs b/osu.Game/Online/Solo/CreateSoloScoreRequest.cs
index 8c92b32915..2f462b2610 100644
--- a/osu.Game/Online/Solo/CreateSoloScoreRequest.cs
+++ b/osu.Game/Online/Solo/CreateSoloScoreRequest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Globalization;
 using System.Net.Http;
 using osu.Framework.IO.Network;
diff --git a/osu.Game/Online/Solo/SubmitSoloScoreRequest.cs b/osu.Game/Online/Solo/SubmitSoloScoreRequest.cs
index f387e61901..3260ba8e7c 100644
--- a/osu.Game/Online/Solo/SubmitSoloScoreRequest.cs
+++ b/osu.Game/Online/Solo/SubmitSoloScoreRequest.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Online.Rooms;
 using osu.Game.Scoring;
 
diff --git a/osu.Game/Online/Spectator/ISpectatorClient.cs b/osu.Game/Online/Spectator/ISpectatorClient.cs
index 605ebc4ef0..9605604966 100644
--- a/osu.Game/Online/Spectator/ISpectatorClient.cs
+++ b/osu.Game/Online/Spectator/ISpectatorClient.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Threading.Tasks;
 
 namespace osu.Game.Online.Spectator
diff --git a/osu.Game/Online/Spectator/ISpectatorServer.cs b/osu.Game/Online/Spectator/ISpectatorServer.cs
index fa9d04792a..848983009b 100644
--- a/osu.Game/Online/Spectator/ISpectatorServer.cs
+++ b/osu.Game/Online/Spectator/ISpectatorServer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Threading.Tasks;
 
 namespace osu.Game.Online.Spectator
diff --git a/osu.Game/OsuGameBase_Importing.cs b/osu.Game/OsuGameBase_Importing.cs
index cf65460bab..601d17bea9 100644
--- a/osu.Game/OsuGameBase_Importing.cs
+++ b/osu.Game/OsuGameBase_Importing.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/osu.Game/Overlays/AccountCreation/AccountCreationBackground.cs b/osu.Game/Overlays/AccountCreation/AccountCreationBackground.cs
index 0042b9f8f6..8d015709aa 100644
--- a/osu.Game/Overlays/AccountCreation/AccountCreationBackground.cs
+++ b/osu.Game/Overlays/AccountCreation/AccountCreationBackground.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
diff --git a/osu.Game/Overlays/AccountCreation/AccountCreationScreen.cs b/osu.Game/Overlays/AccountCreation/AccountCreationScreen.cs
index a7dd53f511..32e5ca471c 100644
--- a/osu.Game/Overlays/AccountCreation/AccountCreationScreen.cs
+++ b/osu.Game/Overlays/AccountCreation/AccountCreationScreen.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Screens;
 
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSortTabControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSortTabControl.cs
index 2f290d05e9..e3e2bcaf9a 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSortTabControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSortTabControl.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
index 3ab0e47a6c..608ecbb6f3 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchRulesetFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchRulesetFilterRow.cs
index 96626d0ac6..2efa4b455e 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchRulesetFilterRow.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchRulesetFilterRow.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchScoreFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchScoreFilterRow.cs
index 031833a107..195ac09c3e 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchScoreFilterRow.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchScoreFilterRow.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Extensions;
diff --git a/osu.Game/Overlays/BeatmapListing/SearchCategory.cs b/osu.Game/Overlays/BeatmapListing/SearchCategory.cs
index b3e12d00a6..2c77177541 100644
--- a/osu.Game/Overlays/BeatmapListing/SearchCategory.cs
+++ b/osu.Game/Overlays/BeatmapListing/SearchCategory.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.ComponentModel;
 using osu.Framework.Localisation;
 using osu.Game.Resources.Localisation.Web;
diff --git a/osu.Game/Overlays/BeatmapListing/SearchExplicit.cs b/osu.Game/Overlays/BeatmapListing/SearchExplicit.cs
index 10fea6d5b2..4df5cd4b0a 100644
--- a/osu.Game/Overlays/BeatmapListing/SearchExplicit.cs
+++ b/osu.Game/Overlays/BeatmapListing/SearchExplicit.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Localisation;
 using osu.Game.Resources.Localisation.Web;
 
diff --git a/osu.Game/Overlays/BeatmapListing/SearchExtra.cs b/osu.Game/Overlays/BeatmapListing/SearchExtra.cs
index d307cd09eb..e54632acd8 100644
--- a/osu.Game/Overlays/BeatmapListing/SearchExtra.cs
+++ b/osu.Game/Overlays/BeatmapListing/SearchExtra.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.ComponentModel;
 using osu.Framework.Localisation;
 using osu.Game.Resources.Localisation.Web;
diff --git a/osu.Game/Overlays/BeatmapListing/SearchGeneral.cs b/osu.Game/Overlays/BeatmapListing/SearchGeneral.cs
index ebcbef1ad9..28d8473a6e 100644
--- a/osu.Game/Overlays/BeatmapListing/SearchGeneral.cs
+++ b/osu.Game/Overlays/BeatmapListing/SearchGeneral.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.ComponentModel;
 using osu.Framework.Localisation;
 using osu.Game.Resources.Localisation.Web;
diff --git a/osu.Game/Overlays/BeatmapListing/SearchGenre.cs b/osu.Game/Overlays/BeatmapListing/SearchGenre.cs
index 7746eb50d7..f928f8a7bb 100644
--- a/osu.Game/Overlays/BeatmapListing/SearchGenre.cs
+++ b/osu.Game/Overlays/BeatmapListing/SearchGenre.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.ComponentModel;
 using osu.Framework.Localisation;
 using osu.Game.Resources.Localisation.Web;
diff --git a/osu.Game/Overlays/BeatmapListing/SearchLanguage.cs b/osu.Game/Overlays/BeatmapListing/SearchLanguage.cs
index d52f923158..af8a298919 100644
--- a/osu.Game/Overlays/BeatmapListing/SearchLanguage.cs
+++ b/osu.Game/Overlays/BeatmapListing/SearchLanguage.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Localisation;
 using osu.Framework.Utils;
 using osu.Game.Resources.Localisation.Web;
diff --git a/osu.Game/Overlays/BeatmapListing/SearchPlayed.cs b/osu.Game/Overlays/BeatmapListing/SearchPlayed.cs
index 0c379b3825..3b04ac01ca 100644
--- a/osu.Game/Overlays/BeatmapListing/SearchPlayed.cs
+++ b/osu.Game/Overlays/BeatmapListing/SearchPlayed.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Localisation;
 using osu.Game.Resources.Localisation.Web;
 
diff --git a/osu.Game/Overlays/BeatmapListing/SortCriteria.cs b/osu.Game/Overlays/BeatmapListing/SortCriteria.cs
index 6c010c7504..5e3cbbfeea 100644
--- a/osu.Game/Overlays/BeatmapListing/SortCriteria.cs
+++ b/osu.Game/Overlays/BeatmapListing/SortCriteria.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Localisation;
 using osu.Game.Resources.Localisation.Web;
 
diff --git a/osu.Game/Overlays/BeatmapSet/BeatmapRulesetSelector.cs b/osu.Game/Overlays/BeatmapSet/BeatmapRulesetSelector.cs
index 9291988367..7d8160bef7 100644
--- a/osu.Game/Overlays/BeatmapSet/BeatmapRulesetSelector.cs
+++ b/osu.Game/Overlays/BeatmapSet/BeatmapRulesetSelector.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Rulesets;
diff --git a/osu.Game/Overlays/BeatmapSet/BeatmapSetLayoutSection.cs b/osu.Game/Overlays/BeatmapSet/BeatmapSetLayoutSection.cs
index 305a3661a7..4dd257c6ea 100644
--- a/osu.Game/Overlays/BeatmapSet/BeatmapSetLayoutSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/BeatmapSetLayoutSection.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs b/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs
index b3b8b80a0d..62a8bf80d3 100644
--- a/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs
+++ b/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Overlays/BeatmapSet/Info.cs b/osu.Game/Overlays/BeatmapSet/Info.cs
index 8758b9c5cf..c182ef2e15 100644
--- a/osu.Game/Overlays/BeatmapSet/Info.cs
+++ b/osu.Game/Overlays/BeatmapSet/Info.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
diff --git a/osu.Game/Overlays/BeatmapSet/LeaderboardScopeSelector.cs b/osu.Game/Overlays/BeatmapSet/LeaderboardScopeSelector.cs
index 476a252c7b..5cfe4a35b3 100644
--- a/osu.Game/Overlays/BeatmapSet/LeaderboardScopeSelector.cs
+++ b/osu.Game/Overlays/BeatmapSet/LeaderboardScopeSelector.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Screens.Select.Leaderboards;
 using osu.Game.Graphics.UserInterface;
 using osu.Framework.Allocation;
diff --git a/osu.Game/Overlays/BeatmapSet/MetadataType.cs b/osu.Game/Overlays/BeatmapSet/MetadataType.cs
index dc96ce99e9..c92cecc17e 100644
--- a/osu.Game/Overlays/BeatmapSet/MetadataType.cs
+++ b/osu.Game/Overlays/BeatmapSet/MetadataType.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Localisation;
 using osu.Game.Resources.Localisation.Web;
 
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/NoScoresPlaceholder.cs b/osu.Game/Overlays/BeatmapSet/Scores/NoScoresPlaceholder.cs
index f7703af27d..29a696593d 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/NoScoresPlaceholder.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/NoScoresPlaceholder.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Screens.Select.Leaderboards;
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/NotSupporterPlaceholder.cs b/osu.Game/Overlays/BeatmapSet/Scores/NotSupporterPlaceholder.cs
index 04ab3ec72f..7cb119bf32 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/NotSupporterPlaceholder.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/NotSupporterPlaceholder.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTableRowBackground.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTableRowBackground.cs
index 130dfd45e7..8a6545a97b 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTableRowBackground.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTableRowBackground.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreboardTime.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreboardTime.cs
index 04cbf171f6..59ba9cd449 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreboardTime.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreboardTime.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Game.Extensions;
 using osu.Game.Graphics;
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
index afaed85250..9dc2ce204f 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Extensions.LocalisationExtensions;
diff --git a/osu.Game/Overlays/BreadcrumbControlOverlayHeader.cs b/osu.Game/Overlays/BreadcrumbControlOverlayHeader.cs
index e730496b5c..67b11af0c1 100644
--- a/osu.Game/Overlays/BreadcrumbControlOverlayHeader.cs
+++ b/osu.Game/Overlays/BreadcrumbControlOverlayHeader.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.UserInterface;
diff --git a/osu.Game/Overlays/Changelog/ChangelogEntry.cs b/osu.Game/Overlays/Changelog/ChangelogEntry.cs
index ab671d9c86..06ec2043f9 100644
--- a/osu.Game/Overlays/Changelog/ChangelogEntry.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogEntry.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Diagnostics;
 using System.Net;
@@ -26,10 +24,10 @@ namespace osu.Game.Overlays.Changelog
         private readonly APIChangelogEntry entry;
 
         [Resolved]
-        private OsuColour colours { get; set; }
+        private OsuColour colours { get; set; } = null!;
 
         [Resolved]
-        private OverlayColourProvider colourProvider { get; set; }
+        private OverlayColourProvider colourProvider { get; set; } = null!;
 
         private FontUsage fontLarge;
         private FontUsage fontMedium;
diff --git a/osu.Game/Overlays/Changelog/ChangelogListing.cs b/osu.Game/Overlays/Changelog/ChangelogListing.cs
index 4b784c7a28..3a648f66cf 100644
--- a/osu.Game/Overlays/Changelog/ChangelogListing.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogListing.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
diff --git a/osu.Game/Overlays/Changelog/ChangelogSupporterPromo.cs b/osu.Game/Overlays/Changelog/ChangelogSupporterPromo.cs
index 4aded1dd59..012ccf8f64 100644
--- a/osu.Game/Overlays/Changelog/ChangelogSupporterPromo.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogSupporterPromo.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
diff --git a/osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs b/osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs
index 155cbc7d65..e3dd989e2d 100644
--- a/osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Overlays.Changelog
diff --git a/osu.Game/Overlays/Chat/ChannelScrollContainer.cs b/osu.Game/Overlays/Chat/ChannelScrollContainer.cs
index 090f7835ae..6d8b21a7c5 100644
--- a/osu.Game/Overlays/Chat/ChannelScrollContainer.cs
+++ b/osu.Game/Overlays/Chat/ChannelScrollContainer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Containers;
 
diff --git a/osu.Game/Overlays/Comments/Buttons/ChevronButton.cs b/osu.Game/Overlays/Comments/Buttons/ChevronButton.cs
index 88e7d00476..45024f25db 100644
--- a/osu.Game/Overlays/Comments/Buttons/ChevronButton.cs
+++ b/osu.Game/Overlays/Comments/Buttons/ChevronButton.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Framework.Bindables;
diff --git a/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs b/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
index d9576f5b72..400820ddd9 100644
--- a/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
+++ b/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -26,7 +24,7 @@ namespace osu.Game.Overlays.Comments.Buttons
         }
 
         [Resolved]
-        private OverlayColourProvider colourProvider { get; set; }
+        private OverlayColourProvider colourProvider { get; set; } = null!;
 
         private readonly ChevronIcon icon;
         private readonly Box background;
diff --git a/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs b/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs
index 9cc20caa05..278cef9112 100644
--- a/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using Markdig.Syntax;
 using osu.Framework.Graphics.Containers.Markdown;
 using osu.Game.Graphics.Containers.Markdown;
diff --git a/osu.Game/Overlays/Comments/CommentsShowMoreButton.cs b/osu.Game/Overlays/Comments/CommentsShowMoreButton.cs
index 1770fcb269..50bd08b66b 100644
--- a/osu.Game/Overlays/Comments/CommentsShowMoreButton.cs
+++ b/osu.Game/Overlays/Comments/CommentsShowMoreButton.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Localisation;
diff --git a/osu.Game/Overlays/Comments/DeletedCommentsCounter.cs b/osu.Game/Overlays/Comments/DeletedCommentsCounter.cs
index 6adb388185..fa366f38c3 100644
--- a/osu.Game/Overlays/Comments/DeletedCommentsCounter.cs
+++ b/osu.Game/Overlays/Comments/DeletedCommentsCounter.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
diff --git a/osu.Game/Overlays/Comments/HeaderButton.cs b/osu.Game/Overlays/Comments/HeaderButton.cs
index de99cd6cc8..1a26148e49 100644
--- a/osu.Game/Overlays/Comments/HeaderButton.cs
+++ b/osu.Game/Overlays/Comments/HeaderButton.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs b/osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs
index 5cbeb8f306..0f4697e33c 100644
--- a/osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs
+++ b/osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.ComponentModel;
 using osu.Framework.Localisation;
 using osu.Game.Localisation;
diff --git a/osu.Game/Overlays/Dashboard/Friends/FriendStream.cs b/osu.Game/Overlays/Dashboard/Friends/FriendStream.cs
index 3bb42ec953..4abece9a8d 100644
--- a/osu.Game/Overlays/Dashboard/Friends/FriendStream.cs
+++ b/osu.Game/Overlays/Dashboard/Friends/FriendStream.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Overlays.Dashboard.Friends
 {
     public class FriendStream
diff --git a/osu.Game/Overlays/Dashboard/Friends/FriendsOnlineStatusItem.cs b/osu.Game/Overlays/Dashboard/Friends/FriendsOnlineStatusItem.cs
index 785eef38ad..2aea631b7c 100644
--- a/osu.Game/Overlays/Dashboard/Friends/FriendsOnlineStatusItem.cs
+++ b/osu.Game/Overlays/Dashboard/Friends/FriendsOnlineStatusItem.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Extensions;
 using osu.Framework.Localisation;
diff --git a/osu.Game/Overlays/Dashboard/Friends/OnlineStatus.cs b/osu.Game/Overlays/Dashboard/Friends/OnlineStatus.cs
index 21bc5b8203..dc291f1a44 100644
--- a/osu.Game/Overlays/Dashboard/Friends/OnlineStatus.cs
+++ b/osu.Game/Overlays/Dashboard/Friends/OnlineStatus.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Localisation;
 using osu.Game.Resources.Localisation.Web;
 
diff --git a/osu.Game/Overlays/Dashboard/Friends/UserListToolbar.cs b/osu.Game/Overlays/Dashboard/Friends/UserListToolbar.cs
index db8510325c..3f31ceee1a 100644
--- a/osu.Game/Overlays/Dashboard/Friends/UserListToolbar.cs
+++ b/osu.Game/Overlays/Dashboard/Friends/UserListToolbar.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osuTK;
diff --git a/osu.Game/Overlays/Dashboard/Friends/UserSortTabControl.cs b/osu.Game/Overlays/Dashboard/Friends/UserSortTabControl.cs
index 886ed08af2..db01e1f266 100644
--- a/osu.Game/Overlays/Dashboard/Friends/UserSortTabControl.cs
+++ b/osu.Game/Overlays/Dashboard/Friends/UserSortTabControl.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.ComponentModel;
 using osu.Framework.Localisation;
 using osu.Game.Resources.Localisation.Web;
diff --git a/osu.Game/Overlays/Dashboard/Home/DashboardBeatmapListing.cs b/osu.Game/Overlays/Dashboard/Home/DashboardBeatmapListing.cs
index 0282ba8785..4eac1a1d29 100644
--- a/osu.Game/Overlays/Dashboard/Home/DashboardBeatmapListing.cs
+++ b/osu.Game/Overlays/Dashboard/Home/DashboardBeatmapListing.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Overlays/Dashboard/Home/DashboardNewBeatmapPanel.cs b/osu.Game/Overlays/Dashboard/Home/DashboardNewBeatmapPanel.cs
index fef33bdf5a..9e9c22fea2 100644
--- a/osu.Game/Overlays/Dashboard/Home/DashboardNewBeatmapPanel.cs
+++ b/osu.Game/Overlays/Dashboard/Home/DashboardNewBeatmapPanel.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
diff --git a/osu.Game/Overlays/Dashboard/Home/DashboardPopularBeatmapPanel.cs b/osu.Game/Overlays/Dashboard/Home/DashboardPopularBeatmapPanel.cs
index 54d95c994b..a08a1fef6f 100644
--- a/osu.Game/Overlays/Dashboard/Home/DashboardPopularBeatmapPanel.cs
+++ b/osu.Game/Overlays/Dashboard/Home/DashboardPopularBeatmapPanel.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
diff --git a/osu.Game/Overlays/Dashboard/Home/DrawableBeatmapList.cs b/osu.Game/Overlays/Dashboard/Home/DrawableBeatmapList.cs
index af36f71dd2..a0e22a0faf 100644
--- a/osu.Game/Overlays/Dashboard/Home/DrawableBeatmapList.cs
+++ b/osu.Game/Overlays/Dashboard/Home/DrawableBeatmapList.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
diff --git a/osu.Game/Overlays/Dashboard/Home/DrawableNewBeatmapList.cs b/osu.Game/Overlays/Dashboard/Home/DrawableNewBeatmapList.cs
index 8a60d8568c..a22ce8acb0 100644
--- a/osu.Game/Overlays/Dashboard/Home/DrawableNewBeatmapList.cs
+++ b/osu.Game/Overlays/Dashboard/Home/DrawableNewBeatmapList.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Framework.Localisation;
 using osu.Game.Online.API.Requests.Responses;
diff --git a/osu.Game/Overlays/Dashboard/Home/DrawablePopularBeatmapList.cs b/osu.Game/Overlays/Dashboard/Home/DrawablePopularBeatmapList.cs
index aab99d0ed3..b321057ef2 100644
--- a/osu.Game/Overlays/Dashboard/Home/DrawablePopularBeatmapList.cs
+++ b/osu.Game/Overlays/Dashboard/Home/DrawablePopularBeatmapList.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Framework.Localisation;
 using osu.Game.Online.API.Requests.Responses;
diff --git a/osu.Game/Overlays/Dashboard/Home/HomePanel.cs b/osu.Game/Overlays/Dashboard/Home/HomePanel.cs
index 8023c093aa..93db9978a7 100644
--- a/osu.Game/Overlays/Dashboard/Home/HomePanel.cs
+++ b/osu.Game/Overlays/Dashboard/Home/HomePanel.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Overlays/Dashboard/Home/News/FeaturedNewsItemPanel.cs b/osu.Game/Overlays/Dashboard/Home/News/FeaturedNewsItemPanel.cs
index dabe65964a..86babf82b5 100644
--- a/osu.Game/Overlays/Dashboard/Home/News/FeaturedNewsItemPanel.cs
+++ b/osu.Game/Overlays/Dashboard/Home/News/FeaturedNewsItemPanel.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.LocalisationExtensions;
diff --git a/osu.Game/Overlays/Dashboard/Home/News/NewsGroupItem.cs b/osu.Game/Overlays/Dashboard/Home/News/NewsGroupItem.cs
index 9b27d1a193..9319d0dabd 100644
--- a/osu.Game/Overlays/Dashboard/Home/News/NewsGroupItem.cs
+++ b/osu.Game/Overlays/Dashboard/Home/News/NewsGroupItem.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.LocalisationExtensions;
diff --git a/osu.Game/Overlays/Dashboard/Home/News/NewsItemGroupPanel.cs b/osu.Game/Overlays/Dashboard/Home/News/NewsItemGroupPanel.cs
index fa59f38690..f0d51be52a 100644
--- a/osu.Game/Overlays/Dashboard/Home/News/NewsItemGroupPanel.cs
+++ b/osu.Game/Overlays/Dashboard/Home/News/NewsItemGroupPanel.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
diff --git a/osu.Game/Overlays/Dashboard/Home/News/NewsTitleLink.cs b/osu.Game/Overlays/Dashboard/Home/News/NewsTitleLink.cs
index 1960e0372e..d6f8499c85 100644
--- a/osu.Game/Overlays/Dashboard/Home/News/NewsTitleLink.cs
+++ b/osu.Game/Overlays/Dashboard/Home/News/NewsTitleLink.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game/Overlays/DashboardOverlay.cs b/osu.Game/Overlays/DashboardOverlay.cs
index 527ac1689b..2f96421531 100644
--- a/osu.Game/Overlays/DashboardOverlay.cs
+++ b/osu.Game/Overlays/DashboardOverlay.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Game.Overlays.Dashboard;
 using osu.Game.Overlays.Dashboard.Friends;
diff --git a/osu.Game/Overlays/Dialog/PopupDialog.cs b/osu.Game/Overlays/Dialog/PopupDialog.cs
index f5a7e9e43d..9969677826 100644
--- a/osu.Game/Overlays/Dialog/PopupDialog.cs
+++ b/osu.Game/Overlays/Dialog/PopupDialog.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Extensions.Color4Extensions;
diff --git a/osu.Game/Overlays/Dialog/PopupDialogButton.cs b/osu.Game/Overlays/Dialog/PopupDialogButton.cs
index 91a19add21..499dab3a1d 100644
--- a/osu.Game/Overlays/Dialog/PopupDialogButton.cs
+++ b/osu.Game/Overlays/Dialog/PopupDialogButton.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Game.Graphics.UserInterface;
 
diff --git a/osu.Game/Overlays/Dialog/PopupDialogCancelButton.cs b/osu.Game/Overlays/Dialog/PopupDialogCancelButton.cs
index f4289c66f1..c55226b147 100644
--- a/osu.Game/Overlays/Dialog/PopupDialogCancelButton.cs
+++ b/osu.Game/Overlays/Dialog/PopupDialogCancelButton.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
diff --git a/osu.Game/Overlays/Dialog/PopupDialogOkButton.cs b/osu.Game/Overlays/Dialog/PopupDialogOkButton.cs
index eb4a0f0709..968657755f 100644
--- a/osu.Game/Overlays/Dialog/PopupDialogOkButton.cs
+++ b/osu.Game/Overlays/Dialog/PopupDialogOkButton.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
diff --git a/osu.Game/Overlays/FullscreenOverlay.cs b/osu.Game/Overlays/FullscreenOverlay.cs
index 032821f215..b58a3b929b 100644
--- a/osu.Game/Overlays/FullscreenOverlay.cs
+++ b/osu.Game/Overlays/FullscreenOverlay.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
@@ -29,7 +27,7 @@ namespace osu.Game.Overlays
         protected virtual Color4 BackgroundColour => ColourProvider.Background5;
 
         [Resolved]
-        protected IAPIProvider API { get; private set; }
+        protected IAPIProvider API { get; private set; } = null!;
 
         [Cached]
         protected readonly OverlayColourProvider ColourProvider;
diff --git a/osu.Game/Overlays/INamedOverlayComponent.cs b/osu.Game/Overlays/INamedOverlayComponent.cs
index e9d01a55e3..65664b12e7 100644
--- a/osu.Game/Overlays/INamedOverlayComponent.cs
+++ b/osu.Game/Overlays/INamedOverlayComponent.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Localisation;
 
 namespace osu.Game.Overlays
diff --git a/osu.Game/Overlays/INotificationOverlay.cs b/osu.Game/Overlays/INotificationOverlay.cs
index b9ac466229..93346cb0ee 100644
--- a/osu.Game/Overlays/INotificationOverlay.cs
+++ b/osu.Game/Overlays/INotificationOverlay.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Overlays.Notifications;
diff --git a/osu.Game/Overlays/IOverlayManager.cs b/osu.Game/Overlays/IOverlayManager.cs
index 0318b2b3a0..d771308e34 100644
--- a/osu.Game/Overlays/IOverlayManager.cs
+++ b/osu.Game/Overlays/IOverlayManager.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
diff --git a/osu.Game/Overlays/Login/UserDropdown.cs b/osu.Game/Overlays/Login/UserDropdown.cs
index 0bdfa82517..78b5271ca0 100644
--- a/osu.Game/Overlays/Login/UserDropdown.cs
+++ b/osu.Game/Overlays/Login/UserDropdown.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Overlays/Mods/DeselectAllModsButton.cs b/osu.Game/Overlays/Mods/DeselectAllModsButton.cs
index 817b6beac3..0e60fc3414 100644
--- a/osu.Game/Overlays/Mods/DeselectAllModsButton.cs
+++ b/osu.Game/Overlays/Mods/DeselectAllModsButton.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Bindables;
diff --git a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
index ee4f932326..9e16aa926f 100644
--- a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
+++ b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
diff --git a/osu.Game/Overlays/Mods/IncompatibilityDisplayingModPanel.cs b/osu.Game/Overlays/Mods/IncompatibilityDisplayingModPanel.cs
index 93279b6e1c..26c5b2ac49 100644
--- a/osu.Game/Overlays/Mods/IncompatibilityDisplayingModPanel.cs
+++ b/osu.Game/Overlays/Mods/IncompatibilityDisplayingModPanel.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
@@ -19,7 +17,7 @@ namespace osu.Game.Overlays.Mods
         private readonly BindableBool incompatible = new BindableBool();
 
         [Resolved]
-        private Bindable<IReadOnlyList<Mod>> selectedMods { get; set; }
+        private Bindable<IReadOnlyList<Mod>> selectedMods { get; set; } = null!;
 
         public IncompatibilityDisplayingModPanel(ModState modState)
             : base(modState)
diff --git a/osu.Game/Overlays/Mods/IncompatibilityDisplayingTooltip.cs b/osu.Game/Overlays/Mods/IncompatibilityDisplayingTooltip.cs
index 1723634774..2f82711162 100644
--- a/osu.Game/Overlays/Mods/IncompatibilityDisplayingTooltip.cs
+++ b/osu.Game/Overlays/Mods/IncompatibilityDisplayingTooltip.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
@@ -24,7 +22,7 @@ namespace osu.Game.Overlays.Mods
         private readonly Bindable<IReadOnlyList<Mod>> incompatibleMods = new Bindable<IReadOnlyList<Mod>>();
 
         [Resolved]
-        private Bindable<RulesetInfo> ruleset { get; set; }
+        private Bindable<RulesetInfo> ruleset { get; set; } = null!;
 
         public IncompatibilityDisplayingTooltip()
         {
diff --git a/osu.Game/Overlays/Mods/ModSettingsArea.cs b/osu.Game/Overlays/Mods/ModSettingsArea.cs
index f11fef1299..fe1d683d59 100644
--- a/osu.Game/Overlays/Mods/ModSettingsArea.cs
+++ b/osu.Game/Overlays/Mods/ModSettingsArea.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -32,7 +30,7 @@ namespace osu.Game.Overlays.Mods
         private readonly FillFlowContainer modSettingsFlow;
 
         [Resolved]
-        private OverlayColourProvider colourProvider { get; set; }
+        private OverlayColourProvider colourProvider { get; set; } = null!;
 
         public ModSettingsArea()
         {
diff --git a/osu.Game/Overlays/Music/MusicKeyBindingHandler.cs b/osu.Game/Overlays/Music/MusicKeyBindingHandler.cs
index 827caf0467..b7d265c448 100644
--- a/osu.Game/Overlays/Music/MusicKeyBindingHandler.cs
+++ b/osu.Game/Overlays/Music/MusicKeyBindingHandler.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.LocalisationExtensions;
@@ -24,16 +22,16 @@ namespace osu.Game.Overlays.Music
     public partial class MusicKeyBindingHandler : Component, IKeyBindingHandler<GlobalAction>
     {
         [Resolved]
-        private IBindable<WorkingBeatmap> beatmap { get; set; }
+        private IBindable<WorkingBeatmap> beatmap { get; set; } = null!;
 
         [Resolved]
-        private MusicController musicController { get; set; }
-
-        [Resolved(canBeNull: true)]
-        private OnScreenDisplay onScreenDisplay { get; set; }
+        private MusicController musicController { get; set; } = null!;
 
         [Resolved]
-        private OsuGame game { get; set; }
+        private OnScreenDisplay? onScreenDisplay { get; set; }
+
+        [Resolved]
+        private OsuGame game { get; set; } = null!;
 
         public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
         {
diff --git a/osu.Game/Overlays/Music/NowPlayingCollectionDropdown.cs b/osu.Game/Overlays/Music/NowPlayingCollectionDropdown.cs
index ae59fbb35e..fa9a2e3972 100644
--- a/osu.Game/Overlays/Music/NowPlayingCollectionDropdown.cs
+++ b/osu.Game/Overlays/Music/NowPlayingCollectionDropdown.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osuTK;
 using osuTK.Graphics;
 using osu.Framework.Allocation;
diff --git a/osu.Game/Overlays/News/NewsPostBackground.cs b/osu.Game/Overlays/News/NewsPostBackground.cs
index 05f8a639fa..663747255a 100644
--- a/osu.Game/Overlays/News/NewsPostBackground.cs
+++ b/osu.Game/Overlays/News/NewsPostBackground.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
diff --git a/osu.Game/Overlays/Notifications/SimpleErrorNotification.cs b/osu.Game/Overlays/Notifications/SimpleErrorNotification.cs
index 7d0d07fc1b..758eea93d4 100644
--- a/osu.Game/Overlays/Notifications/SimpleErrorNotification.cs
+++ b/osu.Game/Overlays/Notifications/SimpleErrorNotification.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics.Sprites;
 
 namespace osu.Game.Overlays.Notifications
diff --git a/osu.Game/Overlays/OSD/Toast.cs b/osu.Game/Overlays/OSD/Toast.cs
index ff8696c04f..7df534d90d 100644
--- a/osu.Game/Overlays/OSD/Toast.cs
+++ b/osu.Game/Overlays/OSD/Toast.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game/Overlays/OnlineOverlay.cs b/osu.Game/Overlays/OnlineOverlay.cs
index 8b7a82f899..051873b394 100644
--- a/osu.Game/Overlays/OnlineOverlay.cs
+++ b/osu.Game/Overlays/OnlineOverlay.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Overlays/OverlayColourProvider.cs b/osu.Game/Overlays/OverlayColourProvider.cs
index d7581960f4..a4f6527024 100644
--- a/osu.Game/Overlays/OverlayColourProvider.cs
+++ b/osu.Game/Overlays/OverlayColourProvider.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osuTK;
 using osuTK.Graphics;
diff --git a/osu.Game/Overlays/OverlayHeader.cs b/osu.Game/Overlays/OverlayHeader.cs
index 93de463204..827a7749af 100644
--- a/osu.Game/Overlays/OverlayHeader.cs
+++ b/osu.Game/Overlays/OverlayHeader.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Overlays/OverlayHeaderBackground.cs b/osu.Game/Overlays/OverlayHeaderBackground.cs
index a089001385..7e264ee196 100644
--- a/osu.Game/Overlays/OverlayHeaderBackground.cs
+++ b/osu.Game/Overlays/OverlayHeaderBackground.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game/Overlays/OverlayRulesetSelector.cs b/osu.Game/Overlays/OverlayRulesetSelector.cs
index 9205a14d9f..e10bcda734 100644
--- a/osu.Game/Overlays/OverlayRulesetSelector.cs
+++ b/osu.Game/Overlays/OverlayRulesetSelector.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
diff --git a/osu.Game/Overlays/OverlayRulesetTabItem.cs b/osu.Game/Overlays/OverlayRulesetTabItem.cs
index d5c70a46d0..6d318820b3 100644
--- a/osu.Game/Overlays/OverlayRulesetTabItem.cs
+++ b/osu.Game/Overlays/OverlayRulesetTabItem.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
@@ -35,7 +33,7 @@ namespace osu.Game.Overlays
         protected override Container<Drawable> Content { get; }
 
         [Resolved]
-        private OverlayColourProvider colourProvider { get; set; }
+        private OverlayColourProvider colourProvider { get; set; } = null!;
 
         private readonly Drawable icon;
 
diff --git a/osu.Game/Overlays/OverlaySidebar.cs b/osu.Game/Overlays/OverlaySidebar.cs
index 93e5e83ffc..b08a9d08a4 100644
--- a/osu.Game/Overlays/OverlaySidebar.cs
+++ b/osu.Game/Overlays/OverlaySidebar.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Overlays/Rankings/CountryFilter.cs b/osu.Game/Overlays/Rankings/CountryFilter.cs
index 525816f8fd..c4e281402b 100644
--- a/osu.Game/Overlays/Rankings/CountryFilter.cs
+++ b/osu.Game/Overlays/Rankings/CountryFilter.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Overlays/Rankings/CountryPill.cs b/osu.Game/Overlays/Rankings/CountryPill.cs
index 5efa9d12f0..294b6df34d 100644
--- a/osu.Game/Overlays/Rankings/CountryPill.cs
+++ b/osu.Game/Overlays/Rankings/CountryPill.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
diff --git a/osu.Game/Overlays/Rankings/RankingsScope.cs b/osu.Game/Overlays/Rankings/RankingsScope.cs
index 2644fee58b..3392db9360 100644
--- a/osu.Game/Overlays/Rankings/RankingsScope.cs
+++ b/osu.Game/Overlays/Rankings/RankingsScope.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Localisation;
 using osu.Game.Resources.Localisation.Web;
 
diff --git a/osu.Game/Overlays/Rankings/RankingsSortTabControl.cs b/osu.Game/Overlays/Rankings/RankingsSortTabControl.cs
index 9e73c3adb0..b13ecc190e 100644
--- a/osu.Game/Overlays/Rankings/RankingsSortTabControl.cs
+++ b/osu.Game/Overlays/Rankings/RankingsSortTabControl.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Localisation;
 using osu.Game.Resources.Localisation.Web;
diff --git a/osu.Game/Overlays/Rankings/Tables/CountriesTable.cs b/osu.Game/Overlays/Rankings/Tables/CountriesTable.cs
index 3be5cc994c..fb3e58d2ac 100644
--- a/osu.Game/Overlays/Rankings/Tables/CountriesTable.cs
+++ b/osu.Game/Overlays/Rankings/Tables/CountriesTable.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using System;
@@ -68,8 +66,8 @@ namespace osu.Game.Overlays.Rankings.Tables
 
         private partial class CountryName : LinkFlowContainer
         {
-            [Resolved(canBeNull: true)]
-            private RankingsOverlay rankings { get; set; }
+            [Resolved]
+            private RankingsOverlay? rankings { get; set; }
 
             public CountryName(CountryCode countryCode)
                 : base(t => t.Font = OsuFont.GetFont(size: 12))
diff --git a/osu.Game/Overlays/Rankings/Tables/PerformanceTable.cs b/osu.Game/Overlays/Rankings/Tables/PerformanceTable.cs
index 19ed3afdca..f13fbd66ec 100644
--- a/osu.Game/Overlays/Rankings/Tables/PerformanceTable.cs
+++ b/osu.Game/Overlays/Rankings/Tables/PerformanceTable.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Overlays/Rankings/Tables/ScoresTable.cs b/osu.Game/Overlays/Rankings/Tables/ScoresTable.cs
index 0da3fba8cc..9005334dda 100644
--- a/osu.Game/Overlays/Rankings/Tables/ScoresTable.cs
+++ b/osu.Game/Overlays/Rankings/Tables/ScoresTable.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Overlays/Rankings/Tables/TableRowBackground.cs b/osu.Game/Overlays/Rankings/Tables/TableRowBackground.cs
index 54ec45f4ff..8c50e72207 100644
--- a/osu.Game/Overlays/Rankings/Tables/TableRowBackground.cs
+++ b/osu.Game/Overlays/Rankings/Tables/TableRowBackground.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game/Overlays/Settings/DangerousSettingsButton.cs b/osu.Game/Overlays/Settings/DangerousSettingsButton.cs
index 248b4d339a..42b042ae75 100644
--- a/osu.Game/Overlays/Settings/DangerousSettingsButton.cs
+++ b/osu.Game/Overlays/Settings/DangerousSettingsButton.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Game.Graphics;
 
diff --git a/osu.Game/Overlays/Settings/ISettingsItem.cs b/osu.Game/Overlays/Settings/ISettingsItem.cs
index 509fc1ab0d..b77a8d9268 100644
--- a/osu.Game/Overlays/Settings/ISettingsItem.cs
+++ b/osu.Game/Overlays/Settings/ISettingsItem.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Graphics;
 
diff --git a/osu.Game/Overlays/Settings/OutlinedTextBox.cs b/osu.Game/Overlays/Settings/OutlinedTextBox.cs
index 56b662ecf0..ef2039f8bf 100644
--- a/osu.Game/Overlays/Settings/OutlinedTextBox.cs
+++ b/osu.Game/Overlays/Settings/OutlinedTextBox.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Input.Events;
diff --git a/osu.Game/Overlays/Settings/Sections/Audio/OffsetSettings.cs b/osu.Game/Overlays/Settings/Sections/Audio/OffsetSettings.cs
index fc354027c1..6b5c769853 100644
--- a/osu.Game/Overlays/Settings/Sections/Audio/OffsetSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Audio/OffsetSettings.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
diff --git a/osu.Game/Overlays/Settings/Sections/Audio/VolumeSettings.cs b/osu.Game/Overlays/Settings/Sections/Audio/VolumeSettings.cs
index 7066be4f92..2bb5fa983f 100644
--- a/osu.Game/Overlays/Settings/Sections/Audio/VolumeSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Audio/VolumeSettings.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Overlays/Settings/Sections/AudioSection.cs b/osu.Game/Overlays/Settings/Sections/AudioSection.cs
index 542d5bc8fd..fb3d486776 100644
--- a/osu.Game/Overlays/Settings/Sections/AudioSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/AudioSection.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Localisation;
diff --git a/osu.Game/Overlays/Settings/Sections/DebugSection.cs b/osu.Game/Overlays/Settings/Sections/DebugSection.cs
index 509410fbb1..33a6f4c673 100644
--- a/osu.Game/Overlays/Settings/Sections/DebugSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/DebugSection.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Development;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
diff --git a/osu.Game/Overlays/Settings/Sections/DebugSettings/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/DebugSettings/GeneralSettings.cs
index 6c2bfedba0..1044810bdc 100644
--- a/osu.Game/Overlays/Settings/Sections/DebugSettings/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/DebugSettings/GeneralSettings.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Overlays/Settings/Sections/DebugSettings/MemorySettings.cs b/osu.Game/Overlays/Settings/Sections/DebugSettings/MemorySettings.cs
index bf0a48d2c2..0d2d163859 100644
--- a/osu.Game/Overlays/Settings/Sections/DebugSettings/MemorySettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/DebugSettings/MemorySettings.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/AudioSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/AudioSettings.cs
index 00eb6fa62c..467c988020 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/AudioSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/AudioSettings.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/BackgroundSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/BackgroundSettings.cs
index 09e5f3e163..048351b4cb 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/BackgroundSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/BackgroundSettings.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/BeatmapSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/BeatmapSettings.cs
index da5fc519e6..9efdfa9955 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/BeatmapSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/BeatmapSettings.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
index 96d458a942..c7f5aa5665 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/HUDSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/HUDSettings.cs
index c67c14bb43..e7c83159cd 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/HUDSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/HUDSettings.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/InputSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/InputSettings.cs
index 9291dfe923..c245a1a9ea 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/InputSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/InputSettings.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/ModsSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/ModsSettings.cs
index f6b3c12487..79a971510f 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/ModsSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/ModsSettings.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
diff --git a/osu.Game/Overlays/Settings/Sections/GameplaySection.cs b/osu.Game/Overlays/Settings/Sections/GameplaySection.cs
index ae6145752b..b60689b611 100644
--- a/osu.Game/Overlays/Settings/Sections/GameplaySection.cs
+++ b/osu.Game/Overlays/Settings/Sections/GameplaySection.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/ScreenshotSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/ScreenshotSettings.cs
index 8054b27de5..c7180ec51b 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/ScreenshotSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/ScreenshotSettings.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
diff --git a/osu.Game/Overlays/Settings/Sections/GraphicsSection.cs b/osu.Game/Overlays/Settings/Sections/GraphicsSection.cs
index 323cdaf14d..98f6908512 100644
--- a/osu.Game/Overlays/Settings/Sections/GraphicsSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/GraphicsSection.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
diff --git a/osu.Game/Overlays/Settings/Sections/Input/BindingSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/BindingSettings.cs
index 2b478f6af3..a93e6c37af 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/BindingSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/BindingSettings.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingPanel.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingPanel.cs
index 30429c84f0..7296003c7f 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingPanel.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingPanel.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Input.Bindings;
diff --git a/osu.Game/Overlays/Settings/Sections/Input/RulesetBindingsSection.cs b/osu.Game/Overlays/Settings/Sections/Input/RulesetBindingsSection.cs
index 19f0d0f7d1..0ed7de9d3f 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/RulesetBindingsSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/RulesetBindingsSection.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
diff --git a/osu.Game/Overlays/Settings/Sections/InputSection.cs b/osu.Game/Overlays/Settings/Sections/InputSection.cs
index 0647068da7..a8f19cc91d 100644
--- a/osu.Game/Overlays/Settings/Sections/InputSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/InputSection.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs
index 633bf8c5a5..fcbc603c83 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
@@ -15,7 +13,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
     public partial class StableDirectoryLocationDialog : PopupDialog
     {
         [Resolved]
-        private IPerformFromScreenRunner performer { get; set; }
+        private IPerformFromScreenRunner performer { get; set; } = null!;
 
         public StableDirectoryLocationDialog(TaskCompletionSource<string> taskCompletionSource)
         {
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
index 048f3ee683..1f62077f20 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
diff --git a/osu.Game/Overlays/Settings/Sections/Online/AlertsAndPrivacySettings.cs b/osu.Game/Overlays/Settings/Sections/Online/AlertsAndPrivacySettings.cs
index dc6743c042..e7b6aa56a8 100644
--- a/osu.Game/Overlays/Settings/Sections/Online/AlertsAndPrivacySettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Online/AlertsAndPrivacySettings.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
diff --git a/osu.Game/Overlays/Settings/Sections/Online/IntegrationSettings.cs b/osu.Game/Overlays/Settings/Sections/Online/IntegrationSettings.cs
index 33748d0f5e..3d0fac32cf 100644
--- a/osu.Game/Overlays/Settings/Sections/Online/IntegrationSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Online/IntegrationSettings.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
diff --git a/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs b/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
index d0707a434a..d34b01ebf3 100644
--- a/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
diff --git a/osu.Game/Overlays/Settings/Sections/OnlineSection.cs b/osu.Game/Overlays/Settings/Sections/OnlineSection.cs
index 775c6f9839..c8faa3b697 100644
--- a/osu.Game/Overlays/Settings/Sections/OnlineSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/OnlineSection.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
diff --git a/osu.Game/Overlays/Settings/Sections/SizeSlider.cs b/osu.Game/Overlays/Settings/Sections/SizeSlider.cs
index 20d77bef0d..c73831d8d1 100644
--- a/osu.Game/Overlays/Settings/Sections/SizeSlider.cs
+++ b/osu.Game/Overlays/Settings/Sections/SizeSlider.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Globalization;
 using osu.Framework.Localisation;
diff --git a/osu.Game/Overlays/Settings/Sections/UserInterface/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/UserInterface/GeneralSettings.cs
index 2e8d005401..844b8aeac6 100644
--- a/osu.Game/Overlays/Settings/Sections/UserInterface/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/UserInterface/GeneralSettings.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
diff --git a/osu.Game/Overlays/Settings/Sections/UserInterface/SongSelectSettings.cs b/osu.Game/Overlays/Settings/Sections/UserInterface/SongSelectSettings.cs
index d3303e409c..addf5ce163 100644
--- a/osu.Game/Overlays/Settings/Sections/UserInterface/SongSelectSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/UserInterface/SongSelectSettings.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
diff --git a/osu.Game/Overlays/Settings/Sections/UserInterfaceSection.cs b/osu.Game/Overlays/Settings/Sections/UserInterfaceSection.cs
index 0926574a54..2ec9e32ea9 100644
--- a/osu.Game/Overlays/Settings/Sections/UserInterfaceSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/UserInterfaceSection.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
diff --git a/osu.Game/Overlays/Settings/SettingsCheckbox.cs b/osu.Game/Overlays/Settings/SettingsCheckbox.cs
index a413bcf220..f8edcaf53d 100644
--- a/osu.Game/Overlays/Settings/SettingsCheckbox.cs
+++ b/osu.Game/Overlays/Settings/SettingsCheckbox.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
 using osu.Game.Graphics.UserInterface;
diff --git a/osu.Game/Overlays/Settings/SettingsEnumDropdown.cs b/osu.Game/Overlays/Settings/SettingsEnumDropdown.cs
index 62dd4f2905..cf6bc30f85 100644
--- a/osu.Game/Overlays/Settings/SettingsEnumDropdown.cs
+++ b/osu.Game/Overlays/Settings/SettingsEnumDropdown.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.UserInterface;
diff --git a/osu.Game/Overlays/Settings/SettingsFooter.cs b/osu.Game/Overlays/Settings/SettingsFooter.cs
index 9ab0fa7ad8..ffb955f3bd 100644
--- a/osu.Game/Overlays/Settings/SettingsFooter.cs
+++ b/osu.Game/Overlays/Settings/SettingsFooter.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Development;
 using osu.Framework.Graphics;
@@ -83,7 +81,7 @@ namespace osu.Game.Overlays.Settings
             private readonly string version;
 
             [Resolved]
-            private OsuColour colours { get; set; }
+            private OsuColour colours { get; set; } = null!;
 
             public BuildDisplay(string version)
             {
diff --git a/osu.Game/Overlays/Settings/SettingsHeader.cs b/osu.Game/Overlays/Settings/SettingsHeader.cs
index f2b84c4ba9..8d155fd01e 100644
--- a/osu.Game/Overlays/Settings/SettingsHeader.cs
+++ b/osu.Game/Overlays/Settings/SettingsHeader.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game/Overlays/Settings/SettingsNumberBox.cs b/osu.Game/Overlays/Settings/SettingsNumberBox.cs
index 97b8f6de60..7912890528 100644
--- a/osu.Game/Overlays/Settings/SettingsNumberBox.cs
+++ b/osu.Game/Overlays/Settings/SettingsNumberBox.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Overlays/Settings/SettingsSidebar.cs b/osu.Game/Overlays/Settings/SettingsSidebar.cs
index 36411e01cc..06bc2fd788 100644
--- a/osu.Game/Overlays/Settings/SettingsSidebar.cs
+++ b/osu.Game/Overlays/Settings/SettingsSidebar.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
diff --git a/osu.Game/Overlays/Settings/SettingsSlider.cs b/osu.Game/Overlays/Settings/SettingsSlider.cs
index e1483d4202..6c81fece13 100644
--- a/osu.Game/Overlays/Settings/SettingsSlider.cs
+++ b/osu.Game/Overlays/Settings/SettingsSlider.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.UserInterface;
diff --git a/osu.Game/Overlays/Settings/SettingsSubsection.cs b/osu.Game/Overlays/Settings/SettingsSubsection.cs
index eda18abaef..87772eb18c 100644
--- a/osu.Game/Overlays/Settings/SettingsSubsection.cs
+++ b/osu.Game/Overlays/Settings/SettingsSubsection.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osuTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game/Overlays/Settings/SettingsTextBox.cs b/osu.Game/Overlays/Settings/SettingsTextBox.cs
index 3f9fa06384..7fc7e1a97b 100644
--- a/osu.Game/Overlays/Settings/SettingsTextBox.cs
+++ b/osu.Game/Overlays/Settings/SettingsTextBox.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Overlays/Settings/SidebarButton.cs b/osu.Game/Overlays/Settings/SidebarButton.cs
index aec0509394..5fe0e1afc0 100644
--- a/osu.Game/Overlays/Settings/SidebarButton.cs
+++ b/osu.Game/Overlays/Settings/SidebarButton.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics.UserInterface;
@@ -14,7 +12,7 @@ namespace osu.Game.Overlays.Settings
         protected const double FADE_DURATION = 500;
 
         [Resolved]
-        protected OverlayColourProvider ColourProvider { get; private set; }
+        protected OverlayColourProvider ColourProvider { get; private set; } = null!;
 
         protected SidebarButton()
             : base(HoverSampleSet.ButtonSidebar)
diff --git a/osu.Game/Overlays/TabControlOverlayHeader.cs b/osu.Game/Overlays/TabControlOverlayHeader.cs
index 2b87535708..edfe38b2da 100644
--- a/osu.Game/Overlays/TabControlOverlayHeader.cs
+++ b/osu.Game/Overlays/TabControlOverlayHeader.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
diff --git a/osu.Game/Overlays/Toolbar/ClockDisplay.cs b/osu.Game/Overlays/Toolbar/ClockDisplay.cs
index 088631f8d6..c72c92b61b 100644
--- a/osu.Game/Overlays/Toolbar/ClockDisplay.cs
+++ b/osu.Game/Overlays/Toolbar/ClockDisplay.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Graphics.Containers;
 
diff --git a/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs b/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs
index efcb011293..247be553e1 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Input.Bindings;
diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
index 4193e52584..e181322dda 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
@@ -39,10 +37,10 @@ namespace osu.Game.Overlays.Toolbar
         }
 
         [Resolved]
-        private TextureStore textures { get; set; }
+        private TextureStore textures { get; set; } = null!;
 
         [Resolved]
-        private ReadableKeyCombinationProvider keyCombinationProvider { get; set; }
+        private ReadableKeyCombinationProvider keyCombinationProvider { get; set; } = null!;
 
         public void SetIcon(string texture) =>
             SetIcon(new Sprite
@@ -81,7 +79,7 @@ namespace osu.Game.Overlays.Toolbar
         protected FillFlowContainer Flow;
 
         [Resolved]
-        private RealmAccess realm { get; set; }
+        private RealmAccess realm { get; set; } = null!;
 
         protected ToolbarButton()
         {
diff --git a/osu.Game/Overlays/Toolbar/ToolbarChangelogButton.cs b/osu.Game/Overlays/Toolbar/ToolbarChangelogButton.cs
index 30e32d831c..06f171b1f2 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarChangelogButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarChangelogButton.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 
diff --git a/osu.Game/Overlays/Toolbar/ToolbarChatButton.cs b/osu.Game/Overlays/Toolbar/ToolbarChatButton.cs
index 7bb94067ab..126f8383ce 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarChatButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarChatButton.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Input.Bindings;
diff --git a/osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs b/osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs
index dba4e8feb6..ba2c8282c5 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Game.Input.Bindings;
 using osu.Game.Localisation;
diff --git a/osu.Game/Overlays/Toolbar/ToolbarNewsButton.cs b/osu.Game/Overlays/Toolbar/ToolbarNewsButton.cs
index bdcf6c3fec..13900dffa9 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarNewsButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarNewsButton.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 
diff --git a/osu.Game/Overlays/Toolbar/ToolbarNotificationButton.cs b/osu.Game/Overlays/Toolbar/ToolbarNotificationButton.cs
index 3dfec2cba0..1871371750 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarNotificationButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarNotificationButton.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Overlays/Toolbar/ToolbarRankingsButton.cs b/osu.Game/Overlays/Toolbar/ToolbarRankingsButton.cs
index ddbf4889b6..3e94ff90c5 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarRankingsButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarRankingsButton.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 
diff --git a/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs b/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs
index 07f7d52545..7d75acb9d1 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.UserInterface;
diff --git a/osu.Game/Overlays/Toolbar/ToolbarSettingsButton.cs b/osu.Game/Overlays/Toolbar/ToolbarSettingsButton.cs
index 6ebf2a4c02..78df060252 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarSettingsButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarSettingsButton.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Game.Input.Bindings;
 
diff --git a/osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs b/osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs
index a8a88813d2..8e6a5fdb78 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Input.Bindings;
diff --git a/osu.Game/Overlays/Toolbar/ToolbarWikiButton.cs b/osu.Game/Overlays/Toolbar/ToolbarWikiButton.cs
index 49e6be7978..e60aea53c3 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarWikiButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarWikiButton.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 
diff --git a/osu.Game/Overlays/VersionManager.cs b/osu.Game/Overlays/VersionManager.cs
index 0e74cada29..71f8fc05aa 100644
--- a/osu.Game/Overlays/VersionManager.cs
+++ b/osu.Game/Overlays/VersionManager.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Development;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Overlays/Volume/MuteButton.cs b/osu.Game/Overlays/Volume/MuteButton.cs
index c83ad4ac0d..1dc8d754b7 100644
--- a/osu.Game/Overlays/Volume/MuteButton.cs
+++ b/osu.Game/Overlays/Volume/MuteButton.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
diff --git a/osu.Game/Overlays/WaveOverlayContainer.cs b/osu.Game/Overlays/WaveOverlayContainer.cs
index 34fbec93b7..153f7f5412 100644
--- a/osu.Game/Overlays/WaveOverlayContainer.cs
+++ b/osu.Game/Overlays/WaveOverlayContainer.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Containers;
diff --git a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs
index 7c36caa62f..9107ad342b 100644
--- a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs
+++ b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using Markdig.Extensions.CustomContainers;
 using Markdig.Extensions.Yaml;
diff --git a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownImage.cs b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownImage.cs
index 71c2df538d..cfeb4de19c 100644
--- a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownImage.cs
+++ b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownImage.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using Markdig.Syntax.Inlines;
 using osu.Game.Graphics.Containers.Markdown;
 
diff --git a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownImageBlock.cs b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownImageBlock.cs
index 641c6242b6..bb7c232a13 100644
--- a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownImageBlock.cs
+++ b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownImageBlock.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using Markdig.Syntax.Inlines;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -16,7 +14,7 @@ namespace osu.Game.Overlays.Wiki.Markdown
     public partial class WikiMarkdownImageBlock : FillFlowContainer
     {
         [Resolved]
-        private IMarkdownTextFlowComponent parentFlowComponent { get; set; }
+        private IMarkdownTextFlowComponent parentFlowComponent { get; set; } = null!;
 
         private readonly LinkInline linkInline;
 
diff --git a/osu.Game/Overlays/Wiki/Markdown/WikiNoticeContainer.cs b/osu.Game/Overlays/Wiki/Markdown/WikiNoticeContainer.cs
index a40bd14878..1ab35b1972 100644
--- a/osu.Game/Overlays/Wiki/Markdown/WikiNoticeContainer.cs
+++ b/osu.Game/Overlays/Wiki/Markdown/WikiNoticeContainer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using Markdig.Extensions.Yaml;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -80,7 +78,7 @@ namespace osu.Game.Overlays.Wiki.Markdown
         private partial class NoticeBox : Container
         {
             [Resolved]
-            private IMarkdownTextFlowComponent parentFlowComponent { get; set; }
+            private IMarkdownTextFlowComponent parentFlowComponent { get; set; } = null!;
 
             public LocalisableString Text { get; set; }
 
diff --git a/osu.Game/Performance/HighPerformanceSession.cs b/osu.Game/Performance/HighPerformanceSession.cs
index c113e7a342..07b5e7da98 100644
--- a/osu.Game/Performance/HighPerformanceSession.cs
+++ b/osu.Game/Performance/HighPerformanceSession.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Properties/AssemblyInfo.cs b/osu.Game/Properties/AssemblyInfo.cs
index dde1af6461..1b77e45891 100644
--- a/osu.Game/Properties/AssemblyInfo.cs
+++ b/osu.Game/Properties/AssemblyInfo.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Runtime.CompilerServices;
 
 // We publish our internal attributes to other sub-projects of the framework.
diff --git a/osu.Game/Rulesets/Difficulty/PerformanceAttributes.cs b/osu.Game/Rulesets/Difficulty/PerformanceAttributes.cs
index 15b90e5147..e8c4c71913 100644
--- a/osu.Game/Rulesets/Difficulty/PerformanceAttributes.cs
+++ b/osu.Game/Rulesets/Difficulty/PerformanceAttributes.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using Newtonsoft.Json;
 
diff --git a/osu.Game/Rulesets/Difficulty/PerformanceCalculator.cs b/osu.Game/Rulesets/Difficulty/PerformanceCalculator.cs
index 38a35ddb3b..f5e826f8c7 100644
--- a/osu.Game/Rulesets/Difficulty/PerformanceCalculator.cs
+++ b/osu.Game/Rulesets/Difficulty/PerformanceCalculator.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Beatmaps;
 using osu.Game.Scoring;
 
diff --git a/osu.Game/Rulesets/Difficulty/PerformanceDisplayAttribute.cs b/osu.Game/Rulesets/Difficulty/PerformanceDisplayAttribute.cs
index 76dfca3db7..a654652ef8 100644
--- a/osu.Game/Rulesets/Difficulty/PerformanceDisplayAttribute.cs
+++ b/osu.Game/Rulesets/Difficulty/PerformanceDisplayAttribute.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Rulesets.Difficulty
 {
     /// <summary>
diff --git a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
index 44abbaaf41..8b8892113b 100644
--- a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
+++ b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Mods;
diff --git a/osu.Game/Rulesets/Difficulty/Skills/StrainDecaySkill.cs b/osu.Game/Rulesets/Difficulty/Skills/StrainDecaySkill.cs
index 6abde64eb7..8fab61ed62 100644
--- a/osu.Game/Rulesets/Difficulty/Skills/StrainDecaySkill.cs
+++ b/osu.Game/Rulesets/Difficulty/Skills/StrainDecaySkill.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Mods;
diff --git a/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs b/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs
index 4beba22e05..b43a272324 100644
--- a/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs
+++ b/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
index 5f5aba26bb..dc73e35923 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Rulesets.Edit.Checks;
diff --git a/osu.Game/Rulesets/Edit/DrawableEditorRulesetWrapper.cs b/osu.Game/Rulesets/Edit/DrawableEditorRulesetWrapper.cs
index 20ee409937..324f2068e9 100644
--- a/osu.Game/Rulesets/Edit/DrawableEditorRulesetWrapper.cs
+++ b/osu.Game/Rulesets/Edit/DrawableEditorRulesetWrapper.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -25,7 +23,7 @@ namespace osu.Game.Rulesets.Edit
         private readonly DrawableRuleset<TObject> drawableRuleset;
 
         [Resolved]
-        private EditorBeatmap beatmap { get; set; }
+        private EditorBeatmap beatmap { get; set; } = null!;
 
         public DrawableEditorRulesetWrapper(DrawableRuleset<TObject> drawableRuleset)
         {
@@ -43,8 +41,8 @@ namespace osu.Game.Rulesets.Edit
             Playfield.DisplayJudgements.Value = false;
         }
 
-        [Resolved(canBeNull: true)]
-        private IEditorChangeHandler changeHandler { get; set; }
+        [Resolved]
+        private IEditorChangeHandler? changeHandler { get; set; }
 
         protected override void LoadComplete()
         {
diff --git a/osu.Game/Rulesets/Edit/EditorToolboxGroup.cs b/osu.Game/Rulesets/Edit/EditorToolboxGroup.cs
index 312ba62b61..f30f5148fe 100644
--- a/osu.Game/Rulesets/Edit/EditorToolboxGroup.cs
+++ b/osu.Game/Rulesets/Edit/EditorToolboxGroup.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Game.Overlays;
 
diff --git a/osu.Game/Rulesets/Edit/ExpandingToolboxContainer.cs b/osu.Game/Rulesets/Edit/ExpandingToolboxContainer.cs
index 7bf10f6beb..36cbf49885 100644
--- a/osu.Game/Rulesets/Edit/ExpandingToolboxContainer.cs
+++ b/osu.Game/Rulesets/Edit/ExpandingToolboxContainer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics.Containers;
diff --git a/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs b/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
index 826bffef5f..7fc9772598 100644
--- a/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Game.Rulesets.Edit.Checks.Components;
 
diff --git a/osu.Game/Rulesets/Edit/IDistanceSnapProvider.cs b/osu.Game/Rulesets/Edit/IDistanceSnapProvider.cs
index 6fbd994e23..da44b42831 100644
--- a/osu.Game/Rulesets/Edit/IDistanceSnapProvider.cs
+++ b/osu.Game/Rulesets/Edit/IDistanceSnapProvider.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
diff --git a/osu.Game/Rulesets/Edit/IPositionSnapProvider.cs b/osu.Game/Rulesets/Edit/IPositionSnapProvider.cs
index ad129e068d..002a0aafe6 100644
--- a/osu.Game/Rulesets/Edit/IPositionSnapProvider.cs
+++ b/osu.Game/Rulesets/Edit/IPositionSnapProvider.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osuTK;
 
diff --git a/osu.Game/Rulesets/Edit/SnapType.cs b/osu.Game/Rulesets/Edit/SnapType.cs
index f5f9ab0437..cf743f6ace 100644
--- a/osu.Game/Rulesets/Edit/SnapType.cs
+++ b/osu.Game/Rulesets/Edit/SnapType.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 
 namespace osu.Game.Rulesets.Edit
diff --git a/osu.Game/Rulesets/Judgements/IgnoreJudgement.cs b/osu.Game/Rulesets/Judgements/IgnoreJudgement.cs
index f08b43e72a..2c78561d31 100644
--- a/osu.Game/Rulesets/Judgements/IgnoreJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/IgnoreJudgement.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Judgements
diff --git a/osu.Game/Rulesets/Judgements/Judgement.cs b/osu.Game/Rulesets/Judgements/Judgement.cs
index 770f656e8f..99dce82ec2 100644
--- a/osu.Game/Rulesets/Judgements/Judgement.cs
+++ b/osu.Game/Rulesets/Judgements/Judgement.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
 
diff --git a/osu.Game/Rulesets/Judgements/JudgementResult.cs b/osu.Game/Rulesets/Judgements/JudgementResult.cs
index 34d1f1f6e9..f001a4cd92 100644
--- a/osu.Game/Rulesets/Judgements/JudgementResult.cs
+++ b/osu.Game/Rulesets/Judgements/JudgementResult.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using JetBrains.Annotations;
 using osu.Game.Rulesets.Objects;
diff --git a/osu.Game/Rulesets/Objects/HitObjectParser.cs b/osu.Game/Rulesets/Objects/HitObjectParser.cs
index 9728a4393b..d3c29d90ce 100644
--- a/osu.Game/Rulesets/Objects/HitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/HitObjectParser.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Rulesets.Objects
 {
     public abstract class HitObjectParser
diff --git a/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHit.cs b/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHit.cs
index 9facfec96f..12b4812824 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHit.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHit.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Objects.Types;
 using osuTK;
 
diff --git a/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertSlider.cs b/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertSlider.cs
index 62726019bb..fb1afed3b4 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertSlider.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertSlider.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Objects.Types;
 using osuTK;
 
diff --git a/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertSpinner.cs b/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertSpinner.cs
index cccb66d92b..014494ec54 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertSpinner.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertSpinner.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Objects.Types;
 
 namespace osu.Game.Rulesets.Objects.Legacy.Catch
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObject.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObject.cs
index d95f97624d..54dbd28c76 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObject.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 
diff --git a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
index 6f1968b41d..386eb8d3ee 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osuTK;
 using osu.Game.Audio;
 using System.Collections.Generic;
diff --git a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHold.cs b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHold.cs
index b6594d0206..2fa4766c1d 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHold.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHold.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Objects.Types;
 
 namespace osu.Game.Rulesets.Objects.Legacy.Mania
diff --git a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSpinner.cs b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSpinner.cs
index dcbaf22c51..c05aaceb9c 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSpinner.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSpinner.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Objects.Types;
 
 namespace osu.Game.Rulesets.Objects.Legacy.Mania
diff --git a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHit.cs b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHit.cs
index 33b390e3ba..069366bad3 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHit.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHit.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Objects.Types;
 using osuTK;
 
diff --git a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSlider.cs b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSlider.cs
index 2f8e9dd352..e947690668 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSlider.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSlider.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Objects.Types;
 using osuTK;
 
diff --git a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs
index d49e9fe9db..e9e5ca8c94 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Objects.Types;
 using osuTK;
 
diff --git a/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSpinner.cs b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSpinner.cs
index ec8d7971ec..1d5ecb1ef3 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSpinner.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSpinner.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Objects.Types;
 
 namespace osu.Game.Rulesets.Objects.Legacy.Taiko
diff --git a/osu.Game/Rulesets/Objects/SliderEventGenerator.cs b/osu.Game/Rulesets/Objects/SliderEventGenerator.cs
index d32a7cb16d..7013d32cbc 100644
--- a/osu.Game/Rulesets/Objects/SliderEventGenerator.cs
+++ b/osu.Game/Rulesets/Objects/SliderEventGenerator.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index 13cc6361cf..028f8b6839 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
diff --git a/osu.Game/Rulesets/Objects/SyntheticHitObjectEntry.cs b/osu.Game/Rulesets/Objects/SyntheticHitObjectEntry.cs
index ee860e82e2..7a9f6948b0 100644
--- a/osu.Game/Rulesets/Objects/SyntheticHitObjectEntry.cs
+++ b/osu.Game/Rulesets/Objects/SyntheticHitObjectEntry.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Objects
diff --git a/osu.Game/Rulesets/Objects/Types/IHasDisplayColour.cs b/osu.Game/Rulesets/Objects/Types/IHasDisplayColour.cs
index 89ee5022bf..691418ec48 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasDisplayColour.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasDisplayColour.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Bindables;
 using osuTK.Graphics;
 
diff --git a/osu.Game/Rulesets/Objects/Types/IHasPath.cs b/osu.Game/Rulesets/Objects/Types/IHasPath.cs
index 46834a55dd..5a3f270f54 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasPath.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasPath.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Rulesets.Objects.Types
 {
     public interface IHasPath : IHasDistance
diff --git a/osu.Game/Rulesets/Objects/Types/IHasPathWithRepeats.cs b/osu.Game/Rulesets/Objects/Types/IHasPathWithRepeats.cs
index 536707e95f..279946b44e 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasPathWithRepeats.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasPathWithRepeats.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osuTK;
 
 namespace osu.Game.Rulesets.Objects.Types
diff --git a/osu.Game/Rulesets/Objects/Types/IHasPosition.cs b/osu.Game/Rulesets/Objects/Types/IHasPosition.cs
index 281f619ba5..8948fe59a9 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasPosition.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasPosition.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osuTK;
 
 namespace osu.Game.Rulesets.Objects.Types
diff --git a/osu.Game/Rulesets/Objects/Types/IHasRepeats.cs b/osu.Game/Rulesets/Objects/Types/IHasRepeats.cs
index 821a6de520..2a4215b960 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasRepeats.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasRepeats.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Audio;
 using System.Collections.Generic;
 
diff --git a/osu.Game/Rulesets/RulesetLoadException.cs b/osu.Game/Rulesets/RulesetLoadException.cs
index 6fee8f446b..803c756b41 100644
--- a/osu.Game/Rulesets/RulesetLoadException.cs
+++ b/osu.Game/Rulesets/RulesetLoadException.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 
 namespace osu.Game.Rulesets
diff --git a/osu.Game/Rulesets/Scoring/AccumulatingHealthProcessor.cs b/osu.Game/Rulesets/Scoring/AccumulatingHealthProcessor.cs
index af6e825b06..422bf8ea79 100644
--- a/osu.Game/Rulesets/Scoring/AccumulatingHealthProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/AccumulatingHealthProcessor.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Rulesets.Scoring
 {
     /// <summary>
diff --git a/osu.Game/Rulesets/Scoring/HitEventExtensions.cs b/osu.Game/Rulesets/Scoring/HitEventExtensions.cs
index 2fde73d5a2..b4bdd8a1ea 100644
--- a/osu.Game/Rulesets/Scoring/HitEventExtensions.cs
+++ b/osu.Game/Rulesets/Scoring/HitEventExtensions.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/osu.Game/Rulesets/Scoring/HitWindows.cs b/osu.Game/Rulesets/Scoring/HitWindows.cs
index 99129fcf96..2d008b58ba 100644
--- a/osu.Game/Rulesets/Scoring/HitWindows.cs
+++ b/osu.Game/Rulesets/Scoring/HitWindows.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
diff --git a/osu.Game/Rulesets/UI/GameplayCursorContainer.cs b/osu.Game/Rulesets/UI/GameplayCursorContainer.cs
index cbce397d1e..0ce3f76384 100644
--- a/osu.Game/Rulesets/UI/GameplayCursorContainer.cs
+++ b/osu.Game/Rulesets/UI/GameplayCursorContainer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 
diff --git a/osu.Game/Rulesets/UI/IHitObjectContainer.cs b/osu.Game/Rulesets/UI/IHitObjectContainer.cs
index 74fd7dee81..6dcb0944be 100644
--- a/osu.Game/Rulesets/UI/IHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/IHitObjectContainer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Game.Rulesets.Objects.Drawables;
 
diff --git a/osu.Game/Rulesets/UI/IPooledHitObjectProvider.cs b/osu.Game/Rulesets/UI/IPooledHitObjectProvider.cs
index b842e708b0..f5739ee525 100644
--- a/osu.Game/Rulesets/UI/IPooledHitObjectProvider.cs
+++ b/osu.Game/Rulesets/UI/IPooledHitObjectProvider.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using JetBrains.Annotations;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
diff --git a/osu.Game/Rulesets/UI/JudgementContainer.cs b/osu.Game/Rulesets/UI/JudgementContainer.cs
index 7181e80206..886dd34fc7 100644
--- a/osu.Game/Rulesets/UI/JudgementContainer.cs
+++ b/osu.Game/Rulesets/UI/JudgementContainer.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Judgements;
diff --git a/osu.Game/Rulesets/UI/PlayfieldAdjustmentContainer.cs b/osu.Game/Rulesets/UI/PlayfieldAdjustmentContainer.cs
index 0f440adef8..9339602ac6 100644
--- a/osu.Game/Rulesets/UI/PlayfieldAdjustmentContainer.cs
+++ b/osu.Game/Rulesets/UI/PlayfieldAdjustmentContainer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 
diff --git a/osu.Game/Rulesets/UI/PlayfieldBorder.cs b/osu.Game/Rulesets/UI/PlayfieldBorder.cs
index 18bd5b9b93..e87421fc88 100644
--- a/osu.Game/Rulesets/UI/PlayfieldBorder.cs
+++ b/osu.Game/Rulesets/UI/PlayfieldBorder.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
diff --git a/osu.Game/Rulesets/UI/PlayfieldBorderStyle.cs b/osu.Game/Rulesets/UI/PlayfieldBorderStyle.cs
index 79f3a2ca84..503bc8fd99 100644
--- a/osu.Game/Rulesets/UI/PlayfieldBorderStyle.cs
+++ b/osu.Game/Rulesets/UI/PlayfieldBorderStyle.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Localisation;
 using osu.Game.Localisation;
 
diff --git a/osu.Game/Rulesets/UI/Scrolling/Algorithms/ConstantScrollAlgorithm.cs b/osu.Game/Rulesets/UI/Scrolling/Algorithms/ConstantScrollAlgorithm.cs
index c957a84eb1..b0bde50cae 100644
--- a/osu.Game/Rulesets/UI/Scrolling/Algorithms/ConstantScrollAlgorithm.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/Algorithms/ConstantScrollAlgorithm.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Rulesets.UI.Scrolling.Algorithms
 {
     public class ConstantScrollAlgorithm : IScrollAlgorithm
diff --git a/osu.Game/Rulesets/UI/Scrolling/IScrollingInfo.cs b/osu.Game/Rulesets/UI/Scrolling/IScrollingInfo.cs
index e00f0ffe5d..cd85932599 100644
--- a/osu.Game/Rulesets/UI/Scrolling/IScrollingInfo.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/IScrollingInfo.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Bindables;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI.Scrolling.Algorithms;
diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
index 7d141113df..1a17349d12 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -20,7 +18,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
         public new ScrollingHitObjectContainer HitObjectContainer => (ScrollingHitObjectContainer)base.HitObjectContainer;
 
         [Resolved]
-        public IScrollingInfo ScrollingInfo { get; private set; }
+        public IScrollingInfo ScrollingInfo { get; private set; } = null!;
 
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game/Scoring/HitResultDisplayStatistic.cs b/osu.Game/Scoring/HitResultDisplayStatistic.cs
index 20deff4875..59e074fb5f 100644
--- a/osu.Game/Scoring/HitResultDisplayStatistic.cs
+++ b/osu.Game/Scoring/HitResultDisplayStatistic.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Localisation;
 using osu.Game.Rulesets.Scoring;
 
diff --git a/osu.Game/Scoring/IScoreInfo.cs b/osu.Game/Scoring/IScoreInfo.cs
index ffc30384d2..3644d099d9 100644
--- a/osu.Game/Scoring/IScoreInfo.cs
+++ b/osu.Game/Scoring/IScoreInfo.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
diff --git a/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs b/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
index 52dec20b32..e298d51ccb 100644
--- a/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
+++ b/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/osu.Game/Scoring/Score.cs b/osu.Game/Scoring/Score.cs
index 06bc3edd37..3323706ac1 100644
--- a/osu.Game/Scoring/Score.cs
+++ b/osu.Game/Scoring/Score.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Replays;
 using osu.Game.Utils;
 
diff --git a/osu.Game/Scoring/ScoreRank.cs b/osu.Game/Scoring/ScoreRank.cs
index a1916953c4..327e4191d7 100644
--- a/osu.Game/Scoring/ScoreRank.cs
+++ b/osu.Game/Scoring/ScoreRank.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.ComponentModel;
 using osu.Framework.Localisation;
 using osu.Game.Resources.Localisation.Web;
diff --git a/osu.Game/Screens/BackgroundScreenStack.cs b/osu.Game/Screens/BackgroundScreenStack.cs
index ca0dad83c8..6ebc97ebbb 100644
--- a/osu.Game/Screens/BackgroundScreenStack.cs
+++ b/osu.Game/Screens/BackgroundScreenStack.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Framework.Graphics;
 using osu.Framework.Screens;
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenBlack.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenBlack.cs
index 09778c5cdf..742d149580 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenBlack.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenBlack.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Screens;
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenCustom.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenCustom.cs
index 3c8ed6fe76..14331c1978 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenCustom.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenCustom.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Graphics.Backgrounds;
 
 namespace osu.Game.Screens.Backgrounds
diff --git a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorPresetCollection.cs b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorPresetCollection.cs
index 67b346fb64..56df0552cc 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorPresetCollection.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorPresetCollection.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/osu.Game/Screens/Edit/Compose/Components/CircularDistanceSnapGrid.cs b/osu.Game/Screens/Edit/Compose/Components/CircularDistanceSnapGrid.cs
index 602ed6f627..e33ef66007 100644
--- a/osu.Game/Screens/Edit/Compose/Components/CircularDistanceSnapGrid.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/CircularDistanceSnapGrid.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
@@ -19,7 +17,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
     public abstract partial class CircularDistanceSnapGrid : DistanceSnapGrid
     {
         [Resolved]
-        private EditorClock editorClock { get; set; }
+        private EditorClock editorClock { get; set; } = null!;
 
         protected CircularDistanceSnapGrid(HitObject referenceObject, Vector2 startPosition, double startTime, double? endTime = null)
             : base(referenceObject, startPosition, startTime, endTime)
@@ -127,10 +125,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
         private partial class Ring : CircularProgress
         {
             [Resolved]
-            private IDistanceSnapProvider snapProvider { get; set; }
+            private IDistanceSnapProvider snapProvider { get; set; } = null!;
 
-            [Resolved(canBeNull: true)]
-            private EditorClock editorClock { get; set; }
+            [Resolved]
+            private EditorClock? editorClock { get; set; }
 
             private readonly HitObject referenceObject;
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
index d618541685..a73278a61e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -28,7 +26,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         public const string HIT_BANK_AUTO = "auto";
 
         [Resolved]
-        protected EditorBeatmap EditorBeatmap { get; private set; }
+        protected EditorBeatmap EditorBeatmap { get; private set; } = null!;
 
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game/Screens/Edit/Compose/Components/HitObjectOrderedSelectionContainer.cs b/osu.Game/Screens/Edit/Compose/Components/HitObjectOrderedSelectionContainer.cs
index 849a526556..0edaaf9825 100644
--- a/osu.Game/Screens/Edit/Compose/Components/HitObjectOrderedSelectionContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/HitObjectOrderedSelectionContainer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -18,7 +16,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
     public sealed partial class HitObjectOrderedSelectionContainer : Container<SelectionBlueprint<HitObject>>
     {
         [Resolved]
-        private EditorBeatmap editorBeatmap { get; set; }
+        private EditorBeatmap editorBeatmap { get; set; } = null!;
 
         protected override void LoadComplete()
         {
diff --git a/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs b/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
index 46d948f8b6..4515e4d7be 100644
--- a/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Rulesets.Edit;
 using osuTK;
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/RectangularPositionSnapGrid.cs b/osu.Game/Screens/Edit/Compose/Components/RectangularPositionSnapGrid.cs
index 06b73c8af4..063ea23281 100644
--- a/osu.Game/Screens/Edit/Compose/Components/RectangularPositionSnapGrid.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/RectangularPositionSnapGrid.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/CentreMarker.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/CentreMarker.cs
index 44daf70577..aee3cffbfd 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/CentreMarker.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/CentreMarker.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineButton.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineButton.cs
index c94de0fe67..767854252e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineButton.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineButton.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays;
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs
index 29983c9cbf..cd97b293ba 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Linq;
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.cs
index 257cc9e635..fc3ef92bf5 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineDragBox.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineDragBox.cs
index a1dfd0718b..c16a948822 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineDragBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineDragBox.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -20,7 +18,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         private double? startTime;
 
         [Resolved]
-        private Timeline timeline { get; set; }
+        private Timeline timeline { get; set; } = null!;
 
         protected override Drawable CreateBox() => new Box
         {
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
index 6a0688e19c..7e7bef8cf2 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Diagnostics;
 using osu.Framework.Allocation;
@@ -21,19 +19,19 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
     public partial class TimelineTickDisplay : TimelinePart<PointVisualisation>
     {
         [Resolved]
-        private EditorBeatmap beatmap { get; set; }
+        private EditorBeatmap beatmap { get; set; } = null!;
 
         [Resolved]
-        private Bindable<WorkingBeatmap> working { get; set; }
+        private Bindable<WorkingBeatmap> working { get; set; } = null!;
 
         [Resolved]
-        private BindableBeatDivisor beatDivisor { get; set; }
-
-        [Resolved(CanBeNull = true)]
-        private IEditorChangeHandler changeHandler { get; set; }
+        private BindableBeatDivisor beatDivisor { get; set; } = null!;
 
         [Resolved]
-        private OsuColour colours { get; set; }
+        private IEditorChangeHandler? changeHandler { get; set; }
+
+        [Resolved]
+        private OsuColour colours { get; set; } = null!;
 
         public TimelineTickDisplay()
         {
@@ -72,8 +70,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         /// </summary>
         private float? nextMaxTick;
 
-        [Resolved(canBeNull: true)]
-        private Timeline timeline { get; set; }
+        [Resolved]
+        private Timeline? timeline { get; set; }
 
         protected override void Update()
         {
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimingPointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimingPointPiece.cs
index 4191864e5c..2a4ad66918 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimingPointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimingPointPiece.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Beatmaps.ControlPoints;
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
index 951f4129d4..848c8f9a0f 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -41,8 +39,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private bool isZoomSetUp;
 
-        [Resolved(canBeNull: true)]
-        private IFrameBasedClock editorClock { get; set; }
+        [Resolved]
+        private IFrameBasedClock? editorClock { get; set; }
 
         private readonly LayoutValue zoomedContentWidthCache = new LayoutValue(Invalidation.DrawSize);
 
diff --git a/osu.Game/Screens/Edit/Compose/IPlacementHandler.cs b/osu.Game/Screens/Edit/Compose/IPlacementHandler.cs
index 46d9555e0c..57960a76a1 100644
--- a/osu.Game/Screens/Edit/Compose/IPlacementHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/IPlacementHandler.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Game.Rulesets.Objects;
 
diff --git a/osu.Game/Screens/Edit/EditorClipboard.cs b/osu.Game/Screens/Edit/EditorClipboard.cs
index f749f4bad6..af303618fb 100644
--- a/osu.Game/Screens/Edit/EditorClipboard.cs
+++ b/osu.Game/Screens/Edit/EditorClipboard.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Bindables;
 
 namespace osu.Game.Screens.Edit
diff --git a/osu.Game/Screens/Edit/EditorRoundedScreenSettings.cs b/osu.Game/Screens/Edit/EditorRoundedScreenSettings.cs
index 1c083b4fab..510c27e8c6 100644
--- a/osu.Game/Screens/Edit/EditorRoundedScreenSettings.cs
+++ b/osu.Game/Screens/Edit/EditorRoundedScreenSettings.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Screens/Edit/EditorScreen.cs b/osu.Game/Screens/Edit/EditorScreen.cs
index 069a5490bb..b39c0cf5f3 100644
--- a/osu.Game/Screens/Edit/EditorScreen.cs
+++ b/osu.Game/Screens/Edit/EditorScreen.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -17,7 +15,7 @@ namespace osu.Game.Screens.Edit
     public abstract partial class EditorScreen : VisibilityContainer
     {
         [Resolved]
-        protected EditorBeatmap EditorBeatmap { get; private set; }
+        protected EditorBeatmap EditorBeatmap { get; private set; } = null!;
 
         protected override Container<Drawable> Content => content;
         private readonly Container content;
diff --git a/osu.Game/Screens/Edit/GameplayTest/EditorPlayerLoader.cs b/osu.Game/Screens/Edit/GameplayTest/EditorPlayerLoader.cs
index a74d97cdc7..bb151e4a45 100644
--- a/osu.Game/Screens/Edit/GameplayTest/EditorPlayerLoader.cs
+++ b/osu.Game/Screens/Edit/GameplayTest/EditorPlayerLoader.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Screens;
@@ -14,7 +12,7 @@ namespace osu.Game.Screens.Edit.GameplayTest
     public partial class EditorPlayerLoader : PlayerLoader
     {
         [Resolved]
-        private OsuLogo osuLogo { get; set; }
+        private OsuLogo osuLogo { get; set; } = null!;
 
         public EditorPlayerLoader(Editor editor)
             : base(() => new EditorPlayer(editor))
diff --git a/osu.Game/Screens/Edit/GameplayTest/SaveBeforeGameplayTestDialog.cs b/osu.Game/Screens/Edit/GameplayTest/SaveBeforeGameplayTestDialog.cs
index 5a5572b508..eb1df43ddd 100644
--- a/osu.Game/Screens/Edit/GameplayTest/SaveBeforeGameplayTestDialog.cs
+++ b/osu.Game/Screens/Edit/GameplayTest/SaveBeforeGameplayTestDialog.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Overlays.Dialog;
diff --git a/osu.Game/Screens/Edit/HitAnimationsMenuItem.cs b/osu.Game/Screens/Edit/HitAnimationsMenuItem.cs
index 3e1e0c4cfe..ee64a53301 100644
--- a/osu.Game/Screens/Edit/HitAnimationsMenuItem.cs
+++ b/osu.Game/Screens/Edit/HitAnimationsMenuItem.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using JetBrains.Annotations;
 using osu.Framework.Bindables;
 using osu.Game.Graphics.UserInterface;
diff --git a/osu.Game/Screens/Edit/Verify/InterpretationSection.cs b/osu.Game/Screens/Edit/Verify/InterpretationSection.cs
index 5b6eea098c..b16e3750bf 100644
--- a/osu.Game/Screens/Edit/Verify/InterpretationSection.cs
+++ b/osu.Game/Screens/Edit/Verify/InterpretationSection.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
diff --git a/osu.Game/Screens/Edit/Verify/IssueSettings.cs b/osu.Game/Screens/Edit/Verify/IssueSettings.cs
index e8275c3684..6d3c0520a2 100644
--- a/osu.Game/Screens/Edit/Verify/IssueSettings.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueSettings.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Framework.Graphics;
 
diff --git a/osu.Game/Screens/Edit/WaveformOpacityMenuItem.cs b/osu.Game/Screens/Edit/WaveformOpacityMenuItem.cs
index 5b1d7142e4..9dc0ea0d07 100644
--- a/osu.Game/Screens/Edit/WaveformOpacityMenuItem.cs
+++ b/osu.Game/Screens/Edit/WaveformOpacityMenuItem.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.UserInterface;
diff --git a/osu.Game/Screens/IHandlePresentBeatmap.cs b/osu.Game/Screens/IHandlePresentBeatmap.cs
index 62cd2c3d3e..323e3b1c0c 100644
--- a/osu.Game/Screens/IHandlePresentBeatmap.cs
+++ b/osu.Game/Screens/IHandlePresentBeatmap.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
 
diff --git a/osu.Game/Screens/IHasSubScreenStack.cs b/osu.Game/Screens/IHasSubScreenStack.cs
index 325702313b..0fcf21ef2b 100644
--- a/osu.Game/Screens/IHasSubScreenStack.cs
+++ b/osu.Game/Screens/IHasSubScreenStack.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Screens;
 
 namespace osu.Game.Screens
diff --git a/osu.Game/Screens/IOsuScreen.cs b/osu.Game/Screens/IOsuScreen.cs
index a5739a41b1..cceede5424 100644
--- a/osu.Game/Screens/IOsuScreen.cs
+++ b/osu.Game/Screens/IOsuScreen.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Bindables;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
diff --git a/osu.Game/Screens/Menu/ExitConfirmOverlay.cs b/osu.Game/Screens/Menu/ExitConfirmOverlay.cs
index bc2f6ea00f..64b9bd52e8 100644
--- a/osu.Game/Screens/Menu/ExitConfirmOverlay.cs
+++ b/osu.Game/Screens/Menu/ExitConfirmOverlay.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Input.Bindings;
diff --git a/osu.Game/Screens/Menu/SongTicker.cs b/osu.Game/Screens/Menu/SongTicker.cs
index bac7e15461..3bdc0efe19 100644
--- a/osu.Game/Screens/Menu/SongTicker.cs
+++ b/osu.Game/Screens/Menu/SongTicker.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -20,7 +18,7 @@ namespace osu.Game.Screens.Menu
         private const int fade_duration = 800;
 
         [Resolved]
-        private Bindable<WorkingBeatmap> beatmap { get; set; }
+        private Bindable<WorkingBeatmap> beatmap { get; set; } = null!;
 
         private readonly OsuSpriteText title, artist;
 
diff --git a/osu.Game/Screens/Menu/StorageErrorDialog.cs b/osu.Game/Screens/Menu/StorageErrorDialog.cs
index ba05ad8b76..dd43289873 100644
--- a/osu.Game/Screens/Menu/StorageErrorDialog.cs
+++ b/osu.Game/Screens/Menu/StorageErrorDialog.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
@@ -15,7 +13,7 @@ namespace osu.Game.Screens.Menu
     public partial class StorageErrorDialog : PopupDialog
     {
         [Resolved]
-        private IDialogOverlay dialogOverlay { get; set; }
+        private IDialogOverlay dialogOverlay { get; set; } = null!;
 
         public StorageErrorDialog(OsuStorage storage, OsuStorageError error)
         {
diff --git a/osu.Game/Screens/OnlinePlay/Components/BeatmapDetailAreaPlaylistTabItem.cs b/osu.Game/Screens/OnlinePlay/Components/BeatmapDetailAreaPlaylistTabItem.cs
index 7c48fc0871..41b994ea32 100644
--- a/osu.Game/Screens/OnlinePlay/Components/BeatmapDetailAreaPlaylistTabItem.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/BeatmapDetailAreaPlaylistTabItem.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Screens.Select;
 
 namespace osu.Game.Screens.OnlinePlay.Components
diff --git a/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs b/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
index ebcc08360e..7c57f5b4f5 100644
--- a/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -49,7 +47,7 @@ namespace osu.Game.Screens.OnlinePlay.Components
         }
 
         [Resolved]
-        private OsuColour colours { get; set; }
+        private OsuColour colours { get; set; } = null!;
 
         private void updateText()
         {
diff --git a/osu.Game/Screens/OnlinePlay/Components/DisableableTabControl.cs b/osu.Game/Screens/OnlinePlay/Components/DisableableTabControl.cs
index 3f7f38f3bc..97716759c3 100644
--- a/osu.Game/Screens/OnlinePlay/Components/DisableableTabControl.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/DisableableTabControl.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
diff --git a/osu.Game/Screens/OnlinePlay/Components/DrawableGameType.cs b/osu.Game/Screens/OnlinePlay/Components/DrawableGameType.cs
index 77e461ce41..d24ad74a68 100644
--- a/osu.Game/Screens/OnlinePlay/Components/DrawableGameType.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/DrawableGameType.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Extensions;
 using osu.Framework.Extensions.Color4Extensions;
@@ -41,7 +39,7 @@ namespace osu.Game.Screens.OnlinePlay.Components
         }
 
         [Resolved]
-        private OsuColour colours { get; set; }
+        private OsuColour colours { get; set; } = null!;
 
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game/Screens/OnlinePlay/Components/OverlinedHeader.cs b/osu.Game/Screens/OnlinePlay/Components/OverlinedHeader.cs
index 0e2ce6703f..09a3602cdd 100644
--- a/osu.Game/Screens/OnlinePlay/Components/OverlinedHeader.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/OverlinedHeader.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Screens/OnlinePlay/Components/OverlinedPlaylistHeader.cs b/osu.Game/Screens/OnlinePlay/Components/OverlinedPlaylistHeader.cs
index f8dcd7b75d..fc86cbbbdd 100644
--- a/osu.Game/Screens/OnlinePlay/Components/OverlinedPlaylistHeader.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/OverlinedPlaylistHeader.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Online.Rooms;
 
 namespace osu.Game.Screens.OnlinePlay.Components
diff --git a/osu.Game/Screens/OnlinePlay/Components/ParticipantsDisplay.cs b/osu.Game/Screens/OnlinePlay/Components/ParticipantsDisplay.cs
index 4fdf41d0f7..e6999771d3 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ParticipantsDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ParticipantsDisplay.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs b/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
index 772c8c4278..813e243449 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Cursor;
diff --git a/osu.Game/Screens/OnlinePlay/Components/RoomPollingComponent.cs b/osu.Game/Screens/OnlinePlay/Components/RoomPollingComponent.cs
index 395a77b9e6..0ba7f20f1c 100644
--- a/osu.Game/Screens/OnlinePlay/Components/RoomPollingComponent.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/RoomPollingComponent.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Game.Online;
 using osu.Game.Online.API;
@@ -12,9 +10,9 @@ namespace osu.Game.Screens.OnlinePlay.Components
     public abstract partial class RoomPollingComponent : PollingComponent
     {
         [Resolved]
-        protected IAPIProvider API { get; private set; }
+        protected IAPIProvider API { get; private set; } = null!;
 
         [Resolved]
-        protected IRoomManager RoomManager { get; private set; }
+        protected IRoomManager RoomManager { get; private set; } = null!;
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs b/osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs
index 98f3df525d..920aff13a8 100644
--- a/osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs
+++ b/osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
diff --git a/osu.Game/Screens/OnlinePlay/IOnlinePlaySubScreen.cs b/osu.Game/Screens/OnlinePlay/IOnlinePlaySubScreen.cs
index f32ead5a11..c528e3952e 100644
--- a/osu.Game/Screens/OnlinePlay/IOnlinePlaySubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/IOnlinePlaySubScreen.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Screens.OnlinePlay
 {
     public interface IOnlinePlaySubScreen : IOsuScreen
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/EndDateInfo.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/EndDateInfo.cs
index c25dd6f158..844991095e 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/EndDateInfo.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/EndDateInfo.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/MatchTypePill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/MatchTypePill.cs
index 35e0482f2b..e30d673b26 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/MatchTypePill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/MatchTypePill.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Game.Online.Rooms;
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/PillContainer.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/PillContainer.cs
index 263261143d..b473ea82c6 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/PillContainer.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/PillContainer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/PlaylistCountPill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/PlaylistCountPill.cs
index d1365c02f3..fe5ccb4f09 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/PlaylistCountPill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/PlaylistCountPill.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using Humanizer;
 using osu.Framework.Extensions.LocalisationExtensions;
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/QueueModePill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/QueueModePill.cs
index 208c11c155..23f4ecf8db 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/QueueModePill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/QueueModePill.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Game.Online.Multiplayer;
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomSpecialCategoryPill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomSpecialCategoryPill.cs
index 10f6e59260..9b8954bb33 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomSpecialCategoryPill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomSpecialCategoryPill.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics.Sprites;
@@ -14,7 +12,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
     public partial class RoomSpecialCategoryPill : OnlinePlayPill
     {
         [Resolved]
-        private OsuColour colours { get; set; }
+        private OsuColour colours { get; set; } = null!;
 
         protected override FontUsage Font => base.Font.With(weight: FontWeight.SemiBold);
 
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusFilter.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusFilter.cs
index 463b883f11..53fbf670e1 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusFilter.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusFilter.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.ComponentModel;
 
 namespace osu.Game.Screens.OnlinePlay.Lounge.Components
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs
index ca9917ad00..aae82b6721 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -19,7 +17,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
     public partial class RoomStatusPill : OnlinePlayPill
     {
         [Resolved]
-        private OsuColour colours { get; set; }
+        private OsuColour colours { get; set; } = null!;
 
         protected override FontUsage Font => base.Font.With(weight: FontWeight.SemiBold);
 
diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/CreateRoomButton.cs b/osu.Game/Screens/OnlinePlay/Match/Components/CreateRoomButton.cs
index 0251dba6ce..3788f4c0b2 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/CreateRoomButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/CreateRoomButton.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs b/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs
index 55d39407b0..8dc1704fcd 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Online.Chat;
@@ -14,8 +12,8 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
     {
         private readonly IBindable<int> channelId = new Bindable<int>();
 
-        [Resolved(CanBeNull = true)]
-        private ChannelManager channelManager { get; set; }
+        [Resolved]
+        private ChannelManager? channelManager { get; set; }
 
         private readonly Room room;
         private readonly bool leaveChannelOnDispose;
diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomBackgroundScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomBackgroundScreen.cs
index c9e51d376c..982275f96a 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomBackgroundScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomBackgroundScreen.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Bindables;
 using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Components;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/GameplayMatchScoreDisplay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/GameplayMatchScoreDisplay.cs
index 8c08390c73..b4373d728f 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/GameplayMatchScoreDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/GameplayMatchScoreDisplay.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Screens.Play.HUD;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/Playlist/MultiplayerHistoryList.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/Playlist/MultiplayerHistoryList.cs
index a19f61787b..d18bb011f0 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/Playlist/MultiplayerHistoryList.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/Playlist/MultiplayerHistoryList.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/Playlist/MultiplayerPlaylistTabControl.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/Playlist/MultiplayerPlaylistTabControl.cs
index a5589c48b9..e5d94c5358 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/Playlist/MultiplayerPlaylistTabControl.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/Playlist/MultiplayerPlaylistTabControl.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterface;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
index 164d1c9a4b..66ae814444 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Diagnostics;
 using osu.Framework.Allocation;
 using osu.Framework.Logging;
@@ -16,7 +14,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
     public partial class Multiplayer : OnlinePlayScreen
     {
         [Resolved]
-        private MultiplayerClient client { get; set; }
+        private MultiplayerClient client { get; set; } = null!;
 
         protected override void LoadComplete()
         {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs
index de19d3a0e9..9708a94cd7 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Online.Rooms;
 using osu.Game.Scoring;
 using osu.Game.Screens.OnlinePlay.Playlists;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsListHeader.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsListHeader.cs
index 7f4e3360e4..79c6fb33cd 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsListHeader.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsListHeader.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Resources.Localisation.Web;
@@ -13,7 +11,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
     public partial class ParticipantsListHeader : OverlinedHeader
     {
         [Resolved]
-        private MultiplayerClient client { get; set; }
+        private MultiplayerClient client { get; set; } = null!;
 
         public ParticipantsListHeader()
             : base(RankingsStrings.SpotlightParticipants)
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayerLoader.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayerLoader.cs
index eb55b0d18a..9a43e96a50 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayerLoader.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayerLoader.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
index 82d4cf5caf..771a8c0de4 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Facade.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Facade.cs
index 2f4ed35392..934c22c918 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Facade.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Facade.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlaySubScreenStack.cs b/osu.Game/Screens/OnlinePlay/OnlinePlaySubScreenStack.cs
index 7ecb7d954e..2e3e2e1dc0 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlaySubScreenStack.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlaySubScreenStack.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Screens;
 
 namespace osu.Game.Screens.OnlinePlay
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/CreatePlaylistsRoomButton.cs b/osu.Game/Screens/OnlinePlay/Playlists/CreatePlaylistsRoomButton.cs
index 9507169e0f..d56ef9ef0c 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/CreatePlaylistsRoomButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/CreatePlaylistsRoomButton.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Game.Screens.OnlinePlay.Match.Components;
 
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/Playlists.cs b/osu.Game/Screens/OnlinePlay/Playlists/Playlists.cs
index f9324840dc..f1d2384c2f 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/Playlists.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/Playlists.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Screens.OnlinePlay.Lounge;
 
 namespace osu.Game.Screens.OnlinePlay.Playlists
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSettingsPlaylist.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSettingsPlaylist.cs
index 736f09584b..2ca1f4cd1f 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSettingsPlaylist.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSettingsPlaylist.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using osu.Framework.Extensions.IEnumerableExtensions;
 
diff --git a/osu.Game/Screens/OsuScreenStack.cs b/osu.Game/Screens/OsuScreenStack.cs
index dffbbdbc55..ef579fac85 100644
--- a/osu.Game/Screens/OsuScreenStack.cs
+++ b/osu.Game/Screens/OsuScreenStack.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Screens;
diff --git a/osu.Game/Screens/Play/Break/BlurredIcon.cs b/osu.Game/Screens/Play/Break/BlurredIcon.cs
index 6ce1c2e686..2bf59ea63b 100644
--- a/osu.Game/Screens/Play/Break/BlurredIcon.cs
+++ b/osu.Game/Screens/Play/Break/BlurredIcon.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game/Screens/Play/Break/BreakArrows.cs b/osu.Game/Screens/Play/Break/BreakArrows.cs
index f0f1e8cc3d..41277c7557 100644
--- a/osu.Game/Screens/Play/Break/BreakArrows.cs
+++ b/osu.Game/Screens/Play/Break/BreakArrows.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
diff --git a/osu.Game/Screens/Play/Break/BreakInfo.cs b/osu.Game/Screens/Play/Break/BreakInfo.cs
index f99c1d1817..ef453405b5 100644
--- a/osu.Game/Screens/Play/Break/BreakInfo.cs
+++ b/osu.Game/Screens/Play/Break/BreakInfo.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
diff --git a/osu.Game/Screens/Play/Break/GlowIcon.cs b/osu.Game/Screens/Play/Break/GlowIcon.cs
index 595c4dd494..8e2b9da0ad 100644
--- a/osu.Game/Screens/Play/Break/GlowIcon.cs
+++ b/osu.Game/Screens/Play/Break/GlowIcon.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game/Screens/Play/Break/RemainingTimeCounter.cs b/osu.Game/Screens/Play/Break/RemainingTimeCounter.cs
index da83f8c29f..3ac0a493da 100644
--- a/osu.Game/Screens/Play/Break/RemainingTimeCounter.cs
+++ b/osu.Game/Screens/Play/Break/RemainingTimeCounter.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.UserInterface;
diff --git a/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
index eb3c71afbb..4a0e8b4f39 100644
--- a/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Game.Graphics;
 using osu.Game.Skinning;
diff --git a/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs b/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
index 2c43905a46..c4d04c5580 100644
--- a/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
diff --git a/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs b/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
index 7cc2dc1751..2a17559503 100644
--- a/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index 7a73eb1657..19ede5533f 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -22,7 +20,7 @@ namespace osu.Game.Screens.Play.HUD
         private readonly Bindable<bool> showHealthBar = new Bindable<bool>(true);
 
         [Resolved]
-        protected HealthProcessor HealthProcessor { get; private set; }
+        protected HealthProcessor HealthProcessor { get; private set; } = null!;
 
         public Bindable<double> Current { get; } = new BindableDouble(1)
         {
@@ -34,8 +32,8 @@ namespace osu.Game.Screens.Play.HUD
         {
         }
 
-        [Resolved(canBeNull: true)]
-        private HUDOverlay hudOverlay { get; set; }
+        [Resolved]
+        private HUDOverlay? hudOverlay { get; set; }
 
         protected override void LoadComplete()
         {
diff --git a/osu.Game/Screens/Play/HUD/ModDisplay.cs b/osu.Game/Screens/Play/HUD/ModDisplay.cs
index 8b2b8f9464..579a0d163a 100644
--- a/osu.Game/Screens/Play/HUD/ModDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ModDisplay.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using osu.Framework.Bindables;
diff --git a/osu.Game/Screens/Play/HUD/ModFlowDisplay.cs b/osu.Game/Screens/Play/HUD/ModFlowDisplay.cs
index 38027c64ac..0b2ce10ac3 100644
--- a/osu.Game/Screens/Play/HUD/ModFlowDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ModFlowDisplay.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using osu.Framework.Bindables;
diff --git a/osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs b/osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs
index 064d2071ce..b6b385e262 100644
--- a/osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs
+++ b/osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
diff --git a/osu.Game/Screens/Play/HUD/UnstableRateCounter.cs b/osu.Game/Screens/Play/HUD/UnstableRateCounter.cs
index 4ceca817e2..e3034b2442 100644
--- a/osu.Game/Screens/Play/HUD/UnstableRateCounter.cs
+++ b/osu.Game/Screens/Play/HUD/UnstableRateCounter.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -30,7 +28,7 @@ namespace osu.Game.Screens.Play.HUD
         private readonly Bindable<bool> valid = new Bindable<bool>();
 
         [Resolved]
-        private ScoreProcessor scoreProcessor { get; set; }
+        private ScoreProcessor scoreProcessor { get; set; } = null!;
 
         public UnstableRateCounter()
         {
diff --git a/osu.Game/Screens/Play/HotkeyExitOverlay.cs b/osu.Game/Screens/Play/HotkeyExitOverlay.cs
index 4c1265c699..bcd9bd7cd6 100644
--- a/osu.Game/Screens/Play/HotkeyExitOverlay.cs
+++ b/osu.Game/Screens/Play/HotkeyExitOverlay.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Input.Bindings;
diff --git a/osu.Game/Screens/Play/HotkeyRetryOverlay.cs b/osu.Game/Screens/Play/HotkeyRetryOverlay.cs
index 582b5a1691..11d0b4f84f 100644
--- a/osu.Game/Screens/Play/HotkeyRetryOverlay.cs
+++ b/osu.Game/Screens/Play/HotkeyRetryOverlay.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Input.Bindings;
diff --git a/osu.Game/Screens/Play/ILocalUserPlayInfo.cs b/osu.Game/Screens/Play/ILocalUserPlayInfo.cs
index e4328b2c78..2d181a09d4 100644
--- a/osu.Game/Screens/Play/ILocalUserPlayInfo.cs
+++ b/osu.Game/Screens/Play/ILocalUserPlayInfo.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 
diff --git a/osu.Game/Screens/Play/PlayerConfiguration.cs b/osu.Game/Screens/Play/PlayerConfiguration.cs
index b82925ccb8..122e25f406 100644
--- a/osu.Game/Screens/Play/PlayerConfiguration.cs
+++ b/osu.Game/Screens/Play/PlayerConfiguration.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Screens.Play
 {
     public class PlayerConfiguration
diff --git a/osu.Game/Screens/Play/PlayerSettings/DiscussionSettings.cs b/osu.Game/Screens/Play/PlayerSettings/DiscussionSettings.cs
index 7c76936621..f64861cfa5 100644
--- a/osu.Game/Screens/Play/PlayerSettings/DiscussionSettings.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/DiscussionSettings.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Configuration;
diff --git a/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs b/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs
index 13e5b66a70..cf261ba49b 100644
--- a/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Configuration;
diff --git a/osu.Game/Screens/Play/PlayerSettings/PlaybackSettings.cs b/osu.Game/Screens/Play/PlayerSettings/PlaybackSettings.cs
index cb6fcb2413..4753effdb0 100644
--- a/osu.Game/Screens/Play/PlayerSettings/PlaybackSettings.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/PlaybackSettings.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game/Screens/Play/PlayerSettings/PlayerSliderBar.cs b/osu.Game/Screens/Play/PlayerSettings/PlayerSliderBar.cs
index 45009684a6..88b778fafb 100644
--- a/osu.Game/Screens/Play/PlayerSettings/PlayerSliderBar.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/PlayerSliderBar.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Screens/Play/ReplayPlayerLoader.cs b/osu.Game/Screens/Play/ReplayPlayerLoader.cs
index 1c9d694325..7da06fe506 100644
--- a/osu.Game/Screens/Play/ReplayPlayerLoader.cs
+++ b/osu.Game/Screens/Play/ReplayPlayerLoader.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Screens;
 using osu.Game.Scoring;
diff --git a/osu.Game/Screens/Play/SpectatorPlayerLoader.cs b/osu.Game/Screens/Play/SpectatorPlayerLoader.cs
index 3830443ce8..8f2bcfe046 100644
--- a/osu.Game/Screens/Play/SpectatorPlayerLoader.cs
+++ b/osu.Game/Screens/Play/SpectatorPlayerLoader.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Screens;
 using osu.Game.Scoring;
diff --git a/osu.Game/Screens/Play/SpectatorResultsScreen.cs b/osu.Game/Screens/Play/SpectatorResultsScreen.cs
index b54dbb387a..67ec1373df 100644
--- a/osu.Game/Screens/Play/SpectatorResultsScreen.cs
+++ b/osu.Game/Screens/Play/SpectatorResultsScreen.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Screens;
 using osu.Game.Online.Spectator;
@@ -19,7 +17,7 @@ namespace osu.Game.Screens.Play
         }
 
         [Resolved]
-        private SpectatorClient spectatorClient { get; set; }
+        private SpectatorClient spectatorClient { get; set; } = null!;
 
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game/Screens/Ranking/AspectContainer.cs b/osu.Game/Screens/Ranking/AspectContainer.cs
index 9ec2a15044..a26bb8fe43 100644
--- a/osu.Game/Screens/Ranking/AspectContainer.cs
+++ b/osu.Game/Screens/Ranking/AspectContainer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 
diff --git a/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
index 402322c611..195cd03e9b 100644
--- a/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
@@ -36,7 +34,7 @@ namespace osu.Game.Screens.Ranking.Contracted
         private readonly ScoreInfo score;
 
         [Resolved]
-        private ScoreManager scoreManager { get; set; }
+        private ScoreManager scoreManager { get; set; } = null!;
 
         /// <summary>
         /// Creates a new <see cref="ContractedPanelMiddleContent"/>.
diff --git a/osu.Game/Screens/Ranking/Expanded/Accuracy/RankNotch.cs b/osu.Game/Screens/Ranking/Expanded/Accuracy/RankNotch.cs
index 32f2eb2fa5..244acbe8b1 100644
--- a/osu.Game/Screens/Ranking/Expanded/Accuracy/RankNotch.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Accuracy/RankNotch.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/HitResultStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/HitResultStatistic.cs
index 863c450617..384e5661b4 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/HitResultStatistic.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/HitResultStatistic.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Scoring;
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/StatisticCounter.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/StatisticCounter.cs
index ecadc9eed6..b279c8107c 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/StatisticCounter.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/StatisticCounter.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
diff --git a/osu.Game/Screens/Ranking/RetryButton.cs b/osu.Game/Screens/Ranking/RetryButton.cs
index c7d2416e29..d977f25323 100644
--- a/osu.Game/Screens/Ranking/RetryButton.cs
+++ b/osu.Game/Screens/Ranking/RetryButton.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
@@ -18,8 +16,8 @@ namespace osu.Game.Screens.Ranking
     {
         private readonly Box background;
 
-        [Resolved(canBeNull: true)]
-        private Player player { get; set; }
+        [Resolved]
+        private Player? player { get; set; }
 
         public RetryButton()
         {
diff --git a/osu.Game/Screens/Ranking/ScorePanelTrackingContainer.cs b/osu.Game/Screens/Ranking/ScorePanelTrackingContainer.cs
index ec153cbd63..f5a26ef754 100644
--- a/osu.Game/Screens/Ranking/ScorePanelTrackingContainer.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelTrackingContainer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Graphics.Containers;
 
diff --git a/osu.Game/Screens/Ranking/Statistics/AverageHitError.cs b/osu.Game/Screens/Ranking/Statistics/AverageHitError.cs
index bb9905d29c..fb7107cc88 100644
--- a/osu.Game/Screens/Ranking/Statistics/AverageHitError.cs
+++ b/osu.Game/Screens/Ranking/Statistics/AverageHitError.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using osu.Game.Rulesets.Scoring;
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs b/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs
index d3327224dc..4202b2158e 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Diagnostics.CodeAnalysis;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticItem.cs b/osu.Game/Screens/Ranking/Statistics/StatisticItem.cs
index c5bdc6f6f5..6a595bf05c 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticItem.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticItem.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using JetBrains.Annotations;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Screens/Ranking/Statistics/UnstableRate.cs b/osu.Game/Screens/Ranking/Statistics/UnstableRate.cs
index de01668029..cc3535a426 100644
--- a/osu.Game/Screens/Ranking/Statistics/UnstableRate.cs
+++ b/osu.Game/Screens/Ranking/Statistics/UnstableRate.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Game.Rulesets.Scoring;
 
diff --git a/osu.Game/Screens/Select/BeatmapDetailAreaDetailTabItem.cs b/osu.Game/Screens/Select/BeatmapDetailAreaDetailTabItem.cs
index d6b076f30b..4ff2600a72 100644
--- a/osu.Game/Screens/Select/BeatmapDetailAreaDetailTabItem.cs
+++ b/osu.Game/Screens/Select/BeatmapDetailAreaDetailTabItem.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Screens.Select
 {
     public class BeatmapDetailAreaDetailTabItem : BeatmapDetailAreaTabItem
diff --git a/osu.Game/Screens/Select/BeatmapDetailAreaLeaderboardTabItem.cs b/osu.Game/Screens/Select/BeatmapDetailAreaLeaderboardTabItem.cs
index 6efadc77b3..8dbe5b8bea 100644
--- a/osu.Game/Screens/Select/BeatmapDetailAreaLeaderboardTabItem.cs
+++ b/osu.Game/Screens/Select/BeatmapDetailAreaLeaderboardTabItem.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 
 namespace osu.Game.Screens.Select
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeBackground.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeBackground.cs
index d5d258704b..50ec446c4f 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeBackground.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeBackground.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osuTK.Graphics;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
diff --git a/osu.Game/Screens/Select/Filter/GroupMode.cs b/osu.Game/Screens/Select/Filter/GroupMode.cs
index 8e2b9271b0..d794c215a3 100644
--- a/osu.Game/Screens/Select/Filter/GroupMode.cs
+++ b/osu.Game/Screens/Select/Filter/GroupMode.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.ComponentModel;
 
 namespace osu.Game.Screens.Select.Filter
diff --git a/osu.Game/Screens/Select/Filter/SortMode.cs b/osu.Game/Screens/Select/Filter/SortMode.cs
index c77bdbfbc6..7f2b33adbe 100644
--- a/osu.Game/Screens/Select/Filter/SortMode.cs
+++ b/osu.Game/Screens/Select/Filter/SortMode.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.ComponentModel;
 using osu.Framework.Localisation;
 using osu.Game.Resources.Localisation.Web;
diff --git a/osu.Game/Screens/Select/FooterButtonOptions.cs b/osu.Game/Screens/Select/FooterButtonOptions.cs
index e56efcb458..532051369b 100644
--- a/osu.Game/Screens/Select/FooterButtonOptions.cs
+++ b/osu.Game/Screens/Select/FooterButtonOptions.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Game.Graphics;
diff --git a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboardScope.cs b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboardScope.cs
index b8840b124a..5bcb4c27a7 100644
--- a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboardScope.cs
+++ b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboardScope.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.ComponentModel;
 using osu.Framework.Localisation;
 using osu.Game.Resources.Localisation.Web;
diff --git a/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs b/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs
index 0d3e1238f3..045a518525 100644
--- a/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs
+++ b/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game/Screens/Spectate/SpectatorGameplayState.cs b/osu.Game/Screens/Spectate/SpectatorGameplayState.cs
index 498363adef..1ee328a307 100644
--- a/osu.Game/Screens/Spectate/SpectatorGameplayState.cs
+++ b/osu.Game/Screens/Spectate/SpectatorGameplayState.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
 using osu.Game.Scoring;
diff --git a/osu.Game/Screens/StartupScreen.cs b/osu.Game/Screens/StartupScreen.cs
index 84ef3eac78..9e04a238eb 100644
--- a/osu.Game/Screens/StartupScreen.cs
+++ b/osu.Game/Screens/StartupScreen.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Overlays;
 
 namespace osu.Game.Screens
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
index f460a3d31a..f1c99a315d 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/osu.Game/Storyboards/CommandLoop.cs b/osu.Game/Storyboards/CommandLoop.cs
index 29e034d86c..480d69c12f 100644
--- a/osu.Game/Storyboards/CommandLoop.cs
+++ b/osu.Game/Storyboards/CommandLoop.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 
diff --git a/osu.Game/Storyboards/CommandTimelineGroup.cs b/osu.Game/Storyboards/CommandTimelineGroup.cs
index d198ed68bd..0b96db6861 100644
--- a/osu.Game/Storyboards/CommandTimelineGroup.cs
+++ b/osu.Game/Storyboards/CommandTimelineGroup.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osuTK;
 using osuTK.Graphics;
diff --git a/osu.Game/Storyboards/CommandTrigger.cs b/osu.Game/Storyboards/CommandTrigger.cs
index 50f3f0ef49..011f345df2 100644
--- a/osu.Game/Storyboards/CommandTrigger.cs
+++ b/osu.Game/Storyboards/CommandTrigger.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Storyboards
 {
     public class CommandTrigger : CommandTimelineGroup
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs
index 6fc8d124c7..38e7ff1c70 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Threading;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
index c281d23804..830b6a5caa 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
@@ -30,8 +28,8 @@ namespace osu.Game.Storyboards.Drawables
             LifetimeStart = sampleInfo.StartTime;
         }
 
-        [Resolved(CanBeNull = true)]
-        private IReadOnlyList<Mod> mods { get; set; }
+        [Resolved]
+        private IReadOnlyList<Mod>? mods { get; set; }
 
         protected override void SkinChanged(ISkinSource skin)
         {
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
index 400d33481c..63f644886a 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -86,7 +84,7 @@ namespace osu.Game.Storyboards.Drawables
         }
 
         [Resolved]
-        private ISkinSource skin { get; set; }
+        private ISkinSource skin { get; set; } = null!;
 
         [BackgroundDependencyLoader]
         private void load(TextureStore textureStore, Storyboard storyboard)
diff --git a/osu.Game/Storyboards/Drawables/DrawablesExtensions.cs b/osu.Game/Storyboards/Drawables/DrawablesExtensions.cs
index 779c8384c5..bbc55a336d 100644
--- a/osu.Game/Storyboards/Drawables/DrawablesExtensions.cs
+++ b/osu.Game/Storyboards/Drawables/DrawablesExtensions.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Transforms;
 
diff --git a/osu.Game/Storyboards/Drawables/IFlippable.cs b/osu.Game/Storyboards/Drawables/IFlippable.cs
index aceb5c041c..165b3d97cc 100644
--- a/osu.Game/Storyboards/Drawables/IFlippable.cs
+++ b/osu.Game/Storyboards/Drawables/IFlippable.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Transforms;
 
diff --git a/osu.Game/Storyboards/Drawables/IVectorScalable.cs b/osu.Game/Storyboards/Drawables/IVectorScalable.cs
index 3b43a35a90..60a297e126 100644
--- a/osu.Game/Storyboards/Drawables/IVectorScalable.cs
+++ b/osu.Game/Storyboards/Drawables/IVectorScalable.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Transforms;
 using osuTK;
diff --git a/osu.Game/Storyboards/IStoryboardElement.cs b/osu.Game/Storyboards/IStoryboardElement.cs
index 7e83f8b692..9a059991e6 100644
--- a/osu.Game/Storyboards/IStoryboardElement.cs
+++ b/osu.Game/Storyboards/IStoryboardElement.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 
 namespace osu.Game.Storyboards
diff --git a/osu.Game/Storyboards/IStoryboardElementWithDuration.cs b/osu.Game/Storyboards/IStoryboardElementWithDuration.cs
index 9eed139ad4..3e0f7fb576 100644
--- a/osu.Game/Storyboards/IStoryboardElementWithDuration.cs
+++ b/osu.Game/Storyboards/IStoryboardElementWithDuration.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Storyboards
 {
     /// <summary>
diff --git a/osu.Game/Storyboards/StoryboardExtensions.cs b/osu.Game/Storyboards/StoryboardExtensions.cs
index e5cafc152b..04c7196315 100644
--- a/osu.Game/Storyboards/StoryboardExtensions.cs
+++ b/osu.Game/Storyboards/StoryboardExtensions.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
 using osuTK;
diff --git a/osu.Game/Storyboards/StoryboardLayer.cs b/osu.Game/Storyboards/StoryboardLayer.cs
index 2ab8d9fc2a..fa9d4ebfea 100644
--- a/osu.Game/Storyboards/StoryboardLayer.cs
+++ b/osu.Game/Storyboards/StoryboardLayer.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Storyboards.Drawables;
 using System.Collections.Generic;
 
diff --git a/osu.Game/Storyboards/StoryboardSample.cs b/osu.Game/Storyboards/StoryboardSample.cs
index 752d086993..5d6ce215f5 100644
--- a/osu.Game/Storyboards/StoryboardSample.cs
+++ b/osu.Game/Storyboards/StoryboardSample.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Framework.Graphics;
 using osu.Game.Audio;
diff --git a/osu.Game/Storyboards/StoryboardVideo.cs b/osu.Game/Storyboards/StoryboardVideo.cs
index 04ff941397..4652e45852 100644
--- a/osu.Game/Storyboards/StoryboardVideo.cs
+++ b/osu.Game/Storyboards/StoryboardVideo.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Game.Storyboards.Drawables;
 
diff --git a/osu.Game/Storyboards/StoryboardVideoLayer.cs b/osu.Game/Storyboards/StoryboardVideoLayer.cs
index f08c02cfd2..f780604029 100644
--- a/osu.Game/Storyboards/StoryboardVideoLayer.cs
+++ b/osu.Game/Storyboards/StoryboardVideoLayer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Game.Storyboards.Drawables;
 using osuTK;
diff --git a/osu.Game/Tests/Beatmaps/LegacyModConversionTest.cs b/osu.Game/Tests/Beatmaps/LegacyModConversionTest.cs
index 921a039065..b7803f3420 100644
--- a/osu.Game/Tests/Beatmaps/LegacyModConversionTest.cs
+++ b/osu.Game/Tests/Beatmaps/LegacyModConversionTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Linq;
 using NUnit.Framework;
diff --git a/osu.Game/Tests/Beatmaps/TestBeatmap.cs b/osu.Game/Tests/Beatmaps/TestBeatmap.cs
index 1aa99ceed9..ff670e1232 100644
--- a/osu.Game/Tests/Beatmaps/TestBeatmap.cs
+++ b/osu.Game/Tests/Beatmaps/TestBeatmap.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Diagnostics;
 using System.IO;
diff --git a/osu.Game/Tests/CleanRunHeadlessGameHost.cs b/osu.Game/Tests/CleanRunHeadlessGameHost.cs
index 02d67de5a5..f3c69201e2 100644
--- a/osu.Game/Tests/CleanRunHeadlessGameHost.cs
+++ b/osu.Game/Tests/CleanRunHeadlessGameHost.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Runtime.CompilerServices;
 using osu.Framework;
diff --git a/osu.Game/Tests/OsuTestBrowser.cs b/osu.Game/Tests/OsuTestBrowser.cs
index 689eae336e..0bc51a0c1e 100644
--- a/osu.Game/Tests/OsuTestBrowser.cs
+++ b/osu.Game/Tests/OsuTestBrowser.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Platform;
 using osu.Framework.Screens;
diff --git a/osu.Game/Tests/Visual/DependencyProvidingContainer.cs b/osu.Game/Tests/Visual/DependencyProvidingContainer.cs
index acfff4cefe..000509598d 100644
--- a/osu.Game/Tests/Visual/DependencyProvidingContainer.cs
+++ b/osu.Game/Tests/Visual/DependencyProvidingContainer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game/Tests/Visual/ModPerfectTestScene.cs b/osu.Game/Tests/Visual/ModPerfectTestScene.cs
index 167d5450e9..164faa16aa 100644
--- a/osu.Game/Tests/Visual/ModPerfectTestScene.cs
+++ b/osu.Game/Tests/Visual/ModPerfectTestScene.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
diff --git a/osu.Game/Tests/Visual/Multiplayer/IMultiplayerTestSceneDependencies.cs b/osu.Game/Tests/Visual/Multiplayer/IMultiplayerTestSceneDependencies.cs
index 0570c4e2f2..efd0b80ebf 100644
--- a/osu.Game/Tests/Visual/Multiplayer/IMultiplayerTestSceneDependencies.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/IMultiplayerTestSceneDependencies.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Screens.OnlinePlay;
 using osu.Game.Tests.Visual.OnlinePlay;
 using osu.Game.Tests.Visual.Spectator;
diff --git a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestSceneDependencies.cs b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestSceneDependencies.cs
index 0f286475bd..88202d4327 100644
--- a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestSceneDependencies.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestSceneDependencies.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Spectator;
 using osu.Game.Screens.OnlinePlay;
diff --git a/osu.Game/Tests/Visual/OnlinePlay/IOnlinePlayTestSceneDependencies.cs b/osu.Game/Tests/Visual/OnlinePlay/IOnlinePlayTestSceneDependencies.cs
index 12d1846ece..3509519113 100644
--- a/osu.Game/Tests/Visual/OnlinePlay/IOnlinePlayTestSceneDependencies.cs
+++ b/osu.Game/Tests/Visual/OnlinePlay/IOnlinePlayTestSceneDependencies.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Bindables;
 using osu.Game.Database;
 using osu.Game.Online.Rooms;
diff --git a/osu.Game/Tests/Visual/OnlinePlay/OnlinePlayTestSceneDependencies.cs b/osu.Game/Tests/Visual/OnlinePlay/OnlinePlayTestSceneDependencies.cs
index a9acbdcd7e..975423d19b 100644
--- a/osu.Game/Tests/Visual/OnlinePlay/OnlinePlayTestSceneDependencies.cs
+++ b/osu.Game/Tests/Visual/OnlinePlay/OnlinePlayTestSceneDependencies.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
diff --git a/osu.Game/Tests/Visual/OsuGridTestScene.cs b/osu.Game/Tests/Visual/OsuGridTestScene.cs
index 9ef3b2a59d..6ee5593a69 100644
--- a/osu.Game/Tests/Visual/OsuGridTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuGridTestScene.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs b/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
index a5e0bddc6b..16496ff320 100644
--- a/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game/Tests/Visual/ScreenTestScene.cs b/osu.Game/Tests/Visual/ScreenTestScene.cs
index 7d382ca1bc..3cca1e59cc 100644
--- a/osu.Game/Tests/Visual/ScreenTestScene.cs
+++ b/osu.Game/Tests/Visual/ScreenTestScene.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
diff --git a/osu.Game/Tests/Visual/TestReplayPlayer.cs b/osu.Game/Tests/Visual/TestReplayPlayer.cs
index bc6dc9bb27..0c9b466152 100644
--- a/osu.Game/Tests/Visual/TestReplayPlayer.cs
+++ b/osu.Game/Tests/Visual/TestReplayPlayer.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Bindables;
diff --git a/osu.Game/Tests/VisualTestRunner.cs b/osu.Game/Tests/VisualTestRunner.cs
index c8279b9e3c..e04c71d193 100644
--- a/osu.Game/Tests/VisualTestRunner.cs
+++ b/osu.Game/Tests/VisualTestRunner.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework;
 using osu.Framework.Platform;
diff --git a/osu.Game/Users/CountryStatistics.cs b/osu.Game/Users/CountryStatistics.cs
index 03d455bc04..921d60bb44 100644
--- a/osu.Game/Users/CountryStatistics.cs
+++ b/osu.Game/Users/CountryStatistics.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using Newtonsoft.Json;
 
 namespace osu.Game.Users
diff --git a/osu.Game/Users/Drawables/DrawableFlag.cs b/osu.Game/Users/Drawables/DrawableFlag.cs
index 929a29251d..289f68ee7f 100644
--- a/osu.Game/Users/Drawables/DrawableFlag.cs
+++ b/osu.Game/Users/Drawables/DrawableFlag.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions;
diff --git a/osu.Game/Users/UserActivity.cs b/osu.Game/Users/UserActivity.cs
index 0b11d12c46..1761282e2e 100644
--- a/osu.Game/Users/UserActivity.cs
+++ b/osu.Game/Users/UserActivity.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Online.Rooms;
diff --git a/osu.Game/Users/UserBrickPanel.cs b/osu.Game/Users/UserBrickPanel.cs
index 69b390b36e..b92c9a9afd 100644
--- a/osu.Game/Users/UserBrickPanel.cs
+++ b/osu.Game/Users/UserBrickPanel.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Users/UserGridPanel.cs b/osu.Game/Users/UserGridPanel.cs
index 90b6c11f0e..f4ec1475b1 100644
--- a/osu.Game/Users/UserGridPanel.cs
+++ b/osu.Game/Users/UserGridPanel.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game/Users/UserListPanel.cs b/osu.Game/Users/UserListPanel.cs
index 3047e70a1a..4942cc7512 100644
--- a/osu.Game/Users/UserListPanel.cs
+++ b/osu.Game/Users/UserListPanel.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Colour;
diff --git a/osu.Game/Users/UserStatus.cs b/osu.Game/Users/UserStatus.cs
index 075463c1e0..ffd86b78c7 100644
--- a/osu.Game/Users/UserStatus.cs
+++ b/osu.Game/Users/UserStatus.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Localisation;
 using osuTK.Graphics;
 using osu.Game.Graphics;
diff --git a/osu.Game/Utils/LimitedCapacityQueue.cs b/osu.Game/Utils/LimitedCapacityQueue.cs
index 86a106a678..d36aa8af2c 100644
--- a/osu.Game/Utils/LimitedCapacityQueue.cs
+++ b/osu.Game/Utils/LimitedCapacityQueue.cs
@@ -1,8 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections;
 using System.Collections.Generic;
diff --git a/osu.iOS/OsuGameIOS.cs b/osu.iOS/OsuGameIOS.cs
index c49e6907ff..502f302157 100644
--- a/osu.iOS/OsuGameIOS.cs
+++ b/osu.iOS/OsuGameIOS.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using Foundation;
 using Microsoft.Maui.Devices;

From 06565871d684549769ed28b30742f5eed609ea8f Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Sat, 24 Jun 2023 01:03:18 +0900
Subject: [PATCH 0998/1604] Add flag to disable computing legacy scoring values

---
 .../Difficulty/CatchDifficultyCalculator.cs     | 17 +++++++++++------
 .../Difficulty/ManiaDifficultyCalculator.cs     | 13 +++++++++----
 .../Difficulty/OsuDifficultyCalculator.cs       | 17 +++++++++++------
 .../Difficulty/TaikoDifficultyCalculator.cs     | 17 +++++++++++------
 .../Rulesets/Difficulty/DifficultyCalculator.cs |  7 +++++++
 5 files changed, 49 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
index 36af9fb980..a44aaf6dfa 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
@@ -41,18 +41,23 @@ namespace osu.Game.Rulesets.Catch.Difficulty
             // this is the same as osu!, so there's potential to share the implementation... maybe
             double preempt = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.ApproachRate, 1800, 1200, 450) / clockRate;
 
-            CatchScoreV1Processor sv1Processor = new CatchScoreV1Processor(workingBeatmap.Beatmap, beatmap, mods);
-
-            return new CatchDifficultyAttributes
+            CatchDifficultyAttributes attributes = new CatchDifficultyAttributes
             {
                 StarRating = Math.Sqrt(skills[0].DifficultyValue()) * star_scaling_factor,
                 Mods = mods,
                 ApproachRate = preempt > 1200.0 ? -(preempt - 1800.0) / 120.0 : -(preempt - 1200.0) / 150.0 + 5.0,
                 MaxCombo = beatmap.HitObjects.Count(h => h is Fruit) + beatmap.HitObjects.OfType<JuiceStream>().SelectMany(j => j.NestedHitObjects).Count(h => !(h is TinyDroplet)),
-                LegacyAccuracyScore = sv1Processor.AccuracyScore,
-                LegacyComboScore = sv1Processor.ComboScore,
-                LegacyBonusScoreRatio = sv1Processor.BonusScoreRatio
             };
+
+            if (ComputeLegacyScoringValues)
+            {
+                CatchScoreV1Processor sv1Processor = new CatchScoreV1Processor(workingBeatmap.Beatmap, beatmap, mods);
+                attributes.LegacyAccuracyScore = sv1Processor.AccuracyScore;
+                attributes.LegacyComboScore = sv1Processor.ComboScore;
+                attributes.LegacyBonusScoreRatio = sv1Processor.BonusScoreRatio;
+            }
+
+            return attributes;
         }
 
         protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, double clockRate)
diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
index d1058a9f8c..675f6099e2 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
@@ -48,9 +48,7 @@ namespace osu.Game.Rulesets.Mania.Difficulty
             HitWindows hitWindows = new ManiaHitWindows();
             hitWindows.SetDifficulty(beatmap.Difficulty.OverallDifficulty);
 
-            ManiaScoreV1Processor sv1Processor = new ManiaScoreV1Processor(mods);
-
-            return new ManiaDifficultyAttributes
+            ManiaDifficultyAttributes attributes = new ManiaDifficultyAttributes
             {
                 StarRating = skills[0].DifficultyValue() * star_scaling_factor,
                 Mods = mods,
@@ -58,8 +56,15 @@ namespace osu.Game.Rulesets.Mania.Difficulty
                 // This is done the way it is to introduce fractional differences in order to match osu-stable for the time being.
                 GreatHitWindow = Math.Ceiling((int)(getHitWindow300(mods) * clockRate) / clockRate),
                 MaxCombo = beatmap.HitObjects.Sum(maxComboForObject),
-                LegacyComboScore = sv1Processor.TotalScore
             };
+
+            if (ComputeLegacyScoringValues)
+            {
+                ManiaScoreV1Processor sv1Processor = new ManiaScoreV1Processor(mods);
+                attributes.LegacyComboScore = sv1Processor.TotalScore;
+            }
+
+            return attributes;
         }
 
         private static int maxComboForObject(HitObject hitObject)
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
index 5d6ed4792d..5158ea8a16 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
@@ -91,9 +91,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
             double hitWindowGreat = hitWindows.WindowFor(HitResult.Great) / clockRate;
 
-            OsuScoreV1Processor sv1Processor = new OsuScoreV1Processor(workingBeatmap.Beatmap, beatmap, mods);
-
-            return new OsuDifficultyAttributes
+            OsuDifficultyAttributes attributes = new OsuDifficultyAttributes
             {
                 StarRating = starRating,
                 Mods = mods,
@@ -109,10 +107,17 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                 HitCircleCount = hitCirclesCount,
                 SliderCount = sliderCount,
                 SpinnerCount = spinnerCount,
-                LegacyAccuracyScore = sv1Processor.AccuracyScore,
-                LegacyComboScore = sv1Processor.ComboScore,
-                LegacyBonusScoreRatio = sv1Processor.BonusScoreRatio
             };
+
+            if (ComputeLegacyScoringValues)
+            {
+                OsuScoreV1Processor sv1Processor = new OsuScoreV1Processor(workingBeatmap.Beatmap, beatmap, mods);
+                attributes.LegacyAccuracyScore = sv1Processor.AccuracyScore;
+                attributes.LegacyComboScore = sv1Processor.ComboScore;
+                attributes.LegacyBonusScoreRatio = sv1Processor.BonusScoreRatio;
+            }
+
+            return attributes;
         }
 
         protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, double clockRate)
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
index 49222adc89..d2f19e1e67 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
@@ -89,9 +89,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
             HitWindows hitWindows = new TaikoHitWindows();
             hitWindows.SetDifficulty(beatmap.Difficulty.OverallDifficulty);
 
-            TaikoScoreV1Processor sv1Processor = new TaikoScoreV1Processor(workingBeatmap.Beatmap, beatmap, mods);
-
-            return new TaikoDifficultyAttributes
+            TaikoDifficultyAttributes attributes = new TaikoDifficultyAttributes
             {
                 StarRating = starRating,
                 Mods = mods,
@@ -101,10 +99,17 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
                 PeakDifficulty = combinedRating,
                 GreatHitWindow = hitWindows.WindowFor(HitResult.Great) / clockRate,
                 MaxCombo = beatmap.HitObjects.Count(h => h is Hit),
-                LegacyAccuracyScore = sv1Processor.AccuracyScore,
-                LegacyComboScore = sv1Processor.ComboScore,
-                LegacyBonusScoreRatio = sv1Processor.BonusScoreRatio
             };
+
+            if (ComputeLegacyScoringValues)
+            {
+                TaikoScoreV1Processor sv1Processor = new TaikoScoreV1Processor(workingBeatmap.Beatmap, beatmap, mods);
+                attributes.LegacyAccuracyScore = sv1Processor.AccuracyScore;
+                attributes.LegacyComboScore = sv1Processor.ComboScore;
+                attributes.LegacyBonusScoreRatio = sv1Processor.BonusScoreRatio;
+            }
+
+            return attributes;
         }
 
         /// <summary>
diff --git a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
index 00c90bd317..d005bbfc7a 100644
--- a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
+++ b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
@@ -23,6 +23,13 @@ namespace osu.Game.Rulesets.Difficulty
 {
     public abstract class DifficultyCalculator
     {
+        /// <summary>
+        /// Whether legacy scoring values (ScoreV1) should be computed to populate the difficulty attributes
+        /// <see cref="DifficultyAttributes.LegacyAccuracyScore"/>, <see cref="DifficultyAttributes.LegacyComboScore"/>,
+        /// and <see cref="DifficultyAttributes.LegacyBonusScoreRatio"/>.
+        /// </summary>
+        public bool ComputeLegacyScoringValues;
+
         /// <summary>
         /// The beatmap for which difficulty will be calculated.
         /// </summary>

From df5b389629e7992ae4f799ed6dbd79a666473ec0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 24 Jun 2023 00:59:36 +0900
Subject: [PATCH 0999/1604] Manual fixes to reduce warnings to zero

---
 .../ManiaSelectionBlueprintTestScene.cs       |  2 +-
 .../ManiaInputTestScene.cs                    |  3 ++-
 .../Edit/ManiaBlueprintContainer.cs           |  2 +-
 .../Preprocessing/OsuDifficultyHitObject.cs   |  6 +++---
 .../Edit/OsuBlueprintContainer.cs             |  2 +-
 .../Drawables/DrawableStrongNestedHit.cs      |  5 ++---
 .../TestSceneHitObjectSampleAdjustments.cs    |  2 +-
 .../Screens/TestSceneTeamWinScreen.cs         |  2 +-
 .../Components/DrawableTeamTitleWithHeader.cs |  2 +-
 .../Components/DrawableTeamWithPlayers.cs     |  2 +-
 osu.Game.Tournament/Models/LadderInfo.cs      |  2 +-
 .../Gameplay/Components/MatchRoundDisplay.cs  |  4 ++--
 osu.Game/Beatmaps/APIFailTimes.cs             |  4 ++--
 .../UpdateableBeatmapBackgroundSprite.cs      |  2 +-
 .../Beatmaps/Legacy/LegacyControlPointInfo.cs |  3 ---
 osu.Game/Configuration/OsuConfigManager.cs    |  2 +-
 osu.Game/Database/IHasFiles.cs                |  2 --
 .../Graphics/Backgrounds/BeatmapBackground.cs |  2 +-
 osu.Game/Graphics/ErrorTextFlowContainer.cs   |  2 +-
 .../Graphics/UserInterface/DialogButton.cs    |  2 +-
 .../UserInterfaceV2/OsuHSVColourPicker.cs     |  3 +--
 .../UserInterfaceV2/OsuHexColourPicker.cs     |  3 +--
 .../Graphics/UserInterfaceV2/OsuPopover.cs    |  3 +--
 osu.Game/IO/OsuStorage.cs                     |  5 +----
 .../BeatmapListing/BeatmapSearchFilterRow.cs  |  2 --
 .../Overlays/BeatmapSet/Buttons/PlayButton.cs |  2 ++
 .../BeatmapSet/Buttons/PreviewButton.cs       |  2 +-
 .../Overlays/Changelog/ChangelogListing.cs    |  2 +-
 osu.Game/Overlays/FullscreenOverlay.cs        |  2 --
 osu.Game/Overlays/OverlayHeader.cs            |  3 ---
 osu.Game/Overlays/OverlaySidebar.cs           |  2 --
 .../Sections/DebugSettings/GeneralSettings.cs |  2 +-
 .../Sections/DebugSettings/MemorySettings.cs  |  7 ++++---
 .../Sections/Input/RulesetBindingsSection.cs  |  7 +------
 .../StableDirectorySelectScreen.cs            |  2 +-
 osu.Game/Overlays/Settings/SettingsFooter.cs  |  4 ++--
 osu.Game/Overlays/TabControlOverlayHeader.cs  |  3 ---
 .../Toolbar/ToolbarNotificationButton.cs      |  3 +--
 .../Edit/Checks/CheckAudioPresence.cs         |  2 +-
 .../Rulesets/Edit/Checks/CheckAudioQuality.cs |  2 +-
 .../Edit/Checks/CheckBackgroundPresence.cs    |  2 +-
 .../Edit/Checks/CheckBackgroundQuality.cs     |  4 ++--
 .../Edit/DrawableEditorRulesetWrapper.cs      |  3 ++-
 .../Rulesets/Judgements/JudgementResult.cs    |  5 +----
 osu.Game/Rulesets/Objects/HitObjectParser.cs  |  2 +-
 .../Objects/Legacy/ConvertHitObjectParser.cs  |  1 -
 .../Rulesets/UI/IPooledHitObjectProvider.cs   |  4 +---
 osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs | 19 ++++++++-----------
 osu.Game/Screens/BackgroundScreenStack.cs     |  2 +-
 .../HitObjectOrderedSelectionContainer.cs     |  3 ++-
 .../OnlinePlay/Multiplayer/Multiplayer.cs     |  3 ++-
 .../Spectate/MultiSpectatorPlayerLoader.cs    |  3 +--
 .../OnlinePlay/OnlinePlaySubScreenStack.cs    |  7 +++++--
 osu.Game/Screens/OsuScreenStack.cs            |  6 +++---
 osu.Game/Screens/Play/HUD/HealthDisplay.cs    |  3 ++-
 osu.Game/Screens/Play/HUD/ModDisplay.cs       |  4 +---
 .../Screens/Play/HUD/UnstableRateCounter.cs   | 10 ++++++----
 .../Screens/Play/SpectatorResultsScreen.cs    |  3 ++-
 .../Ranking/Statistics/StatisticContainer.cs  |  3 +--
 .../Ranking/Statistics/StatisticItem.cs       |  3 +--
 .../Drawables/DrawableStoryboardSprite.cs     |  3 ++-
 61 files changed, 89 insertions(+), 118 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
index 281dec3c79..80e1b753ea 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
     {
         protected override Container<Drawable> Content => blueprints ?? base.Content;
 
-        private readonly Container blueprints;
+        private readonly Container? blueprints;
 
         [Cached(typeof(Playfield))]
         public Playfield Playfield { get; }
diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs b/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs
index ec249f6ae9..62591ce4ca 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs
@@ -12,7 +12,8 @@ namespace osu.Game.Rulesets.Mania.Tests
 {
     public abstract partial class ManiaInputTestScene : OsuTestScene
     {
-        private readonly Container<Drawable> content;
+        private readonly Container<Drawable>? content;
+
         protected override Container<Drawable> Content => content ?? base.Content;
 
         protected ManiaInputTestScene(int keys)
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs
index fb3e2d494e..d0eb8c1e6e 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Mania.Edit
         {
         }
 
-        public override HitObjectSelectionBlueprint CreateHitObjectBlueprintFor(HitObject hitObject)
+        public override HitObjectSelectionBlueprint? CreateHitObjectBlueprintFor(HitObject hitObject)
         {
             switch (hitObject)
             {
diff --git a/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs b/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
index 5215920ea0..e627c9ad67 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
@@ -82,13 +82,13 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
         /// </summary>
         public double HitWindowGreat { get; private set; }
 
-        private readonly OsuHitObject lastLastObject;
+        private readonly OsuHitObject? lastLastObject;
         private readonly OsuHitObject lastObject;
 
-        public OsuDifficultyHitObject(HitObject hitObject, HitObject lastObject, HitObject lastLastObject, double clockRate, List<DifficultyHitObject> objects, int index)
+        public OsuDifficultyHitObject(HitObject hitObject, HitObject lastObject, HitObject? lastLastObject, double clockRate, List<DifficultyHitObject> objects, int index)
             : base(hitObject, lastObject, clockRate, objects, index)
         {
-            this.lastLastObject = (OsuHitObject)lastLastObject;
+            this.lastLastObject = lastLastObject as OsuHitObject;
             this.lastObject = (OsuHitObject)lastObject;
 
             // Capped to 25ms to prevent difficulty calculation breaking from simultaneous objects.
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs b/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs
index ed149d004c..54c54fca17 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         protected override SelectionHandler<HitObject> CreateSelectionHandler() => new OsuSelectionHandler();
 
-        public override HitObjectSelectionBlueprint CreateHitObjectBlueprintFor(HitObject hitObject)
+        public override HitObjectSelectionBlueprint? CreateHitObjectBlueprintFor(HitObject hitObject)
         {
             switch (hitObject)
             {
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs
index 6ee29fa014..9b410d1871 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using JetBrains.Annotations;
 using osu.Game.Rulesets.Taiko.Judgements;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
@@ -11,9 +10,9 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
     /// </summary>
     public abstract partial class DrawableStrongNestedHit : DrawableTaikoHitObject
     {
-        public new DrawableTaikoHitObject ParentHitObject => (DrawableTaikoHitObject)base.ParentHitObject;
+        public new DrawableTaikoHitObject? ParentHitObject => base.ParentHitObject as DrawableTaikoHitObject;
 
-        protected DrawableStrongNestedHit([CanBeNull] StrongNestedHitObject nestedHit)
+        protected DrawableStrongNestedHit(StrongNestedHitObject? nestedHit)
             : base(nestedHit)
         {
         }
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSampleAdjustments.cs b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSampleAdjustments.cs
index 29de0bff79..1415ff4b0f 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSampleAdjustments.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSampleAdjustments.cs
@@ -358,7 +358,7 @@ namespace osu.Game.Tests.Visual.Editing
             var popover = this.ChildrenOfType<SamplePointPiece.SampleEditPopover>().SingleOrDefault();
             var textBox = popover?.ChildrenOfType<OsuTextBox>().First();
 
-            return textBox?.Current.Value == bank && string.IsNullOrEmpty(textBox?.PlaceholderText.ToString());
+            return textBox?.Current.Value == bank && string.IsNullOrEmpty(textBox.PlaceholderText.ToString());
         });
 
         private void samplePopoverHasIndeterminateBank() => AddUntilStep("sample popover has indeterminate bank", () =>
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs
index 8096988864..2ed87cdcd5 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Tournament.Tests.Screens
         {
             AddStep("set up match", () =>
             {
-                var match = Ladder.CurrentMatch.Value;
+                var match = Ladder.CurrentMatch.Value!;
 
                 match.Round.Value = Ladder.Rounds.FirstOrDefault(g => g.Name.Value == "Finals");
                 match.Completed.Value = true;
diff --git a/osu.Game.Tournament/Components/DrawableTeamTitleWithHeader.cs b/osu.Game.Tournament/Components/DrawableTeamTitleWithHeader.cs
index 59e261a7dd..89f45fc1d3 100644
--- a/osu.Game.Tournament/Components/DrawableTeamTitleWithHeader.cs
+++ b/osu.Game.Tournament/Components/DrawableTeamTitleWithHeader.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Tournament.Components
 {
     public partial class DrawableTeamTitleWithHeader : CompositeDrawable
     {
-        public DrawableTeamTitleWithHeader(TournamentTeam team, TeamColour colour)
+        public DrawableTeamTitleWithHeader(TournamentTeam? team, TeamColour colour)
         {
             AutoSizeAxes = Axes.Both;
 
diff --git a/osu.Game.Tournament/Components/DrawableTeamWithPlayers.cs b/osu.Game.Tournament/Components/DrawableTeamWithPlayers.cs
index 5ebed34e6a..4f0c7d6b72 100644
--- a/osu.Game.Tournament/Components/DrawableTeamWithPlayers.cs
+++ b/osu.Game.Tournament/Components/DrawableTeamWithPlayers.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Tournament.Components
 {
     public partial class DrawableTeamWithPlayers : CompositeDrawable
     {
-        public DrawableTeamWithPlayers(TournamentTeam team, TeamColour colour)
+        public DrawableTeamWithPlayers(TournamentTeam? team, TeamColour colour)
         {
             AutoSizeAxes = Axes.Both;
 
diff --git a/osu.Game.Tournament/Models/LadderInfo.cs b/osu.Game.Tournament/Models/LadderInfo.cs
index b5bc5fd307..3defd517cd 100644
--- a/osu.Game.Tournament/Models/LadderInfo.cs
+++ b/osu.Game.Tournament/Models/LadderInfo.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Tournament.Models
         public List<TournamentProgression> Progressions = new List<TournamentProgression>();
 
         [JsonIgnore] // updated manually in TournamentGameBase
-        public Bindable<TournamentMatch> CurrentMatch = new Bindable<TournamentMatch>();
+        public Bindable<TournamentMatch?> CurrentMatch = new Bindable<TournamentMatch?>();
 
         public Bindable<int> ChromaKeyWidth = new BindableInt(1024)
         {
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/MatchRoundDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/MatchRoundDisplay.cs
index 79de4e465e..bd23317e1f 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/MatchRoundDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/MatchRoundDisplay.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
 {
     public partial class MatchRoundDisplay : TournamentSpriteTextWithBackground
     {
-        private readonly Bindable<TournamentMatch> currentMatch = new Bindable<TournamentMatch>();
+        private readonly Bindable<TournamentMatch?> currentMatch = new Bindable<TournamentMatch?>();
 
         [BackgroundDependencyLoader]
         private void load(LadderInfo ladder)
@@ -19,7 +19,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
             currentMatch.BindTo(ladder.CurrentMatch);
         }
 
-        private void matchChanged(ValueChangedEvent<TournamentMatch> match) =>
+        private void matchChanged(ValueChangedEvent<TournamentMatch?> match) =>
             Text.Text = match.NewValue?.Round.Value?.Name.Value ?? "Unknown Round";
     }
 }
diff --git a/osu.Game/Beatmaps/APIFailTimes.cs b/osu.Game/Beatmaps/APIFailTimes.cs
index 7218906b38..09ab16598d 100644
--- a/osu.Game/Beatmaps/APIFailTimes.cs
+++ b/osu.Game/Beatmaps/APIFailTimes.cs
@@ -15,12 +15,12 @@ namespace osu.Game.Beatmaps
         /// Points of failure on a relative time scale (usually 0..100).
         /// </summary>
         [JsonProperty(@"fail")]
-        public int[] Fails { get; set; } = Array.Empty<int>();
+        public int[]? Fails { get; set; } = Array.Empty<int>();
 
         /// <summary>
         /// Points of retry on a relative time scale (usually 0..100).
         /// </summary>
         [JsonProperty(@"exit")]
-        public int[] Retries { get; set; } = Array.Empty<int>();
+        public int[]? Retries { get; set; } = Array.Empty<int>();
     }
 }
diff --git a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs
index 72f37143d0..67eedf655e 100644
--- a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs
+++ b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Beatmaps.Drawables
             return drawable;
         }
 
-        private Drawable getDrawableForModel(IBeatmapInfo model)
+        private Drawable getDrawableForModel(IBeatmapInfo? model)
         {
             // prefer online cover where available.
             if (model?.BeatmapSet is IBeatmapSetOnlineInfo online)
diff --git a/osu.Game/Beatmaps/Legacy/LegacyControlPointInfo.cs b/osu.Game/Beatmaps/Legacy/LegacyControlPointInfo.cs
index fc80f0db6f..6dda18bc4d 100644
--- a/osu.Game/Beatmaps/Legacy/LegacyControlPointInfo.cs
+++ b/osu.Game/Beatmaps/Legacy/LegacyControlPointInfo.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using JetBrains.Annotations;
 using Newtonsoft.Json;
 using osu.Framework.Lists;
 using osu.Game.Beatmaps.ControlPoints;
@@ -24,7 +23,6 @@ namespace osu.Game.Beatmaps.Legacy
         /// </summary>
         /// <param name="time">The time to find the sound control point at.</param>
         /// <returns>The sound control point.</returns>
-        [NotNull]
         public SampleControlPoint SamplePointAt(double time) => BinarySearchWithFallback(SamplePoints, time, SamplePoints.Count > 0 ? SamplePoints[0] : SampleControlPoint.DEFAULT);
 
         /// <summary>
@@ -40,7 +38,6 @@ namespace osu.Game.Beatmaps.Legacy
         /// </summary>
         /// <param name="time">The time to find the difficulty control point at.</param>
         /// <returns>The difficulty control point.</returns>
-        [NotNull]
         public DifficultyControlPoint DifficultyPointAt(double time) => BinarySearchWithFallback(DifficultyPoints, time, DifficultyControlPoint.DEFAULT);
 
         public override void Clear()
diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 309a5818ae..ba555a7926 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -257,7 +257,7 @@ namespace osu.Game.Configuration
                     string skinName = string.Empty;
 
                     if (Guid.TryParse(skin, out var id))
-                        skinName = LookupSkinName(id) ?? string.Empty;
+                        skinName = LookupSkinName(id);
 
                     return new SettingDescription(
                         rawValue: skinName,
diff --git a/osu.Game/Database/IHasFiles.cs b/osu.Game/Database/IHasFiles.cs
index 3f6531832f..d64ac9b662 100644
--- a/osu.Game/Database/IHasFiles.cs
+++ b/osu.Game/Database/IHasFiles.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using JetBrains.Annotations;
 
 namespace osu.Game.Database
 {
@@ -13,7 +12,6 @@ namespace osu.Game.Database
     public interface IHasFiles<TFile>
         where TFile : INamedFileInfo
     {
-        [NotNull]
         List<TFile> Files { get; }
 
         string Hash { get; set; }
diff --git a/osu.Game/Graphics/Backgrounds/BeatmapBackground.cs b/osu.Game/Graphics/Backgrounds/BeatmapBackground.cs
index beb7c5a4df..b8de0f7f1e 100644
--- a/osu.Game/Graphics/Backgrounds/BeatmapBackground.cs
+++ b/osu.Game/Graphics/Backgrounds/BeatmapBackground.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Graphics.Backgrounds
         [BackgroundDependencyLoader]
         private void load(LargeTextureStore textures)
         {
-            Sprite.Texture = Beatmap?.GetBackground() ?? textures.Get(fallbackTextureName);
+            Sprite.Texture = Beatmap.GetBackground() ?? textures.Get(fallbackTextureName);
         }
 
         public override bool Equals(Background other)
diff --git a/osu.Game/Graphics/ErrorTextFlowContainer.cs b/osu.Game/Graphics/ErrorTextFlowContainer.cs
index 7386baf83f..40c7580647 100644
--- a/osu.Game/Graphics/ErrorTextFlowContainer.cs
+++ b/osu.Game/Graphics/ErrorTextFlowContainer.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Graphics
                 RemovePart(textPart);
         }
 
-        public void AddErrors(string[] errors)
+        public void AddErrors(string[]? errors)
         {
             ClearErrors();
 
diff --git a/osu.Game/Graphics/UserInterface/DialogButton.cs b/osu.Game/Graphics/UserInterface/DialogButton.cs
index 06ebe48850..db81bc991d 100644
--- a/osu.Game/Graphics/UserInterface/DialogButton.cs
+++ b/osu.Game/Graphics/UserInterface/DialogButton.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Graphics.UserInterface
         private const float hover_duration = 500;
         private const float click_duration = 200;
 
-        public event Action<SelectionState> StateChanged;
+        public event Action<SelectionState>? StateChanged;
 
         private SelectionState state;
 
diff --git a/osu.Game/Graphics/UserInterfaceV2/OsuHSVColourPicker.cs b/osu.Game/Graphics/UserInterfaceV2/OsuHSVColourPicker.cs
index 75ff1e5665..63bad283a8 100644
--- a/osu.Game/Graphics/UserInterfaceV2/OsuHSVColourPicker.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/OsuHSVColourPicker.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -24,7 +23,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
         protected override SaturationValueSelector CreateSaturationValueSelector() => new OsuSaturationValueSelector();
 
         [BackgroundDependencyLoader(true)]
-        private void load([CanBeNull] OverlayColourProvider colourProvider, OsuColour osuColour)
+        private void load(OverlayColourProvider? colourProvider, OsuColour osuColour)
         {
             Background.Colour = colourProvider?.Dark5 ?? osuColour.GreySeaFoamDark;
 
diff --git a/osu.Game/Graphics/UserInterfaceV2/OsuHexColourPicker.cs b/osu.Game/Graphics/UserInterfaceV2/OsuHexColourPicker.cs
index 6633ba0eb2..3621ca165f 100644
--- a/osu.Game/Graphics/UserInterfaceV2/OsuHexColourPicker.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/OsuHexColourPicker.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -21,7 +20,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load([CanBeNull] OverlayColourProvider overlayColourProvider, OsuColour osuColour)
+        private void load(OverlayColourProvider? overlayColourProvider, OsuColour osuColour)
         {
             Background.Colour = overlayColourProvider?.Dark6 ?? osuColour.GreySeaFoamDarker;
         }
diff --git a/osu.Game/Graphics/UserInterfaceV2/OsuPopover.cs b/osu.Game/Graphics/UserInterfaceV2/OsuPopover.cs
index 9153d5253d..00e5b8838c 100644
--- a/osu.Game/Graphics/UserInterfaceV2/OsuPopover.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/OsuPopover.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
@@ -39,7 +38,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load([CanBeNull] OverlayColourProvider colourProvider, OsuColour colours)
+        private void load(OverlayColourProvider? colourProvider, OsuColour colours)
         {
             Background.Colour = Arrow.Colour = colourProvider?.Background4 ?? colours.GreySeaFoamDarker;
         }
diff --git a/osu.Game/IO/OsuStorage.cs b/osu.Game/IO/OsuStorage.cs
index a2b89b6d97..a936fa74da 100644
--- a/osu.Game/IO/OsuStorage.cs
+++ b/osu.Game/IO/OsuStorage.cs
@@ -3,7 +3,6 @@
 
 using System.Diagnostics;
 using System.Linq;
-using JetBrains.Annotations;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Configuration;
@@ -20,13 +19,11 @@ namespace osu.Game.IO
         /// <summary>
         /// The custom storage path as selected by the user.
         /// </summary>
-        [CanBeNull]
-        public string CustomStoragePath => storageConfig.Get<string>(StorageConfig.FullPath);
+        public string? CustomStoragePath => storageConfig.Get<string>(StorageConfig.FullPath);
 
         /// <summary>
         /// The default storage path to be used if a custom storage path hasn't been selected or is not accessible.
         /// </summary>
-        [NotNull]
         public string DefaultStoragePath => defaultStorage.GetFullPath(".");
 
         private readonly GameHost host;
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
index 608ecbb6f3..6d75521cb0 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -64,7 +63,6 @@ namespace osu.Game.Overlays.BeatmapListing
                 Current = filterWithValue.Current;
         }
 
-        [NotNull]
         protected virtual Drawable CreateFilter() => new BeatmapSearchFilter();
 
         protected partial class BeatmapSearchFilter : TabControl<T>
diff --git a/osu.Game/Overlays/BeatmapSet/Buttons/PlayButton.cs b/osu.Game/Overlays/BeatmapSet/Buttons/PlayButton.cs
index c43be33290..5f9cdf5065 100644
--- a/osu.Game/Overlays/BeatmapSet/Buttons/PlayButton.cs
+++ b/osu.Game/Overlays/BeatmapSet/Buttons/PlayButton.cs
@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -24,6 +25,7 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
 
         private readonly BindableBool playing = new BindableBool();
 
+        [CanBeNull]
         public PreviewTrack Preview { get; private set; }
 
         private APIBeatmapSet beatmapSet;
diff --git a/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs b/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs
index 62a8bf80d3..2254514a44 100644
--- a/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs
+++ b/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
         private readonly Box background, progress;
         private readonly PlayButton playButton;
 
-        private PreviewTrack preview => playButton.Preview;
+        private PreviewTrack? preview => playButton.Preview;
 
         public IBindable<bool> Playing => playButton.Playing;
 
diff --git a/osu.Game/Overlays/Changelog/ChangelogListing.cs b/osu.Game/Overlays/Changelog/ChangelogListing.cs
index 3a648f66cf..c4320dcbd0 100644
--- a/osu.Game/Overlays/Changelog/ChangelogListing.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogListing.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Overlays.Changelog
 {
     public partial class ChangelogListing : ChangelogContent
     {
-        private readonly List<APIChangelogBuild> entries;
+        private readonly List<APIChangelogBuild>? entries;
 
         public ChangelogListing(List<APIChangelogBuild> entries)
         {
diff --git a/osu.Game/Overlays/FullscreenOverlay.cs b/osu.Game/Overlays/FullscreenOverlay.cs
index b58a3b929b..7ae5167081 100644
--- a/osu.Game/Overlays/FullscreenOverlay.cs
+++ b/osu.Game/Overlays/FullscreenOverlay.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -81,7 +80,6 @@ namespace osu.Game.Overlays
             Waves.FourthWaveColour = ColourProvider.Dark3;
         }
 
-        [NotNull]
         protected abstract T CreateHeader();
 
         public override void Show()
diff --git a/osu.Game/Overlays/OverlayHeader.cs b/osu.Game/Overlays/OverlayHeader.cs
index 827a7749af..3d71b7d5ae 100644
--- a/osu.Game/Overlays/OverlayHeader.cs
+++ b/osu.Game/Overlays/OverlayHeader.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -96,10 +95,8 @@ namespace osu.Game.Overlays
             titleBackground.Colour = colourProvider.Dark5;
         }
 
-        [NotNull]
         protected virtual Drawable CreateContent() => Empty();
 
-        [NotNull]
         protected virtual Drawable CreateBackground() => Empty();
 
         protected abstract OverlayTitle CreateTitle();
diff --git a/osu.Game/Overlays/OverlaySidebar.cs b/osu.Game/Overlays/OverlaySidebar.cs
index b08a9d08a4..f1bdfbddac 100644
--- a/osu.Game/Overlays/OverlaySidebar.cs
+++ b/osu.Game/Overlays/OverlaySidebar.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -71,7 +70,6 @@ namespace osu.Game.Overlays
             scrollbarBackground.Colour = colourProvider.Background3;
         }
 
-        [NotNull]
         protected virtual Drawable CreateContent() => Empty();
 
         private partial class SidebarScrollContainer : OsuScrollContainer
diff --git a/osu.Game/Overlays/Settings/Sections/DebugSettings/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/DebugSettings/GeneralSettings.cs
index 1044810bdc..01408ca087 100644
--- a/osu.Game/Overlays/Settings/Sections/DebugSettings/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/DebugSettings/GeneralSettings.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Overlays.Settings.Sections.DebugSettings
         protected override LocalisableString Header => DebugSettingsStrings.GeneralHeader;
 
         [BackgroundDependencyLoader(true)]
-        private void load(FrameworkDebugConfigManager config, FrameworkConfigManager frameworkConfig, IPerformFromScreenRunner performer)
+        private void load(FrameworkDebugConfigManager config, FrameworkConfigManager frameworkConfig, IPerformFromScreenRunner? performer)
         {
             Children = new Drawable[]
             {
diff --git a/osu.Game/Overlays/Settings/Sections/DebugSettings/MemorySettings.cs b/osu.Game/Overlays/Settings/Sections/DebugSettings/MemorySettings.cs
index 0d2d163859..d5de7ae2db 100644
--- a/osu.Game/Overlays/Settings/Sections/DebugSettings/MemorySettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/DebugSettings/MemorySettings.cs
@@ -5,6 +5,7 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
 using osu.Framework.Logging;
@@ -56,7 +57,7 @@ namespace osu.Game.Overlays.Settings.Sections.DebugSettings
             {
                 try
                 {
-                    var token = realm.BlockAllOperations("maintenance");
+                    IDisposable? token = realm.BlockAllOperations("maintenance");
 
                     blockAction.Enabled.Value = false;
 
@@ -73,10 +74,10 @@ namespace osu.Game.Overlays.Settings.Sections.DebugSettings
 
                     void unblock()
                     {
-                        if (token == null)
+                        if (token.IsNull())
                             return;
 
-                        token?.Dispose();
+                        token.Dispose();
                         token = null;
 
                         Scheduler.Add(() =>
diff --git a/osu.Game/Overlays/Settings/Sections/Input/RulesetBindingsSection.cs b/osu.Game/Overlays/Settings/Sections/Input/RulesetBindingsSection.cs
index 0ed7de9d3f..3b5002b423 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/RulesetBindingsSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/RulesetBindingsSection.cs
@@ -2,19 +2,14 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
-using osu.Game.Graphics;
 using osu.Game.Rulesets;
 
 namespace osu.Game.Overlays.Settings.Sections.Input
 {
     public partial class RulesetBindingsSection : SettingsSection
     {
-        public override Drawable CreateIcon() => ruleset?.CreateInstance().CreateIcon() ?? new SpriteIcon
-        {
-            Icon = OsuIcon.Hot
-        };
+        public override Drawable CreateIcon() => ruleset.CreateInstance().CreateIcon();
 
         public override LocalisableString Header => ruleset.Name;
 
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
index 1f62077f20..1b935b0cec 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 
         protected override OverlayActivation InitialOverlayActivationMode => OverlayActivation.Disabled;
 
-        protected override bool IsValidDirectory(DirectoryInfo info) => info?.GetFiles("osu!.*.cfg").Any() ?? false;
+        protected override bool IsValidDirectory(DirectoryInfo? info) => info?.GetFiles("osu!.*.cfg").Any() ?? false;
 
         public override LocalisableString HeaderText => "Please select your osu!stable install location";
 
diff --git a/osu.Game/Overlays/Settings/SettingsFooter.cs b/osu.Game/Overlays/Settings/SettingsFooter.cs
index ffb955f3bd..4e9d4c0d28 100644
--- a/osu.Game/Overlays/Settings/SettingsFooter.cs
+++ b/osu.Game/Overlays/Settings/SettingsFooter.cs
@@ -92,8 +92,8 @@ namespace osu.Game.Overlays.Settings
                 Height = 20;
             }
 
-            [BackgroundDependencyLoader(true)]
-            private void load(ChangelogOverlay changelog)
+            [BackgroundDependencyLoader]
+            private void load(ChangelogOverlay? changelog)
             {
                 Action = () => changelog?.ShowBuild(OsuGameBase.CLIENT_STREAM_NAME, version);
 
diff --git a/osu.Game/Overlays/TabControlOverlayHeader.cs b/osu.Game/Overlays/TabControlOverlayHeader.cs
index edfe38b2da..3875f18152 100644
--- a/osu.Game/Overlays/TabControlOverlayHeader.cs
+++ b/osu.Game/Overlays/TabControlOverlayHeader.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
@@ -83,13 +82,11 @@ namespace osu.Game.Overlays
             controlBackground.Colour = colourProvider.Dark4;
         }
 
-        [NotNull]
         protected virtual OsuTabControl<T> CreateTabControl() => new OverlayHeaderTabControl();
 
         /// <summary>
         /// Creates a <see cref="Drawable"/> on the opposite side of the <see cref="OsuTabControl{T}"/>. Used mostly to create <see cref="OverlayRulesetSelector"/>.
         /// </summary>
-        [NotNull]
         protected virtual Drawable CreateTabControlContent() => Empty();
 
         public partial class OverlayHeaderTabControl : OverlayTabControl<T>
diff --git a/osu.Game/Overlays/Toolbar/ToolbarNotificationButton.cs b/osu.Game/Overlays/Toolbar/ToolbarNotificationButton.cs
index 1871371750..9971871229 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarNotificationButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarNotificationButton.cs
@@ -41,8 +41,7 @@ namespace osu.Game.Overlays.Toolbar
         {
             StateContainer = notificationOverlay as NotificationOverlay;
 
-            if (notificationOverlay != null)
-                NotificationCount.BindTo(notificationOverlay.UnreadCount);
+            NotificationCount.BindTo(notificationOverlay.UnreadCount);
 
             NotificationCount.ValueChanged += count =>
             {
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckAudioPresence.cs b/osu.Game/Rulesets/Edit/Checks/CheckAudioPresence.cs
index e922ddf023..416a0d5897 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckAudioPresence.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckAudioPresence.cs
@@ -10,6 +10,6 @@ namespace osu.Game.Rulesets.Edit.Checks
     {
         protected override CheckCategory Category => CheckCategory.Audio;
         protected override string TypeOfFile => "audio";
-        protected override string? GetFilename(IBeatmap beatmap) => beatmap.Metadata?.AudioFile;
+        protected override string GetFilename(IBeatmap beatmap) => beatmap.Metadata.AudioFile;
     }
 }
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs b/osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs
index daa33fb0da..440d4e8e62 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Edit.Checks
 
         public IEnumerable<Issue> Run(BeatmapVerifierContext context)
         {
-            string? audioFile = context.Beatmap.Metadata?.AudioFile;
+            string audioFile = context.Beatmap.Metadata.AudioFile;
             if (string.IsNullOrEmpty(audioFile))
                 yield break;
 
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundPresence.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundPresence.cs
index 4ca93a9807..04cbba1e8c 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundPresence.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundPresence.cs
@@ -10,6 +10,6 @@ namespace osu.Game.Rulesets.Edit.Checks
     {
         protected override CheckCategory Category => CheckCategory.Resources;
         protected override string TypeOfFile => "background";
-        protected override string? GetFilename(IBeatmap beatmap) => beatmap.Metadata?.BackgroundFile;
+        protected override string GetFilename(IBeatmap beatmap) => beatmap.Metadata.BackgroundFile;
     }
 }
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
index 8c3a5c026d..5008c13d9a 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
@@ -33,8 +33,8 @@ namespace osu.Game.Rulesets.Edit.Checks
 
         public IEnumerable<Issue> Run(BeatmapVerifierContext context)
         {
-            string? backgroundFile = context.Beatmap.Metadata?.BackgroundFile;
-            if (backgroundFile == null)
+            string backgroundFile = context.Beatmap.Metadata.BackgroundFile;
+            if (string.IsNullOrEmpty(backgroundFile))
                 yield break;
 
             var texture = context.WorkingBeatmap.GetBackground();
diff --git a/osu.Game/Rulesets/Edit/DrawableEditorRulesetWrapper.cs b/osu.Game/Rulesets/Edit/DrawableEditorRulesetWrapper.cs
index 324f2068e9..174b278d89 100644
--- a/osu.Game/Rulesets/Edit/DrawableEditorRulesetWrapper.cs
+++ b/osu.Game/Rulesets/Edit/DrawableEditorRulesetWrapper.cs
@@ -3,6 +3,7 @@
 
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Mods;
@@ -92,7 +93,7 @@ namespace osu.Game.Rulesets.Edit
         {
             base.Dispose(isDisposing);
 
-            if (beatmap != null)
+            if (beatmap.IsNotNull())
             {
                 beatmap.HitObjectAdded -= addHitObject;
                 beatmap.HitObjectRemoved -= removeHitObject;
diff --git a/osu.Game/Rulesets/Judgements/JudgementResult.cs b/osu.Game/Rulesets/Judgements/JudgementResult.cs
index f001a4cd92..c67f8b9fd5 100644
--- a/osu.Game/Rulesets/Judgements/JudgementResult.cs
+++ b/osu.Game/Rulesets/Judgements/JudgementResult.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using JetBrains.Annotations;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
@@ -22,13 +21,11 @@ namespace osu.Game.Rulesets.Judgements
         /// <summary>
         /// The <see cref="HitObject"/> which was judged.
         /// </summary>
-        [NotNull]
         public readonly HitObject HitObject;
 
         /// <summary>
         /// The <see cref="Judgement"/> which this <see cref="JudgementResult"/> applies for.
         /// </summary>
-        [NotNull]
         public readonly Judgement Judgement;
 
         /// <summary>
@@ -97,7 +94,7 @@ namespace osu.Game.Rulesets.Judgements
         /// </summary>
         /// <param name="hitObject">The <see cref="HitObject"/> which was judged.</param>
         /// <param name="judgement">The <see cref="Judgement"/> to refer to for scoring information.</param>
-        public JudgementResult([NotNull] HitObject hitObject, [NotNull] Judgement judgement)
+        public JudgementResult(HitObject hitObject, Judgement judgement)
         {
             HitObject = hitObject;
             Judgement = judgement;
diff --git a/osu.Game/Rulesets/Objects/HitObjectParser.cs b/osu.Game/Rulesets/Objects/HitObjectParser.cs
index d3c29d90ce..c6e250bd74 100644
--- a/osu.Game/Rulesets/Objects/HitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/HitObjectParser.cs
@@ -5,6 +5,6 @@ namespace osu.Game.Rulesets.Objects
 {
     public abstract class HitObjectParser
     {
-        public abstract HitObject Parse(string text);
+        public abstract HitObject? Parse(string text);
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index 8eda2a8f61..3dbe7b6519 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -44,7 +44,6 @@ namespace osu.Game.Rulesets.Objects.Legacy
             FormatVersion = formatVersion;
         }
 
-        [CanBeNull]
         public override HitObject Parse(string text)
         {
             string[] split = text.Split(',');
diff --git a/osu.Game/Rulesets/UI/IPooledHitObjectProvider.cs b/osu.Game/Rulesets/UI/IPooledHitObjectProvider.cs
index f5739ee525..01c8e6d1da 100644
--- a/osu.Game/Rulesets/UI/IPooledHitObjectProvider.cs
+++ b/osu.Game/Rulesets/UI/IPooledHitObjectProvider.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using JetBrains.Annotations;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 
@@ -15,7 +14,6 @@ namespace osu.Game.Rulesets.UI
         /// <param name="hitObject">The <see cref="HitObject"/> to retrieve the <see cref="DrawableHitObject"/> representation of.</param>
         /// <param name="parent">The parenting <see cref="DrawableHitObject"/>, if any.</param>
         /// <returns>The <see cref="DrawableHitObject"/> representing <see cref="HitObject"/>, or <c>null</c> if no poolable representation exists.</returns>
-        [CanBeNull]
-        DrawableHitObject GetPooledDrawableRepresentation([NotNull] HitObject hitObject, [CanBeNull] DrawableHitObject parent);
+        DrawableHitObject? GetPooledDrawableRepresentation(HitObject hitObject, DrawableHitObject? parent);
     }
 }
diff --git a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
index 87e1e79f87..2a54ef16c6 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
@@ -126,19 +126,16 @@ namespace osu.Game.Scoring.Legacy
                 // As this is baked into hitobject timing (see `LegacyBeatmapDecoder`) we also need to apply this to replay frame timing.
                 double offset = beatmap?.BeatmapInfo.BeatmapVersion < 5 ? -LegacyBeatmapDecoder.EARLY_VERSION_TIMING_OFFSET : 0;
 
-                if (score.Replay != null)
+                int lastTime = 0;
+
+                foreach (var f in score.Replay.Frames)
                 {
-                    int lastTime = 0;
+                    var legacyFrame = getLegacyFrame(f);
 
-                    foreach (var f in score.Replay.Frames)
-                    {
-                        var legacyFrame = getLegacyFrame(f);
-
-                        // Rounding because stable could only parse integral values
-                        int time = (int)Math.Round(legacyFrame.Time + offset);
-                        replayData.Append(FormattableString.Invariant($"{time - lastTime}|{legacyFrame.MouseX ?? 0}|{legacyFrame.MouseY ?? 0}|{(int)legacyFrame.ButtonState},"));
-                        lastTime = time;
-                    }
+                    // Rounding because stable could only parse integral values
+                    int time = (int)Math.Round(legacyFrame.Time + offset);
+                    replayData.Append(FormattableString.Invariant($"{time - lastTime}|{legacyFrame.MouseX ?? 0}|{legacyFrame.MouseY ?? 0}|{(int)legacyFrame.ButtonState},"));
+                    lastTime = time;
                 }
 
                 // Warning: this is purposefully hardcoded as a string rather than interpolating, as in some cultures the minus sign is not encoded as the standard ASCII U+00C2 codepoint,
diff --git a/osu.Game/Screens/BackgroundScreenStack.cs b/osu.Game/Screens/BackgroundScreenStack.cs
index 6ebc97ebbb..99ca383b9f 100644
--- a/osu.Game/Screens/BackgroundScreenStack.cs
+++ b/osu.Game/Screens/BackgroundScreenStack.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Screens
         /// </summary>
         /// <param name="screen">The screen to attempt to push.</param>
         /// <returns>Whether the push succeeded. For example, if the existing screen was already of the correct type this will return <c>false</c>.</returns>
-        public bool Push(BackgroundScreen screen)
+        public bool Push(BackgroundScreen? screen)
         {
             if (screen == null)
                 return false;
diff --git a/osu.Game/Screens/Edit/Compose/Components/HitObjectOrderedSelectionContainer.cs b/osu.Game/Screens/Edit/Compose/Components/HitObjectOrderedSelectionContainer.cs
index 0edaaf9825..8f54d55d5d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/HitObjectOrderedSelectionContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/HitObjectOrderedSelectionContainer.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Edit;
@@ -67,7 +68,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             base.Dispose(isDisposing);
 
-            if (editorBeatmap != null)
+            if (editorBeatmap.IsNotNull())
                 editorBeatmap.BeatmapReprocessed -= SortInternal;
         }
     }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
index 66ae814444..514b80b999 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
@@ -3,6 +3,7 @@
 
 using System.Diagnostics;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Online.Multiplayer;
@@ -93,7 +94,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         {
             base.Dispose(isDisposing);
 
-            if (client != null)
+            if (client.IsNotNull())
                 client.RoomUpdated -= onRoomUpdated;
         }
     }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayerLoader.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayerLoader.cs
index 9a43e96a50..737f301f4d 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayerLoader.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayerLoader.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Game.Scoring;
 using osu.Game.Screens.Menu;
@@ -15,7 +14,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
     /// </summary>
     public partial class MultiSpectatorPlayerLoader : SpectatorPlayerLoader
     {
-        public MultiSpectatorPlayerLoader([NotNull] Score score, [NotNull] Func<MultiSpectatorPlayer> createPlayer)
+        public MultiSpectatorPlayerLoader(Score score, Func<MultiSpectatorPlayer> createPlayer)
             : base(score, createPlayer)
         {
         }
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlaySubScreenStack.cs b/osu.Game/Screens/OnlinePlay/OnlinePlaySubScreenStack.cs
index 2e3e2e1dc0..6695c97508 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlaySubScreenStack.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlaySubScreenStack.cs
@@ -1,18 +1,21 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Diagnostics;
 using osu.Framework.Screens;
 
 namespace osu.Game.Screens.OnlinePlay
 {
     public partial class OnlinePlaySubScreenStack : OsuScreenStack
     {
-        protected override void ScreenChanged(IScreen prev, IScreen next)
+        protected override void ScreenChanged(IScreen prev, IScreen? next)
         {
             base.ScreenChanged(prev, next);
 
             // because this is a screen stack within a screen stack, let's manually handle disabled changes to simplify things.
-            var osuScreen = ((OsuScreen)next);
+            var osuScreen = next as OsuScreen;
+
+            Debug.Assert(osuScreen != null);
 
             bool disallowChanges = osuScreen.DisallowExternalBeatmapRulesetChanges;
 
diff --git a/osu.Game/Screens/OsuScreenStack.cs b/osu.Game/Screens/OsuScreenStack.cs
index ef579fac85..7d1f6419ad 100644
--- a/osu.Game/Screens/OsuScreenStack.cs
+++ b/osu.Game/Screens/OsuScreenStack.cs
@@ -52,12 +52,12 @@ namespace osu.Game.Screens
             ScreenChanged(prev, next);
         }
 
-        protected virtual void ScreenChanged(IScreen prev, IScreen next)
+        protected virtual void ScreenChanged(IScreen prev, IScreen? next)
         {
             setParallax(next);
         }
 
-        private void setParallax(IScreen next) =>
-            parallaxContainer.ParallaxAmount = ParallaxContainer.DEFAULT_PARALLAX_AMOUNT * (((IOsuScreen)next)?.BackgroundParallaxAmount ?? 1.0f);
+        private void setParallax(IScreen? next) =>
+            parallaxContainer.ParallaxAmount = ParallaxContainer.DEFAULT_PARALLAX_AMOUNT * ((next as IOsuScreen)?.BackgroundParallaxAmount ?? 1.0f);
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index 19ede5533f..9fdd735804 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Judgements;
@@ -59,7 +60,7 @@ namespace osu.Game.Screens.Play.HUD
         {
             base.Dispose(isDisposing);
 
-            if (HealthProcessor != null)
+            if (HealthProcessor.IsNotNull())
                 HealthProcessor.NewJudgement -= onNewJudgement;
         }
     }
diff --git a/osu.Game/Screens/Play/HUD/ModDisplay.cs b/osu.Game/Screens/Play/HUD/ModDisplay.cs
index 579a0d163a..c064cdb040 100644
--- a/osu.Game/Screens/Play/HUD/ModDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ModDisplay.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Screens.Play.HUD
 
         public ExpansionMode ExpansionMode = ExpansionMode.ExpandOnHover;
 
-        private readonly BindableWithCurrent<IReadOnlyList<Mod>> current = new BindableWithCurrent<IReadOnlyList<Mod>>();
+        private readonly BindableWithCurrent<IReadOnlyList<Mod>> current = new BindableWithCurrent<IReadOnlyList<Mod>>(Array.Empty<Mod>());
 
         public Bindable<IReadOnlyList<Mod>> Current
         {
@@ -63,8 +63,6 @@ namespace osu.Game.Screens.Play.HUD
         {
             iconsContainer.Clear();
 
-            if (mods.NewValue == null) return;
-
             foreach (Mod mod in mods.NewValue)
                 iconsContainer.Add(new ModIcon(mod) { Scale = new Vector2(0.6f) });
 
diff --git a/osu.Game/Screens/Play/HUD/UnstableRateCounter.cs b/osu.Game/Screens/Play/HUD/UnstableRateCounter.cs
index e3034b2442..701b8a8732 100644
--- a/osu.Game/Screens/Play/HUD/UnstableRateCounter.cs
+++ b/osu.Game/Screens/Play/HUD/UnstableRateCounter.cs
@@ -4,6 +4,7 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
@@ -75,10 +76,11 @@ namespace osu.Game.Screens.Play.HUD
         {
             base.Dispose(isDisposing);
 
-            if (scoreProcessor == null) return;
-
-            scoreProcessor.NewJudgement -= updateDisplay;
-            scoreProcessor.JudgementReverted -= updateDisplay;
+            if (scoreProcessor.IsNotNull())
+            {
+                scoreProcessor.NewJudgement -= updateDisplay;
+                scoreProcessor.JudgementReverted -= updateDisplay;
+            }
         }
 
         private partial class TextComponent : CompositeDrawable, IHasText
diff --git a/osu.Game/Screens/Play/SpectatorResultsScreen.cs b/osu.Game/Screens/Play/SpectatorResultsScreen.cs
index 67ec1373df..001d3b4bbc 100644
--- a/osu.Game/Screens/Play/SpectatorResultsScreen.cs
+++ b/osu.Game/Screens/Play/SpectatorResultsScreen.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Screens;
 using osu.Game.Online.Spectator;
 using osu.Game.Scoring;
@@ -40,7 +41,7 @@ namespace osu.Game.Screens.Play
         {
             base.Dispose(isDisposing);
 
-            if (spectatorClient != null)
+            if (spectatorClient.IsNotNull())
                 spectatorClient.OnUserBeganPlaying -= userBeganPlaying;
         }
     }
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs b/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs
index 4202b2158e..9191ee6f52 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Diagnostics.CodeAnalysis;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -22,7 +21,7 @@ namespace osu.Game.Screens.Ranking.Statistics
         /// Creates a new <see cref="StatisticContainer"/>.
         /// </summary>
         /// <param name="item">The <see cref="StatisticItem"/> to display.</param>
-        public StatisticContainer([NotNull] StatisticItem item)
+        public StatisticContainer(StatisticItem item)
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticItem.cs b/osu.Game/Screens/Ranking/Statistics/StatisticItem.cs
index 6a595bf05c..fd7a0ddb4f 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticItem.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticItem.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using JetBrains.Annotations;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
 
@@ -34,7 +33,7 @@ namespace osu.Game.Screens.Ranking.Statistics
         /// <param name="name">The name of the item. Can be <see langword="null"/> to hide the item header.</param>
         /// <param name="createContent">A function returning the <see cref="Drawable"/> content to be displayed.</param>
         /// <param name="requiresHitEvents">Whether this item requires hit events. If true, <see cref="CreateContent"/> will not be called if no hit events are available.</param>
-        public StatisticItem(LocalisableString name, [NotNull] Func<Drawable> createContent, bool requiresHitEvents = false)
+        public StatisticItem(LocalisableString name, Func<Drawable> createContent, bool requiresHitEvents = false)
         {
             Name = name;
             RequiresHitEvents = requiresHitEvents;
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
index 63f644886a..ec0cb7ca19 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
@@ -3,6 +3,7 @@
 
 using System;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
@@ -106,7 +107,7 @@ namespace osu.Game.Storyboards.Drawables
         {
             base.Dispose(isDisposing);
 
-            if (skin != null)
+            if (skin.IsNotNull())
                 skin.SourceChanged -= skinSourceChanged;
         }
     }

From ad6650cbfa229c61910ff59114a740f7cc9fb3d5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 24 Jun 2023 01:56:16 +0900
Subject: [PATCH 1000/1604] Add automated commit to blame ignore revs

---
 .git-blame-ignore-revs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index b85862270b..d35d4be412 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -6,3 +6,5 @@
 212d78865a6b5f091173a347bad5686834d1d5fe
 # Add partial specs in mobile projects too
 00c11b2b4e389e48f3995d63484a6bc66a7afbdb
+# Mass NRT enabling
+0ab0c52ad577b3e7b406d09fa6056a56ff997c3e

From 4a2f259f7e254c57d33f1829f9fcf358207f10e5 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 23 Jun 2023 22:04:29 +0300
Subject: [PATCH 1001/1604] Add test coverage for tournament players with
 profile colours

---
 .../TestSceneTournamentMatchChatDisplay.cs    | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs b/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs
index b552d49d1d..8003011475 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs
@@ -43,6 +43,12 @@ namespace osu.Game.Tournament.Tests.Components
             OnlineID = 4,
         };
 
+        private readonly TournamentUser blueUserWithCustomColour = new TournamentUser
+        {
+            Username = "nekodex",
+            OnlineID = 5,
+        };
+
         [Cached]
         private LadderInfo ladderInfo = new LadderInfo();
 
@@ -67,7 +73,7 @@ namespace osu.Game.Tournament.Tests.Components
                 },
                 Team2 =
                 {
-                    Value = new TournamentTeam { Players = new BindableList<TournamentUser> { blueUser } }
+                    Value = new TournamentTeam { Players = new BindableList<TournamentUser> { blueUser, blueUserWithCustomColour } }
                 }
             };
 
@@ -108,6 +114,21 @@ namespace osu.Game.Tournament.Tests.Components
             AddUntilStep("message from team blue is blue color", () =>
                 this.ChildrenOfType<DrawableChatUsername>().Last().AccentColour, () => Is.EqualTo(TournamentGame.COLOUR_BLUE));
 
+            var userWithCustomColour = blueUserWithCustomColour.ToAPIUser();
+            userWithCustomColour.Colour = "#e45678";
+
+            AddStep("message from team blue with custom colour", () => testChannel.AddNewMessages(new Message(nextMessageId())
+            {
+                Sender = userWithCustomColour,
+                Content = "Not on my watch. Prepare to eat saaaaaaaaaand. Lots and lots of saaaaaaand."
+            }));
+
+            AddUntilStep("message from team blue is blue color", () =>
+                this.ChildrenOfType<DrawableChatUsername>().Last().AccentColour, () => Is.EqualTo(TournamentGame.COLOUR_BLUE));
+
+            AddUntilStep("message from user with custom colour is inverted", () =>
+                this.ChildrenOfType<DrawableChatUsername>().Last().Inverted, () => Is.EqualTo(true));
+
             AddStep("message from admin", () => testChannel.AddNewMessages(new Message(nextMessageId())
             {
                 Sender = admin,

From 7a771609f90b26d3bce25fe934ccef40d8d7330e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 23 Jun 2023 22:20:25 +0300
Subject: [PATCH 1002/1604] Reword and fix typo

---
 osu.Game/Overlays/Chat/ChatLine.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Chat/ChatLine.cs b/osu.Game/Overlays/Chat/ChatLine.cs
index fdf91dce23..bbc3ee5bf4 100644
--- a/osu.Game/Overlays/Chat/ChatLine.cs
+++ b/osu.Game/Overlays/Chat/ChatLine.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Overlays.Chat
         private Container? highlight;
 
         /// <summary>
-        /// The colour to use to paint the chat mesasge author's username.
+        /// The colour used to paint the author's username.
         /// </summary>
         /// <remarks>
         /// The colour can be set explicitly by consumers via the property initialiser.

From ff17685bc3650928062fecb20fe9b31698c0d839 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 23 Jun 2023 22:37:44 +0300
Subject: [PATCH 1003/1604] Fix `OpenUserProfile` links having multiple
 argument types

---
 osu.Game/Graphics/Containers/LinkFlowContainer.cs |  8 +++++++-
 osu.Game/OsuGame.cs                               | 10 +++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Graphics/Containers/LinkFlowContainer.cs b/osu.Game/Graphics/Containers/LinkFlowContainer.cs
index 2d27ce906b..a2c9b0ac32 100644
--- a/osu.Game/Graphics/Containers/LinkFlowContainer.cs
+++ b/osu.Game/Graphics/Containers/LinkFlowContainer.cs
@@ -74,7 +74,13 @@ namespace osu.Game.Graphics.Containers
         }
 
         public void AddUserLink(IUser user, Action<SpriteText> creationParameters = null)
-            => createLink(CreateChunkFor(user.Username, true, CreateSpriteText, creationParameters), new LinkDetails(LinkAction.OpenUserProfile, user), "view profile");
+        {
+            string argument = user.OnlineID > 1
+                ? user.OnlineID.ToString()
+                : user.Username;
+
+            createLink(CreateChunkFor(user.Username, true, CreateSpriteText, creationParameters), new LinkDetails(LinkAction.OpenUserProfile, argument), "view profile");
+        }
 
         private void createLink(ITextPart textPart, LinkDetails link, LocalisableString tooltipText, Action action = null)
         {
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index a80639d4ff..2db8872524 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -446,15 +446,11 @@ namespace osu.Game
                     break;
 
                 case LinkAction.OpenUserProfile:
-                    if (!(link.Argument is IUser user))
-                    {
-                        user = int.TryParse(argString, out int userId)
-                            ? new APIUser { Id = userId }
-                            : new APIUser { Username = argString };
-                    }
+                    var user = int.TryParse(argString, out int userId)
+                        ? new APIUser { Id = userId }
+                        : new APIUser { Username = argString };
 
                     ShowUser(user);
-
                     break;
 
                 case LinkAction.OpenWiki:

From 3585c3f1d5b96e66aec5aa9162fd75de2b6eb336 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Jun 2023 15:58:05 +0900
Subject: [PATCH 1004/1604] Apply required nullability changes

---
 .../Editor/TestSceneSliderSplitting.cs                        | 2 +-
 osu.Game.Rulesets.Taiko/Skinning/Default/DefaultInputDrum.cs  | 2 +-
 osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs         | 2 +-
 osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs   | 4 ++++
 .../Visual/UserInterface/TestSceneModSelectOverlay.cs         | 4 ++--
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs
index 605771fb20..8ba97892fe 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs
@@ -244,7 +244,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
                 MenuItem? item = visualiser.ContextMenuItems.FirstOrDefault(menuItem => menuItem.Text.Value == contextMenuText);
 
-                item?.Action?.Value();
+                item?.Action.Value?.Invoke();
             });
         }
     }
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Default/DefaultInputDrum.cs b/osu.Game.Rulesets.Taiko/Skinning/Default/DefaultInputDrum.cs
index 6d19db999c..60bacf6413 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Default/DefaultInputDrum.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Default/DefaultInputDrum.cs
@@ -148,7 +148,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Default
                     back = rim;
                 }
 
-                if (target != null)
+                if (target != null && back != null)
                 {
                     const float scale_amount = 0.05f;
                     const float alpha_amount = 0.5f;
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index f97019e466..c6dad1b25e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -213,7 +213,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddStep("attempt seek", () =>
             {
-                InputManager.MoveMouseTo(getSongProgress());
+                InputManager.MoveMouseTo(getSongProgress().AsNonNull());
                 InputManager.Click(MouseButton.Left);
             });
 
diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index f094d40caa..af3a6e178c 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -825,6 +825,8 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddStep("Click on a filtered difficulty", () =>
             {
+                Debug.Assert(filteredIcon != null);
+
                 InputManager.MoveMouseTo(filteredIcon);
 
                 InputManager.Click(MouseButton.Left);
@@ -918,6 +920,8 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddStep("Click on a difficulty", () =>
             {
+                Debug.Assert(difficultyIcon != null);
+
                 InputManager.MoveMouseTo(difficultyIcon);
 
                 InputManager.Click(MouseButton.Left);
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index d566a04261..dcb1f730a2 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -218,7 +218,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             AddStep("dismiss mod customisation via toggle", () =>
             {
-                InputManager.MoveMouseTo(modSelectOverlay.CustomisationButton);
+                InputManager.MoveMouseTo(modSelectOverlay.CustomisationButton.AsNonNull());
                 InputManager.Click(MouseButton.Left);
             });
             assertCustomisationToggleState(disabled: false, active: false);
@@ -558,7 +558,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             void navigateAndClick<T>() where T : Drawable
             {
-                InputManager.MoveMouseTo(modSelectOverlay.ChildrenOfType<T>().FirstOrDefault());
+                InputManager.MoveMouseTo(modSelectOverlay.ChildrenOfType<T>().First());
                 InputManager.Click(MouseButton.Left);
             }
         }

From 58e6b3782b63e3c16ed1e4ae056f2ec5bb2222f4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 24 Jun 2023 09:48:16 +0900
Subject: [PATCH 1005/1604] Fix a couple of remaining issues

---
 .../Visual/Online/TestSceneCurrentlyPlayingDisplay.cs          | 2 +-
 osu.Game/Rulesets/RulesetStore.cs                              | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
index 885c00be80..5237238f63 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Tests.Visual.Online
         public void TestBasicDisplay()
         {
             AddStep("Add playing user", () => spectatorClient.SendStartPlay(streamingUser.Id, 0));
-            AddUntilStep("Panel loaded", () => currentlyPlaying.ChildrenOfType<UserGridPanel>()?.FirstOrDefault()?.User.Id == 2);
+            AddUntilStep("Panel loaded", () => currentlyPlaying.ChildrenOfType<UserGridPanel>().FirstOrDefault()?.User.Id == 2);
             AddStep("Remove playing user", () => spectatorClient.SendEndPlay(streamingUser.Id));
             AddUntilStep("Panel no longer present", () => !currentlyPlaying.ChildrenOfType<UserGridPanel>().Any());
         }
diff --git a/osu.Game/Rulesets/RulesetStore.cs b/osu.Game/Rulesets/RulesetStore.cs
index 881b09bd1b..ac36ee6494 100644
--- a/osu.Game/Rulesets/RulesetStore.cs
+++ b/osu.Game/Rulesets/RulesetStore.cs
@@ -7,6 +7,7 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using osu.Framework;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 
@@ -32,7 +33,7 @@ namespace osu.Game.Rulesets
             // This null check prevents Android from attempting to load the rulesets from disk,
             // as the underlying path "AppContext.BaseDirectory", despite being non-nullable, it returns null on android.
             // See https://github.com/xamarin/xamarin-android/issues/3489.
-            if (RuntimeInfo.StartupDirectory != null)
+            if (RuntimeInfo.StartupDirectory.IsNotNull())
                 loadFromDisk();
 
             // the event handler contains code for resolving dependency on the game assembly for rulesets located outside the base game directory.

From 354e85a2e15c081f8742d29c4880f862b2d85fa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 24 Jun 2023 14:35:23 +0200
Subject: [PATCH 1006/1604] Trim redundant BDL nullability spec

---
 .../Overlays/Settings/Sections/DebugSettings/GeneralSettings.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/DebugSettings/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/DebugSettings/GeneralSettings.cs
index 01408ca087..cf97743fde 100644
--- a/osu.Game/Overlays/Settings/Sections/DebugSettings/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/DebugSettings/GeneralSettings.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Overlays.Settings.Sections.DebugSettings
     {
         protected override LocalisableString Header => DebugSettingsStrings.GeneralHeader;
 
-        [BackgroundDependencyLoader(true)]
+        [BackgroundDependencyLoader]
         private void load(FrameworkDebugConfigManager config, FrameworkConfigManager frameworkConfig, IPerformFromScreenRunner? performer)
         {
             Children = new Drawable[]

From 1f2f522a1ee3e16a0df4d41a6f27fac7c169597b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 24 Jun 2023 15:07:04 +0200
Subject: [PATCH 1007/1604] Mark override as null-accepting

`ModelBackedDrawable<T>.CreateDrawable()` is R#-annotated to accept
a potentially null model. Apply nullability there too for better reading
experience.
---
 .../Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs
index 67eedf655e..0bb60847e5 100644
--- a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs
+++ b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Beatmaps.Drawables
 
         protected override double TransformDuration => 400;
 
-        protected override Drawable CreateDrawable(IBeatmapInfo model)
+        protected override Drawable CreateDrawable(IBeatmapInfo? model)
         {
             var drawable = getDrawableForModel(model);
             drawable.RelativeSizeAxes = Axes.Both;

From 8fdd599b39cb50005177312b73cadfa62405a810 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 24 Jun 2023 15:17:14 +0200
Subject: [PATCH 1008/1604] Match field NRT annotation in ctor argument

---
 osu.Game/Overlays/Changelog/ChangelogListing.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Changelog/ChangelogListing.cs b/osu.Game/Overlays/Changelog/ChangelogListing.cs
index c4320dcbd0..5f1ae5b6fa 100644
--- a/osu.Game/Overlays/Changelog/ChangelogListing.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogListing.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Overlays.Changelog
     {
         private readonly List<APIChangelogBuild>? entries;
 
-        public ChangelogListing(List<APIChangelogBuild> entries)
+        public ChangelogListing(List<APIChangelogBuild>? entries)
         {
             this.entries = entries;
         }

From 66ef199fa47a3b68047e8879284f44aca2de6007 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 24 Jun 2023 15:35:07 +0200
Subject: [PATCH 1009/1604] Revert nullability enable in `Score` (and related
 changes)

Causes several knock-on inspections in `OsuGame` et al. Probably best
addressed in a separate pass, because treatment is mixed at best (some
places nullcheck, some expect non-null).
---
 osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs | 15 +++++++++------
 osu.Game/Scoring/Score.cs                     |  2 ++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
index 2a54ef16c6..f71da6c7e0 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
@@ -128,14 +128,17 @@ namespace osu.Game.Scoring.Legacy
 
                 int lastTime = 0;
 
-                foreach (var f in score.Replay.Frames)
+                if (score.Replay != null)
                 {
-                    var legacyFrame = getLegacyFrame(f);
+                    foreach (var f in score.Replay.Frames)
+                    {
+                        var legacyFrame = getLegacyFrame(f);
 
-                    // Rounding because stable could only parse integral values
-                    int time = (int)Math.Round(legacyFrame.Time + offset);
-                    replayData.Append(FormattableString.Invariant($"{time - lastTime}|{legacyFrame.MouseX ?? 0}|{legacyFrame.MouseY ?? 0}|{(int)legacyFrame.ButtonState},"));
-                    lastTime = time;
+                        // Rounding because stable could only parse integral values
+                        int time = (int)Math.Round(legacyFrame.Time + offset);
+                        replayData.Append(FormattableString.Invariant($"{time - lastTime}|{legacyFrame.MouseX ?? 0}|{legacyFrame.MouseY ?? 0}|{(int)legacyFrame.ButtonState},"));
+                        lastTime = time;
+                    }
                 }
 
                 // Warning: this is purposefully hardcoded as a string rather than interpolating, as in some cultures the minus sign is not encoded as the standard ASCII U+00C2 codepoint,
diff --git a/osu.Game/Scoring/Score.cs b/osu.Game/Scoring/Score.cs
index 3323706ac1..7152f93f94 100644
--- a/osu.Game/Scoring/Score.cs
+++ b/osu.Game/Scoring/Score.cs
@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+#nullable disable
+
 using osu.Game.Replays;
 using osu.Game.Utils;
 

From 2c1a44da895b0be4140704c0fcdca0a614efb3ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 24 Jun 2023 15:40:06 +0200
Subject: [PATCH 1010/1604] Revert nullability enable in `BeatmapBackground`

Due to varying expectations in handling of `Beatmap`. Some places allow
or expect null and some don't. Needs to be looked at closer separately.
---
 osu.Game/Graphics/Backgrounds/BeatmapBackground.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/Backgrounds/BeatmapBackground.cs b/osu.Game/Graphics/Backgrounds/BeatmapBackground.cs
index b8de0f7f1e..685f03ae56 100644
--- a/osu.Game/Graphics/Backgrounds/BeatmapBackground.cs
+++ b/osu.Game/Graphics/Backgrounds/BeatmapBackground.cs
@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+#nullable disable
+
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Beatmaps;
@@ -22,7 +24,7 @@ namespace osu.Game.Graphics.Backgrounds
         [BackgroundDependencyLoader]
         private void load(LargeTextureStore textures)
         {
-            Sprite.Texture = Beatmap.GetBackground() ?? textures.Get(fallbackTextureName);
+            Sprite.Texture = Beatmap?.GetBackground() ?? textures.Get(fallbackTextureName);
         }
 
         public override bool Equals(Background other)

From caf5673b68f3157d09964f487d94aa467cab9ca0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 24 Jun 2023 16:05:19 +0200
Subject: [PATCH 1011/1604] Revert nullability enables in tournament client

Not trivial to fix right now and I'm not fixing in a 1k-line changeset.
---
 osu.Game.Tournament/Components/DateTextBox.cs | 2 ++
 osu.Game.Tournament/Models/LadderInfo.cs      | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Components/DateTextBox.cs b/osu.Game.Tournament/Components/DateTextBox.cs
index 4fa94b6c63..f23ad20a67 100644
--- a/osu.Game.Tournament/Components/DateTextBox.cs
+++ b/osu.Game.Tournament/Components/DateTextBox.cs
@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+#nullable disable
+
 using System;
 using osu.Framework.Bindables;
 using osu.Game.Graphics.UserInterface;
diff --git a/osu.Game.Tournament/Models/LadderInfo.cs b/osu.Game.Tournament/Models/LadderInfo.cs
index 3defd517cd..229837c94e 100644
--- a/osu.Game.Tournament/Models/LadderInfo.cs
+++ b/osu.Game.Tournament/Models/LadderInfo.cs
@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
@@ -25,7 +27,7 @@ namespace osu.Game.Tournament.Models
         public List<TournamentProgression> Progressions = new List<TournamentProgression>();
 
         [JsonIgnore] // updated manually in TournamentGameBase
-        public Bindable<TournamentMatch?> CurrentMatch = new Bindable<TournamentMatch?>();
+        public Bindable<TournamentMatch> CurrentMatch = new Bindable<TournamentMatch>();
 
         public Bindable<int> ChromaKeyWidth = new BindableInt(1024)
         {

From e3a89a6273b01487b5c74130ab66eeedbd1ffaf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 24 Jun 2023 16:07:01 +0200
Subject: [PATCH 1012/1604] Fix remaining obvious CI inspections

---
 .../Edit/DrawableManiaEditorRuleset.cs                 |  2 +-
 .../Difficulty/Evaluators/SpeedEvaluator.cs            |  2 +-
 .../Visual/Online/TestSceneNowPlayingCommand.cs        |  5 +++--
 osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs     | 10 ++++++----
 .../Ranking/TestSceneExpandedPanelMiddleContent.cs     |  2 +-
 osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs |  2 +-
 osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs      |  2 +-
 .../Containers/Markdown/OsuMarkdownContainer.cs        |  7 +++++++
 osu.Game/Online/API/APIException.cs                    |  2 +-
 osu.Game/Overlays/BeatmapSet/BeatmapRulesetSelector.cs |  4 ++--
 osu.Game/Overlays/BeatmapSet/Info.cs                   |  2 +-
 osu.Game/Screens/Select/BeatmapInfoWedge.cs            |  2 +-
 12 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs b/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs
index 1e9085bb2f..f480fa516b 100644
--- a/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs
+++ b/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Mania.Edit
     {
         public new IScrollingInfo ScrollingInfo => base.ScrollingInfo;
 
-        public DrawableManiaEditorRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods)
+        public DrawableManiaEditorRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod>? mods)
             : base(ruleset, beatmap, mods)
         {
         }
diff --git a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/SpeedEvaluator.cs b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/SpeedEvaluator.cs
index 1ae500ec78..2df383aaa8 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/SpeedEvaluator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/SpeedEvaluator.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
             // derive strainTime for calculation
             var osuCurrObj = (OsuDifficultyHitObject)current;
             var osuPrevObj = current.Index > 0 ? (OsuDifficultyHitObject)current.Previous(0) : null;
-            var osuNextObj = (OsuDifficultyHitObject)current.Next(0);
+            var osuNextObj = (OsuDifficultyHitObject?)current.Next(0);
 
             double strainTime = osuCurrObj.StrainTime;
             double doubletapness = 1;
diff --git a/osu.Game.Tests/Visual/Online/TestSceneNowPlayingCommand.cs b/osu.Game.Tests/Visual/Online/TestSceneNowPlayingCommand.cs
index 10c2b2b9e1..fb36580a42 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNowPlayingCommand.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNowPlayingCommand.cs
@@ -10,6 +10,7 @@ using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API;
 using osu.Game.Online.Chat;
+using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Users;
@@ -32,7 +33,7 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestGenericActivity()
         {
-            AddStep("Set activity", () => api.Activity.Value = new UserActivity.InLobby(null));
+            AddStep("Set activity", () => api.Activity.Value = new UserActivity.InLobby(new Room()));
 
             AddStep("Run command", () => Add(new NowPlayingCommand(new Channel())));
 
@@ -63,7 +64,7 @@ namespace osu.Game.Tests.Visual.Online
         [TestCase(false)]
         public void TestLinkPresence(bool hasOnlineId)
         {
-            AddStep("Set activity", () => api.Activity.Value = new UserActivity.InLobby(null));
+            AddStep("Set activity", () => api.Activity.Value = new UserActivity.InLobby(new Room()));
 
             AddStep("Set beatmap", () => Beatmap.Value = new DummyWorkingBeatmap(Audio, null)
             {
diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
index a047e2f0c5..c61b572d8c 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
@@ -9,8 +9,10 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Beatmaps;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Osu;
 using osu.Game.Scoring;
 using osu.Game.Tests.Beatmaps;
 using osu.Game.Users;
@@ -116,9 +118,9 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("solo (osu!catch)", () => activity.Value = soloGameStatusForRuleset(2));
             AddStep("solo (osu!mania)", () => activity.Value = soloGameStatusForRuleset(3));
             AddStep("choosing", () => activity.Value = new UserActivity.ChoosingBeatmap());
-            AddStep("editing beatmap", () => activity.Value = new UserActivity.EditingBeatmap(null));
-            AddStep("modding beatmap", () => activity.Value = new UserActivity.ModdingBeatmap(null));
-            AddStep("testing beatmap", () => activity.Value = new UserActivity.TestingBeatmap(null, null));
+            AddStep("editing beatmap", () => activity.Value = new UserActivity.EditingBeatmap(new BeatmapInfo()));
+            AddStep("modding beatmap", () => activity.Value = new UserActivity.ModdingBeatmap(new BeatmapInfo()));
+            AddStep("testing beatmap", () => activity.Value = new UserActivity.TestingBeatmap(new BeatmapInfo(), new OsuRuleset().RulesetInfo));
         }
 
         [Test]
@@ -134,7 +136,7 @@ namespace osu.Game.Tests.Visual.Online
             AddAssert("visit message is not visible", () => !boundPanel2.LastVisitMessage.IsPresent);
         }
 
-        private UserActivity soloGameStatusForRuleset(int rulesetId) => new UserActivity.InSoloGame(null, rulesetStore.GetRuleset(rulesetId));
+        private UserActivity soloGameStatusForRuleset(int rulesetId) => new UserActivity.InSoloGame(new BeatmapInfo(), rulesetStore.GetRuleset(rulesetId)!);
 
         private ScoreInfo createScore(string name) => new ScoreInfo(new TestBeatmap(Ruleset.Value).BeatmapInfo)
         {
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
index bd7a11b4bb..c05774400f 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
@@ -93,7 +93,7 @@ namespace osu.Game.Tests.Visual.Ranking
 
         private BeatmapInfo createTestBeatmap([NotNull] RealmUser author)
         {
-            var beatmap = new TestBeatmap(rulesetStore.GetRuleset(0)).BeatmapInfo;
+            var beatmap = new TestBeatmap(rulesetStore.GetRuleset(0)!).BeatmapInfo;
 
             beatmap.Metadata.Author = author;
             beatmap.Metadata.Title = "Verrrrrrrrrrrrrrrrrrry looooooooooooooooooooooooong beatmap title";
diff --git a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
index 8d5547c749..6b35102014 100644
--- a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
+++ b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
@@ -177,7 +177,7 @@ namespace osu.Game.Tournament.Screens.Schedule
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
                         },
-                        new TournamentSpriteTextWithBackground(match.NewValue.Round.Value?.Name.Value)
+                        new TournamentSpriteTextWithBackground(match.NewValue.Round.Value?.Name.Value ?? string.Empty)
                         {
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index a5fc815a5e..041b00c7e1 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -93,7 +93,7 @@ namespace osu.Game.Beatmaps.Formats
             writer.WriteLine(FormattableString.Invariant($"PreviewTime: {beatmap.Metadata.PreviewTime}"));
             writer.WriteLine(FormattableString.Invariant($"Countdown: {(int)beatmap.BeatmapInfo.Countdown}"));
             writer.WriteLine(FormattableString.Invariant(
-                $"SampleSet: {toLegacySampleBank(((beatmap.ControlPointInfo as LegacyControlPointInfo)?.SamplePoints?.FirstOrDefault() ?? SampleControlPoint.DEFAULT).SampleBank)}"));
+                $"SampleSet: {toLegacySampleBank(((beatmap.ControlPointInfo as LegacyControlPointInfo)?.SamplePoints.FirstOrDefault() ?? SampleControlPoint.DEFAULT).SampleBank)}"));
             writer.WriteLine(FormattableString.Invariant($"StackLeniency: {beatmap.BeatmapInfo.StackLeniency}"));
             writer.WriteLine(FormattableString.Invariant($"Mode: {onlineRulesetID}"));
             writer.WriteLine(FormattableString.Invariant($"LetterboxInBreaks: {(beatmap.BeatmapInfo.LetterboxInBreaks ? '1' : '0')}"));
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
index 4a61ee2043..b478c4757f 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
@@ -35,6 +35,13 @@ namespace osu.Game.Graphics.Containers.Markdown
                     break;
 
                 case ListItemBlock listItemBlock:
+                    // `ListBlock.Parent` is annotated as null-returning in xmldoc.
+                    // Unfortunately code analysis sees that the type doesn't have NRT enabled and complains.
+                    // This is fixed upstream in 0.24.0 (https://github.com/xoofx/markdig/commit/6684c8257cbbcba2d34457020876be289d3cd8b9),
+                    // but markdig is a transitive dependency from framework, wherein we are locked to 0.23.0
+                    // (https://github.com/ppy/osu-framework/blob/9746d7d06f48910c05a24687a25f435f30d12f8b/osu.Framework/osu.Framework.csproj#L52C1-L54)
+                    // Therefore...
+                    // ReSharper disable once ConstantConditionalAccessQualifier
                     bool isOrdered = ((ListBlock)listItemBlock.Parent)?.IsOrdered == true;
 
                     OsuMarkdownListItem childContainer = CreateListItem(listItemBlock, level, isOrdered);
diff --git a/osu.Game/Online/API/APIException.cs b/osu.Game/Online/API/APIException.cs
index 7491e375df..4327600e13 100644
--- a/osu.Game/Online/API/APIException.cs
+++ b/osu.Game/Online/API/APIException.cs
@@ -7,7 +7,7 @@ namespace osu.Game.Online.API
 {
     public class APIException : InvalidOperationException
     {
-        public APIException(string message, Exception innerException)
+        public APIException(string message, Exception? innerException)
             : base(message, innerException)
         {
         }
diff --git a/osu.Game/Overlays/BeatmapSet/BeatmapRulesetSelector.cs b/osu.Game/Overlays/BeatmapSet/BeatmapRulesetSelector.cs
index 7d8160bef7..426fbcdb8d 100644
--- a/osu.Game/Overlays/BeatmapSet/BeatmapRulesetSelector.cs
+++ b/osu.Game/Overlays/BeatmapSet/BeatmapRulesetSelector.cs
@@ -11,9 +11,9 @@ namespace osu.Game.Overlays.BeatmapSet
 {
     public partial class BeatmapRulesetSelector : OverlayRulesetSelector
     {
-        private readonly Bindable<APIBeatmapSet> beatmapSet = new Bindable<APIBeatmapSet>();
+        private readonly Bindable<APIBeatmapSet?> beatmapSet = new Bindable<APIBeatmapSet?>();
 
-        public APIBeatmapSet BeatmapSet
+        public APIBeatmapSet? BeatmapSet
         {
             get => beatmapSet.Value;
             set
diff --git a/osu.Game/Overlays/BeatmapSet/Info.cs b/osu.Game/Overlays/BeatmapSet/Info.cs
index c182ef2e15..d21b2546b9 100644
--- a/osu.Game/Overlays/BeatmapSet/Info.cs
+++ b/osu.Game/Overlays/BeatmapSet/Info.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Overlays.BeatmapSet
 
         public readonly Bindable<APIBeatmapSet> BeatmapSet = new Bindable<APIBeatmapSet>();
 
-        public APIBeatmap BeatmapInfo
+        public APIBeatmap? BeatmapInfo
         {
             get => successRate.Beatmap;
             set => successRate.Beatmap = value;
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 961f8684ce..5dd2486e1c 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -351,7 +351,7 @@ namespace osu.Game.Screens.Select
 
             private void addInfoLabels()
             {
-                if (working.Beatmap?.HitObjects?.Any() != true)
+                if (working.Beatmap?.HitObjects.Any() != true)
                     return;
 
                 infoLabelContainer.Children = new Drawable[]

From 34e25403313a0a5926403aac69cd518c5d483c03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 24 Jun 2023 17:05:52 +0200
Subject: [PATCH 1013/1604] Fix nullability-related warnings in Android project

---
 osu.Android/GameplayScreenRotationLocker.cs |  2 +-
 osu.Android/OsuGameActivity.cs              | 15 ++++++++-------
 osu.Android/OsuGameAndroid.cs               |  7 ++++---
 osu.Game.Tests.Android/MainActivity.cs      |  2 +-
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/osu.Android/GameplayScreenRotationLocker.cs b/osu.Android/GameplayScreenRotationLocker.cs
index d77b24722a..e5fc354db7 100644
--- a/osu.Android/GameplayScreenRotationLocker.cs
+++ b/osu.Android/GameplayScreenRotationLocker.cs
@@ -11,7 +11,7 @@ namespace osu.Android
 {
     public partial class GameplayScreenRotationLocker : Component
     {
-        private Bindable<bool> localUserPlaying;
+        private Bindable<bool> localUserPlaying = null!;
 
         [Resolved]
         private OsuGameActivity gameActivity { get; set; } = null!;
diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index 81b218436e..33ffed432e 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -13,6 +13,7 @@ using Android.Graphics;
 using Android.OS;
 using Android.Views;
 using osu.Framework.Android;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Game.Database;
 using Debug = System.Diagnostics.Debug;
 using Uri = Android.Net.Uri;
@@ -49,11 +50,11 @@ namespace osu.Android
         /// <remarks>Adjusted on startup to match expected UX for the current device type (phone/tablet).</remarks>
         public ScreenOrientation DefaultOrientation = ScreenOrientation.Unspecified;
 
-        private OsuGameAndroid game;
+        private OsuGameAndroid game = null!;
 
         protected override Framework.Game CreateGame() => game = new OsuGameAndroid(this);
 
-        protected override void OnCreate(Bundle savedInstanceState)
+        protected override void OnCreate(Bundle? savedInstanceState)
         {
             base.OnCreate(savedInstanceState);
 
@@ -90,15 +91,15 @@ namespace osu.Android
             Assembly.Load("osu.Game.Rulesets.Mania");
         }
 
-        protected override void OnNewIntent(Intent intent) => handleIntent(intent);
+        protected override void OnNewIntent(Intent? intent) => handleIntent(intent);
 
-        private void handleIntent(Intent intent)
+        private void handleIntent(Intent? intent)
         {
-            switch (intent.Action)
+            switch (intent?.Action)
             {
                 case Intent.ActionDefault:
                     if (intent.Scheme == ContentResolver.SchemeContent)
-                        handleImportFromUris(intent.Data);
+                        handleImportFromUris(intent.Data.AsNonNull());
                     else if (osu_url_schemes.Contains(intent.Scheme))
                         game.HandleLink(intent.DataString);
                     break;
@@ -112,7 +113,7 @@ namespace osu.Android
                     {
                         var content = intent.ClipData?.GetItemAt(i);
                         if (content != null)
-                            uris.Add(content.Uri);
+                            uris.Add(content.Uri.AsNonNull());
                     }
 
                     handleImportFromUris(uris.ToArray());
diff --git a/osu.Android/OsuGameAndroid.cs b/osu.Android/OsuGameAndroid.cs
index 96f81c209c..dea70e6b27 100644
--- a/osu.Android/OsuGameAndroid.cs
+++ b/osu.Android/OsuGameAndroid.cs
@@ -6,6 +6,7 @@ using Android.App;
 using Microsoft.Maui.Devices;
 using osu.Framework.Allocation;
 using osu.Framework.Android.Input;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Input.Handlers;
 using osu.Framework.Platform;
 using osu.Game;
@@ -30,7 +31,7 @@ namespace osu.Android
         {
             get
             {
-                var packageInfo = Application.Context.ApplicationContext.PackageManager.GetPackageInfo(Application.Context.ApplicationContext.PackageName, 0);
+                var packageInfo = Application.Context.ApplicationContext!.PackageManager!.GetPackageInfo(Application.Context.ApplicationContext.PackageName!, 0).AsNonNull();
 
                 try
                 {
@@ -43,7 +44,7 @@ namespace osu.Android
                     // Basic conversion format (as done in Fastfile): 2020.606.0 -> 202006060
 
                     // https://stackoverflow.com/questions/52977079/android-sdk-28-versioncode-in-packageinfo-has-been-deprecated
-                    string versionName = string.Empty;
+                    string versionName;
 
                     if (OperatingSystem.IsAndroidVersionAtLeast(28))
                     {
@@ -66,7 +67,7 @@ namespace osu.Android
                 {
                 }
 
-                return new Version(packageInfo.VersionName);
+                return new Version(packageInfo.VersionName.AsNonNull());
             }
         }
 
diff --git a/osu.Game.Tests.Android/MainActivity.cs b/osu.Game.Tests.Android/MainActivity.cs
index ab43a6766c..d25e46f3c5 100644
--- a/osu.Game.Tests.Android/MainActivity.cs
+++ b/osu.Game.Tests.Android/MainActivity.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Tests.Android
     {
         protected override Framework.Game CreateGame() => new OsuTestBrowser();
 
-        protected override void OnCreate(Bundle savedInstanceState)
+        protected override void OnCreate(Bundle? savedInstanceState)
         {
             base.OnCreate(savedInstanceState);
 

From df2dcf85b4b4e7e54755d6d9e56b43ae04e787c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 24 Jun 2023 17:07:42 +0200
Subject: [PATCH 1014/1604] Fix wrong disable

---
 osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
index b478c4757f..5da785603a 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Graphics.Containers.Markdown
                     // but markdig is a transitive dependency from framework, wherein we are locked to 0.23.0
                     // (https://github.com/ppy/osu-framework/blob/9746d7d06f48910c05a24687a25f435f30d12f8b/osu.Framework/osu.Framework.csproj#L52C1-L54)
                     // Therefore...
-                    // ReSharper disable once ConstantConditionalAccessQualifier
+                    // ReSharper disable once ConditionalAccessQualifierIsNonNullableAccordingToAPIContract
                     bool isOrdered = ((ListBlock)listItemBlock.Parent)?.IsOrdered == true;
 
                     OsuMarkdownListItem childContainer = CreateListItem(listItemBlock, level, isOrdered);

From e273c223a8afd7a6c22e3e7de300117fe8832762 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 24 Jun 2023 17:11:38 +0200
Subject: [PATCH 1015/1604] Fix some more missed CI inspections

---
 .../Visual/Online/TestSceneBeatmapRulesetSelector.cs          | 2 +-
 osu.Game/Online/Rooms/JoinRoomRequest.cs                      | 4 ++--
 .../Rulesets/Difficulty/PerformanceBreakdownCalculator.cs     | 3 ++-
 osu.Game/Screens/OnlinePlay/Match/RoomBackgroundScreen.cs     | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapRulesetSelector.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapRulesetSelector.cs
index 36c3576da6..599eee7d0c 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapRulesetSelector.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapRulesetSelector.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Tests.Visual.Online
 
                 selector.BeatmapSet = new APIBeatmapSet
                 {
-                    Beatmaps = selector.BeatmapSet.Beatmaps
+                    Beatmaps = selector.BeatmapSet!.Beatmaps
                                        .Where(b => b.Ruleset.OnlineID != ruleset)
                                        .Concat(Enumerable.Range(0, count).Select(_ => new APIBeatmap { RulesetID = ruleset }))
                                        .ToArray(),
diff --git a/osu.Game/Online/Rooms/JoinRoomRequest.cs b/osu.Game/Online/Rooms/JoinRoomRequest.cs
index a1d6ed1e82..8645f2a2c0 100644
--- a/osu.Game/Online/Rooms/JoinRoomRequest.cs
+++ b/osu.Game/Online/Rooms/JoinRoomRequest.cs
@@ -10,9 +10,9 @@ namespace osu.Game.Online.Rooms
     public class JoinRoomRequest : APIRequest
     {
         public readonly Room Room;
-        public readonly string Password;
+        public readonly string? Password;
 
-        public JoinRoomRequest(Room room, string password)
+        public JoinRoomRequest(Room room, string? password)
         {
             Room = room;
             Password = password;
diff --git a/osu.Game/Rulesets/Difficulty/PerformanceBreakdownCalculator.cs b/osu.Game/Rulesets/Difficulty/PerformanceBreakdownCalculator.cs
index 64a04f896f..8b59500f43 100644
--- a/osu.Game/Rulesets/Difficulty/PerformanceBreakdownCalculator.cs
+++ b/osu.Game/Rulesets/Difficulty/PerformanceBreakdownCalculator.cs
@@ -8,6 +8,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
@@ -88,7 +89,7 @@ namespace osu.Game.Rulesets.Difficulty
                 ).ConfigureAwait(false);
 
                 // ScorePerformanceCache is not used to avoid caching multiple copies of essentially identical perfect performance attributes
-                return difficulty == null ? null : ruleset.CreatePerformanceCalculator()?.Calculate(perfectPlay, difficulty.Value.Attributes);
+                return difficulty == null ? null : ruleset.CreatePerformanceCalculator()?.Calculate(perfectPlay, difficulty.Value.Attributes.AsNonNull());
             }, cancellationToken);
         }
 
diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomBackgroundScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomBackgroundScreen.cs
index 982275f96a..53a52a8cb8 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomBackgroundScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomBackgroundScreen.cs
@@ -9,9 +9,9 @@ namespace osu.Game.Screens.OnlinePlay.Match
 {
     public partial class RoomBackgroundScreen : OnlinePlayBackgroundScreen
     {
-        public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
+        public readonly Bindable<PlaylistItem?> SelectedItem = new Bindable<PlaylistItem?>();
 
-        public RoomBackgroundScreen(PlaylistItem initialPlaylistItem)
+        public RoomBackgroundScreen(PlaylistItem? initialPlaylistItem)
         {
             PlaylistItem = initialPlaylistItem;
             SelectedItem.BindValueChanged(item => PlaylistItem = item.NewValue);

From 9a5f033a0fa6a066d8994322777f2478780463e9 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 24 Jun 2023 18:11:34 +0300
Subject: [PATCH 1016/1604] Change `OpenUserProfile` argument type to always
 use `IUser`

---
 osu.Game/Graphics/Containers/LinkFlowContainer.cs  |  8 +-------
 osu.Game/Online/Chat/MessageFormatter.cs           | 14 +++++++++++---
 osu.Game/OsuGame.cs                                |  7 +------
 .../Sections/Recent/DrawableRecentActivity.cs      |  2 +-
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Graphics/Containers/LinkFlowContainer.cs b/osu.Game/Graphics/Containers/LinkFlowContainer.cs
index a2c9b0ac32..2d27ce906b 100644
--- a/osu.Game/Graphics/Containers/LinkFlowContainer.cs
+++ b/osu.Game/Graphics/Containers/LinkFlowContainer.cs
@@ -74,13 +74,7 @@ namespace osu.Game.Graphics.Containers
         }
 
         public void AddUserLink(IUser user, Action<SpriteText> creationParameters = null)
-        {
-            string argument = user.OnlineID > 1
-                ? user.OnlineID.ToString()
-                : user.Username;
-
-            createLink(CreateChunkFor(user.Username, true, CreateSpriteText, creationParameters), new LinkDetails(LinkAction.OpenUserProfile, argument), "view profile");
-        }
+            => createLink(CreateChunkFor(user.Username, true, CreateSpriteText, creationParameters), new LinkDetails(LinkAction.OpenUserProfile, user), "view profile");
 
         private void createLink(ITextPart textPart, LinkDetails link, LocalisableString tooltipText, Action action = null)
         {
diff --git a/osu.Game/Online/Chat/MessageFormatter.cs b/osu.Game/Online/Chat/MessageFormatter.cs
index 523185a7cb..f89939d7cf 100644
--- a/osu.Game/Online/Chat/MessageFormatter.cs
+++ b/osu.Game/Online/Chat/MessageFormatter.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
+using osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Online.Chat
 {
@@ -172,7 +173,7 @@ namespace osu.Game.Online.Chat
 
                             case "u":
                             case "users":
-                                return new LinkDetails(LinkAction.OpenUserProfile, mainArg);
+                                return getUserLink(mainArg);
 
                             case "wiki":
                                 return new LinkDetails(LinkAction.OpenWiki, string.Join('/', args.Skip(3)));
@@ -230,8 +231,7 @@ namespace osu.Game.Online.Chat
                             break;
 
                         case "u":
-                            linkType = LinkAction.OpenUserProfile;
-                            break;
+                            return getUserLink(args[2]);
 
                         default:
                             return new LinkDetails(LinkAction.External, url);
@@ -246,6 +246,14 @@ namespace osu.Game.Online.Chat
             return new LinkDetails(LinkAction.External, url);
         }
 
+        private static LinkDetails getUserLink(string argument)
+        {
+            if (int.TryParse(argument, out int userId))
+                return new LinkDetails(LinkAction.OpenUserProfile, new APIUser { Id = userId });
+
+            return new LinkDetails(LinkAction.OpenUserProfile, new APIUser { Username = argument });
+        }
+
         private static MessageFormatterResult format(string toFormat, int startIndex = 0, int space = 3)
         {
             var result = new MessageFormatterResult(toFormat);
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 2db8872524..d8eb63caee 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -45,7 +45,6 @@ using osu.Game.Input.Bindings;
 using osu.Game.IO;
 using osu.Game.Localisation;
 using osu.Game.Online;
-using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Chat;
 using osu.Game.Overlays;
 using osu.Game.Overlays.BeatmapListing;
@@ -446,11 +445,7 @@ namespace osu.Game
                     break;
 
                 case LinkAction.OpenUserProfile:
-                    var user = int.TryParse(argString, out int userId)
-                        ? new APIUser { Id = userId }
-                        : new APIUser { Username = argString };
-
-                    ShowUser(user);
+                    ShowUser((IUser)link.Argument);
                     break;
 
                 case LinkAction.OpenWiki:
diff --git a/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs b/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs
index 0479ab7c16..8a0003b4ea 100644
--- a/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs
+++ b/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs
@@ -223,7 +223,7 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
         private void addBeatmapsetLink()
             => content.AddLink(activity.Beatmapset.AsNonNull().Title, LinkAction.OpenBeatmapSet, getLinkArgument(activity.Beatmapset.AsNonNull().Url), creationParameters: t => t.Font = getLinkFont());
 
-        private string getLinkArgument(string url) => MessageFormatter.GetLinkDetails($"{api.WebsiteRootUrl}{url}").Argument.ToString().AsNonNull();
+        private object getLinkArgument(string url) => MessageFormatter.GetLinkDetails($"{api.WebsiteRootUrl}{url}").Argument.AsNonNull();
 
         private FontUsage getLinkFont(FontWeight fontWeight = FontWeight.Regular)
             => OsuFont.GetFont(size: font_size, weight: fontWeight, italics: true);

From ca402c4d2f4470cba5cd4f21d4a8a4eb15bf5047 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 25 Jun 2023 00:38:19 +0900
Subject: [PATCH 1017/1604] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 66f518f3d5..39c10c2014 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -11,7 +11,7 @@
     <AndroidManifestMerger>manifestmerger.jar</AndroidManifestMerger>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.620.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.624.0" />
   </ItemGroup>
   <ItemGroup>
     <AndroidManifestOverlay Include="$(MSBuildThisFileDirectory)osu.Android\Properties\AndroidManifestOverlay.xml" />
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 9cb20ee364..d179d354fb 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,7 +36,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="10.20.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.620.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.624.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.605.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 256d1e43c4..85cbe3f14b 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -16,6 +16,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.620.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.624.0" />
   </ItemGroup>
 </Project>

From f8d2f2f7e1f9f364700b7b10169b667ca0c32837 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 24 Jun 2023 19:04:05 +0200
Subject: [PATCH 1018/1604] Fix more issues discovered by CI that can be fixed
 game-side

---
 .../Editor/TestScenePathControlPointVisualiser.cs               | 2 +-
 .../Visual/Navigation/TestSceneChangeAndUseGameplayBindings.cs  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
index 37561fda85..0d6841017e 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
@@ -184,7 +184,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             {
                 MenuItem item = visualiser.ContextMenuItems.FirstOrDefault(menuItem => menuItem.Text.Value == "Curve type")?.Items.FirstOrDefault(menuItem => menuItem.Text.Value == contextMenuText);
 
-                item?.Action?.Value();
+                item?.Action.Value?.Invoke();
             });
         }
     }
diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneChangeAndUseGameplayBindings.cs b/osu.Game.Tests/Visual/Navigation/TestSceneChangeAndUseGameplayBindings.cs
index 224e7e411e..5467a64b85 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneChangeAndUseGameplayBindings.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneChangeAndUseGameplayBindings.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Tests.Visual.Navigation
 
         private OsuButton configureBindingsButton => Game.Settings
                                                          .ChildrenOfType<BindingSettings>().SingleOrDefault()?
-                                                         .ChildrenOfType<OsuButton>()?
+                                                         .ChildrenOfType<OsuButton>()
                                                          .First(b => b.Text.ToString() == "Configure");
 
         private KeyBindingPanel keyBindingPanel => Game.Settings

From 5806153cfd6dd176cb584ea700a8416f0bb52a5f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 25 Jun 2023 12:00:14 +0900
Subject: [PATCH 1019/1604] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 39c10c2014..fdec4e575b 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -11,7 +11,7 @@
     <AndroidManifestMerger>manifestmerger.jar</AndroidManifestMerger>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.624.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.625.0" />
   </ItemGroup>
   <ItemGroup>
     <AndroidManifestOverlay Include="$(MSBuildThisFileDirectory)osu.Android\Properties\AndroidManifestOverlay.xml" />
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index d179d354fb..ce03dca949 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,7 +36,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="10.20.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.624.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.625.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.605.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 85cbe3f14b..86694e268a 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -16,6 +16,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.624.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.625.0" />
   </ItemGroup>
 </Project>

From 922fe927ac62ddd2af867093d7c36d26fe043f7f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 25 Jun 2023 15:18:56 +0900
Subject: [PATCH 1020/1604] Update resources

---
 osu.Game/osu.Game.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index ce03dca949..b4d8dd513f 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -37,7 +37,7 @@
     </PackageReference>
     <PackageReference Include="Realm" Version="10.20.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2023.625.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.605.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.625.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />

From 0dced4610035b07c48856324314c3be5a18af92f Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 25 Jun 2023 20:46:28 +0900
Subject: [PATCH 1021/1604] remove `#nullable disable` in `LadderInfo`

---
 osu.Game.Tournament/Models/LadderInfo.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game.Tournament/Models/LadderInfo.cs b/osu.Game.Tournament/Models/LadderInfo.cs
index 229837c94e..3defd517cd 100644
--- a/osu.Game.Tournament/Models/LadderInfo.cs
+++ b/osu.Game.Tournament/Models/LadderInfo.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
@@ -27,7 +25,7 @@ namespace osu.Game.Tournament.Models
         public List<TournamentProgression> Progressions = new List<TournamentProgression>();
 
         [JsonIgnore] // updated manually in TournamentGameBase
-        public Bindable<TournamentMatch> CurrentMatch = new Bindable<TournamentMatch>();
+        public Bindable<TournamentMatch?> CurrentMatch = new Bindable<TournamentMatch?>();
 
         public Bindable<int> ChromaKeyWidth = new BindableInt(1024)
         {

From a3cd0d14a3f3caea616a3ab635a9f5f67463787e Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 25 Jun 2023 20:46:58 +0900
Subject: [PATCH 1022/1604] null guard for Current Match in MatchMessage

---
 .../TestSceneTournamentMatchChatDisplay.cs    | 24 +++++++++----------
 .../Components/TournamentMatchChatDisplay.cs  | 10 ++++----
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs b/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs
index f627bd2ad2..bf59678ac5 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs
@@ -63,18 +63,6 @@ namespace osu.Game.Tournament.Tests.Components
                 Origin = Anchor.Centre,
             });
 
-            ladderInfo.CurrentMatch.Value = new TournamentMatch
-            {
-                Team1 =
-                {
-                    Value = new TournamentTeam { Players = new BindableList<TournamentUser> { redUser } }
-                },
-                Team2 =
-                {
-                    Value = new TournamentTeam { Players = new BindableList<TournamentUser> { blueUser, blueUserWithCustomColour } }
-                }
-            };
-
             chatDisplay.Channel.Value = testChannel;
         }
 
@@ -88,6 +76,18 @@ namespace osu.Game.Tournament.Tests.Components
                 Content = "I am a wang!"
             }));
 
+            AddStep("set Current match", () => ladderInfo.CurrentMatch.Value = new TournamentMatch
+            {
+                Team1 =
+                {
+                    Value = new TournamentTeam { Players = new BindableList<TournamentUser> { redUser } }
+                },
+                Team2 =
+                {
+                    Value = new TournamentTeam { Players = new BindableList<TournamentUser> { blueUser, blueUserWithCustomColour } }
+                }
+            });
+
             AddStep("message from team red", () => testChannel.AddNewMessages(new Message(nextMessageId())
             {
                 Sender = redUser.ToAPIUser(),
diff --git a/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs b/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
index 2a2e45d70c..bb8d86e7e2 100644
--- a/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
+++ b/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -19,10 +17,10 @@ namespace osu.Game.Tournament.Components
     {
         private readonly Bindable<string> chatChannel = new Bindable<string>();
 
-        private ChannelManager manager;
+        private ChannelManager? manager;
 
         [Resolved]
-        private LadderInfo ladderInfo { get; set; }
+        private LadderInfo ladderInfo { get; set; } = null!;
 
         public TournamentMatchChatDisplay()
         {
@@ -35,7 +33,7 @@ namespace osu.Game.Tournament.Components
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(MatchIPCInfo ipc, IAPIProvider api)
+        private void load(MatchIPCInfo? ipc, IAPIProvider api)
         {
             if (ipc != null)
             {
@@ -92,6 +90,8 @@ namespace osu.Game.Tournament.Components
             public MatchMessage(Message message, LadderInfo info)
                 : base(message)
             {
+                if (info.CurrentMatch.Value == null) return;
+
                 if (info.CurrentMatch.Value.Team1.Value.Players.Any(u => u.OnlineID == Message.Sender.OnlineID))
                     UsernameColour = TournamentGame.COLOUR_RED;
                 else if (info.CurrentMatch.Value.Team2.Value.Players.Any(u => u.OnlineID == Message.Sender.OnlineID))

From 95e8dd2e8ef27669bf9a19a326fde1d6397c35f9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 25 Jun 2023 21:25:07 +0900
Subject: [PATCH 1023/1604] Don't attempt to access notifications before loaded
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 osu.Game/Overlays/NotificationOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index 28803fe590..f1e39b947d 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Overlays
         public const float TRANSITION_LENGTH = 600;
 
         public IEnumerable<Notification> AllNotifications =>
-            toastTray.Notifications.Concat(sections.SelectMany(s => s.Notifications));
+            IsLoaded ? toastTray.Notifications.Concat(sections.SelectMany(s => s.Notifications)) : Array.Empty<Notification>();
 
         private FlowContainer<NotificationSection> sections = null!;
 

From 3d1a8aeb540799e3d62fc915805b3dd3678beb69 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 25 Jun 2023 21:24:39 +0900
Subject: [PATCH 1024/1604] Use more understandable cancel button text

---
 osu.Game/Screens/Menu/ConfirmExitDialog.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Menu/ConfirmExitDialog.cs b/osu.Game/Screens/Menu/ConfirmExitDialog.cs
index fb22f7eff8..0041d047bd 100644
--- a/osu.Game/Screens/Menu/ConfirmExitDialog.cs
+++ b/osu.Game/Screens/Menu/ConfirmExitDialog.cs
@@ -4,6 +4,7 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Localisation;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Dialog;
 
@@ -52,7 +53,7 @@ namespace osu.Game.Screens.Menu
                     },
                     new PopupDialogCancelButton
                     {
-                        Text = @"Cancel",
+                        Text = CommonStrings.Back,
                         Action = onCancel
                     },
                 };

From cf43cd2bdcc165eca96d7b569b2f26a617e049bb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 25 Jun 2023 21:26:08 +0900
Subject: [PATCH 1025/1604] Rename test scene to match updated class name

---
 ...dToConfirmOverlay.cs => TestSceneHoldToExitGameOverlay.cs} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename osu.Game.Tests/Visual/UserInterface/{TestSceneHoldToConfirmOverlay.cs => TestSceneHoldToExitGameOverlay.cs} (94%)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneHoldToConfirmOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneHoldToExitGameOverlay.cs
similarity index 94%
rename from osu.Game.Tests/Visual/UserInterface/TestSceneHoldToConfirmOverlay.cs
rename to osu.Game.Tests/Visual/UserInterface/TestSceneHoldToExitGameOverlay.cs
index 58d1637ca7..df423268b6 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneHoldToConfirmOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneHoldToExitGameOverlay.cs
@@ -8,11 +8,11 @@ using osu.Game.Screens.Menu;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
-    public partial class TestSceneHoldToConfirmOverlay : OsuTestScene
+    public partial class TestSceneHoldToExitGameOverlay : OsuTestScene
     {
         protected override double TimePerAction => 100; // required for the early exit test, since hold-to-confirm delay is 200ms
 
-        public TestSceneHoldToConfirmOverlay()
+        public TestSceneHoldToExitGameOverlay()
         {
             bool fired = false;
 

From 4215ca313f17f147d3b0ca2d2feaeb04abf062bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 25 Jun 2023 14:36:21 +0200
Subject: [PATCH 1026/1604] Add missing using

---
 osu.Game/Overlays/NotificationOverlay.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index f1e39b947d..21027b0931 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;

From a7088ffe22f6b03475303dcda5425fde0aa9cee1 Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Sun, 25 Jun 2023 15:04:39 +0200
Subject: [PATCH 1027/1604] revert: bring back old attachment flow

As discussed, this would bring more problems that anything.

Refs: 4c39708, f83a4f4
---
 osu.Game/Rulesets/UI/DrawableRuleset.cs       | 11 +++-
 osu.Game/Rulesets/UI/IKeybindingListener.cs   | 50 ---------------
 osu.Game/Rulesets/UI/RulesetInputManager.cs   | 63 ++++++++++---------
 .../ClicksPerSecondCalculator.cs              | 19 +-----
 .../Screens/Play/HUD/KeyCounterController.cs  | 21 +------
 osu.Game/Screens/Play/HUDOverlay.cs           | 12 ++--
 6 files changed, 49 insertions(+), 127 deletions(-)
 delete mode 100644 osu.Game/Rulesets/UI/IKeybindingListener.cs

diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index e0a1533c4b..57f5f54d8f 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -30,6 +30,8 @@ using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
+using osu.Game.Screens.Play.HUD;
+using osu.Game.Screens.Play.HUD.ClicksPerSecond;
 using osuTK;
 
 namespace osu.Game.Rulesets.UI
@@ -38,7 +40,7 @@ namespace osu.Game.Rulesets.UI
     /// Displays an interactive ruleset gameplay instance.
     /// </summary>
     /// <typeparam name="TObject">The type of HitObject contained by this DrawableRuleset.</typeparam>
-    public abstract partial class DrawableRuleset<TObject> : DrawableRuleset, IProvideCursor, IKeybindingEventsEmitter
+    public abstract partial class DrawableRuleset<TObject> : DrawableRuleset, IProvideCursor, ICanAttachHUDPieces
         where TObject : HitObject
     {
         public override event Action<JudgementResult> NewResult;
@@ -327,8 +329,11 @@ namespace osu.Game.Rulesets.UI
         /// <returns>The representing <see cref="DrawableHitObject{TObject}"/>.</returns>
         public abstract DrawableHitObject<TObject> CreateDrawableRepresentation(TObject h);
 
-        public void Attach(IKeybindingListener skinComponent) =>
-            (KeyBindingInputManager as IKeybindingEventsEmitter)?.Attach(skinComponent);
+        public void Attach(KeyCounterController keyCounter) =>
+            (KeyBindingInputManager as ICanAttachHUDPieces)?.Attach(keyCounter);
+
+        public void Attach(ClicksPerSecondCalculator calculator) =>
+            (KeyBindingInputManager as ICanAttachHUDPieces)?.Attach(calculator);
 
         /// <summary>
         /// Creates a key conversion input manager. An exception will be thrown if a valid <see cref="RulesetInputManager{T}"/> is not returned.
diff --git a/osu.Game/Rulesets/UI/IKeybindingListener.cs b/osu.Game/Rulesets/UI/IKeybindingListener.cs
deleted file mode 100644
index f38ce8643e..0000000000
--- a/osu.Game/Rulesets/UI/IKeybindingListener.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-#nullable disable
-using System.Collections.Generic;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Input.Bindings;
-using osu.Framework.Input.Events;
-
-namespace osu.Game.Rulesets.UI
-{
-    /// <summary>
-    /// Listens to <see cref="IKeyBinding"/> events emitted by an <see cref="IKeybindingEventsEmitter"/>.
-    /// Alternative to <see cref="IKeyBindingHandler{T}"/> for classes that need to not depend on type parameters.
-    /// </summary>
-    public interface IKeybindingListener
-    {
-        /// <summary>
-        /// This class or a member of this class can already handle keybindings.
-        /// Signals to the <see cref="IKeybindingEventsEmitter"/> that <see cref="OnPressed{T}"/> and <see cref="OnReleased{T}"/>
-        /// don't necessarily need to be called.
-        /// </summary>
-        /// <remarks>
-        /// This is usually true for <see cref="CompositeDrawable"/>s and <see cref="CompositeComponent"/>s that need to
-        /// pass <see cref="IKeyBinding"/>s events to children that can already handle them.
-        /// </remarks>
-        public bool CanHandleKeybindings { get; }
-
-        /// <summary>
-        /// Prepares this class to receive events.
-        /// </summary>
-        /// <param name="actions">The list of possible actions that can occur.</param>
-        /// <typeparam name="T">The type actions, commonly enums.</typeparam>
-        public void Setup<T>(IEnumerable<T> actions) where T : struct;
-
-        /// <summary>
-        /// Called when an action is pressed.
-        /// </summary>
-        /// <param name="action">The event containing information about the pressed action.</param>
-        /// <typeparam name="T">The type of binding, commonly enums.</typeparam>
-        public void OnPressed<T>(KeyBindingPressEvent<T> action) where T : struct;
-
-        /// <summary>
-        /// Called when an action is released.
-        /// </summary>
-        /// <param name="action">The event containing information about the released action.</param>
-        /// <typeparam name="T">The type of binding, commonly enums.</typeparam>
-        public void OnReleased<T>(KeyBindingReleaseEvent<T> action) where T : struct;
-    }
-}
diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 44c1f00cf7..2c403139b6 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -19,11 +19,13 @@ using osu.Game.Input;
 using osu.Game.Input.Bindings;
 using osu.Game.Input.Handlers;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Screens.Play.HUD;
+using osu.Game.Screens.Play.HUD.ClicksPerSecond;
 using static osu.Game.Input.Handlers.ReplayInputHandler;
 
 namespace osu.Game.Rulesets.UI
 {
-    public abstract partial class RulesetInputManager<T> : PassThroughInputManager, IKeybindingEventsEmitter, IHasReplayHandler, IHasRecordingHandler
+    public abstract partial class RulesetInputManager<T> : PassThroughInputManager, ICanAttachHUDPieces, IHasReplayHandler, IHasRecordingHandler
         where T : struct
     {
         protected override bool AllowRightClickFromLongTouch => false;
@@ -64,7 +66,6 @@ namespace osu.Game.Rulesets.UI
             InternalChild = KeyBindingContainer =
                 CreateKeyBindingContainer(ruleset, variant, unique)
                     .WithChild(content = new Container { RelativeSizeAxes = Axes.Both });
-            KeyBindingContainer.Add(actionListener = new ActionListener());
         }
 
         [BackgroundDependencyLoader(true)]
@@ -157,49 +158,47 @@ namespace osu.Game.Rulesets.UI
 
         #endregion
 
-        #region Component attachement
+        #region Key Counter Attachment
 
-        private readonly ActionListener actionListener;
-
-        public void Attach(IKeybindingListener skinComponent)
+        public void Attach(KeyCounterController keyCounter)
         {
-            skinComponent.Setup(KeyBindingContainer.DefaultKeyBindings
+            KeyBindingContainer.Add(keyCounter);
+
+            keyCounter.AddRange(KeyBindingContainer.DefaultKeyBindings
                                                    .Select(b => b.GetAction<T>())
                                                    .Distinct()
-                                                   .OrderBy(a => a));
+                                                   .OrderBy(action => action)
+                                                   .Select(action => new KeyCounterActionTrigger<T>(action)));
+        }
 
-            if (skinComponent.CanHandleKeybindings && skinComponent is Drawable component)
-            {
-                try
-                {
-                    KeyBindingContainer.Add(component);
-                    return;
-                }
-                catch (Exception)
-                {
-                    return;
-                }
-            }
+        #endregion
 
-            actionListener.OnPressedEvent += skinComponent.OnPressed;
-            actionListener.OnReleasedEvent += skinComponent.OnReleased;
+        #region Keys per second Counter Attachment
+
+        public void Attach(ClicksPerSecondCalculator calculator)
+        {
+            var listener = new ActionListener(calculator);
+
+            KeyBindingContainer.Add(listener);
         }
 
         private partial class ActionListener : Component, IKeyBindingHandler<T>
         {
-            public event Action<KeyBindingPressEvent<T>> OnPressedEvent;
+            private readonly ClicksPerSecondCalculator calculator;
 
-            public event Action<KeyBindingReleaseEvent<T>> OnReleasedEvent;
+            public ActionListener(ClicksPerSecondCalculator calculator)
+            {
+                this.calculator = calculator;
+            }
 
             public bool OnPressed(KeyBindingPressEvent<T> e)
             {
-                OnPressedEvent?.Invoke(e);
+                calculator.AddInputTimestamp();
                 return false;
             }
 
             public void OnReleased(KeyBindingReleaseEvent<T> e)
             {
-                OnReleasedEvent?.Invoke(e);
             }
         }
 
@@ -240,11 +239,17 @@ namespace osu.Game.Rulesets.UI
     }
 
     /// <summary>
-    /// Sends <see cref="IKeyBinding"/> events to a <see cref="IKeybindingListener"/>
+    /// Supports attaching various HUD pieces.
+    /// Keys will be populated automatically and a receptor will be injected inside.
     /// </summary>
-    public interface IKeybindingEventsEmitter
+    public interface ICanAttachHUDPieces
+    {
+        void Attach(KeyCounterController keyCounter);
+        void Attach(ClicksPerSecondCalculator calculator);
+    }
+
+    public interface IAttachableSkinComponent
     {
-        void Attach(IKeybindingListener component);
     }
 
     public class RulesetInputManagerInputState<T> : InputState
diff --git a/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs b/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs
index e0e93cb66e..3e55e11f1c 100644
--- a/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs
+++ b/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs
@@ -4,12 +4,11 @@
 using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Input.Events;
 using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Screens.Play.HUD.ClicksPerSecond
 {
-    public partial class ClicksPerSecondCalculator : Component, IKeybindingListener
+    public partial class ClicksPerSecondCalculator : Component, IAttachableSkinComponent
     {
         private readonly List<double> timestamps = new List<double>();
 
@@ -54,21 +53,5 @@ namespace osu.Game.Screens.Play.HUD.ClicksPerSecond
 
             Value = count;
         }
-
-        #region IKeybindingListener
-
-        bool IKeybindingListener.CanHandleKeybindings => false;
-
-        void IKeybindingListener.Setup<T>(IEnumerable<T> actions)
-        {
-        }
-
-        void IKeybindingListener.OnPressed<T>(KeyBindingPressEvent<T> action) => AddInputTimestamp();
-
-        void IKeybindingListener.OnReleased<T>(KeyBindingReleaseEvent<T> action)
-        {
-        }
-
-        #endregion
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/KeyCounterController.cs b/osu.Game/Screens/Play/HUD/KeyCounterController.cs
index 2e678e55fc..0fa02afbb4 100644
--- a/osu.Game/Screens/Play/HUD/KeyCounterController.cs
+++ b/osu.Game/Screens/Play/HUD/KeyCounterController.cs
@@ -3,16 +3,14 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Input.Events;
 using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public partial class KeyCounterController : CompositeComponent, IKeybindingListener
+    public partial class KeyCounterController : CompositeComponent, IAttachableSkinComponent
     {
         public readonly Bindable<bool> IsCounting = new BindableBool(true);
 
@@ -38,22 +36,5 @@ namespace osu.Game.Screens.Play.HUD
         public override bool HandleNonPositionalInput => true;
 
         public override bool HandlePositionalInput => true;
-
-        #region IKeybindingListener
-
-        bool IKeybindingListener.CanHandleKeybindings => true;
-
-        void IKeybindingListener.Setup<T>(IEnumerable<T> actions)
-            => AddRange(actions.Select(a => new KeyCounterActionTrigger<T>(a)));
-
-        void IKeybindingListener.OnPressed<T>(KeyBindingPressEvent<T> action)
-        {
-        }
-
-        void IKeybindingListener.OnReleased<T>(KeyBindingReleaseEvent<T> action)
-        {
-        }
-
-        #endregion
     }
 }
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index b74b5d835a..21636ac04c 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -10,7 +10,6 @@ using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.EnumExtensions;
-using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Bindings;
@@ -103,8 +102,6 @@ namespace osu.Game.Screens.Play
 
         private readonly List<Drawable> hideTargets;
 
-        private readonly IEnumerable<IKeybindingListener> actionInjectionCandidates;
-
         public HUDOverlay(DrawableRuleset drawableRuleset, IReadOnlyList<Mod> mods, bool alwaysShowLeaderboard = true)
         {
             Drawable rulesetComponents;
@@ -166,8 +163,6 @@ namespace osu.Game.Screens.Play
 
             hideTargets = new List<Drawable> { mainComponents, rulesetComponents, topRightElements };
 
-            actionInjectionCandidates = new IKeybindingListener[] { clicksPerSecondCalculator, KeyCounter };
-
             if (!alwaysShowLeaderboard)
                 hideTargets.Add(LeaderboardFlow);
         }
@@ -324,8 +319,11 @@ namespace osu.Game.Screens.Play
 
         protected virtual void BindDrawableRuleset(DrawableRuleset drawableRuleset)
         {
-            if (drawableRuleset is IKeybindingEventsEmitter attachTarget)
-                actionInjectionCandidates.ForEach(attachTarget.Attach);
+            if (drawableRuleset is ICanAttachHUDPieces attachTarget)
+            {
+                attachTarget.Attach(KeyCounter);
+                attachTarget.Attach(clicksPerSecondCalculator);
+            }
 
             replayLoaded.BindTo(drawableRuleset.HasReplayLoaded);
         }

From e02a06e3e557f793f4c61d688cf8712524f9bc08 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 25 Jun 2023 22:47:36 +0900
Subject: [PATCH 1028/1604] Revert "remove `#nullable disable` in `LadderInfo`"

This reverts commit 0dced4610035b07c48856324314c3be5a18af92f.
---
 osu.Game.Tournament/Models/LadderInfo.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Models/LadderInfo.cs b/osu.Game.Tournament/Models/LadderInfo.cs
index 3defd517cd..229837c94e 100644
--- a/osu.Game.Tournament/Models/LadderInfo.cs
+++ b/osu.Game.Tournament/Models/LadderInfo.cs
@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
@@ -25,7 +27,7 @@ namespace osu.Game.Tournament.Models
         public List<TournamentProgression> Progressions = new List<TournamentProgression>();
 
         [JsonIgnore] // updated manually in TournamentGameBase
-        public Bindable<TournamentMatch?> CurrentMatch = new Bindable<TournamentMatch?>();
+        public Bindable<TournamentMatch> CurrentMatch = new Bindable<TournamentMatch>();
 
         public Bindable<int> ChromaKeyWidth = new BindableInt(1024)
         {

From 14e26d2a850e8e366c25ed0e39456024cca39e42 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 25 Jun 2023 22:42:02 +0900
Subject: [PATCH 1029/1604] use BeatmapCache for populate beatmap information

---
 osu.Game.Tournament/TournamentGameBase.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 634cc87a9f..2067295eb6 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -15,6 +15,7 @@ using osu.Framework.Input;
 using osu.Framework.IO.Stores;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
+using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Online;
 using osu.Game.Online.API.Requests;
@@ -35,6 +36,7 @@ namespace osu.Game.Tournament
         private TournamentStorage storage;
         private DependencyContainer dependencies;
         private FileBasedIPC ipc;
+        private BeatmapLookupCache beatmapCache;
 
         protected Task BracketLoadTask => bracketLoadTaskCompletionSource.Task;
 
@@ -75,6 +77,8 @@ namespace osu.Game.Tournament
             Textures.AddTextureSource(new TextureLoaderStore(new StorageBackedResourceStore(storage)));
 
             dependencies.CacheAs(new StableInfo(storage));
+
+            beatmapCache = dependencies.Get<BeatmapLookupCache>();
         }
 
         protected override void LoadComplete()
@@ -241,9 +245,7 @@ namespace osu.Game.Tournament
             {
                 var b = beatmapsRequiringPopulation[i];
 
-                var req = new GetBeatmapRequest(new APIBeatmap { OnlineID = b.ID });
-                API.Perform(req);
-                b.Beatmap = new TournamentBeatmap(req.Response ?? new APIBeatmap());
+                b.Beatmap = new TournamentBeatmap(beatmapCache.GetBeatmapAsync(b.ID).GetAwaiter().GetResult() ?? new APIBeatmap());
 
                 updateLoadProgressMessage($"Populating round beatmaps ({i} / {beatmapsRequiringPopulation.Count})");
             }
@@ -268,9 +270,7 @@ namespace osu.Game.Tournament
             {
                 var b = beatmapsRequiringPopulation[i];
 
-                var req = new GetBeatmapRequest(new APIBeatmap { OnlineID = b.ID });
-                API.Perform(req);
-                b.Beatmap = new TournamentBeatmap(req.Response ?? new APIBeatmap());
+                b.Beatmap = new TournamentBeatmap(beatmapCache.GetBeatmapAsync(b.ID).GetAwaiter().GetResult() ?? new APIBeatmap());
 
                 updateLoadProgressMessage($"Populating seeding beatmaps ({i} / {beatmapsRequiringPopulation.Count})");
             }

From 9862992af0b415b3bfb4685196d35347ddd9397b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 25 Jun 2023 17:36:44 +0200
Subject: [PATCH 1030/1604] Use alternative guard

Early-returning from ctors feels pretty bad. Also saves on some
nested accesses.
---
 .../Components/TournamentMatchChatDisplay.cs        | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs b/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
index bb8d86e7e2..15c37474f5 100644
--- a/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
+++ b/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
@@ -90,12 +90,13 @@ namespace osu.Game.Tournament.Components
             public MatchMessage(Message message, LadderInfo info)
                 : base(message)
             {
-                if (info.CurrentMatch.Value == null) return;
-
-                if (info.CurrentMatch.Value.Team1.Value.Players.Any(u => u.OnlineID == Message.Sender.OnlineID))
-                    UsernameColour = TournamentGame.COLOUR_RED;
-                else if (info.CurrentMatch.Value.Team2.Value.Players.Any(u => u.OnlineID == Message.Sender.OnlineID))
-                    UsernameColour = TournamentGame.COLOUR_BLUE;
+                if (info.CurrentMatch.Value is TournamentMatch match)
+                {
+                    if (match.Team1.Value.Players.Any(u => u.OnlineID == Message.Sender.OnlineID))
+                        UsernameColour = TournamentGame.COLOUR_RED;
+                    else if (match.Team2.Value.Players.Any(u => u.OnlineID == Message.Sender.OnlineID))
+                        UsernameColour = TournamentGame.COLOUR_BLUE;
+                }
             }
         }
     }

From 7d9d7066cd525ae6d20afeef6f206e9b27457730 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 25 Jun 2023 17:39:15 +0200
Subject: [PATCH 1031/1604] Remove no-longer-needed BDL `permitNulls` spec

---
 osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs b/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
index 15c37474f5..e943cb8b8c 100644
--- a/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
+++ b/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Tournament.Components
             CornerRadius = 0;
         }
 
-        [BackgroundDependencyLoader(true)]
+        [BackgroundDependencyLoader]
         private void load(MatchIPCInfo? ipc, IAPIProvider api)
         {
             if (ipc != null)

From 44a3f401887a1d1fa5f1c7076e3b694e8ce17386 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 25 Jun 2023 17:39:36 +0200
Subject: [PATCH 1032/1604] Rename test step

---
 .../Components/TestSceneTournamentMatchChatDisplay.cs           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs b/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs
index bf59678ac5..044e5ebbbf 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs
@@ -76,7 +76,7 @@ namespace osu.Game.Tournament.Tests.Components
                 Content = "I am a wang!"
             }));
 
-            AddStep("set Current match", () => ladderInfo.CurrentMatch.Value = new TournamentMatch
+            AddStep("set current match", () => ladderInfo.CurrentMatch.Value = new TournamentMatch
             {
                 Team1 =
                 {

From 1b671b8c6e3296d373d168f643745af660a81399 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Mon, 26 Jun 2023 00:45:59 +0900
Subject: [PATCH 1033/1604] Use `GetResultSafely()`

---
 osu.Game.Tournament/TournamentGameBase.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 2067295eb6..7d0571dde0 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -9,6 +9,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Input;
@@ -245,7 +246,7 @@ namespace osu.Game.Tournament
             {
                 var b = beatmapsRequiringPopulation[i];
 
-                b.Beatmap = new TournamentBeatmap(beatmapCache.GetBeatmapAsync(b.ID).GetAwaiter().GetResult() ?? new APIBeatmap());
+                b.Beatmap = new TournamentBeatmap(beatmapCache.GetBeatmapAsync(b.ID).GetResultSafely() ?? new APIBeatmap());
 
                 updateLoadProgressMessage($"Populating round beatmaps ({i} / {beatmapsRequiringPopulation.Count})");
             }
@@ -270,7 +271,7 @@ namespace osu.Game.Tournament
             {
                 var b = beatmapsRequiringPopulation[i];
 
-                b.Beatmap = new TournamentBeatmap(beatmapCache.GetBeatmapAsync(b.ID).GetAwaiter().GetResult() ?? new APIBeatmap());
+                b.Beatmap = new TournamentBeatmap(beatmapCache.GetBeatmapAsync(b.ID).GetResultSafely() ?? new APIBeatmap());
 
                 updateLoadProgressMessage($"Populating seeding beatmaps ({i} / {beatmapsRequiringPopulation.Count})");
             }

From 25c9bf40614b2c89683b5415f43163baf7760b77 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sun, 25 Jun 2023 11:22:05 -0700
Subject: [PATCH 1034/1604] Improve and refactor `LoginPanel` test scene to use
 `LoginOverlay`

---
 .../Visual/Menus/TestSceneLoginOverlay.cs     | 89 +++++++++++++++++++
 .../Visual/Menus/TestSceneLoginPanel.cs       | 78 ----------------
 osu.Game/Online/API/DummyAPIAccess.cs         |  8 ++
 3 files changed, 97 insertions(+), 78 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Menus/TestSceneLoginOverlay.cs
 delete mode 100644 osu.Game.Tests/Visual/Menus/TestSceneLoginPanel.cs

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneLoginOverlay.cs b/osu.Game.Tests/Visual/Menus/TestSceneLoginOverlay.cs
new file mode 100644
index 0000000000..5c2edac84d
--- /dev/null
+++ b/osu.Game.Tests/Visual/Menus/TestSceneLoginOverlay.cs
@@ -0,0 +1,89 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.API;
+using osu.Game.Overlays;
+using osu.Game.Users.Drawables;
+using osuTK.Input;
+
+namespace osu.Game.Tests.Visual.Menus
+{
+    [TestFixture]
+    public partial class TestSceneLoginOverlay : OsuManualInputManagerTestScene
+    {
+        private LoginOverlay loginOverlay = null!;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Child = loginOverlay = new LoginOverlay
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+            };
+        }
+
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep("show login overlay", () => loginOverlay.Show());
+        }
+
+        [Test]
+        public void TestLoginSuccess()
+        {
+            AddStep("logout", () => API.Logout());
+
+            AddStep("enter password", () => loginOverlay.ChildrenOfType<OsuPasswordTextBox>().First().Text = "password");
+            AddStep("submit", () => loginOverlay.ChildrenOfType<OsuButton>().First(b => b.Text.ToString() == "Sign in").TriggerClick());
+        }
+
+        [Test]
+        public void TestLoginFailure()
+        {
+            AddStep("logout", () =>
+            {
+                API.Logout();
+                ((DummyAPIAccess)API).FailNextLogin();
+            });
+
+            AddStep("enter password", () => loginOverlay.ChildrenOfType<OsuPasswordTextBox>().First().Text = "password");
+            AddStep("submit", () => loginOverlay.ChildrenOfType<OsuButton>().First(b => b.Text.ToString() == "Sign in").TriggerClick());
+        }
+
+        [Test]
+        public void TestLoginConnecting()
+        {
+            AddStep("logout", () =>
+            {
+                API.Logout();
+                ((DummyAPIAccess)API).StayConnectingNextLogin();
+            });
+
+            AddStep("enter password", () => loginOverlay.ChildrenOfType<OsuPasswordTextBox>().First().Text = "password");
+            AddStep("submit", () => loginOverlay.ChildrenOfType<OsuButton>().First(b => b.Text.ToString() == "Sign in").TriggerClick());
+        }
+
+        [Test]
+        public void TestClickingOnFlagClosesOverlay()
+        {
+            AddStep("logout", () => API.Logout());
+            AddStep("enter password", () => loginOverlay.ChildrenOfType<OsuPasswordTextBox>().First().Text = "password");
+            AddStep("submit", () => loginOverlay.ChildrenOfType<OsuButton>().First(b => b.Text.ToString() == "Sign in").TriggerClick());
+
+            AddStep("click on flag", () =>
+            {
+                InputManager.MoveMouseTo(loginOverlay.ChildrenOfType<UpdateableFlag>().First());
+                InputManager.Click(MouseButton.Left);
+            });
+            AddAssert("login overlay is hidden", () => loginOverlay.State.Value == Visibility.Hidden);
+        }
+    }
+}
diff --git a/osu.Game.Tests/Visual/Menus/TestSceneLoginPanel.cs b/osu.Game.Tests/Visual/Menus/TestSceneLoginPanel.cs
deleted file mode 100644
index 738220f5ce..0000000000
--- a/osu.Game.Tests/Visual/Menus/TestSceneLoginPanel.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-#nullable disable
-
-using System.Linq;
-using NUnit.Framework;
-using osu.Framework.Graphics;
-using osu.Framework.Testing;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Online.API;
-using osu.Game.Overlays.Login;
-using osu.Game.Users.Drawables;
-using osuTK.Input;
-
-namespace osu.Game.Tests.Visual.Menus
-{
-    [TestFixture]
-    public partial class TestSceneLoginPanel : OsuManualInputManagerTestScene
-    {
-        private LoginPanel loginPanel;
-        private int hideCount;
-
-        [SetUpSteps]
-        public void SetUpSteps()
-        {
-            AddStep("create login dialog", () =>
-            {
-                Add(loginPanel = new LoginPanel
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Width = 0.5f,
-                    RequestHide = () => hideCount++,
-                });
-            });
-        }
-
-        [Test]
-        public void TestLoginSuccess()
-        {
-            AddStep("logout", () => API.Logout());
-
-            AddStep("enter password", () => loginPanel.ChildrenOfType<OsuPasswordTextBox>().First().Text = "password");
-            AddStep("submit", () => loginPanel.ChildrenOfType<OsuButton>().First(b => b.Text.ToString() == "Sign in").TriggerClick());
-        }
-
-        [Test]
-        public void TestLoginFailure()
-        {
-            AddStep("logout", () =>
-            {
-                API.Logout();
-                ((DummyAPIAccess)API).FailNextLogin();
-            });
-
-            AddStep("enter password", () => loginPanel.ChildrenOfType<OsuPasswordTextBox>().First().Text = "password");
-            AddStep("submit", () => loginPanel.ChildrenOfType<OsuButton>().First(b => b.Text.ToString() == "Sign in").TriggerClick());
-        }
-
-        [Test]
-        public void TestClickingOnFlagClosesPanel()
-        {
-            AddStep("reset hide count", () => hideCount = 0);
-
-            AddStep("logout", () => API.Logout());
-            AddStep("enter password", () => loginPanel.ChildrenOfType<OsuPasswordTextBox>().First().Text = "password");
-            AddStep("submit", () => loginPanel.ChildrenOfType<OsuButton>().First(b => b.Text.ToString() == "Sign in").TriggerClick());
-
-            AddStep("click on flag", () =>
-            {
-                InputManager.MoveMouseTo(loginPanel.ChildrenOfType<UpdateableFlag>().First());
-                InputManager.Click(MouseButton.Left);
-            });
-            AddAssert("hide requested", () => hideCount == 1);
-        }
-    }
-}
diff --git a/osu.Game/Online/API/DummyAPIAccess.cs b/osu.Game/Online/API/DummyAPIAccess.cs
index bf9baa4414..c2ef0b4e92 100644
--- a/osu.Game/Online/API/DummyAPIAccess.cs
+++ b/osu.Game/Online/API/DummyAPIAccess.cs
@@ -56,6 +56,7 @@ namespace osu.Game.Online.API
         private readonly Bindable<APIState> state = new Bindable<APIState>(APIState.Online);
 
         private bool shouldFailNextLogin;
+        private bool stayConnectingNextLogin;
 
         /// <summary>
         /// The current connectivity state of the API.
@@ -94,6 +95,12 @@ namespace osu.Game.Online.API
         {
             state.Value = APIState.Connecting;
 
+            if (stayConnectingNextLogin)
+            {
+                stayConnectingNextLogin = false;
+                return;
+            }
+
             if (shouldFailNextLogin)
             {
                 LastLoginError = new APIException("Not powerful enough to login.", new ArgumentException(nameof(shouldFailNextLogin)));
@@ -138,6 +145,7 @@ namespace osu.Game.Online.API
         IBindable<UserActivity> IAPIProvider.Activity => Activity;
 
         public void FailNextLogin() => shouldFailNextLogin = true;
+        public void StayConnectingNextLogin() => stayConnectingNextLogin = true;
 
         protected override void Dispose(bool isDisposing)
         {

From 1058f434d75d74f3814c5f90756e14824decda26 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sun, 25 Jun 2023 10:07:30 -0700
Subject: [PATCH 1035/1604] Update login overlay background to conform to other
 overlays

---
 osu.Game/Overlays/LoginOverlay.cs | 41 ++++++++++++++++---------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Overlays/LoginOverlay.cs b/osu.Game/Overlays/LoginOverlay.cs
index 8b60024682..b16cc5bd4b 100644
--- a/osu.Game/Overlays/LoginOverlay.cs
+++ b/osu.Game/Overlays/LoginOverlay.cs
@@ -4,9 +4,10 @@
 #nullable disable
 
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Graphics;
+using osu.Framework.Graphics.Effects;
 using osuTK.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics.Containers;
@@ -21,13 +22,24 @@ namespace osu.Game.Overlays
 
         private const float transition_time = 400;
 
+        [Cached]
+        private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
+
         public LoginOverlay()
         {
             AutoSizeAxes = Axes.Both;
+            Masking = true;
+            EdgeEffect = new EdgeEffectParameters
+            {
+                Colour = Color4.Black.Opacity(0),
+                Type = EdgeEffectType.Shadow,
+                Radius = 10,
+                Hollow = true,
+            };
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load()
         {
             Children = new Drawable[]
             {
@@ -40,8 +52,7 @@ namespace osu.Game.Overlays
                         new Box
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Colour = Color4.Black,
-                            Alpha = 0.6f,
+                            Colour = colourProvider.Background4,
                         },
                         new Container
                         {
@@ -50,23 +61,11 @@ namespace osu.Game.Overlays
                             Masking = true,
                             AutoSizeDuration = transition_time,
                             AutoSizeEasing = Easing.OutQuint,
-                            Children = new Drawable[]
+                            Child = panel = new LoginPanel
                             {
-                                panel = new LoginPanel
-                                {
-                                    Padding = new MarginPadding(10),
-                                    RequestHide = Hide,
-                                },
-                                new Box
-                                {
-                                    RelativeSizeAxes = Axes.X,
-                                    Anchor = Anchor.BottomLeft,
-                                    Origin = Anchor.BottomLeft,
-                                    Height = 3,
-                                    Colour = colours.Yellow,
-                                    Alpha = 1,
-                                },
-                            }
+                                Padding = new MarginPadding(10),
+                                RequestHide = Hide,
+                            },
                         }
                     }
                 }
@@ -77,6 +76,7 @@ namespace osu.Game.Overlays
         {
             panel.Bounding = true;
             this.FadeIn(transition_time, Easing.OutQuint);
+            FadeEdgeEffectTo(WaveContainer.SHADOW_OPACITY, WaveContainer.APPEAR_DURATION, Easing.Out);
 
             ScheduleAfterChildren(() => GetContainingInputManager().ChangeFocus(panel));
         }
@@ -87,6 +87,7 @@ namespace osu.Game.Overlays
 
             panel.Bounding = false;
             this.FadeOut(transition_time);
+            FadeEdgeEffectTo(0, WaveContainer.DISAPPEAR_DURATION, Easing.In);
         }
     }
 }

From 442fda3598699f69853d739634473a60378389e8 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sun, 25 Jun 2023 10:15:16 -0700
Subject: [PATCH 1036/1604] Remove using aliases

---
 osu.Game/Overlays/Login/LoginPanel.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Login/LoginPanel.cs b/osu.Game/Overlays/Login/LoginPanel.cs
index 79569ada65..80238f5474 100644
--- a/osu.Game/Overlays/Login/LoginPanel.cs
+++ b/osu.Game/Overlays/Login/LoginPanel.cs
@@ -9,6 +9,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Primitives;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -18,8 +19,6 @@ using osu.Game.Localisation;
 using osu.Game.Online.API;
 using osu.Game.Users;
 using osuTK;
-using RectangleF = osu.Framework.Graphics.Primitives.RectangleF;
-using Container = osu.Framework.Graphics.Containers.Container;
 
 namespace osu.Game.Overlays.Login
 {

From 4a3b8c405eeb27ab6b7e7e7743f332d0940ab14c Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sun, 25 Jun 2023 11:47:32 -0700
Subject: [PATCH 1037/1604] Fix login error text adding unnecessary spacing

---
 osu.Game/Overlays/Login/LoginForm.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Overlays/Login/LoginForm.cs b/osu.Game/Overlays/Login/LoginForm.cs
index 47e706fe58..f56753dbe7 100644
--- a/osu.Game/Overlays/Login/LoginForm.cs
+++ b/osu.Game/Overlays/Login/LoginForm.cs
@@ -73,6 +73,7 @@ namespace osu.Game.Overlays.Login
                 {
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
+                    Alpha = 0,
                 },
                 new SettingsCheckbox
                 {
@@ -128,7 +129,10 @@ namespace osu.Game.Overlays.Login
             password.OnCommit += (_, _) => performLogin();
 
             if (api.LastLoginError?.Message is string error)
+            {
+                errorText.Alpha = 1;
                 errorText.AddErrors(new[] { error });
+            }
         }
 
         public override bool AcceptsFocus => true;

From 59fa46bbdd6933f304521d298ef61720d3ed8929 Mon Sep 17 00:00:00 2001
From: Bastian Pedersen <bastian.tangedal@gmail.com>
Date: Sun, 25 Jun 2023 21:02:41 +0200
Subject: [PATCH 1038/1604] Create localisation string class for multiplayer
 countdown buttons

---
 .../MultiplayerCountdownButtonStrings.cs      | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 osu.Game/Localisation/MultiplayerCountdownButtonStrings.cs

diff --git a/osu.Game/Localisation/MultiplayerCountdownButtonStrings.cs b/osu.Game/Localisation/MultiplayerCountdownButtonStrings.cs
new file mode 100644
index 0000000000..926b15386a
--- /dev/null
+++ b/osu.Game/Localisation/MultiplayerCountdownButtonStrings.cs
@@ -0,0 +1,29 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Localisation;
+
+namespace osu.Game.Localisation
+{
+    public static class MultiplayerCountdownButtonStrings
+    {
+        private const string prefix = @"osu.Game.Resources.Localisation.MultiplayerCountdownButton";
+
+        /// <summary>
+        /// "Stop countdown"
+        /// </summary>
+        public static LocalisableString StopCountdown => new TranslatableString(getKey(@"stop_countdown"), @"Stop countdown");
+
+        /// <summary>
+        /// "Countdown settings"
+        /// </summary>
+        public static LocalisableString CountdownSettings => new TranslatableString(getKey(@"countdown_settings"), @"Countdown settings");
+
+        /// <summary>
+        /// "Start match in {0} minute/seconds"
+        /// </summary>
+        public static LocalisableString StartMatchInTime(string humanReadableTime) => new TranslatableString(getKey(@"start_match_in"), @"Start match in {0}", humanReadableTime);
+
+        private static string getKey(string key) => $@"{prefix}:{key}";
+    }
+}

From a7153478d6e9c143cbe203a26bfeb24b0ffd47ca Mon Sep 17 00:00:00 2001
From: Bastian Pedersen <bastian.tangedal@gmail.com>
Date: Sun, 25 Jun 2023 21:03:07 +0200
Subject: [PATCH 1039/1604] Use newly create localised strings for buttons

---
 .../Multiplayer/Match/MultiplayerCountdownButton.cs        | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerCountdownButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerCountdownButton.cs
index 6dc343f00a..72c3a8122d 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerCountdownButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerCountdownButton.cs
@@ -17,6 +17,7 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Localisation;
 using osu.Game.Online.Multiplayer;
 using osuTK;
 
@@ -56,7 +57,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
             base.Action = this.ShowPopover;
 
-            TooltipText = "Countdown settings";
+            TooltipText = MultiplayerCountdownButtonStrings.CountdownSettings;
         }
 
         [BackgroundDependencyLoader]
@@ -112,7 +113,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                 flow.Add(new RoundedButton
                 {
                     RelativeSizeAxes = Axes.X,
-                    Text = $"Start match in {duration.Humanize()}",
+                    Text = MultiplayerCountdownButtonStrings.StartMatchInTime(duration.Humanize()),
                     BackgroundColour = colours.Green,
                     Action = () =>
                     {
@@ -127,7 +128,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                 flow.Add(new RoundedButton
                 {
                     RelativeSizeAxes = Axes.X,
-                    Text = "Stop countdown",
+                    Text = MultiplayerCountdownButtonStrings.StopCountdown,
                     BackgroundColour = colours.Red,
                     Action = () =>
                     {

From 4582faee7988c4c0b3a49c1c47058edb39217174 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sun, 25 Jun 2023 12:06:02 -0700
Subject: [PATCH 1040/1604] Refactor login panel to not inherit
 `FillFlowContainer`

---
 osu.Game/Overlays/Login/LoginForm.cs  |   6 ++
 osu.Game/Overlays/Login/LoginPanel.cs | 101 ++++++++++++--------------
 2 files changed, 53 insertions(+), 54 deletions(-)

diff --git a/osu.Game/Overlays/Login/LoginForm.cs b/osu.Game/Overlays/Login/LoginForm.cs
index f56753dbe7..55490198f8 100644
--- a/osu.Game/Overlays/Login/LoginForm.cs
+++ b/osu.Game/Overlays/Login/LoginForm.cs
@@ -11,6 +11,7 @@ using osu.Framework.Input.Events;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
 using osu.Game.Overlays.Settings;
@@ -56,6 +57,11 @@ namespace osu.Game.Overlays.Login
 
             Children = new Drawable[]
             {
+                new OsuSpriteText
+                {
+                    Text = LoginPanelStrings.Account.ToUpper(),
+                    Font = OsuFont.GetFont(weight: FontWeight.Bold),
+                },
                 username = new OsuTextBox
                 {
                     PlaceholderText = UsersStrings.LoginUsername.ToLower(),
diff --git a/osu.Game/Overlays/Login/LoginPanel.cs b/osu.Game/Overlays/Login/LoginPanel.cs
index 80238f5474..6c09b2e6ed 100644
--- a/osu.Game/Overlays/Login/LoginPanel.cs
+++ b/osu.Game/Overlays/Login/LoginPanel.cs
@@ -22,7 +22,7 @@ using osuTK;
 
 namespace osu.Game.Overlays.Login
 {
-    public partial class LoginPanel : FillFlowContainer
+    public partial class LoginPanel : Container
     {
         private bool bounding = true;
         private LoginForm form;
@@ -59,8 +59,6 @@ namespace osu.Game.Overlays.Login
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
-            Direction = FillDirection.Vertical;
-            Spacing = new Vector2(0f, 5f);
         }
 
         [BackgroundDependencyLoader]
@@ -77,18 +75,9 @@ namespace osu.Game.Overlays.Login
             switch (state.NewValue)
             {
                 case APIState.Offline:
-                    Children = new Drawable[]
+                    Child = form = new LoginForm
                     {
-                        new OsuSpriteText
-                        {
-                            Text = LoginPanelStrings.Account.ToUpper(),
-                            Margin = new MarginPadding { Bottom = 5 },
-                            Font = OsuFont.GetFont(weight: FontWeight.Bold),
-                        },
-                        form = new LoginForm
-                        {
-                            RequestHide = RequestHide
-                        }
+                        RequestHide = RequestHide
                     };
                     break;
 
@@ -96,22 +85,29 @@ namespace osu.Game.Overlays.Login
                 case APIState.Connecting:
                     LinkFlowContainer linkFlow;
 
-                    Children = new Drawable[]
+                    Child = new FillFlowContainer
                     {
-                        new LoadingSpinner
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Direction = FillDirection.Vertical,
+                        Spacing = new Vector2(0f, 5f),
+                        Children = new Drawable[]
                         {
-                            State = { Value = Visibility.Visible },
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.TopCentre,
-                        },
-                        linkFlow = new LinkFlowContainer
-                        {
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.TopCentre,
-                            TextAnchor = Anchor.TopCentre,
-                            AutoSizeAxes = Axes.Both,
-                            Text = state.NewValue == APIState.Failing ? ToolbarStrings.AttemptingToReconnect : ToolbarStrings.Connecting,
-                            Margin = new MarginPadding { Top = 10, Bottom = 10 },
+                            new LoadingSpinner
+                            {
+                                State = { Value = Visibility.Visible },
+                                Anchor = Anchor.TopCentre,
+                                Origin = Anchor.TopCentre,
+                            },
+                            linkFlow = new LinkFlowContainer
+                            {
+                                Anchor = Anchor.TopCentre,
+                                Origin = Anchor.TopCentre,
+                                TextAnchor = Anchor.TopCentre,
+                                AutoSizeAxes = Axes.Both,
+                                Text = state.NewValue == APIState.Failing ? ToolbarStrings.AttemptingToReconnect : ToolbarStrings.Connecting,
+                                Margin = new MarginPadding { Top = 10, Bottom = 10 },
+                            },
                         },
                     };
 
@@ -119,40 +115,37 @@ namespace osu.Game.Overlays.Login
                     break;
 
                 case APIState.Online:
-                    Children = new Drawable[]
+                    Child = new FillFlowContainer
                     {
-                        new FillFlowContainer
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Padding = new MarginPadding { Left = 20, Right = 20 },
+                        Direction = FillDirection.Vertical,
+                        Spacing = new Vector2(0f, 10f),
+                        Children = new Drawable[]
                         {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
-                            Padding = new MarginPadding { Left = 20, Right = 20 },
-                            Direction = FillDirection.Vertical,
-                            Spacing = new Vector2(0f, 10f),
-                            Children = new Drawable[]
+                            new Container
                             {
-                                new Container
+                                RelativeSizeAxes = Axes.X,
+                                AutoSizeAxes = Axes.Y,
+                                Children = new[]
                                 {
-                                    RelativeSizeAxes = Axes.X,
-                                    AutoSizeAxes = Axes.Y,
-                                    Children = new[]
+                                    new OsuSpriteText
                                     {
-                                        new OsuSpriteText
-                                        {
-                                            Anchor = Anchor.Centre,
-                                            Origin = Anchor.Centre,
-                                            Text = LoginPanelStrings.SignedIn,
-                                            Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold),
-                                            Margin = new MarginPadding { Top = 5, Bottom = 5 },
-                                        },
+                                        Anchor = Anchor.Centre,
+                                        Origin = Anchor.Centre,
+                                        Text = LoginPanelStrings.SignedIn,
+                                        Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold),
+                                        Margin = new MarginPadding { Top = 5, Bottom = 5 },
                                     },
                                 },
-                                panel = new UserGridPanel(api.LocalUser.Value)
-                                {
-                                    RelativeSizeAxes = Axes.X,
-                                    Action = RequestHide
-                                },
-                                dropdown = new UserDropdown { RelativeSizeAxes = Axes.X },
                             },
+                            panel = new UserGridPanel(api.LocalUser.Value)
+                            {
+                                RelativeSizeAxes = Axes.X,
+                                Action = RequestHide
+                            },
+                            dropdown = new UserDropdown { RelativeSizeAxes = Axes.X },
                         },
                     };
 

From 671f84e32b26f6a92cdd5a3d82b0215d8b65f708 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sun, 25 Jun 2023 12:15:03 -0700
Subject: [PATCH 1041/1604] Remove unnecessary container

---
 osu.Game/Overlays/Login/LoginPanel.cs | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Overlays/Login/LoginPanel.cs b/osu.Game/Overlays/Login/LoginPanel.cs
index 6c09b2e6ed..885f5639a7 100644
--- a/osu.Game/Overlays/Login/LoginPanel.cs
+++ b/osu.Game/Overlays/Login/LoginPanel.cs
@@ -124,21 +124,13 @@ namespace osu.Game.Overlays.Login
                         Spacing = new Vector2(0f, 10f),
                         Children = new Drawable[]
                         {
-                            new Container
+                            new OsuSpriteText
                             {
-                                RelativeSizeAxes = Axes.X,
-                                AutoSizeAxes = Axes.Y,
-                                Children = new[]
-                                {
-                                    new OsuSpriteText
-                                    {
-                                        Anchor = Anchor.Centre,
-                                        Origin = Anchor.Centre,
-                                        Text = LoginPanelStrings.SignedIn,
-                                        Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold),
-                                        Margin = new MarginPadding { Top = 5, Bottom = 5 },
-                                    },
-                                },
+                                Anchor = Anchor.TopCentre,
+                                Origin = Anchor.TopCentre,
+                                Text = LoginPanelStrings.SignedIn,
+                                Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold),
+                                Margin = new MarginPadding { Top = 5, Bottom = 5 },
                             },
                             panel = new UserGridPanel(api.LocalUser.Value)
                             {

From 6ebc2581c2a207fe45ee1b6cac2adb2a9bfe04cf Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sun, 25 Jun 2023 12:26:01 -0700
Subject: [PATCH 1042/1604] Normalise login overlay padding/spacing

---
 osu.Game/Overlays/Login/LoginForm.cs    | 67 +++++++++++++------------
 osu.Game/Overlays/Login/LoginPanel.cs   | 10 ++--
 osu.Game/Overlays/Login/UserDropdown.cs |  3 --
 osu.Game/Overlays/LoginOverlay.cs       |  3 +-
 4 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/osu.Game/Overlays/Login/LoginForm.cs b/osu.Game/Overlays/Login/LoginForm.cs
index 55490198f8..0eef55162f 100644
--- a/osu.Game/Overlays/Login/LoginForm.cs
+++ b/osu.Game/Overlays/Login/LoginForm.cs
@@ -43,43 +43,50 @@ namespace osu.Game.Overlays.Login
         [BackgroundDependencyLoader(permitNulls: true)]
         private void load(OsuConfigManager config, AccountCreationOverlay accountCreation)
         {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
             Direction = FillDirection.Vertical;
             Spacing = new Vector2(0, SettingsSection.ITEM_SPACING);
-            AutoSizeAxes = Axes.Y;
-            RelativeSizeAxes = Axes.X;
-            Padding = new MarginPadding
-            {
-                Top = 5,
-                Bottom = 24,
-            };
+
             ErrorTextFlowContainer errorText;
             LinkFlowContainer forgottenPasswordLink;
 
             Children = new Drawable[]
             {
-                new OsuSpriteText
-                {
-                    Text = LoginPanelStrings.Account.ToUpper(),
-                    Font = OsuFont.GetFont(weight: FontWeight.Bold),
-                },
-                username = new OsuTextBox
-                {
-                    PlaceholderText = UsersStrings.LoginUsername.ToLower(),
-                    RelativeSizeAxes = Axes.X,
-                    Text = api.ProvidedUsername,
-                    TabbableContentContainer = this
-                },
-                password = new OsuPasswordTextBox
-                {
-                    PlaceholderText = UsersStrings.LoginPassword.ToLower(),
-                    RelativeSizeAxes = Axes.X,
-                    TabbableContentContainer = this,
-                },
-                errorText = new ErrorTextFlowContainer
+                new FillFlowContainer
                 {
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
-                    Alpha = 0,
+                    Padding = new MarginPadding { Horizontal = SettingsPanel.CONTENT_MARGINS },
+                    Direction = FillDirection.Vertical,
+                    Spacing = new Vector2(0f, SettingsSection.ITEM_SPACING),
+                    Children = new Drawable[]
+                    {
+                        new OsuSpriteText
+                        {
+                            Text = LoginPanelStrings.Account.ToUpper(),
+                            Font = OsuFont.GetFont(weight: FontWeight.Bold),
+                        },
+                        username = new OsuTextBox
+                        {
+                            PlaceholderText = UsersStrings.LoginUsername.ToLower(),
+                            RelativeSizeAxes = Axes.X,
+                            Text = api.ProvidedUsername,
+                            TabbableContentContainer = this
+                        },
+                        password = new OsuPasswordTextBox
+                        {
+                            PlaceholderText = UsersStrings.LoginPassword.ToLower(),
+                            RelativeSizeAxes = Axes.X,
+                            TabbableContentContainer = this,
+                        },
+                        errorText = new ErrorTextFlowContainer
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Alpha = 0,
+                        },
+                    },
                 },
                 new SettingsCheckbox
                 {
@@ -93,11 +100,7 @@ namespace osu.Game.Overlays.Login
                 },
                 forgottenPasswordLink = new LinkFlowContainer
                 {
-                    Padding = new MarginPadding
-                    {
-                        Left = SettingsPanel.CONTENT_MARGINS,
-                        Bottom = SettingsSection.ITEM_SPACING
-                    },
+                    Padding = new MarginPadding { Horizontal = SettingsPanel.CONTENT_MARGINS },
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
                 },
diff --git a/osu.Game/Overlays/Login/LoginPanel.cs b/osu.Game/Overlays/Login/LoginPanel.cs
index 885f5639a7..a84a211dfc 100644
--- a/osu.Game/Overlays/Login/LoginPanel.cs
+++ b/osu.Game/Overlays/Login/LoginPanel.cs
@@ -17,6 +17,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Localisation;
 using osu.Game.Online.API;
+using osu.Game.Overlays.Settings;
 using osu.Game.Users;
 using osuTK;
 
@@ -89,8 +90,9 @@ namespace osu.Game.Overlays.Login
                     {
                         RelativeSizeAxes = Axes.X,
                         AutoSizeAxes = Axes.Y,
+                        Padding = new MarginPadding { Horizontal = SettingsPanel.CONTENT_MARGINS },
                         Direction = FillDirection.Vertical,
-                        Spacing = new Vector2(0f, 5f),
+                        Spacing = new Vector2(0f, SettingsSection.ITEM_SPACING),
                         Children = new Drawable[]
                         {
                             new LoadingSpinner
@@ -106,7 +108,6 @@ namespace osu.Game.Overlays.Login
                                 TextAnchor = Anchor.TopCentre,
                                 AutoSizeAxes = Axes.Both,
                                 Text = state.NewValue == APIState.Failing ? ToolbarStrings.AttemptingToReconnect : ToolbarStrings.Connecting,
-                                Margin = new MarginPadding { Top = 10, Bottom = 10 },
                             },
                         },
                     };
@@ -119,9 +120,9 @@ namespace osu.Game.Overlays.Login
                     {
                         RelativeSizeAxes = Axes.X,
                         AutoSizeAxes = Axes.Y,
-                        Padding = new MarginPadding { Left = 20, Right = 20 },
+                        Padding = new MarginPadding { Horizontal = SettingsPanel.CONTENT_MARGINS },
                         Direction = FillDirection.Vertical,
-                        Spacing = new Vector2(0f, 10f),
+                        Spacing = new Vector2(0f, SettingsSection.ITEM_SPACING),
                         Children = new Drawable[]
                         {
                             new OsuSpriteText
@@ -130,7 +131,6 @@ namespace osu.Game.Overlays.Login
                                 Origin = Anchor.TopCentre,
                                 Text = LoginPanelStrings.SignedIn,
                                 Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold),
-                                Margin = new MarginPadding { Top = 5, Bottom = 5 },
                             },
                             panel = new UserGridPanel(api.LocalUser.Value)
                             {
diff --git a/osu.Game/Overlays/Login/UserDropdown.cs b/osu.Game/Overlays/Login/UserDropdown.cs
index 78b5271ca0..9ffaaff8bf 100644
--- a/osu.Game/Overlays/Login/UserDropdown.cs
+++ b/osu.Game/Overlays/Login/UserDropdown.cs
@@ -36,8 +36,6 @@ namespace osu.Game.Overlays.Login
                 Masking = true;
                 CornerRadius = 5;
 
-                Margin = new MarginPadding { Bottom = 5 };
-
                 EdgeEffect = new EdgeEffectParameters
                 {
                     Type = EdgeEffectType.Shadow,
@@ -86,7 +84,6 @@ namespace osu.Game.Overlays.Login
             public UserDropdownHeader()
             {
                 Foreground.Padding = new MarginPadding { Left = 10, Right = 10 };
-                Margin = new MarginPadding { Bottom = 5 };
                 Masking = true;
                 CornerRadius = 5;
                 EdgeEffect = new EdgeEffectParameters
diff --git a/osu.Game/Overlays/LoginOverlay.cs b/osu.Game/Overlays/LoginOverlay.cs
index b16cc5bd4b..ecf2e7a634 100644
--- a/osu.Game/Overlays/LoginOverlay.cs
+++ b/osu.Game/Overlays/LoginOverlay.cs
@@ -13,6 +13,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Overlays.Login;
+using osu.Game.Overlays.Settings;
 
 namespace osu.Game.Overlays
 {
@@ -63,7 +64,7 @@ namespace osu.Game.Overlays
                             AutoSizeEasing = Easing.OutQuint,
                             Child = panel = new LoginPanel
                             {
-                                Padding = new MarginPadding(10),
+                                Padding = new MarginPadding { Vertical = SettingsSection.ITEM_SPACING },
                                 RequestHide = Hide,
                             },
                         }

From ccc4d1609617e20fed35c212fd0782b7a6e43230 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sun, 25 Jun 2023 12:46:00 -0700
Subject: [PATCH 1043/1604] Remove most custom styling of user dropdown

---
 osu.Game/Overlays/Login/UserDropdown.cs | 51 +------------------------
 1 file changed, 1 insertion(+), 50 deletions(-)

diff --git a/osu.Game/Overlays/Login/UserDropdown.cs b/osu.Game/Overlays/Login/UserDropdown.cs
index 9ffaaff8bf..f0449d50b5 100644
--- a/osu.Game/Overlays/Login/UserDropdown.cs
+++ b/osu.Game/Overlays/Login/UserDropdown.cs
@@ -31,27 +31,6 @@ namespace osu.Game.Overlays.Login
 
         protected partial class UserDropdownMenu : OsuDropdownMenu
         {
-            public UserDropdownMenu()
-            {
-                Masking = true;
-                CornerRadius = 5;
-
-                EdgeEffect = new EdgeEffectParameters
-                {
-                    Type = EdgeEffectType.Shadow,
-                    Colour = Color4.Black.Opacity(0.25f),
-                    Radius = 4,
-                };
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
-            {
-                BackgroundColour = colours.Gray3;
-                SelectionColour = colours.Gray4;
-                HoverColour = colours.Gray5;
-            }
-
             protected override DrawableDropdownMenuItem CreateDrawableDropdownMenuItem(MenuItem item) => new DrawableUserDropdownMenuItem(item);
 
             private partial class DrawableUserDropdownMenuItem : DrawableOsuDropdownMenuItem
@@ -60,20 +39,12 @@ namespace osu.Game.Overlays.Login
                     : base(item)
                 {
                     Foreground.Padding = new MarginPadding { Top = 5, Bottom = 5, Left = 10, Right = 5 };
-                    CornerRadius = 5;
                 }
-
-                protected override Drawable CreateContent() => new Content
-                {
-                    Label = { Margin = new MarginPadding { Left = UserDropdownHeader.LABEL_LEFT_MARGIN - 11 } }
-                };
             }
         }
 
         private partial class UserDropdownHeader : OsuDropdownHeader
         {
-            public const float LABEL_LEFT_MARGIN = 20;
-
             private readonly StatusIcon statusIcon;
 
             public Color4 StatusColour
@@ -83,19 +54,6 @@ namespace osu.Game.Overlays.Login
 
             public UserDropdownHeader()
             {
-                Foreground.Padding = new MarginPadding { Left = 10, Right = 10 };
-                Masking = true;
-                CornerRadius = 5;
-                EdgeEffect = new EdgeEffectParameters
-                {
-                    Type = EdgeEffectType.Shadow,
-                    Colour = Color4.Black.Opacity(0.25f),
-                    Radius = 4,
-                };
-
-                Icon.Size = new Vector2(14);
-                Icon.Margin = new MarginPadding(0);
-
                 Foreground.Add(statusIcon = new StatusIcon
                 {
                     Anchor = Anchor.CentreLeft,
@@ -103,14 +61,7 @@ namespace osu.Game.Overlays.Login
                     Size = new Vector2(14),
                 });
 
-                Text.Margin = new MarginPadding { Left = LABEL_LEFT_MARGIN };
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
-            {
-                BackgroundColour = colours.Gray3;
-                BackgroundColourHover = colours.Gray5;
+                Text.Margin = new MarginPadding { Left = 20 };
             }
         }
     }

From 5477ef6bfb7a253ed1bc93356c48de7ceb218bcb Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sun, 25 Jun 2023 12:58:51 -0700
Subject: [PATCH 1044/1604] Remove unused usings

---
 osu.Game/Overlays/Login/UserDropdown.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/osu.Game/Overlays/Login/UserDropdown.cs b/osu.Game/Overlays/Login/UserDropdown.cs
index f0449d50b5..f2a12f9a1e 100644
--- a/osu.Game/Overlays/Login/UserDropdown.cs
+++ b/osu.Game/Overlays/Login/UserDropdown.cs
@@ -1,12 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Framework.Allocation;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.UserInterface;
-using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Users.Drawables;
 using osuTK;

From 8d2dccbda56eb768f0255a6746fccdd56de73eec Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Jun 2023 13:19:07 +0900
Subject: [PATCH 1045/1604] Remove pointless zero opacity specification

---
 osu.Game/Overlays/LoginOverlay.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/LoginOverlay.cs b/osu.Game/Overlays/LoginOverlay.cs
index ecf2e7a634..de37aaa291 100644
--- a/osu.Game/Overlays/LoginOverlay.cs
+++ b/osu.Game/Overlays/LoginOverlay.cs
@@ -4,7 +4,6 @@
 #nullable disable
 
 using osu.Framework.Allocation;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
@@ -32,7 +31,7 @@ namespace osu.Game.Overlays
             Masking = true;
             EdgeEffect = new EdgeEffectParameters
             {
-                Colour = Color4.Black.Opacity(0),
+                Colour = Color4.Black,
                 Type = EdgeEffectType.Shadow,
                 Radius = 10,
                 Hollow = true,

From ac0c988d4932f4e5efe826963188b0e17a705247 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Jun 2023 13:21:29 +0900
Subject: [PATCH 1046/1604] Fix weirdly named test method and add xmldoc

---
 osu.Game.Tests/Visual/Menus/TestSceneLoginOverlay.cs | 2 +-
 osu.Game/Online/API/DummyAPIAccess.cs                | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneLoginOverlay.cs b/osu.Game.Tests/Visual/Menus/TestSceneLoginOverlay.cs
index 5c2edac84d..0bc71924ce 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneLoginOverlay.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneLoginOverlay.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Tests.Visual.Menus
             AddStep("logout", () =>
             {
                 API.Logout();
-                ((DummyAPIAccess)API).StayConnectingNextLogin();
+                ((DummyAPIAccess)API).PauseOnConnectingNextLogin();
             });
 
             AddStep("enter password", () => loginOverlay.ChildrenOfType<OsuPasswordTextBox>().First().Text = "password");
diff --git a/osu.Game/Online/API/DummyAPIAccess.cs b/osu.Game/Online/API/DummyAPIAccess.cs
index c2ef0b4e92..45a4737c21 100644
--- a/osu.Game/Online/API/DummyAPIAccess.cs
+++ b/osu.Game/Online/API/DummyAPIAccess.cs
@@ -144,8 +144,15 @@ namespace osu.Game.Online.API
         IBindableList<APIUser> IAPIProvider.Friends => Friends;
         IBindable<UserActivity> IAPIProvider.Activity => Activity;
 
+        /// <summary>
+        /// During the next simulated login, the process will fail immediately.
+        /// </summary>
         public void FailNextLogin() => shouldFailNextLogin = true;
-        public void StayConnectingNextLogin() => stayConnectingNextLogin = true;
+
+        /// <summary>
+        /// During the next simulated login, the process will pause indefinitely at "connecting".
+        /// </summary>
+        public void PauseOnConnectingNextLogin() => stayConnectingNextLogin = true;
 
         protected override void Dispose(bool isDisposing)
         {

From 1abce098b4876946690ae69c69002127a0f0b070 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Jun 2023 13:26:07 +0900
Subject: [PATCH 1047/1604] Apply nullability to login form related classes

---
 osu.Game/Online/API/DummyAPIAccess.cs | 10 ++++------
 osu.Game/Overlays/Login/LoginPanel.cs | 15 +++++++--------
 osu.Game/Overlays/LoginOverlay.cs     |  4 +---
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Online/API/DummyAPIAccess.cs b/osu.Game/Online/API/DummyAPIAccess.cs
index 45a4737c21..01169828b0 100644
--- a/osu.Game/Online/API/DummyAPIAccess.cs
+++ b/osu.Game/Online/API/DummyAPIAccess.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Threading;
 using System.Threading.Tasks;
@@ -45,13 +43,13 @@ namespace osu.Game.Online.API
 
         public int APIVersion => int.Parse(DateTime.Now.ToString("yyyyMMdd"));
 
-        public Exception LastLoginError { get; private set; }
+        public Exception? LastLoginError { get; private set; }
 
         /// <summary>
         /// Provide handling logic for an arbitrary API request.
         /// Should return true is a request was handled. If null or false return, the request will be failed with a <see cref="NotSupportedException"/>.
         /// </summary>
-        public Func<APIRequest, bool> HandleRequest;
+        public Func<APIRequest, bool>? HandleRequest;
 
         private readonly Bindable<APIState> state = new Bindable<APIState>(APIState.Online);
 
@@ -128,11 +126,11 @@ namespace osu.Game.Online.API
             LocalUser.Value = new GuestUser();
         }
 
-        public IHubClientConnector GetHubConnector(string clientName, string endpoint, bool preferMessagePack) => null;
+        public IHubClientConnector? GetHubConnector(string clientName, string endpoint, bool preferMessagePack) => null;
 
         public NotificationsClientConnector GetNotificationsConnector() => new PollingNotificationsClientConnector(this);
 
-        public RegistrationRequest.RegistrationRequestErrors CreateAccount(string email, string username, string password)
+        public RegistrationRequest.RegistrationRequestErrors? CreateAccount(string email, string username, string password)
         {
             Thread.Sleep(200);
             return null;
diff --git a/osu.Game/Overlays/Login/LoginPanel.cs b/osu.Game/Overlays/Login/LoginPanel.cs
index a84a211dfc..71ecf2e75a 100644
--- a/osu.Game/Overlays/Login/LoginPanel.cs
+++ b/osu.Game/Overlays/Login/LoginPanel.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -26,23 +24,24 @@ namespace osu.Game.Overlays.Login
     public partial class LoginPanel : Container
     {
         private bool bounding = true;
-        private LoginForm form;
+
+        private LoginForm? form;
 
         [Resolved]
-        private OsuColour colours { get; set; }
+        private OsuColour colours { get; set; } = null!;
 
-        private UserGridPanel panel;
-        private UserDropdown dropdown;
+        private UserGridPanel panel = null!;
+        private UserDropdown dropdown = null!;
 
         /// <summary>
         /// Called to request a hide of a parent displaying this container.
         /// </summary>
-        public Action RequestHide;
+        public Action? RequestHide;
 
         private readonly IBindable<APIState> apiState = new Bindable<APIState>();
 
         [Resolved]
-        private IAPIProvider api { get; set; }
+        private IAPIProvider api { get; set; } = null!;
 
         public override RectangleF BoundingBox => bounding ? base.BoundingBox : RectangleF.Empty;
 
diff --git a/osu.Game/Overlays/LoginOverlay.cs b/osu.Game/Overlays/LoginOverlay.cs
index de37aaa291..a575253e71 100644
--- a/osu.Game/Overlays/LoginOverlay.cs
+++ b/osu.Game/Overlays/LoginOverlay.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -18,7 +16,7 @@ namespace osu.Game.Overlays
 {
     public partial class LoginOverlay : OsuFocusedOverlayContainer
     {
-        private LoginPanel panel;
+        private LoginPanel panel = null!;
 
         private const float transition_time = 400;
 

From b240ce295b76c91ee6c2c2839ab2173e16eea75c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Jun 2023 13:38:34 +0900
Subject: [PATCH 1048/1604] Rename class and key to better match expectations

---
 ...untdownButtonStrings.cs => MultiplayerMatchStrings.cs} | 8 ++++----
 .../Multiplayer/Match/MultiplayerCountdownButton.cs       | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename osu.Game/Localisation/{MultiplayerCountdownButtonStrings.cs => MultiplayerMatchStrings.cs} (72%)

diff --git a/osu.Game/Localisation/MultiplayerCountdownButtonStrings.cs b/osu.Game/Localisation/MultiplayerMatchStrings.cs
similarity index 72%
rename from osu.Game/Localisation/MultiplayerCountdownButtonStrings.cs
rename to osu.Game/Localisation/MultiplayerMatchStrings.cs
index 926b15386a..95c7168a09 100644
--- a/osu.Game/Localisation/MultiplayerCountdownButtonStrings.cs
+++ b/osu.Game/Localisation/MultiplayerMatchStrings.cs
@@ -5,9 +5,9 @@ using osu.Framework.Localisation;
 
 namespace osu.Game.Localisation
 {
-    public static class MultiplayerCountdownButtonStrings
+    public static class MultiplayerMatchStrings
     {
-        private const string prefix = @"osu.Game.Resources.Localisation.MultiplayerCountdownButton";
+        private const string prefix = @"osu.Game.Resources.Localisation.MultiplayerMatchStrings";
 
         /// <summary>
         /// "Stop countdown"
@@ -20,9 +20,9 @@ namespace osu.Game.Localisation
         public static LocalisableString CountdownSettings => new TranslatableString(getKey(@"countdown_settings"), @"Countdown settings");
 
         /// <summary>
-        /// "Start match in {0} minute/seconds"
+        /// "Start match in {0}"
         /// </summary>
-        public static LocalisableString StartMatchInTime(string humanReadableTime) => new TranslatableString(getKey(@"start_match_in"), @"Start match in {0}", humanReadableTime);
+        public static LocalisableString StartMatchWithCountdown(string humanReadableTime) => new TranslatableString(getKey(@"start_match_width_countdown"), @"Start match in {0}", humanReadableTime);
 
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerCountdownButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerCountdownButton.cs
index 72c3a8122d..e1543eaceb 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerCountdownButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerCountdownButton.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
             base.Action = this.ShowPopover;
 
-            TooltipText = MultiplayerCountdownButtonStrings.CountdownSettings;
+            TooltipText = MultiplayerMatchStrings.CountdownSettings;
         }
 
         [BackgroundDependencyLoader]
@@ -113,7 +113,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                 flow.Add(new RoundedButton
                 {
                     RelativeSizeAxes = Axes.X,
-                    Text = MultiplayerCountdownButtonStrings.StartMatchInTime(duration.Humanize()),
+                    Text = MultiplayerMatchStrings.StartMatchWithCountdown(duration.Humanize()),
                     BackgroundColour = colours.Green,
                     Action = () =>
                     {
@@ -128,7 +128,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                 flow.Add(new RoundedButton
                 {
                     RelativeSizeAxes = Axes.X,
-                    Text = MultiplayerCountdownButtonStrings.StopCountdown,
+                    Text = MultiplayerMatchStrings.StopCountdown,
                     BackgroundColour = colours.Red,
                     Action = () =>
                     {

From ba7f4722478bb0ac4e84962f2946269fbed9fb4e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Jun 2023 16:04:16 +0900
Subject: [PATCH 1049/1604] Split padding out into constant to fix weird
 looking math

---
 osu.Game/Skinning/LegacySkin.cs    | 4 +++-
 osu.Game/Skinning/TrianglesSkin.cs | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index e264af4c83..79f13686e8 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -383,9 +383,11 @@ namespace osu.Game.Skinning
 
                                     if (keyCounter != null)
                                     {
+                                        const float padding = 10;
+
                                         keyCounter.Anchor = Anchor.BottomRight;
                                         keyCounter.Origin = Anchor.BottomRight;
-                                        keyCounter.Position = new Vector2(-10, -10 - hitError.Width);
+                                        keyCounter.Position = new Vector2(-padding, -(padding + hitError.Width));
                                     }
                                 }
                             })
diff --git a/osu.Game/Skinning/TrianglesSkin.cs b/osu.Game/Skinning/TrianglesSkin.cs
index 5f839fad0b..a4cfef63d4 100644
--- a/osu.Game/Skinning/TrianglesSkin.cs
+++ b/osu.Game/Skinning/TrianglesSkin.cs
@@ -146,9 +146,11 @@ namespace osu.Game.Skinning
 
                                 if (songProgress != null && keyCounter != null)
                                 {
+                                    const float padding = 10;
+
                                     keyCounter.Anchor = Anchor.BottomRight;
                                     keyCounter.Origin = Anchor.BottomRight;
-                                    keyCounter.Position = new Vector2(-10, -60 - 10);
+                                    keyCounter.Position = new Vector2(-padding, -(60 + padding));
                                 }
                             })
                             {

From 52fdeeb4911c390a826aef8d6b15378bc8ae0d2e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Jun 2023 16:20:51 +0900
Subject: [PATCH 1050/1604] Improve positioning and positioning code clarity
 for argon / triangles implementations

---
 osu.Game/Skinning/ArgonSkin.cs     | 11 ++++++++---
 osu.Game/Skinning/TrianglesSkin.cs |  5 ++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs
index 48326bfe60..3570922a9e 100644
--- a/osu.Game/Skinning/ArgonSkin.cs
+++ b/osu.Game/Skinning/ArgonSkin.cs
@@ -168,14 +168,19 @@ namespace osu.Game.Skinning
 
                                     if (songProgress != null)
                                     {
-                                        songProgress.Position = new Vector2(0, -10);
+                                        const float padding = 10;
+
+                                        songProgress.Position = new Vector2(0, -padding);
                                         songProgress.Scale = new Vector2(0.9f, 1);
 
-                                        if (keyCounter != null)
+                                        if (keyCounter != null && hitError != null)
                                         {
+                                            // Hard to find this at runtime, so taken from the most expanded state during replay.
+                                            const float song_progress_offset_height = 36 + padding;
+
                                             keyCounter.Anchor = Anchor.BottomLeft;
                                             keyCounter.Origin = Anchor.BottomLeft;
-                                            keyCounter.Position = new Vector2(50, -57);
+                                            keyCounter.Position = new Vector2(hitError.Width + padding, -(padding * 2 + song_progress_offset_height));
                                         }
                                     }
                                 }
diff --git a/osu.Game/Skinning/TrianglesSkin.cs b/osu.Game/Skinning/TrianglesSkin.cs
index a4cfef63d4..a68a7fd5b9 100644
--- a/osu.Game/Skinning/TrianglesSkin.cs
+++ b/osu.Game/Skinning/TrianglesSkin.cs
@@ -148,9 +148,12 @@ namespace osu.Game.Skinning
                                 {
                                     const float padding = 10;
 
+                                    // Hard to find this at runtime, so taken from the most expanded state during replay.
+                                    const float song_progress_offset_height = 73;
+
                                     keyCounter.Anchor = Anchor.BottomRight;
                                     keyCounter.Origin = Anchor.BottomRight;
-                                    keyCounter.Position = new Vector2(-padding, -(60 + padding));
+                                    keyCounter.Position = new Vector2(-padding, -(song_progress_offset_height + padding));
                                 }
                             })
                             {

From 3a2dd0e7dd2eb5b19807194037c9751db354dbb2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Jun 2023 16:22:38 +0900
Subject: [PATCH 1051/1604] Move argon key counter to right to match stable
 expectations

---
 osu.Game/Skinning/ArgonSkin.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs
index 3570922a9e..ba392386de 100644
--- a/osu.Game/Skinning/ArgonSkin.cs
+++ b/osu.Game/Skinning/ArgonSkin.cs
@@ -178,9 +178,9 @@ namespace osu.Game.Skinning
                                             // Hard to find this at runtime, so taken from the most expanded state during replay.
                                             const float song_progress_offset_height = 36 + padding;
 
-                                            keyCounter.Anchor = Anchor.BottomLeft;
-                                            keyCounter.Origin = Anchor.BottomLeft;
-                                            keyCounter.Position = new Vector2(hitError.Width + padding, -(padding * 2 + song_progress_offset_height));
+                                            keyCounter.Anchor = Anchor.BottomRight;
+                                            keyCounter.Origin = Anchor.BottomRight;
+                                            keyCounter.Position = new Vector2(-(hitError.Width + padding), -(padding * 2 + song_progress_offset_height));
                                         }
                                     }
                                 }

From ec209428300ee776d515daaffd73059248e70f1c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Jun 2023 16:24:36 +0900
Subject: [PATCH 1052/1604] Actuall add composite component to hierarchy

---
 osu.Game/Screens/Play/HUDOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 21636ac04c..9f3b7d5a93 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -116,6 +116,7 @@ namespace osu.Game.Screens.Play
                 CreateFailingLayer(),
                 //Needs to be initialized before skinnable drawables.
                 tally = new JudgementTally(),
+                KeyCounter = new KeyCounterController(),
                 mainComponents = new HUDComponentsContainer { AlwaysPresent = true, },
                 rulesetComponents = drawableRuleset != null
                     ? new HUDComponentsContainer(drawableRuleset.Ruleset.RulesetInfo) { AlwaysPresent = true, }
@@ -159,7 +160,6 @@ namespace osu.Game.Screens.Play
                 },
                 clicksPerSecondCalculator = new ClicksPerSecondCalculator(),
             };
-            KeyCounter = new KeyCounterController();
 
             hideTargets = new List<Drawable> { mainComponents, rulesetComponents, topRightElements };
 

From c8e081c2b6883c62fcf0cb5e8ceada3acff4b80c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Jun 2023 16:32:04 +0900
Subject: [PATCH 1053/1604] Remove unused interface

---
 osu.Game/Rulesets/UI/RulesetInputManager.cs                   | 4 ----
 .../Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs     | 2 +-
 osu.Game/Screens/Play/HUD/KeyCounterController.cs             | 3 +--
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 2c403139b6..a8a5962762 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -248,10 +248,6 @@ namespace osu.Game.Rulesets.UI
         void Attach(ClicksPerSecondCalculator calculator);
     }
 
-    public interface IAttachableSkinComponent
-    {
-    }
-
     public class RulesetInputManagerInputState<T> : InputState
         where T : struct
     {
diff --git a/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs b/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs
index 3e55e11f1c..ba0c47dc8b 100644
--- a/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs
+++ b/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs
@@ -8,7 +8,7 @@ using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Screens.Play.HUD.ClicksPerSecond
 {
-    public partial class ClicksPerSecondCalculator : Component, IAttachableSkinComponent
+    public partial class ClicksPerSecondCalculator : Component
     {
         private readonly List<double> timestamps = new List<double>();
 
diff --git a/osu.Game/Screens/Play/HUD/KeyCounterController.cs b/osu.Game/Screens/Play/HUD/KeyCounterController.cs
index 0fa02afbb4..f64a0306c6 100644
--- a/osu.Game/Screens/Play/HUD/KeyCounterController.cs
+++ b/osu.Game/Screens/Play/HUD/KeyCounterController.cs
@@ -6,11 +6,10 @@ using System.Collections.Generic;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public partial class KeyCounterController : CompositeComponent, IAttachableSkinComponent
+    public partial class KeyCounterController : CompositeComponent
     {
         public readonly Bindable<bool> IsCounting = new BindableBool(true);
 

From 084354a8dc5a3ce266528571340f3180909c4efe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Jun 2023 16:34:57 +0900
Subject: [PATCH 1054/1604] Split out interfaces from `RulesetInputManager` and
 improve xmldoc

---
 osu.Game/Rulesets/UI/ICanAttachHUDPieces.cs  | 21 ++++++++++++++++++
 osu.Game/Rulesets/UI/IHasRecordingHandler.cs | 15 +++++++++++++
 osu.Game/Rulesets/UI/IHasReplayHandler.cs    | 16 ++++++++++++++
 osu.Game/Rulesets/UI/RulesetInputManager.cs  | 23 --------------------
 4 files changed, 52 insertions(+), 23 deletions(-)
 create mode 100644 osu.Game/Rulesets/UI/ICanAttachHUDPieces.cs
 create mode 100644 osu.Game/Rulesets/UI/IHasRecordingHandler.cs
 create mode 100644 osu.Game/Rulesets/UI/IHasReplayHandler.cs

diff --git a/osu.Game/Rulesets/UI/ICanAttachHUDPieces.cs b/osu.Game/Rulesets/UI/ICanAttachHUDPieces.cs
new file mode 100644
index 0000000000..b81af8556e
--- /dev/null
+++ b/osu.Game/Rulesets/UI/ICanAttachHUDPieces.cs
@@ -0,0 +1,21 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Game.Screens.Play.HUD;
+using osu.Game.Screens.Play.HUD.ClicksPerSecond;
+
+namespace osu.Game.Rulesets.UI
+{
+    /// <summary>
+    /// A target (generally always <see cref="DrawableRuleset"/>) which can attach various skinnable components.
+    /// </summary>
+    /// <remarks>
+    /// Attach methods will give the target permission to prepare the component into a usable state, usually via
+    /// calling methods on the component (attaching various gameplay devices).
+    /// </remarks>
+    public interface ICanAttachHUDPieces
+    {
+        void Attach(KeyCounterController keyCounter);
+        void Attach(ClicksPerSecondCalculator calculator);
+    }
+}
diff --git a/osu.Game/Rulesets/UI/IHasRecordingHandler.cs b/osu.Game/Rulesets/UI/IHasRecordingHandler.cs
new file mode 100644
index 0000000000..2a13272a98
--- /dev/null
+++ b/osu.Game/Rulesets/UI/IHasRecordingHandler.cs
@@ -0,0 +1,15 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Input;
+
+namespace osu.Game.Rulesets.UI
+{
+    /// <summary>
+    /// Expose the <see cref="ReplayRecorder"/> in a capable <see cref="InputManager"/>.
+    /// </summary>
+    public interface IHasRecordingHandler
+    {
+        public ReplayRecorder Recorder { set; }
+    }
+}
diff --git a/osu.Game/Rulesets/UI/IHasReplayHandler.cs b/osu.Game/Rulesets/UI/IHasReplayHandler.cs
new file mode 100644
index 0000000000..561c582b71
--- /dev/null
+++ b/osu.Game/Rulesets/UI/IHasReplayHandler.cs
@@ -0,0 +1,16 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Input;
+using osu.Game.Input.Handlers;
+
+namespace osu.Game.Rulesets.UI
+{
+    /// <summary>
+    /// Expose the <see cref="ReplayInputHandler"/> in a capable <see cref="InputManager"/>.
+    /// </summary>
+    public interface IHasReplayHandler
+    {
+        ReplayInputHandler? ReplayInputHandler { get; set; }
+    }
+}
diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index a8a5962762..9f4fabc300 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -225,29 +225,6 @@ namespace osu.Game.Rulesets.UI
         }
     }
 
-    /// <summary>
-    /// Expose the <see cref="ReplayInputHandler"/>  in a capable <see cref="InputManager"/>.
-    /// </summary>
-    public interface IHasReplayHandler
-    {
-        ReplayInputHandler ReplayInputHandler { get; set; }
-    }
-
-    public interface IHasRecordingHandler
-    {
-        public ReplayRecorder Recorder { set; }
-    }
-
-    /// <summary>
-    /// Supports attaching various HUD pieces.
-    /// Keys will be populated automatically and a receptor will be injected inside.
-    /// </summary>
-    public interface ICanAttachHUDPieces
-    {
-        void Attach(KeyCounterController keyCounter);
-        void Attach(ClicksPerSecondCalculator calculator);
-    }
-
     public class RulesetInputManagerInputState<T> : InputState
         where T : struct
     {

From 44c08f3944854cd1bcd5c7ac1469d1b8cd637154 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Jun 2023 16:47:33 +0900
Subject: [PATCH 1055/1604] Add xmldoc for `KeyCounterController`

---
 osu.Game/Screens/Play/HUD/KeyCounterController.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/Play/HUD/KeyCounterController.cs b/osu.Game/Screens/Play/HUD/KeyCounterController.cs
index f64a0306c6..93e0528e6b 100644
--- a/osu.Game/Screens/Play/HUD/KeyCounterController.cs
+++ b/osu.Game/Screens/Play/HUD/KeyCounterController.cs
@@ -9,6 +9,10 @@ using osu.Framework.Graphics.Containers;
 
 namespace osu.Game.Screens.Play.HUD
 {
+    /// <summary>
+    /// Keeps track of key press counts for a current play session, exposing bindable counts which can
+    /// be used for display purposes.
+    /// </summary>
     public partial class KeyCounterController : CompositeComponent
     {
         public readonly Bindable<bool> IsCounting = new BindableBool(true);

From 14c95f45848c90457425fc85b302517d82db3968 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Jun 2023 17:28:08 +0900
Subject: [PATCH 1056/1604] Apply NRT to `FilterCriteria`

---
 .../SongSelect/TestSceneFilterControl.cs       |  2 +-
 osu.Game/Screens/Select/FilterCriteria.cs      | 18 +++++++-----------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
index 64e2447cca..f020cd02f7 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
@@ -210,7 +210,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 InputManager.Click(MouseButton.Left);
             });
 
-            AddAssert("collection filter still selected", () => control.CreateCriteria().CollectionBeatmapMD5Hashes.Any());
+            AddAssert("collection filter still selected", () => control.CreateCriteria().CollectionBeatmapMD5Hashes?.Any() ?? false);
 
             AddAssert("filter request not fired", () => !received);
         }
diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index 320bfb1b45..2be8c71e21 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -1,12 +1,10 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+#nullable enable
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using JetBrains.Annotations;
 using osu.Game.Beatmaps;
 using osu.Game.Collections;
 using osu.Game.Rulesets;
@@ -20,7 +18,7 @@ namespace osu.Game.Screens.Select
         public GroupMode Group;
         public SortMode Sort;
 
-        public BeatmapSetInfo SelectedBeatmapSet;
+        public BeatmapSetInfo? SelectedBeatmapSet;
 
         public OptionalRange<double> StarDifficulty;
         public OptionalRange<float> ApproachRate;
@@ -42,10 +40,10 @@ namespace osu.Game.Screens.Select
 
         public string[] SearchTerms = Array.Empty<string>();
 
-        public RulesetInfo Ruleset;
+        public RulesetInfo? Ruleset;
         public bool AllowConvertedBeatmaps;
 
-        private string searchText;
+        private string searchText = string.Empty;
 
         /// <summary>
         /// <see cref="SearchText"/> as a number (if it can be parsed as one).
@@ -70,11 +68,9 @@ namespace osu.Game.Screens.Select
         /// <summary>
         /// Hashes from the <see cref="BeatmapCollection"/> to filter to.
         /// </summary>
-        [CanBeNull]
-        public IEnumerable<string> CollectionBeatmapMD5Hashes { get; set; }
+        public IEnumerable<string>? CollectionBeatmapMD5Hashes { get; set; }
 
-        [CanBeNull]
-        public IRulesetFilterCriteria RulesetCriteria { get; set; }
+        public IRulesetFilterCriteria? RulesetCriteria { get; set; }
 
         public struct OptionalRange<T> : IEquatable<OptionalRange<T>>
             where T : struct

From 1960cd08397ed18c67695391b70e0ce415e92fc4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Jun 2023 18:26:39 +0900
Subject: [PATCH 1057/1604] Add test coverage of exact matching of search terms

---
 .../NonVisual/Filtering/FilterMatchingTest.cs | 24 +++++++++++++++++
 .../Filtering/FilterQueryParserTest.cs        | 27 +++++++++++++++++++
 2 files changed, 51 insertions(+)

diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs
index 33204d33a7..8bd9407599 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs
@@ -159,6 +159,30 @@ namespace osu.Game.Tests.NonVisual.Filtering
             Assert.AreEqual(filtered, carouselItem.Filtered.Value);
         }
 
+        [Test]
+        [TestCase("\"artist\"", false)]
+        [TestCase("\"arti\"", true)]
+        [TestCase("\"artist title author\"", true)]
+        [TestCase("\"artist\" \"title\" \"author\"", false)]
+        [TestCase("\"an artist\"", true)]
+        [TestCase("\"tags too\"", false)]
+        [TestCase("\"tags to\"", true)]
+        [TestCase("\"version\"", false)]
+        [TestCase("\"an auteur\"", true)]
+        public void TestCriteriaMatchingExactTerms(string terms, bool filtered)
+        {
+            var exampleBeatmapInfo = getExampleBeatmap();
+            var criteria = new FilterCriteria
+            {
+                Ruleset = new RulesetInfo { OnlineID = 6 },
+                AllowConvertedBeatmaps = true,
+                SearchText = terms
+            };
+            var carouselItem = new CarouselBeatmap(exampleBeatmapInfo);
+            carouselItem.Filter(criteria);
+            Assert.AreEqual(filtered, carouselItem.Filtered.Value);
+        }
+
         [Test]
         [TestCase("", false)]
         [TestCase("The", false)]
diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
index da32edb8fb..46f91f9a67 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
@@ -23,6 +23,31 @@ namespace osu.Game.Tests.NonVisual.Filtering
             Assert.AreEqual(4, filterCriteria.SearchTerms.Length);
         }
 
+        [Test]
+        public void TestApplyQueriesBareWordsWithExactMatch()
+        {
+            const string query = "looking for \"a beatmap\" like \"this\"";
+            var filterCriteria = new FilterCriteria();
+            FilterQueryParser.ApplyQueries(filterCriteria, query);
+            Assert.AreEqual("looking for \"a beatmap\" like \"this\"", filterCriteria.SearchText);
+            Assert.AreEqual(5, filterCriteria.SearchTerms.Length);
+
+            Assert.That(filterCriteria.SearchTerms[0].SearchTerm, Is.EqualTo("a beatmap"));
+            Assert.That(filterCriteria.SearchTerms[0].Exact, Is.True);
+
+            Assert.That(filterCriteria.SearchTerms[1].SearchTerm, Is.EqualTo("this"));
+            Assert.That(filterCriteria.SearchTerms[1].Exact, Is.True);
+
+            Assert.That(filterCriteria.SearchTerms[2].SearchTerm, Is.EqualTo("looking"));
+            Assert.That(filterCriteria.SearchTerms[2].Exact, Is.False);
+
+            Assert.That(filterCriteria.SearchTerms[3].SearchTerm, Is.EqualTo("for"));
+            Assert.That(filterCriteria.SearchTerms[3].Exact, Is.False);
+
+            Assert.That(filterCriteria.SearchTerms[4].SearchTerm, Is.EqualTo("like"));
+            Assert.That(filterCriteria.SearchTerms[4].Exact, Is.False);
+        }
+
         /*
          * The following tests have been written a bit strangely (they don't check exact
          * bound equality with what the filter says).
@@ -235,6 +260,7 @@ namespace osu.Game.Tests.NonVisual.Filtering
             Assert.AreEqual("find me songs by  please", filterCriteria.SearchText.Trim());
             Assert.AreEqual(5, filterCriteria.SearchTerms.Length);
             Assert.AreEqual("singer", filterCriteria.Artist.SearchTerm);
+            Assert.That(filterCriteria.Artist.Exact, Is.False);
         }
 
         [Test]
@@ -246,6 +272,7 @@ namespace osu.Game.Tests.NonVisual.Filtering
             Assert.AreEqual("really like  yes", filterCriteria.SearchText.Trim());
             Assert.AreEqual(3, filterCriteria.SearchTerms.Length);
             Assert.AreEqual("name with space", filterCriteria.Artist.SearchTerm);
+            Assert.That(filterCriteria.Artist.Exact, Is.True);
         }
 
         [Test]

From a74547c43cf0328d69ec5671635f2a4a4c05356a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Jun 2023 17:30:08 +0900
Subject: [PATCH 1058/1604] Add exact match support at song select

---
 .../Select/Carousel/CarouselBeatmap.cs        | 10 ++--
 osu.Game/Screens/Select/FilterCriteria.cs     | 47 +++++++++++++++++--
 osu.Game/Screens/Select/FilterQueryParser.cs  |  2 +-
 3 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
index 7e48bc5cdd..18931c462f 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
 using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Screens.Select.Filter;
@@ -65,16 +64,16 @@ namespace osu.Game.Screens.Select.Carousel
 
             if (criteria.SearchTerms.Length > 0)
             {
-                var terms = BeatmapInfo.GetSearchableTerms();
+                var searchableTerms = BeatmapInfo.GetSearchableTerms();
 
-                foreach (string criteriaTerm in criteria.SearchTerms)
+                foreach (FilterCriteria.OptionalTextFilter criteriaTerm in criteria.SearchTerms)
                 {
                     bool any = false;
 
                     // ReSharper disable once ForeachCanBeConvertedToQueryUsingAnotherGetEnumerator
-                    foreach (string term in terms)
+                    foreach (string searchTerm in searchableTerms)
                     {
-                        if (!term.Contains(criteriaTerm, StringComparison.InvariantCultureIgnoreCase)) continue;
+                        if (!criteriaTerm.Matches(searchTerm)) continue;
 
                         any = true;
                         break;
@@ -98,7 +97,6 @@ namespace osu.Game.Screens.Select.Carousel
             if (!match) return false;
 
             match &= criteria.CollectionBeatmapMD5Hashes?.Contains(BeatmapInfo.MD5Hash) ?? true;
-
             if (match && criteria.RulesetCriteria != null)
                 match &= criteria.RulesetCriteria.Matches(BeatmapInfo);
 
diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index 2be8c71e21..3fcc8d5476 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -1,10 +1,14 @@
-#nullable enable
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+#nullable enable
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.RegularExpressions;
 using osu.Game.Beatmaps;
 using osu.Game.Collections;
 using osu.Game.Rulesets;
@@ -38,7 +42,7 @@ namespace osu.Game.Screens.Select
             IsUpperInclusive = true
         };
 
-        public string[] SearchTerms = Array.Empty<string>();
+        public OptionalTextFilter[] SearchTerms = Array.Empty<OptionalTextFilter>();
 
         public RulesetInfo? Ruleset;
         public bool AllowConvertedBeatmaps;
@@ -56,11 +60,29 @@ namespace osu.Game.Screens.Select
             set
             {
                 searchText = value;
-                SearchTerms = searchText.Split(' ', StringSplitOptions.RemoveEmptyEntries).ToArray();
+
+                List<OptionalTextFilter> terms = new List<OptionalTextFilter>();
+
+                string remainingText = value;
+
+                // First handle quoted segments to ensure we keep inline spaces in exact matches.
+                foreach (Match quotedSegment in Regex.Matches(searchText, "(\"[^\"]+\")"))
+                {
+                    terms.Add(new OptionalTextFilter { SearchTerm = quotedSegment.Value });
+                    remainingText = remainingText.Replace(quotedSegment.Value, string.Empty);
+                }
+
+                // Then handle the rest splitting on any spaces.
+                terms.AddRange(remainingText.Split(' ', StringSplitOptions.RemoveEmptyEntries).Select(s => new OptionalTextFilter
+                {
+                    SearchTerm = s
+                }));
+
+                SearchTerms = terms.ToArray();
 
                 SearchNumber = null;
 
-                if (SearchTerms.Length == 1 && int.TryParse(SearchTerms[0], out int parsed))
+                if (SearchTerms.Length == 1 && int.TryParse(SearchTerms[0].SearchTerm, out int parsed))
                     SearchNumber = parsed;
             }
         }
@@ -120,6 +142,8 @@ namespace osu.Game.Screens.Select
         {
             public bool HasFilter => !string.IsNullOrEmpty(SearchTerm);
 
+            public bool Exact { get; private set; }
+
             public bool Matches(string value)
             {
                 if (!HasFilter)
@@ -129,10 +153,23 @@ namespace osu.Game.Screens.Select
                 if (string.IsNullOrEmpty(value))
                     return false;
 
+                if (Exact)
+                    return Regex.IsMatch(value, $@"(^|\s){searchTerm}($|\s)", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
+
                 return value.Contains(SearchTerm, StringComparison.InvariantCultureIgnoreCase);
             }
 
-            public string SearchTerm;
+            private string searchTerm;
+
+            public string SearchTerm
+            {
+                get => searchTerm;
+                set
+                {
+                    searchTerm = value.Trim('"');
+                    Exact = searchTerm != value;
+                }
+            }
 
             public bool Equals(OptionalTextFilter other) => SearchTerm == other.SearchTerm;
         }
diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index c86554ddbc..474a9fdfea 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -161,7 +161,7 @@ namespace osu.Game.Screens.Select
             switch (op)
             {
                 case Operator.Equal:
-                    textFilter.SearchTerm = value.Trim('"');
+                    textFilter.SearchTerm = value;
                     return true;
 
                 default:

From 8e79510793775ebab730d68d5fd962298aa77aa3 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 26 Jun 2023 17:52:47 +0900
Subject: [PATCH 1059/1604] Add migration for total score conversion

---
 osu.Game/Database/RealmAccess.cs              | 13 ++++++++++++-
 osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs |  3 ++-
 osu.Game/Scoring/ScoreInfo.cs                 |  3 +++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index da4caa42ba..e3423d25c5 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -78,8 +78,9 @@ namespace osu.Game.Database
         /// 28   2023-06-08    Added IsLegacyScore to ScoreInfo, parsed from replay files.
         /// 29   2023-06-12    Run migration of old lazer scores to be best-effort in the new scoring number space. No actual realm changes.
         /// 30   2023-06-16    Run migration of old lazer scores again. This time with more correct rounding considerations.
+        /// 31   2023-06-26    Add Version to ScoreInfo, set to 30000002.
         /// </summary>
-        private const int schema_version = 30;
+        private const int schema_version = 31;
 
         /// <summary>
         /// Lock object which is held during <see cref="BlockAllOperations"/> sections, blocking realm retrieval during blocking periods.
@@ -966,6 +967,16 @@ namespace osu.Game.Database
 
                     break;
                 }
+
+                case 31:
+                {
+                    var scores = migration.NewRealm.All<ScoreInfo>();
+
+                    foreach (var score in scores)
+                        score.Version = 30000002; // Last version before legacy total score conversion.
+
+                    break;
+                }
             }
 
             Logger.Log($"Migration completed in {stopwatch.ElapsedMilliseconds}ms");
diff --git a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
index f71da6c7e0..6c8b99b842 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
@@ -29,9 +29,10 @@ namespace osu.Game.Scoring.Legacy
         /// <list type="bullet">
         /// <item><description>30000001: Appends <see cref="LegacyReplaySoloScoreInfo"/> to the end of scores.</description></item>
         /// <item><description>30000002: Score stored to replay calculated using the Score V2 algorithm.</description></item>
+        /// <item><description>30000003: First version after legacy total score migration.</description></item>
         /// </list>
         /// </remarks>
-        public const int LATEST_VERSION = 30000002;
+        public const int LATEST_VERSION = 30000003;
 
         /// <summary>
         /// The first stable-compatible YYYYMMDD format version given to lazer usage of replays.
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index d56338c6a4..fd67884956 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -15,6 +15,7 @@ using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring.Legacy;
 using osu.Game.Users;
 using osu.Game.Utils;
 using Realms;
@@ -63,6 +64,8 @@ namespace osu.Game.Scoring
 
         public double? PP { get; set; }
 
+        public int Version { get; set; } = LegacyScoreEncoder.LATEST_VERSION;
+
         [Indexed]
         public long OnlineID { get; set; } = -1;
 

From a9c65d200ae63be37d1a3663f9a9240d7d886397 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 26 Jun 2023 22:19:01 +0900
Subject: [PATCH 1060/1604] Initial conversion of scores

---
 .../Difficulty/CatchDifficultyCalculator.cs   |  3 +-
 .../Difficulty/CatchScoreV1Processor.cs       |  8 +-
 .../Difficulty/ManiaDifficultyCalculator.cs   | 11 ++-
 .../Difficulty/ManiaScoreV1Processor.cs       | 12 ++-
 .../Difficulty/OsuDifficultyCalculator.cs     |  3 +-
 .../Difficulty/OsuScoreV1Processor.cs         | 12 +--
 osu.Game.Rulesets.Osu/OsuRuleset.cs           |  2 +
 .../Difficulty/TaikoDifficultyCalculator.cs   |  3 +-
 .../Difficulty/TaikoScoreV1Processor.cs       | 18 ++--
 osu.Game/BackgroundBeatmapProcessor.cs        | 88 +++++++++++++++++++
 osu.Game/Rulesets/Ruleset.cs                  |  2 +
 .../Rulesets/Scoring/ILegacyScoreProcessor.cs | 30 +++++++
 osu.Game/Scoring/ScoreImporter.cs             | 58 ++++++++++++
 osu.Game/Scoring/ScoreManager.cs              |  2 +
 14 files changed, 225 insertions(+), 27 deletions(-)
 create mode 100644 osu.Game/Rulesets/Scoring/ILegacyScoreProcessor.cs

diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
index a44aaf6dfa..5e562237c8 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
@@ -51,7 +51,8 @@ namespace osu.Game.Rulesets.Catch.Difficulty
 
             if (ComputeLegacyScoringValues)
             {
-                CatchScoreV1Processor sv1Processor = new CatchScoreV1Processor(workingBeatmap.Beatmap, beatmap, mods);
+                CatchScoreV1Processor sv1Processor = new CatchScoreV1Processor();
+                sv1Processor.Simulate(workingBeatmap, beatmap, mods);
                 attributes.LegacyAccuracyScore = sv1Processor.AccuracyScore;
                 attributes.LegacyComboScore = sv1Processor.ComboScore;
                 attributes.LegacyBonusScoreRatio = sv1Processor.BonusScoreRatio;
diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchScoreV1Processor.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchScoreV1Processor.cs
index be48763845..bda6be66a4 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchScoreV1Processor.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchScoreV1Processor.cs
@@ -14,7 +14,7 @@ using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Catch.Difficulty
 {
-    internal class CatchScoreV1Processor
+    internal class CatchScoreV1Processor : ILegacyScoreProcessor
     {
         /// <summary>
         /// The accuracy portion of the legacy (ScoreV1) total score.
@@ -36,10 +36,12 @@ namespace osu.Game.Rulesets.Catch.Difficulty
         private int modernBonusScore;
         private int combo;
 
-        private readonly double scoreMultiplier;
+        private double scoreMultiplier;
 
-        public CatchScoreV1Processor(IBeatmap baseBeatmap, IBeatmap playableBeatmap, IReadOnlyList<Mod> mods)
+        public void Simulate(IWorkingBeatmap workingBeatmap, IBeatmap playableBeatmap, IReadOnlyList<Mod> mods)
         {
+            IBeatmap baseBeatmap = workingBeatmap.Beatmap;
+
             int countNormal = 0;
             int countSlider = 0;
             int countSpinner = 0;
diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
index 4c419151c1..5403c1f860 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
@@ -31,9 +31,13 @@ namespace osu.Game.Rulesets.Mania.Difficulty
 
         public override int Version => 20220902;
 
+        private IWorkingBeatmap workingBeatmap;
+
         public ManiaDifficultyCalculator(IRulesetInfo ruleset, IWorkingBeatmap beatmap)
             : base(ruleset, beatmap)
         {
+            workingBeatmap = beatmap;
+
             isForCurrentRuleset = beatmap.BeatmapInfo.Ruleset.MatchesOnlineID(ruleset);
             originalOverallDifficulty = beatmap.BeatmapInfo.Difficulty.OverallDifficulty;
         }
@@ -58,8 +62,11 @@ namespace osu.Game.Rulesets.Mania.Difficulty
 
             if (ComputeLegacyScoringValues)
             {
-                ManiaScoreV1Processor sv1Processor = new ManiaScoreV1Processor(mods);
-                attributes.LegacyComboScore = sv1Processor.TotalScore;
+                ManiaScoreV1Processor sv1Processor = new ManiaScoreV1Processor();
+                sv1Processor.Simulate(workingBeatmap, beatmap, mods);
+                attributes.LegacyAccuracyScore = sv1Processor.AccuracyScore;
+                attributes.LegacyComboScore = sv1Processor.ComboScore;
+                attributes.LegacyBonusScoreRatio = sv1Processor.BonusScoreRatio;
             }
 
             return attributes;
diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaScoreV1Processor.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaScoreV1Processor.cs
index f28a86b6b4..9134ca4e2a 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/ManiaScoreV1Processor.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaScoreV1Processor.cs
@@ -3,22 +3,26 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.Mods;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mania.Difficulty
 {
-    internal class ManiaScoreV1Processor
+    internal class ManiaScoreV1Processor : ILegacyScoreProcessor
     {
-        public int TotalScore { get; private set; }
+        public int AccuracyScore => 0;
+        public int ComboScore { get; private set; }
+        public double BonusScoreRatio => 0;
 
-        public ManiaScoreV1Processor(IReadOnlyList<Mod> mods)
+        public void Simulate(IWorkingBeatmap workingBeatmap, IBeatmap playableBeatmap, IReadOnlyList<Mod> mods)
         {
             double multiplier = mods.Where(m => m is not (ModHidden or ModHardRock or ModDoubleTime or ModFlashlight or ManiaModFadeIn))
                                     .Select(m => m.ScoreMultiplier)
                                     .Aggregate(1.0, (c, n) => c * n);
 
-            TotalScore = (int)(1000000 * multiplier);
+            ComboScore = (int)(1000000 * multiplier);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
index 5158ea8a16..7ecbb48ae6 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
@@ -111,7 +111,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
             if (ComputeLegacyScoringValues)
             {
-                OsuScoreV1Processor sv1Processor = new OsuScoreV1Processor(workingBeatmap.Beatmap, beatmap, mods);
+                OsuScoreV1Processor sv1Processor = new OsuScoreV1Processor();
+                sv1Processor.Simulate(workingBeatmap, beatmap, mods);
                 attributes.LegacyAccuracyScore = sv1Processor.AccuracyScore;
                 attributes.LegacyComboScore = sv1Processor.ComboScore;
                 attributes.LegacyBonusScoreRatio = sv1Processor.BonusScoreRatio;
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuScoreV1Processor.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuScoreV1Processor.cs
index e8231794e0..aa52edae87 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuScoreV1Processor.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuScoreV1Processor.cs
@@ -14,7 +14,7 @@ using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Difficulty
 {
-    internal class OsuScoreV1Processor
+    internal class OsuScoreV1Processor : ILegacyScoreProcessor
     {
         /// <summary>
         /// The accuracy portion of the legacy (ScoreV1) total score.
@@ -36,18 +36,20 @@ namespace osu.Game.Rulesets.Osu.Difficulty
         private int modernBonusScore;
         private int combo;
 
-        private readonly double scoreMultiplier;
-        private readonly IBeatmap playableBeatmap;
+        private double scoreMultiplier;
+        private IBeatmap playableBeatmap = null!;
 
-        public OsuScoreV1Processor(IBeatmap baseBeatmap, IBeatmap playableBeatmap, IReadOnlyList<Mod> mods)
+        public void Simulate(IWorkingBeatmap workingBeatmap, IBeatmap playableBeatmap, IReadOnlyList<Mod> mods)
         {
             this.playableBeatmap = playableBeatmap;
 
+            IBeatmap baseBeatmap = workingBeatmap.Beatmap;
+
             int countNormal = 0;
             int countSlider = 0;
             int countSpinner = 0;
 
-            foreach (HitObject obj in baseBeatmap.HitObjects)
+            foreach (HitObject obj in workingBeatmap.Beatmap.HitObjects)
             {
                 switch (obj)
                 {
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 4cff16b46f..c82f10c017 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -322,5 +322,7 @@ namespace osu.Game.Rulesets.Osu
         }
 
         public override RulesetSetupSection CreateEditorSetupSection() => new OsuSetupSection();
+
+        public override ILegacyScoreProcessor CreateLegacyScoreProcessor() => new OsuScoreV1Processor();
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
index 1f34ba084f..b7f82b7512 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
@@ -101,7 +101,8 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
 
             if (ComputeLegacyScoringValues)
             {
-                TaikoScoreV1Processor sv1Processor = new TaikoScoreV1Processor(workingBeatmap.Beatmap, beatmap, mods);
+                TaikoScoreV1Processor sv1Processor = new TaikoScoreV1Processor();
+                sv1Processor.Simulate(workingBeatmap, beatmap, mods);
                 attributes.LegacyAccuracyScore = sv1Processor.AccuracyScore;
                 attributes.LegacyComboScore = sv1Processor.ComboScore;
                 attributes.LegacyBonusScoreRatio = sv1Processor.BonusScoreRatio;
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoScoreV1Processor.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoScoreV1Processor.cs
index f01ca74f4a..255a3dd963 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoScoreV1Processor.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoScoreV1Processor.cs
@@ -14,7 +14,7 @@ using osu.Game.Rulesets.Taiko.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Difficulty
 {
-    internal class TaikoScoreV1Processor
+    internal class TaikoScoreV1Processor : ILegacyScoreProcessor
     {
         /// <summary>
         /// The accuracy portion of the legacy (ScoreV1) total score.
@@ -36,16 +36,18 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
         private int modernBonusScore;
         private int combo;
 
-        private readonly double modMultiplier;
-        private readonly int difficultyPeppyStars;
-        private readonly IBeatmap playableBeatmap;
-        private readonly IReadOnlyList<Mod> mods;
+        private double modMultiplier;
+        private int difficultyPeppyStars;
+        private IBeatmap playableBeatmap = null!;
+        private IReadOnlyList<Mod> mods = null!;
 
-        public TaikoScoreV1Processor(IBeatmap baseBeatmap, IBeatmap playableBeatmap, IReadOnlyList<Mod> mods)
+        public void Simulate(IWorkingBeatmap workingBeatmap, IBeatmap playableBeatmap, IReadOnlyList<Mod> mods)
         {
             this.playableBeatmap = playableBeatmap;
             this.mods = mods;
 
+            IBeatmap baseBeatmap = workingBeatmap.Beatmap;
+
             int countNormal = 0;
             int countSlider = 0;
             int countSpinner = 0;
@@ -205,10 +207,6 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
 
             if (increaseCombo)
                 combo++;
-
-            if (hitObject is Swell)
-            {
-            }
         }
     }
 }
diff --git a/osu.Game/BackgroundBeatmapProcessor.cs b/osu.Game/BackgroundBeatmapProcessor.cs
index b8c89d8822..c49edec87d 100644
--- a/osu.Game/BackgroundBeatmapProcessor.cs
+++ b/osu.Game/BackgroundBeatmapProcessor.cs
@@ -14,6 +14,8 @@ using osu.Framework.Graphics;
 using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Notifications;
 using osu.Game.Rulesets;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
@@ -40,6 +42,9 @@ namespace osu.Game
         [Resolved]
         private ILocalUserPlayInfo? localUserPlayInfo { get; set; }
 
+        [Resolved]
+        private INotificationOverlay? notificationOverlay { get; set; }
+
         protected virtual int TimeToSleepDuringGameplay => 30000;
 
         protected override void LoadComplete()
@@ -52,6 +57,7 @@ namespace osu.Game
                 checkForOutdatedStarRatings();
                 processBeatmapSetsWithMissingMetrics();
                 processScoresWithMissingStatistics();
+                convertLegacyTotalScoreToStandardised();
             }).ContinueWith(t =>
             {
                 if (t.Exception?.InnerException is ObjectDisposedException)
@@ -193,5 +199,87 @@ namespace osu.Game
                 }
             }
         }
+
+        private void convertLegacyTotalScoreToStandardised()
+        {
+            HashSet<Guid> scoreIds = new HashSet<Guid>();
+
+            Logger.Log("Querying for scores that need total score conversion...");
+
+            realmAccess.Run(r =>
+            {
+                foreach (var score in r.All<ScoreInfo>().Where(s => s.IsLegacyScore))
+                {
+                    if (score.RulesetID is not (0 or 1 or 2 or 3))
+                        continue;
+
+                    if (score.Version >= 30000003)
+                        continue;
+
+                    scoreIds.Add(score.ID);
+                }
+            });
+
+            Logger.Log($"Found {scoreIds.Count} scores which require total score conversion.");
+
+            ProgressNotification? notification = null;
+
+            if (scoreIds.Count > 0)
+                notificationOverlay?.Post(notification = new ProgressNotification { State = ProgressNotificationState.Active });
+
+            int count = 0;
+            updateNotification();
+
+            foreach (var id in scoreIds)
+            {
+                while (localUserPlayInfo?.IsPlaying.Value == true)
+                {
+                    Logger.Log("Background processing sleeping due to active gameplay...");
+                    Thread.Sleep(TimeToSleepDuringGameplay);
+                }
+
+                try
+                {
+                    var score = scoreManager.Query(s => s.ID == id);
+                    long newTotalScore = scoreManager.ConvertFromLegacyTotalScore(score);
+
+                    // Can't use async overload because we're not on the update thread.
+                    // ReSharper disable once MethodHasAsyncOverload
+                    realmAccess.Write(r =>
+                    {
+                        ScoreInfo s = r.Find<ScoreInfo>(id);
+                        s.TotalScore = newTotalScore;
+                        s.Version = 30000003;
+                    });
+
+                    Logger.Log($"Converted total score for score {id}");
+                }
+                catch (Exception e)
+                {
+                    Logger.Log($"Failed to convert total score for {id}: {e}");
+                }
+
+                ++count;
+                updateNotification();
+            }
+
+            void updateNotification()
+            {
+                if (notification == null)
+                    return;
+
+                if (count == scoreIds.Count)
+                {
+                    notification.CompletionText = $"Total score updated for {scoreIds.Count} scores";
+                    notification.Progress = 1;
+                    notification.State = ProgressNotificationState.Completed;
+                }
+                else
+                {
+                    notification.Text = $"Total score updated for {count} of {scoreIds.Count} scores";
+                    notification.Progress = (float)count / scoreIds.Count;
+                }
+            }
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index 490ec1475c..5501a3a7c5 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -380,5 +380,7 @@ namespace osu.Game.Rulesets
         /// Can be overridden to add a ruleset-specific section to the editor beatmap setup screen.
         /// </summary>
         public virtual RulesetSetupSection? CreateEditorSetupSection() => null;
+
+        public virtual ILegacyScoreProcessor? CreateLegacyScoreProcessor() => null;
     }
 }
diff --git a/osu.Game/Rulesets/Scoring/ILegacyScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ILegacyScoreProcessor.cs
new file mode 100644
index 0000000000..70234a9b17
--- /dev/null
+++ b/osu.Game/Rulesets/Scoring/ILegacyScoreProcessor.cs
@@ -0,0 +1,30 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Scoring
+{
+    public interface ILegacyScoreProcessor
+    {
+        /// <summary>
+        /// The accuracy portion of the legacy (ScoreV1) total score.
+        /// </summary>
+        int AccuracyScore { get; }
+
+        /// <summary>
+        /// The combo-multiplied portion of the legacy (ScoreV1) total score.
+        /// </summary>
+        int ComboScore { get; }
+
+        /// <summary>
+        /// A ratio of <c>new_bonus_score / old_bonus_score</c> for converting the bonus score of legacy scores to the new scoring.
+        /// This is made up of all judgements that would be <see cref="HitResult.SmallBonus"/> or <see cref="HitResult.LargeBonus"/>.
+        /// </summary>
+        double BonusScoreRatio { get; }
+
+        void Simulate(IWorkingBeatmap workingBeatmap, IBeatmap playableBeatmap, IReadOnlyList<Mod> mods);
+    }
+}
diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index 16658a598a..04a8bc6fc5 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -88,6 +88,8 @@ namespace osu.Game.Scoring
             // this requires: max combo, statistics, max statistics (where available), and mods to already be populated on the score.
             if (StandardisedScoreMigrationTools.ShouldMigrateToNewStandardised(model))
                 model.TotalScore = StandardisedScoreMigrationTools.GetNewStandardised(model);
+            else if (model.IsLegacyScore)
+                model.TotalScore = ConvertFromLegacyTotalScore(model);
         }
 
         /// <summary>
@@ -151,6 +153,62 @@ namespace osu.Game.Scoring
 #pragma warning restore CS0618
         }
 
+        public long ConvertFromLegacyTotalScore(ScoreInfo score)
+        {
+            var beatmap = beatmaps().GetWorkingBeatmap(score.BeatmapInfo);
+            var ruleset = score.Ruleset.CreateInstance();
+
+            var sv1Processor = ruleset.CreateLegacyScoreProcessor();
+            if (sv1Processor == null)
+                return score.TotalScore;
+
+            sv1Processor.Simulate(beatmap, beatmap.GetPlayableBeatmap(ruleset.RulesetInfo, score.Mods), score.Mods);
+
+            int maximumLegacyAccuracyScore = sv1Processor.AccuracyScore;
+            int maximumLegacyComboScore = sv1Processor.ComboScore;
+            double maximumLegacyBonusRatio = sv1Processor.BonusScoreRatio;
+            double modMultiplier = score.Mods.Select(m => m.ScoreMultiplier).Aggregate(1.0, (c, n) => c * n);
+
+            // The part of total score that doesn't include bonus.
+            int maximumLegacyBaseScore = maximumLegacyAccuracyScore + maximumLegacyComboScore;
+
+            // The combo proportion is calculated as a proportion of maximumLegacyBaseScore.
+            double comboProportion = Math.Min(1, (double)score.TotalScore / maximumLegacyBaseScore);
+
+            // The bonus proportion makes up the rest of the score that exceeds maximumLegacyBaseScore.
+            double bonusProportion = Math.Max(0, (score.TotalScore - maximumLegacyBaseScore) * maximumLegacyBonusRatio);
+
+            switch (ruleset.RulesetInfo.OnlineID)
+            {
+                case 0:
+                    return (long)Math.Round((
+                        700000 * comboProportion
+                        + 300000 * Math.Pow(score.Accuracy, 10)
+                        + bonusProportion) * modMultiplier);
+
+                case 1:
+                    return (long)Math.Round((
+                        250000 * comboProportion
+                        + 750000 * Math.Pow(score.Accuracy, 3.6)
+                        + bonusProportion) * modMultiplier);
+
+                case 2:
+                    return (long)Math.Round((
+                        600000 * comboProportion
+                        + 400000 * score.Accuracy
+                        + bonusProportion) * modMultiplier);
+
+                case 3:
+                    return (long)Math.Round((
+                        990000 * comboProportion
+                        + 10000 * Math.Pow(score.Accuracy, 2 + 2 * score.Accuracy)
+                        + bonusProportion) * modMultiplier);
+
+                default:
+                    return score.TotalScore;
+            }
+        }
+
         // Very naive local caching to improve performance of large score imports (where the username is usually the same for most or all scores).
         private readonly Dictionary<string, APIUser> usernameLookupCache = new Dictionary<string, APIUser>();
 
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 55bcb9f79d..fd5e9c851c 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -169,6 +169,8 @@ namespace osu.Game.Scoring
         /// <param name="score">The score to populate the statistics of.</param>
         public void PopulateMaximumStatistics(ScoreInfo score) => scoreImporter.PopulateMaximumStatistics(score);
 
+        public long ConvertFromLegacyTotalScore(ScoreInfo score) => scoreImporter.ConvertFromLegacyTotalScore(score);
+
         #region Implementation of IPresentImports<ScoreInfo>
 
         public Action<IEnumerable<Live<ScoreInfo>>> PresentImport

From cc45ec4fff329f4b0dda00d5cf347f6518e27165 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 26 Jun 2023 18:52:05 +0200
Subject: [PATCH 1061/1604] Mark `IHasRecordingHandler.Recorder` nullable

---
 osu.Game/Rulesets/UI/IHasRecordingHandler.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/UI/IHasRecordingHandler.cs b/osu.Game/Rulesets/UI/IHasRecordingHandler.cs
index 2a13272a98..f73398dd98 100644
--- a/osu.Game/Rulesets/UI/IHasRecordingHandler.cs
+++ b/osu.Game/Rulesets/UI/IHasRecordingHandler.cs
@@ -10,6 +10,6 @@ namespace osu.Game.Rulesets.UI
     /// </summary>
     public interface IHasRecordingHandler
     {
-        public ReplayRecorder Recorder { set; }
+        public ReplayRecorder? Recorder { set; }
     }
 }

From dbd76c1193bf545342e39cb67f997e6561224f5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 26 Jun 2023 19:02:49 +0200
Subject: [PATCH 1062/1604] Fix attempting to add key counter controller to
 hierarchy in multiple places

---
 osu.Game/Screens/Play/HUDOverlay.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 9f3b7d5a93..b4f37f1df6 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -111,12 +111,14 @@ namespace osu.Game.Screens.Play
 
             RelativeSizeAxes = Axes.Both;
 
+            // intentionally not added to hierarchy here as it will be attached via `BindDrawableRuleset()`.
+            KeyCounter = new KeyCounterController();
+
             Children = new[]
             {
                 CreateFailingLayer(),
                 //Needs to be initialized before skinnable drawables.
                 tally = new JudgementTally(),
-                KeyCounter = new KeyCounterController(),
                 mainComponents = new HUDComponentsContainer { AlwaysPresent = true, },
                 rulesetComponents = drawableRuleset != null
                     ? new HUDComponentsContainer(drawableRuleset.Ruleset.RulesetInfo) { AlwaysPresent = true, }

From ff562e2dd7cb005a09d3443a7ac675f3739b90d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 26 Jun 2023 19:12:49 +0200
Subject: [PATCH 1063/1604] Remove redundant guard

In this particular case guarding with `.IsNull()` makes no sense, as the
`Trigger` is supplied in constructor and cannot feasibly be null. Doing
that only makes sense in scenarios where BDL / dependency injection is
involved.
---
 osu.Game/Screens/Play/HUD/KeyCounter.cs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/KeyCounter.cs b/osu.Game/Screens/Play/HUD/KeyCounter.cs
index 08d7e79e7c..f12d2166fc 100644
--- a/osu.Game/Screens/Play/HUD/KeyCounter.cs
+++ b/osu.Game/Screens/Play/HUD/KeyCounter.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics.Containers;
 
 namespace osu.Game.Screens.Play.HUD
@@ -49,11 +48,8 @@ namespace osu.Game.Screens.Play.HUD
         {
             base.Dispose(isDisposing);
 
-            if (Trigger.IsNotNull())
-            {
-                Trigger.OnActivate -= Activate;
-                Trigger.OnDeactivate -= Deactivate;
-            }
+            Trigger.OnActivate -= Activate;
+            Trigger.OnDeactivate -= Deactivate;
         }
     }
 }

From 4ac48e4cd86385c516e784580f146e593c8486aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 26 Jun 2023 19:15:05 +0200
Subject: [PATCH 1064/1604] Group input handling members together

---
 osu.Game/Screens/Play/HUD/KeyCounterController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/KeyCounterController.cs b/osu.Game/Screens/Play/HUD/KeyCounterController.cs
index 93e0528e6b..e4d5968f26 100644
--- a/osu.Game/Screens/Play/HUD/KeyCounterController.cs
+++ b/osu.Game/Screens/Play/HUD/KeyCounterController.cs
@@ -36,8 +36,8 @@ namespace osu.Game.Screens.Play.HUD
         }
 
         public void AddRange(IEnumerable<InputTrigger> inputTriggers) => inputTriggers.ForEach(Add);
-        public override bool HandleNonPositionalInput => true;
 
+        public override bool HandleNonPositionalInput => true;
         public override bool HandlePositionalInput => true;
     }
 }

From 8d91580dc19f34f5dc782df36236ca69e33d955e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 26 Jun 2023 19:27:42 +0200
Subject: [PATCH 1065/1604] Rename `{KeyCounter -> InputCount}Controller`

---
 osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs    |  6 +++---
 .../Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs   |  2 +-
 .../Visual/Gameplay/TestSceneGameplayRewinding.cs      |  4 ++--
 osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs  |  2 +-
 osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs  |  4 ++--
 osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs      |  2 +-
 .../Gameplay/TestSceneSkinEditorMultipleSkins.cs       |  2 +-
 .../Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs    |  2 +-
 osu.Game/Rulesets/UI/DrawableRuleset.cs                |  4 ++--
 osu.Game/Rulesets/UI/ICanAttachHUDPieces.cs            |  2 +-
 osu.Game/Rulesets/UI/RulesetInputManager.cs            |  6 +++---
 ...KeyCounterController.cs => InputCountController.cs} |  4 ++--
 osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs         |  2 +-
 osu.Game/Screens/Play/HUDOverlay.cs                    | 10 +++++-----
 osu.Game/Screens/Play/Player.cs                        |  4 ++--
 15 files changed, 28 insertions(+), 28 deletions(-)
 rename osu.Game/Screens/Play/HUD/{KeyCounterController.cs => InputCountController.cs} (92%)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
index c829b73f66..3ac4d25028 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
@@ -35,14 +35,14 @@ namespace osu.Game.Tests.Visual.Gameplay
             var referenceBeatmap = CreateBeatmap(new OsuRuleset().RulesetInfo);
 
             AddUntilStep("score above zero", () => Player.ScoreProcessor.TotalScore.Value > 0);
-            AddUntilStep("key counter counted keys", () => Player.HUDOverlay.KeyCounter.Triggers.Any(kc => kc.ActivationCount.Value > 2));
+            AddUntilStep("key counter counted keys", () => Player.HUDOverlay.InputCountController.Triggers.Any(kc => kc.ActivationCount.Value > 2));
 
             seekTo(referenceBeatmap.Breaks[0].StartTime);
-            AddAssert("keys not counting", () => !Player.HUDOverlay.KeyCounter.IsCounting.Value);
+            AddAssert("keys not counting", () => !Player.HUDOverlay.InputCountController.IsCounting.Value);
             AddAssert("overlay displays 100% accuracy", () => Player.BreakOverlay.ChildrenOfType<BreakInfo>().Single().AccuracyDisplay.Current.Value == 1);
 
             AddStep("rewind", () => Player.GameplayClockContainer.Seek(-80000));
-            AddUntilStep("key counter reset", () => Player.HUDOverlay.KeyCounter.Triggers.All(kc => kc.ActivationCount.Value == 0));
+            AddUntilStep("key counter reset", () => Player.HUDOverlay.InputCountController.Triggers.All(kc => kc.ActivationCount.Value == 0));
 
             seekTo(referenceBeatmap.HitObjects[^1].GetEndTime());
             AddUntilStep("results displayed", () => getResultsScreen()?.IsLoaded == true);
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs
index 56c405d81f..18a180589b 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs
@@ -79,7 +79,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                     (typeof(HealthProcessor), actualComponentsContainer.Dependencies.Get<HealthProcessor>()),
                     (typeof(GameplayState), actualComponentsContainer.Dependencies.Get<GameplayState>()),
                     (typeof(IGameplayClock), actualComponentsContainer.Dependencies.Get<IGameplayClock>()),
-                    (typeof(KeyCounterController), actualComponentsContainer.Dependencies.Get<KeyCounterController>())
+                    (typeof(InputCountController), actualComponentsContainer.Dependencies.Get<InputCountController>())
                 },
             };
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs
index 508cf192d3..0cb74ecde6 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs
@@ -31,11 +31,11 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("wait for track to start running", () => Beatmap.Value.Track.IsRunning);
             addSeekStep(3000);
             AddAssert("all judged", () => Player.DrawableRuleset.Playfield.AllHitObjects.All(h => h.Judged));
-            AddUntilStep("key counter counted keys", () => Player.HUDOverlay.KeyCounter.Triggers.Select(kc => kc.ActivationCount.Value).Sum() == 15);
+            AddUntilStep("key counter counted keys", () => Player.HUDOverlay.InputCountController.Triggers.Select(kc => kc.ActivationCount.Value).Sum() == 15);
             AddStep("clear results", () => Player.Results.Clear());
             addSeekStep(0);
             AddAssert("none judged", () => Player.DrawableRuleset.Playfield.AllHitObjects.All(h => !h.Judged));
-            AddUntilStep("key counters reset", () => Player.HUDOverlay.KeyCounter.Triggers.All(kc => kc.ActivationCount.Value == 0));
+            AddUntilStep("key counters reset", () => Player.HUDOverlay.InputCountController.Triggers.All(kc => kc.ActivationCount.Value == 0));
             AddAssert("no results triggered", () => Player.Results.Count == 0);
         }
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index 8cde2ab81f..7552c059a2 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -269,7 +269,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 hudOverlay = new HUDOverlay(null, Array.Empty<Mod>());
 
                 // Add any key just to display the key counter visually.
-                hudOverlay.KeyCounter.Add(new KeyCounterKeyboardTrigger(Key.Space));
+                hudOverlay.InputCountController.Add(new KeyCounterKeyboardTrigger(Key.Space));
 
                 scoreProcessor.Combo.Value = 1;
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
index 786dcc873a..a2c227a76a 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
@@ -18,13 +18,13 @@ namespace osu.Game.Tests.Visual.Gameplay
     public partial class TestSceneKeyCounter : OsuManualInputManagerTestScene
     {
         [Cached]
-        private readonly KeyCounterController controller;
+        private readonly InputCountController controller;
 
         public TestSceneKeyCounter()
         {
             Children = new Drawable[]
             {
-                controller = new KeyCounterController(),
+                controller = new InputCountController(),
                 new FillFlowContainer
                 {
                     Anchor = Anchor.Centre,
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs
index 5fb9bf004f..94a25d064c 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         protected override void AddCheckSteps()
         {
             AddUntilStep("score above zero", () => ((ScoreAccessibleReplayPlayer)Player).ScoreProcessor.TotalScore.Value > 0);
-            AddUntilStep("key counter counted keys", () => ((ScoreAccessibleReplayPlayer)Player).HUDOverlay.KeyCounter.Triggers.Any(kc => kc.ActivationCount.Value > 0));
+            AddUntilStep("key counter counted keys", () => ((ScoreAccessibleReplayPlayer)Player).HUDOverlay.InputCountController.Triggers.Any(kc => kc.ActivationCount.Value > 0));
             AddAssert("cannot fail", () => !((ScoreAccessibleReplayPlayer)Player).AllowFail);
         }
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
index 4ae115a68d..89eb291ab0 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                     };
 
                     // Add any key just to display the key counter visually.
-                    hudOverlay.KeyCounter.Add(new KeyCounterKeyboardTrigger(Key.Space));
+                    hudOverlay.InputCountController.Add(new KeyCounterKeyboardTrigger(Key.Space));
                     scoreProcessor.Combo.Value = 1;
 
                     return new Container
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
index cab52ddab5..be73e36e11 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
@@ -90,7 +90,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                     hudOverlay = new HUDOverlay(null, Array.Empty<Mod>());
 
                     // Add any key just to display the key counter visually.
-                    hudOverlay.KeyCounter.Add(new KeyCounterKeyboardTrigger(Key.Space));
+                    hudOverlay.InputCountController.Add(new KeyCounterKeyboardTrigger(Key.Space));
 
                     action?.Invoke(hudOverlay);
 
diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index 3e390a8931..326c77e94c 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -335,8 +335,8 @@ namespace osu.Game.Rulesets.UI
         /// <returns>The representing <see cref="DrawableHitObject{TObject}"/>.</returns>
         public abstract DrawableHitObject<TObject> CreateDrawableRepresentation(TObject h);
 
-        public void Attach(KeyCounterController keyCounter) =>
-            (KeyBindingInputManager as ICanAttachHUDPieces)?.Attach(keyCounter);
+        public void Attach(InputCountController inputCountController) =>
+            (KeyBindingInputManager as ICanAttachHUDPieces)?.Attach(inputCountController);
 
         public void Attach(ClicksPerSecondCalculator calculator) =>
             (KeyBindingInputManager as ICanAttachHUDPieces)?.Attach(calculator);
diff --git a/osu.Game/Rulesets/UI/ICanAttachHUDPieces.cs b/osu.Game/Rulesets/UI/ICanAttachHUDPieces.cs
index b81af8556e..1f93d25720 100644
--- a/osu.Game/Rulesets/UI/ICanAttachHUDPieces.cs
+++ b/osu.Game/Rulesets/UI/ICanAttachHUDPieces.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.UI
     /// </remarks>
     public interface ICanAttachHUDPieces
     {
-        void Attach(KeyCounterController keyCounter);
+        void Attach(InputCountController inputCountController);
         void Attach(ClicksPerSecondCalculator calculator);
     }
 }
diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 9f4fabc300..2ec3985d36 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -160,11 +160,11 @@ namespace osu.Game.Rulesets.UI
 
         #region Key Counter Attachment
 
-        public void Attach(KeyCounterController keyCounter)
+        public void Attach(InputCountController inputCountController)
         {
-            KeyBindingContainer.Add(keyCounter);
+            KeyBindingContainer.Add(inputCountController);
 
-            keyCounter.AddRange(KeyBindingContainer.DefaultKeyBindings
+            inputCountController.AddRange(KeyBindingContainer.DefaultKeyBindings
                                                    .Select(b => b.GetAction<T>())
                                                    .Distinct()
                                                    .OrderBy(action => action)
diff --git a/osu.Game/Screens/Play/HUD/KeyCounterController.cs b/osu.Game/Screens/Play/HUD/InputCountController.cs
similarity index 92%
rename from osu.Game/Screens/Play/HUD/KeyCounterController.cs
rename to osu.Game/Screens/Play/HUD/InputCountController.cs
index e4d5968f26..47163eeb6d 100644
--- a/osu.Game/Screens/Play/HUD/KeyCounterController.cs
+++ b/osu.Game/Screens/Play/HUD/InputCountController.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Screens.Play.HUD
     /// Keeps track of key press counts for a current play session, exposing bindable counts which can
     /// be used for display purposes.
     /// </summary>
-    public partial class KeyCounterController : CompositeComponent
+    public partial class InputCountController : CompositeComponent
     {
         public readonly Bindable<bool> IsCounting = new BindableBool(true);
 
@@ -23,7 +23,7 @@ namespace osu.Game.Screens.Play.HUD
 
         public IReadOnlyList<InputTrigger> Triggers => triggers;
 
-        public KeyCounterController()
+        public InputCountController()
         {
             InternalChild = triggers = new Container<InputTrigger>();
         }
diff --git a/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs b/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs
index efe51d75b0..e222099c63 100644
--- a/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Screens.Play.HUD
         protected readonly Bindable<bool> ConfigVisibility = new Bindable<bool>();
 
         [Resolved]
-        private KeyCounterController controller { get; set; } = null!;
+        private InputCountController controller { get; set; } = null!;
 
         protected abstract void UpdateVisibility();
 
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index b4f37f1df6..dfc12c06d8 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Screens.Play
         private readonly ClicksPerSecondCalculator clicksPerSecondCalculator;
 
         [Cached]
-        public readonly KeyCounterController KeyCounter;
+        public readonly InputCountController InputCountController;
 
         [Cached]
         private readonly JudgementTally tally;
@@ -112,7 +112,7 @@ namespace osu.Game.Screens.Play
             RelativeSizeAxes = Axes.Both;
 
             // intentionally not added to hierarchy here as it will be attached via `BindDrawableRuleset()`.
-            KeyCounter = new KeyCounterController();
+            InputCountController = new InputCountController();
 
             Children = new[]
             {
@@ -307,13 +307,13 @@ namespace osu.Game.Screens.Play
             {
                 PlayerSettingsOverlay.Show();
                 ModDisplay.FadeIn(200);
-                KeyCounter.Margin = new MarginPadding(10) { Bottom = 30 };
+                InputCountController.Margin = new MarginPadding(10) { Bottom = 30 };
             }
             else
             {
                 PlayerSettingsOverlay.Hide();
                 ModDisplay.Delay(2000).FadeOut(200);
-                KeyCounter.Margin = new MarginPadding(10);
+                InputCountController.Margin = new MarginPadding(10);
             }
 
             updateVisibility();
@@ -323,7 +323,7 @@ namespace osu.Game.Screens.Play
         {
             if (drawableRuleset is ICanAttachHUDPieces attachTarget)
             {
-                attachTarget.Attach(KeyCounter);
+                attachTarget.Attach(InputCountController);
                 attachTarget.Attach(clicksPerSecondCalculator);
             }
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 9fc97162bf..1c6d1fc6a5 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -432,7 +432,7 @@ namespace osu.Game.Screens.Play
                             IsPaused = { BindTarget = GameplayClockContainer.IsPaused },
                             ReplayLoaded = { BindTarget = DrawableRuleset.HasReplayLoaded },
                         },
-                        KeyCounter =
+                        InputCountController =
                         {
                             IsCounting =
                             {
@@ -477,7 +477,7 @@ namespace osu.Game.Screens.Play
         {
             updateGameplayState();
             updatePauseOnFocusLostState();
-            HUDOverlay.KeyCounter.IsCounting.Value = !isBreakTime.NewValue;
+            HUDOverlay.InputCountController.IsCounting.Value = !isBreakTime.NewValue;
         }
 
         private void updateGameplayState()

From 7200855d46c4398aeca84ea2bca45fccc38736a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 26 Jun 2023 19:30:04 +0200
Subject: [PATCH 1066/1604] Rename `Judgement{Tally -> CountController}`

---
 osu.Game.Tests/Visual/Gameplay/TestSceneJudgementCounter.cs | 6 +++---
 .../{JudgementTally.cs => JudgementCountController.cs}      | 2 +-
 .../Screens/Play/HUD/JudgementCounter/JudgementCounter.cs   | 4 ++--
 .../Play/HUD/JudgementCounter/JudgementCounterDisplay.cs    | 6 +++---
 osu.Game/Screens/Play/HUDOverlay.cs                         | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)
 rename osu.Game/Screens/Play/HUD/JudgementCounter/{JudgementTally.cs => JudgementCountController.cs} (96%)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneJudgementCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneJudgementCounter.cs
index 5a802e0d36..f117569657 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneJudgementCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneJudgementCounter.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Tests.Visual.Gameplay
     public partial class TestSceneJudgementCounter : OsuTestScene
     {
         private ScoreProcessor scoreProcessor = null!;
-        private JudgementTally judgementTally = null!;
+        private JudgementCountController judgementCountController = null!;
         private TestJudgementCounterDisplay counterDisplay = null!;
 
         private DependencyProvidingContainer content = null!;
@@ -47,11 +47,11 @@ namespace osu.Game.Tests.Visual.Gameplay
                 CachedDependencies = new (Type, object)[] { (typeof(ScoreProcessor), scoreProcessor), (typeof(Ruleset), ruleset) },
                 Children = new Drawable[]
                 {
-                    judgementTally = new JudgementTally(),
+                    judgementCountController = new JudgementCountController(),
                     content = new DependencyProvidingContainer
                     {
                         RelativeSizeAxes = Axes.Both,
-                        CachedDependencies = new (Type, object)[] { (typeof(JudgementTally), judgementTally) },
+                        CachedDependencies = new (Type, object)[] { (typeof(JudgementCountController), judgementCountController) },
                     }
                 },
             };
diff --git a/osu.Game/Screens/Play/HUD/JudgementCounter/JudgementTally.cs b/osu.Game/Screens/Play/HUD/JudgementCounter/JudgementCountController.cs
similarity index 96%
rename from osu.Game/Screens/Play/HUD/JudgementCounter/JudgementTally.cs
rename to osu.Game/Screens/Play/HUD/JudgementCounter/JudgementCountController.cs
index e9e3fde92a..98e74a0e7e 100644
--- a/osu.Game/Screens/Play/HUD/JudgementCounter/JudgementTally.cs
+++ b/osu.Game/Screens/Play/HUD/JudgementCounter/JudgementCountController.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Screens.Play.HUD.JudgementCounter
     /// Keeps track of judgements for a current play session, exposing bindable counts which can
     /// be used for display purposes.
     /// </summary>
-    public partial class JudgementTally : CompositeDrawable
+    public partial class JudgementCountController : CompositeDrawable
     {
         [Resolved]
         private ScoreProcessor scoreProcessor { get; set; } = null!;
diff --git a/osu.Game/Screens/Play/HUD/JudgementCounter/JudgementCounter.cs b/osu.Game/Screens/Play/HUD/JudgementCounter/JudgementCounter.cs
index 7675d0cc4f..6c417faac2 100644
--- a/osu.Game/Screens/Play/HUD/JudgementCounter/JudgementCounter.cs
+++ b/osu.Game/Screens/Play/HUD/JudgementCounter/JudgementCounter.cs
@@ -18,9 +18,9 @@ namespace osu.Game.Screens.Play.HUD.JudgementCounter
         public BindableBool ShowName = new BindableBool();
         public Bindable<FillDirection> Direction = new Bindable<FillDirection>();
 
-        public readonly JudgementTally.JudgementCount Result;
+        public readonly JudgementCountController.JudgementCount Result;
 
-        public JudgementCounter(JudgementTally.JudgementCount result) => Result = result;
+        public JudgementCounter(JudgementCountController.JudgementCount result) => Result = result;
 
         public OsuSpriteText ResultName = null!;
         private FillFlowContainer flowContainer = null!;
diff --git a/osu.Game/Screens/Play/HUD/JudgementCounter/JudgementCounterDisplay.cs b/osu.Game/Screens/Play/HUD/JudgementCounter/JudgementCounterDisplay.cs
index a9b59a02b5..1dbee19ee3 100644
--- a/osu.Game/Screens/Play/HUD/JudgementCounter/JudgementCounterDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/JudgementCounter/JudgementCounterDisplay.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Screens.Play.HUD.JudgementCounter
         public BindableBool ShowMaxJudgement { get; set; } = new BindableBool(true);
 
         [Resolved]
-        private JudgementTally tally { get; set; } = null!;
+        private JudgementCountController judgementCountController { get; set; } = null!;
 
         protected FillFlowContainer<JudgementCounter> CounterFlow = null!;
 
@@ -49,7 +49,7 @@ namespace osu.Game.Screens.Play.HUD.JudgementCounter
                 AutoSizeAxes = Axes.Both
             };
 
-            foreach (var result in tally.Results)
+            foreach (var result in judgementCountController.Results)
                 CounterFlow.Add(createCounter(result));
         }
 
@@ -123,7 +123,7 @@ namespace osu.Game.Screens.Play.HUD.JudgementCounter
             }
         }
 
-        private JudgementCounter createCounter(JudgementTally.JudgementCount info) =>
+        private JudgementCounter createCounter(JudgementCountController.JudgementCount info) =>
             new JudgementCounter(info)
             {
                 State = { Value = Visibility.Hidden },
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index dfc12c06d8..ae9c6a7d87 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Screens.Play
         public readonly InputCountController InputCountController;
 
         [Cached]
-        private readonly JudgementTally tally;
+        private readonly JudgementCountController judgementCountController;
 
         public Bindable<bool> ShowHealthBar = new Bindable<bool>(true);
 
@@ -118,7 +118,7 @@ namespace osu.Game.Screens.Play
             {
                 CreateFailingLayer(),
                 //Needs to be initialized before skinnable drawables.
-                tally = new JudgementTally(),
+                judgementCountController = new JudgementCountController(),
                 mainComponents = new HUDComponentsContainer { AlwaysPresent = true, },
                 rulesetComponents = drawableRuleset != null
                     ? new HUDComponentsContainer(drawableRuleset.Ruleset.RulesetInfo) { AlwaysPresent = true, }

From e1cbcabe0b4c68625cc4010f2e26cec228f95d85 Mon Sep 17 00:00:00 2001
From: timiimit <timi.korda@gmail.com>
Date: Mon, 22 May 2023 17:00:53 +0200
Subject: [PATCH 1067/1604] Fix skip not always triggering in multiplayer

---
 osu.Game/Screens/Play/Player.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 18ea9d0acb..9eec60f23a 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -378,9 +378,6 @@ namespace osu.Game.Screens.Play
             IsBreakTime.BindTo(breakTracker.IsBreakTime);
             IsBreakTime.BindValueChanged(onBreakTimeChanged, true);
 
-            if (Configuration.AutomaticallySkipIntro)
-                skipIntroOverlay.SkipWhenReady();
-
             loadLeaderboard();
         }
 
@@ -1087,6 +1084,9 @@ namespace osu.Game.Screens.Play
                 throw new InvalidOperationException($"{nameof(StartGameplay)} should not be called when the gameplay clock is already running");
 
             GameplayClockContainer.Reset(startClock: true);
+
+            if (Configuration.AutomaticallySkipIntro)
+                skipIntroOverlay.SkipWhenReady();
         }
 
         public override void OnSuspending(ScreenTransitionEvent e)

From 8a7a42b7ec28fc7af008783cff236b3dbde67a98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 26 Jun 2023 22:19:52 +0200
Subject: [PATCH 1068/1604] Remove weird nullable enable and double licence
 header

---
 osu.Game/Screens/Select/FilterCriteria.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index 3fcc8d5476..0024c431f1 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -1,10 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable enable
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
 using System;
 using System.Collections.Generic;
 using System.Linq;

From 4873aaf7ede1d7558cc551d0744dbec3637543b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 26 Jun 2023 22:27:08 +0200
Subject: [PATCH 1069/1604] Add failing test case for filters potentially
 crashing due to invalid regex

---
 osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs
index 8bd9407599..d8a56ea478 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs
@@ -169,6 +169,7 @@ namespace osu.Game.Tests.NonVisual.Filtering
         [TestCase("\"tags to\"", true)]
         [TestCase("\"version\"", false)]
         [TestCase("\"an auteur\"", true)]
+        [TestCase("\"\\\"", true)] // nasty case, covers properly escaping user input in underlying regex.
         public void TestCriteriaMatchingExactTerms(string terms, bool filtered)
         {
             var exampleBeatmapInfo = getExampleBeatmap();

From 4cb122dad46b3cff9de615b47e7220fd8488297d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 26 Jun 2023 22:27:48 +0200
Subject: [PATCH 1070/1604] Escape user input before embedding into regex

---
 osu.Game/Screens/Select/FilterCriteria.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index 0024c431f1..22780acfc3 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -150,7 +150,7 @@ namespace osu.Game.Screens.Select
                     return false;
 
                 if (Exact)
-                    return Regex.IsMatch(value, $@"(^|\s){searchTerm}($|\s)", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
+                    return Regex.IsMatch(value, $@"(^|\s){Regex.Escape(searchTerm)}($|\s)", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
 
                 return value.Contains(SearchTerm, StringComparison.InvariantCultureIgnoreCase);
             }

From e998be0eee006224e3212ed800901aa6237ecce3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 26 Jun 2023 22:29:20 +0200
Subject: [PATCH 1071/1604] Use `== true` rather than `?? false`

---
 osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
index f020cd02f7..00a0d4a849 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
@@ -210,7 +210,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 InputManager.Click(MouseButton.Left);
             });
 
-            AddAssert("collection filter still selected", () => control.CreateCriteria().CollectionBeatmapMD5Hashes?.Any() ?? false);
+            AddAssert("collection filter still selected", () => control.CreateCriteria().CollectionBeatmapMD5Hashes?.Any() == true);
 
             AddAssert("filter request not fired", () => !received);
         }

From 40ceb4dfac1f978cd0e6bb33a20f9e61dcc0d40e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 26 Jun 2023 22:40:25 +0200
Subject: [PATCH 1072/1604] Fix incorrect indent size

---
 osu.Game/Rulesets/UI/RulesetInputManager.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 2ec3985d36..08e180536f 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -165,10 +165,10 @@ namespace osu.Game.Rulesets.UI
             KeyBindingContainer.Add(inputCountController);
 
             inputCountController.AddRange(KeyBindingContainer.DefaultKeyBindings
-                                                   .Select(b => b.GetAction<T>())
-                                                   .Distinct()
-                                                   .OrderBy(action => action)
-                                                   .Select(action => new KeyCounterActionTrigger<T>(action)));
+                                                             .Select(b => b.GetAction<T>())
+                                                             .Distinct()
+                                                             .OrderBy(action => action)
+                                                             .Select(action => new KeyCounterActionTrigger<T>(action)));
         }
 
         #endregion

From 9c87d42f2be938162544f6a3a6ac7dd0b97e605b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 26 Jun 2023 22:41:31 +0200
Subject: [PATCH 1073/1604] Attempt to remedy HUD overlay test failure by
 waiting more

---
 osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index 7552c059a2..2d1af1386c 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -145,11 +145,11 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddStep("set showhud false", () => hudOverlay.ShowHud.Value = false);
             AddUntilStep("hidetarget is hidden", () => hideTarget.Alpha, () => Is.LessThanOrEqualTo(0));
-            AddAssert("key counters hidden", () => !keyCounterFlow.IsPresent);
+            AddUntilStep("key counters hidden", () => !keyCounterFlow.IsPresent);
 
             AddStep("set showhud true", () => hudOverlay.ShowHud.Value = true);
             AddUntilStep("hidetarget is visible", () => hideTarget.Alpha, () => Is.GreaterThan(0));
-            AddAssert("key counters still hidden", () => !keyCounterFlow.IsPresent);
+            AddUntilStep("key counters still hidden", () => !keyCounterFlow.IsPresent);
         }
 
         [Test]

From 0c5c09597c382e7f6da25bb5c61d4972cafbf0ff Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 27 Jun 2023 14:59:40 +0900
Subject: [PATCH 1074/1604] Store old total score as LegacyTotalScore

---
 osu.Game/Database/RealmAccess.cs  | 5 ++++-
 osu.Game/Scoring/ScoreImporter.cs | 7 +++++--
 osu.Game/Scoring/ScoreInfo.cs     | 2 ++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index e3423d25c5..727ddf06d7 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Database
         /// 28   2023-06-08    Added IsLegacyScore to ScoreInfo, parsed from replay files.
         /// 29   2023-06-12    Run migration of old lazer scores to be best-effort in the new scoring number space. No actual realm changes.
         /// 30   2023-06-16    Run migration of old lazer scores again. This time with more correct rounding considerations.
-        /// 31   2023-06-26    Add Version to ScoreInfo, set to 30000002.
+        /// 31   2023-06-26    Add Version and LegacyTotalScore to ScoreInfo, set Version to 30000002 and move TotalScore into LegacyTotalScore for legacy scores.
         /// </summary>
         private const int schema_version = 31;
 
@@ -973,7 +973,10 @@ namespace osu.Game.Database
                     var scores = migration.NewRealm.All<ScoreInfo>();
 
                     foreach (var score in scores)
+                    {
+                        score.LegacyTotalScore = score.TotalScore;
                         score.Version = 30000002; // Last version before legacy total score conversion.
+                    }
 
                     break;
                 }
diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index 04a8bc6fc5..e8f23fdc10 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -155,6 +155,9 @@ namespace osu.Game.Scoring
 
         public long ConvertFromLegacyTotalScore(ScoreInfo score)
         {
+            if (!score.IsLegacyScore)
+                return score.TotalScore;
+
             var beatmap = beatmaps().GetWorkingBeatmap(score.BeatmapInfo);
             var ruleset = score.Ruleset.CreateInstance();
 
@@ -173,10 +176,10 @@ namespace osu.Game.Scoring
             int maximumLegacyBaseScore = maximumLegacyAccuracyScore + maximumLegacyComboScore;
 
             // The combo proportion is calculated as a proportion of maximumLegacyBaseScore.
-            double comboProportion = Math.Min(1, (double)score.TotalScore / maximumLegacyBaseScore);
+            double comboProportion = Math.Min(1, (double)score.LegacyTotalScore / maximumLegacyBaseScore);
 
             // The bonus proportion makes up the rest of the score that exceeds maximumLegacyBaseScore.
-            double bonusProportion = Math.Max(0, (score.TotalScore - maximumLegacyBaseScore) * maximumLegacyBonusRatio);
+            double bonusProportion = Math.Max(0, (score.LegacyTotalScore - maximumLegacyBaseScore) * maximumLegacyBonusRatio);
 
             switch (ruleset.RulesetInfo.OnlineID)
             {
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index fd67884956..5de1c69d8a 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -54,6 +54,8 @@ namespace osu.Game.Scoring
 
         public long TotalScore { get; set; }
 
+        public long LegacyTotalScore { get; set; }
+
         public int MaxCombo { get; set; }
 
         public double Accuracy { get; set; }

From 702266198b011734a5b679f08d079d4e352331d9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Jun 2023 15:21:13 +0900
Subject: [PATCH 1075/1604] Add missing "title=" search support at song select

---
 .../NonVisual/Filtering/FilterMatchingTest.cs | 23 ++++++++++++++++++-
 .../Select/Carousel/CarouselBeatmap.cs        |  2 ++
 osu.Game/Screens/Select/FilterCriteria.cs     |  1 +
 osu.Game/Screens/Select/FilterQueryParser.cs  |  3 +++
 4 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs
index d8a56ea478..fe5511add1 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Tests.NonVisual.Filtering
                 Artist = "The Artist",
                 ArtistUnicode = "check unicode too",
                 Title = "Title goes here",
-                TitleUnicode = "Title goes here",
+                TitleUnicode = "TitleUnicode goes here",
                 Author = { Username = "The Author" },
                 Source = "unit tests",
                 Tags = "look for tags too",
@@ -204,6 +204,27 @@ namespace osu.Game.Tests.NonVisual.Filtering
             Assert.AreEqual(filtered, carouselItem.Filtered.Value);
         }
 
+        [Test]
+        [TestCase("", false)]
+        [TestCase("Goes", false)]
+        [TestCase("GOES", false)]
+        [TestCase("goes", false)]
+        [TestCase("title goes", false)]
+        [TestCase("title goes AND then something else", true)]
+        [TestCase("titleunicode", false)]
+        [TestCase("unknown", true)]
+        public void TestCriteriaMatchingTitle(string titleName, bool filtered)
+        {
+            var exampleBeatmapInfo = getExampleBeatmap();
+            var criteria = new FilterCriteria
+            {
+                Title = new FilterCriteria.OptionalTextFilter { SearchTerm = titleName }
+            };
+            var carouselItem = new CarouselBeatmap(exampleBeatmapInfo);
+            carouselItem.Filter(criteria);
+            Assert.AreEqual(filtered, carouselItem.Filtered.Value);
+        }
+
         [Test]
         [TestCase("", false)]
         [TestCase("The", false)]
diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
index 18931c462f..6917bd1da2 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
@@ -57,6 +57,8 @@ namespace osu.Game.Screens.Select.Carousel
             match &= !criteria.Creator.HasFilter || criteria.Creator.Matches(BeatmapInfo.Metadata.Author.Username);
             match &= !criteria.Artist.HasFilter || criteria.Artist.Matches(BeatmapInfo.Metadata.Artist) ||
                      criteria.Artist.Matches(BeatmapInfo.Metadata.ArtistUnicode);
+            match &= !criteria.Title.HasFilter || criteria.Title.Matches(BeatmapInfo.Metadata.Title) ||
+                     criteria.Title.Matches(BeatmapInfo.Metadata.TitleUnicode);
 
             match &= !criteria.UserStarDifficulty.HasFilter || criteria.UserStarDifficulty.IsInRange(BeatmapInfo.StarRating);
 
diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index 22780acfc3..680da21dbc 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -31,6 +31,7 @@ namespace osu.Game.Screens.Select
         public OptionalRange<BeatmapOnlineStatus> OnlineStatus;
         public OptionalTextFilter Creator;
         public OptionalTextFilter Artist;
+        public OptionalTextFilter Title;
 
         public OptionalRange<double> UserStarDifficulty = new OptionalRange<double>
         {
diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index 474a9fdfea..20a5d5d1a6 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -73,6 +73,9 @@ namespace osu.Game.Screens.Select
                 case "artist":
                     return TryUpdateCriteriaText(ref criteria.Artist, op, value);
 
+                case "title":
+                    return TryUpdateCriteriaText(ref criteria.Title, op, value);
+
                 default:
                     return criteria.RulesetCriteria?.TryParseCustomKeywordCriteria(key, op, value) ?? false;
             }

From c423f77d535b33a07d5930ea73499d0e621069f9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Jun 2023 15:34:33 +0900
Subject: [PATCH 1076/1604] Add support for matching full terms using suffixed
 `!`

---
 osu.Game/Screens/Select/FilterCriteria.cs    | 53 +++++++++++++++++---
 osu.Game/Screens/Select/FilterQueryParser.cs |  2 +-
 2 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index 22780acfc3..c8804528c7 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Text.RegularExpressions;
 using osu.Game.Beatmaps;
@@ -62,7 +63,7 @@ namespace osu.Game.Screens.Select
                 string remainingText = value;
 
                 // First handle quoted segments to ensure we keep inline spaces in exact matches.
-                foreach (Match quotedSegment in Regex.Matches(searchText, "(\"[^\"]+\")"))
+                foreach (Match quotedSegment in Regex.Matches(searchText, "(\"[^\"]+\"[!]?)"))
                 {
                     terms.Add(new OptionalTextFilter { SearchTerm = quotedSegment.Value });
                     remainingText = remainingText.Replace(quotedSegment.Value, string.Empty);
@@ -138,7 +139,7 @@ namespace osu.Game.Screens.Select
         {
             public bool HasFilter => !string.IsNullOrEmpty(SearchTerm);
 
-            public bool Exact { get; private set; }
+            public MatchMode MatchMode { get; private set; }
 
             public bool Matches(string value)
             {
@@ -149,10 +150,18 @@ namespace osu.Game.Screens.Select
                 if (string.IsNullOrEmpty(value))
                     return false;
 
-                if (Exact)
-                    return Regex.IsMatch(value, $@"(^|\s){Regex.Escape(searchTerm)}($|\s)", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
+                switch (MatchMode)
+                {
+                    default:
+                    case MatchMode.None:
+                        return value.Contains(SearchTerm, StringComparison.InvariantCultureIgnoreCase);
 
-                return value.Contains(SearchTerm, StringComparison.InvariantCultureIgnoreCase);
+                    case MatchMode.IsolatedPhrase:
+                        return Regex.IsMatch(value, $@"(^|\s){Regex.Escape(searchTerm)}($|\s)", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
+
+                    case MatchMode.FullPhrase:
+                        return CultureInfo.InvariantCulture.CompareInfo.Compare(value, searchTerm, CompareOptions.IgnoreCase) == 0;
+                }
             }
 
             private string searchTerm;
@@ -162,12 +171,42 @@ namespace osu.Game.Screens.Select
                 get => searchTerm;
                 set
                 {
-                    searchTerm = value.Trim('"');
-                    Exact = searchTerm != value;
+                    searchTerm = value;
+
+                    if (searchTerm.EndsWith("\"!", StringComparison.Ordinal))
+                    {
+                        searchTerm = searchTerm.Trim('!', '\"');
+                        MatchMode = MatchMode.FullPhrase;
+                    }
+                    else if (searchTerm.StartsWith('\"'))
+                    {
+                        searchTerm = searchTerm.Trim('\"');
+                        MatchMode = MatchMode.IsolatedPhrase;
+                    }
+                    else
+                        MatchMode = MatchMode.None;
                 }
             }
 
             public bool Equals(OptionalTextFilter other) => SearchTerm == other.SearchTerm;
         }
+
+        public enum MatchMode
+        {
+            /// <summary>
+            /// Match using a simple "contains" substring match.
+            /// </summary>
+            None,
+
+            /// <summary>
+            /// Match for the search phrase being isolated by spaces, or at the start or end of the text.
+            /// </summary>
+            IsolatedPhrase,
+
+            /// <summary>
+            /// Match for the search phrase matching the full text in completion.
+            /// </summary>
+            FullPhrase,
+        }
     }
 }
diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index 474a9fdfea..4bc4448291 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Screens.Select
     public static class FilterQueryParser
     {
         private static readonly Regex query_syntax_regex = new Regex(
-            @"\b(?<key>\w+)(?<op>(:|=|(>|<)(:|=)?))(?<value>("".*"")|(\S*))",
+            @"\b(?<key>\w+)(?<op>(:|=|(>|<)(:|=)?))(?<value>("".*""[!]?)|(\S*))",
             RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         internal static void ApplyQueries(FilterCriteria criteria, string query)

From 19ec6d5455bdd68c01fee93ccce24b6bc5796640 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Jun 2023 15:44:58 +0900
Subject: [PATCH 1077/1604] Add test coverage of new matching mode

---
 .../NonVisual/Filtering/FilterMatchingTest.cs |  4 +++
 .../Filtering/FilterQueryParserTest.cs        | 30 +++++++++++++------
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs
index d8a56ea478..89c3009950 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs
@@ -169,6 +169,8 @@ namespace osu.Game.Tests.NonVisual.Filtering
         [TestCase("\"tags to\"", true)]
         [TestCase("\"version\"", false)]
         [TestCase("\"an auteur\"", true)]
+        [TestCase("\"Artist\"!", true)]
+        [TestCase("\"The Artist\"!", false)]
         [TestCase("\"\\\"", true)] // nasty case, covers properly escaping user input in underlying regex.
         public void TestCriteriaMatchingExactTerms(string terms, bool filtered)
         {
@@ -213,6 +215,8 @@ namespace osu.Game.Tests.NonVisual.Filtering
         [TestCase("the artist AND then something else", true)]
         [TestCase("unicode too", false)]
         [TestCase("unknown", true)]
+        [TestCase("\"Artist\"!", true)]
+        [TestCase("\"The Artist\"!", false)]
         public void TestCriteriaMatchingArtist(string artistName, bool filtered)
         {
             var exampleBeatmapInfo = getExampleBeatmap();
diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
index 46f91f9a67..7bf23f1a2e 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
@@ -26,26 +26,26 @@ namespace osu.Game.Tests.NonVisual.Filtering
         [Test]
         public void TestApplyQueriesBareWordsWithExactMatch()
         {
-            const string query = "looking for \"a beatmap\" like \"this\"";
+            const string query = "looking for \"a beatmap\"! like \"this\"";
             var filterCriteria = new FilterCriteria();
             FilterQueryParser.ApplyQueries(filterCriteria, query);
-            Assert.AreEqual("looking for \"a beatmap\" like \"this\"", filterCriteria.SearchText);
+            Assert.AreEqual("looking for \"a beatmap\"! like \"this\"", filterCriteria.SearchText);
             Assert.AreEqual(5, filterCriteria.SearchTerms.Length);
 
             Assert.That(filterCriteria.SearchTerms[0].SearchTerm, Is.EqualTo("a beatmap"));
-            Assert.That(filterCriteria.SearchTerms[0].Exact, Is.True);
+            Assert.That(filterCriteria.SearchTerms[0].MatchMode, Is.EqualTo(FilterCriteria.MatchMode.FullPhrase));
 
             Assert.That(filterCriteria.SearchTerms[1].SearchTerm, Is.EqualTo("this"));
-            Assert.That(filterCriteria.SearchTerms[1].Exact, Is.True);
+            Assert.That(filterCriteria.SearchTerms[1].MatchMode, Is.EqualTo(FilterCriteria.MatchMode.IsolatedPhrase));
 
             Assert.That(filterCriteria.SearchTerms[2].SearchTerm, Is.EqualTo("looking"));
-            Assert.That(filterCriteria.SearchTerms[2].Exact, Is.False);
+            Assert.That(filterCriteria.SearchTerms[2].MatchMode, Is.EqualTo(FilterCriteria.MatchMode.None));
 
             Assert.That(filterCriteria.SearchTerms[3].SearchTerm, Is.EqualTo("for"));
-            Assert.That(filterCriteria.SearchTerms[3].Exact, Is.False);
+            Assert.That(filterCriteria.SearchTerms[3].MatchMode, Is.EqualTo(FilterCriteria.MatchMode.None));
 
             Assert.That(filterCriteria.SearchTerms[4].SearchTerm, Is.EqualTo("like"));
-            Assert.That(filterCriteria.SearchTerms[4].Exact, Is.False);
+            Assert.That(filterCriteria.SearchTerms[4].MatchMode, Is.EqualTo(FilterCriteria.MatchMode.None));
         }
 
         /*
@@ -260,7 +260,7 @@ namespace osu.Game.Tests.NonVisual.Filtering
             Assert.AreEqual("find me songs by  please", filterCriteria.SearchText.Trim());
             Assert.AreEqual(5, filterCriteria.SearchTerms.Length);
             Assert.AreEqual("singer", filterCriteria.Artist.SearchTerm);
-            Assert.That(filterCriteria.Artist.Exact, Is.False);
+            Assert.That(filterCriteria.Artist.MatchMode, Is.EqualTo(FilterCriteria.MatchMode.None));
         }
 
         [Test]
@@ -272,7 +272,19 @@ namespace osu.Game.Tests.NonVisual.Filtering
             Assert.AreEqual("really like  yes", filterCriteria.SearchText.Trim());
             Assert.AreEqual(3, filterCriteria.SearchTerms.Length);
             Assert.AreEqual("name with space", filterCriteria.Artist.SearchTerm);
-            Assert.That(filterCriteria.Artist.Exact, Is.True);
+            Assert.That(filterCriteria.Artist.MatchMode, Is.EqualTo(FilterCriteria.MatchMode.IsolatedPhrase));
+        }
+
+        [Test]
+        public void TestApplyArtistQueriesWithSpacesFullPhrase()
+        {
+            const string query = "artist=\"The Only One\"!";
+            var filterCriteria = new FilterCriteria();
+            FilterQueryParser.ApplyQueries(filterCriteria, query);
+            Assert.That(filterCriteria.SearchText.Trim(), Is.Empty);
+            Assert.AreEqual(0, filterCriteria.SearchTerms.Length);
+            Assert.AreEqual("The Only One", filterCriteria.Artist.SearchTerm);
+            Assert.That(filterCriteria.Artist.MatchMode, Is.EqualTo(FilterCriteria.MatchMode.FullPhrase));
         }
 
         [Test]

From e99de0eb5db05f2caf841b96672e664fea947d53 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Jun 2023 16:04:34 +0900
Subject: [PATCH 1078/1604] Add safety to tests to ensure loaded

---
 osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index 2d1af1386c..74249007e4 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -236,7 +236,6 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             createNew();
 
-            AddUntilStep("wait for hud load", () => hudOverlay.IsLoaded);
             AddUntilStep("wait for components to be hidden", () => hudOverlay.ChildrenOfType<SkinComponentsContainer>().Single().Alpha == 0);
             AddUntilStep("wait for hud load", () => hudOverlay.ChildrenOfType<SkinComponentsContainer>().All(c => c.ComponentsLoaded));
 
@@ -255,7 +254,6 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             createNew();
 
-            AddUntilStep("wait for hud load", () => hudOverlay.IsLoaded);
             AddUntilStep("wait for components to be hidden", () => hudOverlay.ChildrenOfType<SkinComponentsContainer>().Single().Alpha == 0);
 
             AddStep("reload components", () => hudOverlay.ChildrenOfType<SkinComponentsContainer>().Single().Reload());
@@ -277,6 +275,9 @@ namespace osu.Game.Tests.Visual.Gameplay
 
                 Child = hudOverlay;
             });
+
+            AddUntilStep("wait for hud load", () => hudOverlay.IsLoaded);
+            AddUntilStep("wait for components present", () => hudOverlay.ChildrenOfType<KeyCounterDisplay>().FirstOrDefault() != null);
         }
 
         protected override void Dispose(bool isDisposing)

From e21583ff1b642e404bd604d4dd045fd7d23cc2ae Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Jun 2023 16:35:59 +0900
Subject: [PATCH 1079/1604] Refactor `InputCountController` to not require
 being added to foreign body via `Attach`

I've made the flow match `ClicksPerSecondCalculator` as close as
possible. Hopefully this reads better.
---
 .../Visual/Gameplay/TestSceneKeyCounter.cs    |  7 +++-
 osu.Game/Rulesets/UI/RulesetInputManager.cs   | 21 +++++-----
 .../Screens/Play/HUD/InputCountController.cs  | 17 +++-----
 .../Screens/Play/HUD/KeyCounterDisplay.cs     | 39 +++++--------------
 osu.Game/Screens/Play/HUDOverlay.cs           |  4 +-
 5 files changed, 29 insertions(+), 59 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
index a2c227a76a..3df0f18558 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
@@ -48,13 +48,16 @@ namespace osu.Game.Tests.Visual.Gameplay
                 }
             };
 
-            controller.AddRange(new InputTrigger[]
+            var inputTriggers = new InputTrigger[]
             {
                 new KeyCounterKeyboardTrigger(Key.X),
                 new KeyCounterKeyboardTrigger(Key.X),
                 new KeyCounterMouseTrigger(MouseButton.Left),
                 new KeyCounterMouseTrigger(MouseButton.Right),
-            });
+            };
+
+            AddRange(inputTriggers);
+            controller.AddRange(inputTriggers);
 
             AddStep("Add random", () =>
             {
diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 08e180536f..9be210f4b2 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -162,25 +162,22 @@ namespace osu.Game.Rulesets.UI
 
         public void Attach(InputCountController inputCountController)
         {
-            KeyBindingContainer.Add(inputCountController);
+            var triggers = KeyBindingContainer.DefaultKeyBindings
+                                              .Select(b => b.GetAction<T>())
+                                              .Distinct()
+                                              .OrderBy(action => action)
+                                              .Select(action => new KeyCounterActionTrigger<T>(action))
+                                              .ToArray();
 
-            inputCountController.AddRange(KeyBindingContainer.DefaultKeyBindings
-                                                             .Select(b => b.GetAction<T>())
-                                                             .Distinct()
-                                                             .OrderBy(action => action)
-                                                             .Select(action => new KeyCounterActionTrigger<T>(action)));
+            KeyBindingContainer.AddRange(triggers);
+            inputCountController.AddRange(triggers);
         }
 
         #endregion
 
         #region Keys per second Counter Attachment
 
-        public void Attach(ClicksPerSecondCalculator calculator)
-        {
-            var listener = new ActionListener(calculator);
-
-            KeyBindingContainer.Add(listener);
-        }
+        public void Attach(ClicksPerSecondCalculator calculator) => KeyBindingContainer.Add(new ActionListener(calculator));
 
         private partial class ActionListener : Component, IKeyBindingHandler<T>
         {
diff --git a/osu.Game/Screens/Play/HUD/InputCountController.cs b/osu.Game/Screens/Play/HUD/InputCountController.cs
index 47163eeb6d..4827f2315f 100644
--- a/osu.Game/Screens/Play/HUD/InputCountController.cs
+++ b/osu.Game/Screens/Play/HUD/InputCountController.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
 using System.Collections.Generic;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
@@ -17,26 +16,20 @@ namespace osu.Game.Screens.Play.HUD
     {
         public readonly Bindable<bool> IsCounting = new BindableBool(true);
 
-        public event Action<InputTrigger>? OnNewTrigger;
+        private readonly BindableList<InputTrigger> triggers = new BindableList<InputTrigger>();
 
-        private readonly Container<InputTrigger> triggers;
+        public IBindableList<InputTrigger> Triggers => triggers;
 
-        public IReadOnlyList<InputTrigger> Triggers => triggers;
-
-        public InputCountController()
-        {
-            InternalChild = triggers = new Container<InputTrigger>();
-        }
+        public void AddRange(IEnumerable<InputTrigger> triggers) => triggers.ForEach(Add);
 
         public void Add(InputTrigger trigger)
         {
+            // Note that these triggers are not added to the hierarchy here. It is presumed they are added externally at a
+            // more correct location (ie. inside a RulesetInputManager).
             triggers.Add(trigger);
             trigger.IsCounting.BindTo(IsCounting);
-            OnNewTrigger?.Invoke(trigger);
         }
 
-        public void AddRange(IEnumerable<InputTrigger> inputTriggers) => inputTriggers.ForEach(Add);
-
         public override bool HandleNonPositionalInput => true;
         public override bool HandlePositionalInput => true;
     }
diff --git a/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs b/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs
index e222099c63..e7e866932e 100644
--- a/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs
@@ -1,11 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Collections.Generic;
+using System.Collections.Specialized;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.IEnumerableExtensions;
-using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.UI;
@@ -24,35 +22,17 @@ namespace osu.Game.Screens.Play.HUD
         /// </summary>
         public Bindable<bool> AlwaysVisible { get; } = new Bindable<bool>(true);
 
-        /// <summary>
-        /// The <see cref="KeyCounter"/>s contained in this <see cref="KeyCounterDisplay"/>.
-        /// </summary>
-        public IEnumerable<KeyCounter> Counters => KeyFlow;
-
         protected abstract FillFlowContainer<KeyCounter> KeyFlow { get; }
 
         protected readonly Bindable<bool> ConfigVisibility = new Bindable<bool>();
 
+        private readonly IBindableList<InputTrigger> triggers = new BindableList<InputTrigger>();
+
         [Resolved]
         private InputCountController controller { get; set; } = null!;
 
         protected abstract void UpdateVisibility();
 
-        /// <summary>
-        /// Add a <see cref="InputTrigger"/> to this display.
-        /// </summary>
-        public void Add(InputTrigger trigger)
-        {
-            var keyCounter = CreateCounter(trigger);
-
-            KeyFlow.Add(keyCounter);
-        }
-
-        /// <summary>
-        /// Add a range of <see cref="InputTrigger"/> to this display.
-        /// </summary>
-        public void AddRange(IEnumerable<InputTrigger> triggers) => triggers.ForEach(Add);
-
         protected abstract KeyCounter CreateCounter(InputTrigger trigger);
 
         [BackgroundDependencyLoader]
@@ -68,19 +48,18 @@ namespace osu.Game.Screens.Play.HUD
         {
             base.LoadComplete();
 
-            controller.OnNewTrigger += Add;
-            AddRange(controller.Triggers);
+            triggers.BindTo(controller.Triggers);
+            triggers.BindCollectionChanged(triggersChanged, true);
 
             AlwaysVisible.BindValueChanged(_ => UpdateVisibility());
             ConfigVisibility.BindValueChanged(_ => UpdateVisibility(), true);
         }
 
-        protected override void Dispose(bool isDisposing)
+        private void triggersChanged(object? sender, NotifyCollectionChangedEventArgs e)
         {
-            base.Dispose(isDisposing);
-
-            if (controller.IsNotNull())
-                controller.OnNewTrigger -= Add;
+            KeyFlow.Clear();
+            foreach (var trigger in controller.Triggers)
+                KeyFlow.Add(CreateCounter(trigger));
         }
 
         public bool UsesFixedAnchor { get; set; }
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index ae9c6a7d87..278c7b9de2 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -111,9 +111,6 @@ namespace osu.Game.Screens.Play
 
             RelativeSizeAxes = Axes.Both;
 
-            // intentionally not added to hierarchy here as it will be attached via `BindDrawableRuleset()`.
-            InputCountController = new InputCountController();
-
             Children = new[]
             {
                 CreateFailingLayer(),
@@ -161,6 +158,7 @@ namespace osu.Game.Screens.Play
                     Spacing = new Vector2(5)
                 },
                 clicksPerSecondCalculator = new ClicksPerSecondCalculator(),
+                InputCountController = new InputCountController(),
             };
 
             hideTargets = new List<Drawable> { mainComponents, rulesetComponents, topRightElements };

From 113b570bd4473341a695c9848fb1b93f2a6572e1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Jun 2023 16:37:22 +0900
Subject: [PATCH 1080/1604] Move controllers above skinnable elements in
 initialisation order

---
 osu.Game/Screens/Play/HUDOverlay.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 278c7b9de2..339f1483bc 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -116,6 +116,8 @@ namespace osu.Game.Screens.Play
                 CreateFailingLayer(),
                 //Needs to be initialized before skinnable drawables.
                 judgementCountController = new JudgementCountController(),
+                clicksPerSecondCalculator = new ClicksPerSecondCalculator(),
+                InputCountController = new InputCountController(),
                 mainComponents = new HUDComponentsContainer { AlwaysPresent = true, },
                 rulesetComponents = drawableRuleset != null
                     ? new HUDComponentsContainer(drawableRuleset.Ruleset.RulesetInfo) { AlwaysPresent = true, }
@@ -157,8 +159,6 @@ namespace osu.Game.Screens.Play
                     Padding = new MarginPadding(44), // enough margin to avoid the hit error display
                     Spacing = new Vector2(5)
                 },
-                clicksPerSecondCalculator = new ClicksPerSecondCalculator(),
-                InputCountController = new InputCountController(),
             };
 
             hideTargets = new List<Drawable> { mainComponents, rulesetComponents, topRightElements };

From de23a4691ed82b766f5e3b49f01639410f4d85b1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Jun 2023 16:38:15 +0900
Subject: [PATCH 1081/1604] Change `JudgementCountController` to a `Component`

---
 .../Play/HUD/JudgementCounter/JudgementCountController.cs     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/JudgementCounter/JudgementCountController.cs b/osu.Game/Screens/Play/HUD/JudgementCounter/JudgementCountController.cs
index 98e74a0e7e..43c2ae442a 100644
--- a/osu.Game/Screens/Play/HUD/JudgementCounter/JudgementCountController.cs
+++ b/osu.Game/Screens/Play/HUD/JudgementCounter/JudgementCountController.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
@@ -16,7 +16,7 @@ namespace osu.Game.Screens.Play.HUD.JudgementCounter
     /// Keeps track of judgements for a current play session, exposing bindable counts which can
     /// be used for display purposes.
     /// </summary>
-    public partial class JudgementCountController : CompositeDrawable
+    public partial class JudgementCountController : Component
     {
         [Resolved]
         private ScoreProcessor scoreProcessor { get; set; } = null!;

From 8bd6f7a46a745da8138bdbae0a889fdfb66c6d1a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Jun 2023 16:38:46 +0900
Subject: [PATCH 1082/1604] Rename `ClicksPerSecondCalculator` to
 `ClicksPerSecondController`

---
 .../Gameplay/TestSceneClicksPerSecondCalculator.cs     | 10 +++++-----
 osu.Game/Rulesets/UI/DrawableRuleset.cs                |  4 ++--
 osu.Game/Rulesets/UI/ICanAttachHUDPieces.cs            |  2 +-
 osu.Game/Rulesets/UI/RulesetInputManager.cs            | 10 +++++-----
 ...econdCalculator.cs => ClicksPerSecondController.cs} |  4 ++--
 .../Play/HUD/ClicksPerSecond/ClicksPerSecondCounter.cs |  4 ++--
 osu.Game/Screens/Play/HUDOverlay.cs                    |  6 +++---
 7 files changed, 20 insertions(+), 20 deletions(-)
 rename osu.Game/Screens/Play/HUD/ClicksPerSecond/{ClicksPerSecondCalculator.cs => ClicksPerSecondController.cs} (93%)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecondCalculator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecondCalculator.cs
index 6b8e0e1088..bcb5291108 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecondCalculator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecondCalculator.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 {
     public partial class TestSceneClicksPerSecondCalculator : OsuTestScene
     {
-        private ClicksPerSecondCalculator calculator = null!;
+        private ClicksPerSecondController controller = null!;
 
         private TestGameplayClock manualGameplayClock = null!;
 
@@ -34,11 +34,11 @@ namespace osu.Game.Tests.Visual.Gameplay
                     CachedDependencies = new (Type, object)[] { (typeof(IGameplayClock), manualGameplayClock) },
                     Children = new Drawable[]
                     {
-                        calculator = new ClicksPerSecondCalculator(),
+                        controller = new ClicksPerSecondController(),
                         new DependencyProvidingContainer
                         {
                             RelativeSizeAxes = Axes.Both,
-                            CachedDependencies = new (Type, object)[] { (typeof(ClicksPerSecondCalculator), calculator) },
+                            CachedDependencies = new (Type, object)[] { (typeof(ClicksPerSecondController), controller) },
                             Child = new ClicksPerSecondCounter
                             {
                                 Anchor = Anchor.Centre,
@@ -81,7 +81,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             checkClicksPerSecondValue(6);
         }
 
-        private void checkClicksPerSecondValue(int i) => AddAssert("clicks/s is correct", () => calculator.Value, () => Is.EqualTo(i));
+        private void checkClicksPerSecondValue(int i) => AddAssert("clicks/s is correct", () => controller.Value, () => Is.EqualTo(i));
 
         private void seekClockImmediately(double time) => manualGameplayClock.CurrentTime = time;
 
@@ -94,7 +94,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             foreach (double timestamp in inputs)
             {
                 seekClockImmediately(timestamp);
-                calculator.AddInputTimestamp();
+                controller.AddInputTimestamp();
             }
 
             seekClockImmediately(baseTime);
diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index 326c77e94c..4aeb3d4862 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -338,8 +338,8 @@ namespace osu.Game.Rulesets.UI
         public void Attach(InputCountController inputCountController) =>
             (KeyBindingInputManager as ICanAttachHUDPieces)?.Attach(inputCountController);
 
-        public void Attach(ClicksPerSecondCalculator calculator) =>
-            (KeyBindingInputManager as ICanAttachHUDPieces)?.Attach(calculator);
+        public void Attach(ClicksPerSecondController controller) =>
+            (KeyBindingInputManager as ICanAttachHUDPieces)?.Attach(controller);
 
         /// <summary>
         /// Creates a key conversion input manager. An exception will be thrown if a valid <see cref="RulesetInputManager{T}"/> is not returned.
diff --git a/osu.Game/Rulesets/UI/ICanAttachHUDPieces.cs b/osu.Game/Rulesets/UI/ICanAttachHUDPieces.cs
index 1f93d25720..276881d17a 100644
--- a/osu.Game/Rulesets/UI/ICanAttachHUDPieces.cs
+++ b/osu.Game/Rulesets/UI/ICanAttachHUDPieces.cs
@@ -16,6 +16,6 @@ namespace osu.Game.Rulesets.UI
     public interface ICanAttachHUDPieces
     {
         void Attach(InputCountController inputCountController);
-        void Attach(ClicksPerSecondCalculator calculator);
+        void Attach(ClicksPerSecondController controller);
     }
 }
diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 9be210f4b2..26b9d06f73 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -177,20 +177,20 @@ namespace osu.Game.Rulesets.UI
 
         #region Keys per second Counter Attachment
 
-        public void Attach(ClicksPerSecondCalculator calculator) => KeyBindingContainer.Add(new ActionListener(calculator));
+        public void Attach(ClicksPerSecondController controller) => KeyBindingContainer.Add(new ActionListener(controller));
 
         private partial class ActionListener : Component, IKeyBindingHandler<T>
         {
-            private readonly ClicksPerSecondCalculator calculator;
+            private readonly ClicksPerSecondController controller;
 
-            public ActionListener(ClicksPerSecondCalculator calculator)
+            public ActionListener(ClicksPerSecondController controller)
             {
-                this.calculator = calculator;
+                this.controller = controller;
             }
 
             public bool OnPressed(KeyBindingPressEvent<T> e)
             {
-                calculator.AddInputTimestamp();
+                controller.AddInputTimestamp();
                 return false;
             }
 
diff --git a/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs b/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondController.cs
similarity index 93%
rename from osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs
rename to osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondController.cs
index ba0c47dc8b..f2dd20cc8e 100644
--- a/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs
+++ b/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondController.cs
@@ -8,7 +8,7 @@ using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Screens.Play.HUD.ClicksPerSecond
 {
-    public partial class ClicksPerSecondCalculator : Component
+    public partial class ClicksPerSecondController : Component
     {
         private readonly List<double> timestamps = new List<double>();
 
@@ -22,7 +22,7 @@ namespace osu.Game.Screens.Play.HUD.ClicksPerSecond
 
         private IGameplayClock clock => frameStableClock ?? gameplayClock;
 
-        public ClicksPerSecondCalculator()
+        public ClicksPerSecondController()
         {
             RelativeSizeAxes = Axes.Both;
         }
diff --git a/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCounter.cs b/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCounter.cs
index 1aa7c5e091..9b5ea309b0 100644
--- a/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCounter.cs
+++ b/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCounter.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Screens.Play.HUD.ClicksPerSecond
     public partial class ClicksPerSecondCounter : RollingCounter<int>, ISerialisableDrawable
     {
         [Resolved]
-        private ClicksPerSecondCalculator calculator { get; set; } = null!;
+        private ClicksPerSecondController controller { get; set; } = null!;
 
         protected override double RollingDuration => 350;
 
@@ -38,7 +38,7 @@ namespace osu.Game.Screens.Play.HUD.ClicksPerSecond
         {
             base.Update();
 
-            Current.Value = calculator.Value;
+            Current.Value = controller.Value;
         }
 
         protected override IHasText CreateText() => new TextComponent();
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 339f1483bc..f0a2975958 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Screens.Play
         public readonly PlayerSettingsOverlay PlayerSettingsOverlay;
 
         [Cached]
-        private readonly ClicksPerSecondCalculator clicksPerSecondCalculator;
+        private readonly ClicksPerSecondController clicksPerSecondController;
 
         [Cached]
         public readonly InputCountController InputCountController;
@@ -116,7 +116,7 @@ namespace osu.Game.Screens.Play
                 CreateFailingLayer(),
                 //Needs to be initialized before skinnable drawables.
                 judgementCountController = new JudgementCountController(),
-                clicksPerSecondCalculator = new ClicksPerSecondCalculator(),
+                clicksPerSecondController = new ClicksPerSecondController(),
                 InputCountController = new InputCountController(),
                 mainComponents = new HUDComponentsContainer { AlwaysPresent = true, },
                 rulesetComponents = drawableRuleset != null
@@ -322,7 +322,7 @@ namespace osu.Game.Screens.Play
             if (drawableRuleset is ICanAttachHUDPieces attachTarget)
             {
                 attachTarget.Attach(InputCountController);
-                attachTarget.Attach(clicksPerSecondCalculator);
+                attachTarget.Attach(clicksPerSecondController);
             }
 
             replayLoaded.BindTo(drawableRuleset.HasReplayLoaded);

From 41890cfc65fd28e7f9e18ea586ff860c8a69ac3b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Jun 2023 16:39:21 +0900
Subject: [PATCH 1083/1604] Change `JudgementCountController` to a `Component`
 and remove handling overrides

---
 osu.Game/Screens/Play/HUD/InputCountController.cs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/InputCountController.cs b/osu.Game/Screens/Play/HUD/InputCountController.cs
index 4827f2315f..cfe17d8ce0 100644
--- a/osu.Game/Screens/Play/HUD/InputCountController.cs
+++ b/osu.Game/Screens/Play/HUD/InputCountController.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
-using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics;
 
 namespace osu.Game.Screens.Play.HUD
 {
@@ -12,7 +12,7 @@ namespace osu.Game.Screens.Play.HUD
     /// Keeps track of key press counts for a current play session, exposing bindable counts which can
     /// be used for display purposes.
     /// </summary>
-    public partial class InputCountController : CompositeComponent
+    public partial class InputCountController : Component
     {
         public readonly Bindable<bool> IsCounting = new BindableBool(true);
 
@@ -29,8 +29,5 @@ namespace osu.Game.Screens.Play.HUD
             triggers.Add(trigger);
             trigger.IsCounting.BindTo(IsCounting);
         }
-
-        public override bool HandleNonPositionalInput => true;
-        public override bool HandlePositionalInput => true;
     }
 }

From 7ddbf4eaa7bfb01667bf9f6bbf16048e0499546f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Jun 2023 17:01:06 +0900
Subject: [PATCH 1084/1604] Add a visual effect when keyboard shortcuts are
 used to trigger selection box buttons

---
 .../Edit/Compose/Components/SelectionBox.cs   | 19 +++++++------------
 .../Compose/Components/SelectionBoxButton.cs  |  8 ++++----
 .../Compose/Components/SelectionBoxControl.cs |  8 ++++----
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index 1c5faed0e5..50eb3a186d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -32,6 +32,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
         public Action OperationStarted;
         public Action OperationEnded;
 
+        private SelectionBoxButton reverseButton;
+
         private bool canReverse;
 
         /// <summary>
@@ -166,19 +168,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (e.Repeat || !e.ControlPressed)
                 return false;
 
-            bool runOperationFromHotkey(Func<bool> operation)
-            {
-                operationStarted();
-                bool result = operation?.Invoke() ?? false;
-                operationEnded();
-
-                return result;
-            }
-
             switch (e.Key)
             {
                 case Key.G:
-                    return CanReverse && runOperationFromHotkey(OnReverse);
+                    return reverseButton?.TriggerClick() ?? false;
             }
 
             return base.OnKeyDown(e);
@@ -256,7 +249,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (CanFlipX) addXFlipComponents();
             if (CanFlipY) addYFlipComponents();
             if (CanRotate) addRotationComponents();
-            if (CanReverse) addButton(FontAwesome.Solid.Backward, "Reverse pattern (Ctrl-G)", () => OnReverse?.Invoke());
+            if (CanReverse) reverseButton = addButton(FontAwesome.Solid.Backward, "Reverse pattern (Ctrl-G)", () => OnReverse?.Invoke());
         }
 
         private void addRotationComponents()
@@ -300,7 +293,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             addButton(FontAwesome.Solid.ArrowsAltV, "Flip vertically", () => OnFlip?.Invoke(Direction.Vertical, false));
         }
 
-        private void addButton(IconUsage icon, string tooltip, Action action)
+        private SelectionBoxButton addButton(IconUsage icon, string tooltip, Action action)
         {
             var button = new SelectionBoxButton(icon, tooltip)
             {
@@ -310,6 +303,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
             button.OperationStarted += operationStarted;
             button.OperationEnded += operationEnded;
             buttons.Add(button);
+
+            return button;
         }
 
         private void addScaleHandle(Anchor anchor)
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxButton.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxButton.cs
index 832d8b65e5..6108d44c81 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxButton.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxButton.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -17,11 +15,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
 {
     public sealed partial class SelectionBoxButton : SelectionBoxControl, IHasTooltip
     {
-        private SpriteIcon icon;
+        private SpriteIcon icon = null!;
 
         private readonly IconUsage iconUsage;
 
-        public Action Action;
+        public Action? Action;
 
         public SelectionBoxButton(IconUsage iconUsage, string tooltip)
         {
@@ -49,6 +47,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected override bool OnClick(ClickEvent e)
         {
+            Circle.FlashColour(Colours.GrayF, 300);
+
             TriggerOperationStarted();
             Action?.Invoke();
             TriggerOperationEnded();
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
index 35c67a1c67..3746c9652e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         public event Action OperationStarted;
         public event Action OperationEnded;
 
-        private Circle circle;
+        protected Circle Circle { get; private set; }
 
         /// <summary>
         /// Whether the user is currently holding the control with mouse.
@@ -41,7 +41,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             InternalChildren = new Drawable[]
             {
-                circle = new Circle
+                Circle = new Circle
                 {
                     RelativeSizeAxes = Axes.Both,
                     Anchor = Anchor.Centre,
@@ -85,9 +85,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
         protected virtual void UpdateHoverState()
         {
             if (IsHeld)
-                circle.FadeColour(Colours.GrayF, TRANSFORM_DURATION, Easing.OutQuint);
+                Circle.FadeColour(Colours.GrayF, TRANSFORM_DURATION, Easing.OutQuint);
             else
-                circle.FadeColour(IsHovered ? Colours.Red : Colours.YellowDark, TRANSFORM_DURATION, Easing.OutQuint);
+                Circle.FadeColour(IsHovered ? Colours.Red : Colours.YellowDark, TRANSFORM_DURATION, Easing.OutQuint);
 
             this.ScaleTo(IsHeld || IsHovered ? 1.5f : 1, TRANSFORM_DURATION, Easing.OutQuint);
         }

From c6d952abe36a1ae16224291cd60d3012ef709140 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Jun 2023 17:01:40 +0900
Subject: [PATCH 1085/1604] Add support for `Ctrl` + `<` / `>` to rotate
 selection in editor

As discussed in https://github.com/ppy/osu/discussions/24048.
---
 .../Screens/Edit/Compose/Components/SelectionBox.cs  | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index 50eb3a186d..d8fd18ff8f 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -33,6 +33,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
         public Action OperationEnded;
 
         private SelectionBoxButton reverseButton;
+        private SelectionBoxButton rotateClockwiseButton;
+        private SelectionBoxButton rotateCounterClockwiseButton;
 
         private bool canReverse;
 
@@ -172,6 +174,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
             {
                 case Key.G:
                     return reverseButton?.TriggerClick() ?? false;
+
+                case Key.Comma:
+                    return rotateCounterClockwiseButton?.TriggerClick() ?? false;
+
+                case Key.Period:
+                    return rotateClockwiseButton?.TriggerClick() ?? false;
             }
 
             return base.OnKeyDown(e);
@@ -254,8 +262,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private void addRotationComponents()
         {
-            addButton(FontAwesome.Solid.Undo, "Rotate 90 degrees counter-clockwise", () => OnRotation?.Invoke(-90));
-            addButton(FontAwesome.Solid.Redo, "Rotate 90 degrees clockwise", () => OnRotation?.Invoke(90));
+            rotateCounterClockwiseButton = addButton(FontAwesome.Solid.Undo, "Rotate 90 degrees counter-clockwise", () => OnRotation?.Invoke(-90));
+            rotateClockwiseButton = addButton(FontAwesome.Solid.Redo, "Rotate 90 degrees clockwise", () => OnRotation?.Invoke(90));
 
             addRotateHandle(Anchor.TopLeft);
             addRotateHandle(Anchor.TopRight);

From 5f350aa66fc118b563b2e9ca98f80f40245ca7fc Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 27 Jun 2023 16:47:42 +0900
Subject: [PATCH 1086/1604] Fix float division

Firstly, this is intended to be a float division.

Secondly, dividing integers by 0 results in an exception, but dividing
non-zero floats by 0 results in +/- infinity which will be clamped to
the upper range.
In particular, this occurs when the beatmap has 1 hitobject (0 drain
length).
---
 osu.Game.Rulesets.Catch/Difficulty/CatchScoreV1Processor.cs | 2 +-
 osu.Game.Rulesets.Osu/Difficulty/OsuScoreV1Processor.cs     | 2 +-
 osu.Game.Rulesets.Taiko/Difficulty/TaikoScoreV1Processor.cs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchScoreV1Processor.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchScoreV1Processor.cs
index bda6be66a4..b4cca610c3 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchScoreV1Processor.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchScoreV1Processor.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
                 (baseBeatmap.Difficulty.DrainRate
                  + baseBeatmap.Difficulty.OverallDifficulty
                  + baseBeatmap.Difficulty.CircleSize
-                 + Math.Clamp(objectCount / drainLength * 8, 0, 16)) / 38 * 5);
+                 + Math.Clamp((float)objectCount / drainLength * 8, 0, 16)) / 38 * 5);
 
             scoreMultiplier = difficultyPeppyStars * mods.Aggregate(1.0, (current, mod) => current * mod.ScoreMultiplier);
 
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuScoreV1Processor.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuScoreV1Processor.cs
index aa52edae87..2e40d03fc0 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuScoreV1Processor.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuScoreV1Processor.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                 (baseBeatmap.Difficulty.DrainRate
                  + baseBeatmap.Difficulty.OverallDifficulty
                  + baseBeatmap.Difficulty.CircleSize
-                 + Math.Clamp(objectCount / drainLength * 8, 0, 16)) / 38 * 5);
+                 + Math.Clamp((float)objectCount / drainLength * 8, 0, 16)) / 38 * 5);
 
             scoreMultiplier = difficultyPeppyStars * mods.Aggregate(1.0, (current, mod) => current * mod.ScoreMultiplier);
 
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoScoreV1Processor.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoScoreV1Processor.cs
index 255a3dd963..eaa82e695e 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoScoreV1Processor.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoScoreV1Processor.cs
@@ -84,7 +84,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
                 (baseBeatmap.Difficulty.DrainRate
                  + baseBeatmap.Difficulty.OverallDifficulty
                  + baseBeatmap.Difficulty.CircleSize
-                 + Math.Clamp(objectCount / drainLength * 8, 0, 16)) / 38 * 5);
+                 + Math.Clamp((float)objectCount / drainLength * 8, 0, 16)) / 38 * 5);
 
             modMultiplier = mods.Aggregate(1.0, (current, mod) => current * mod.ScoreMultiplier);
 

From 6e2369e6516ee3db92b9226f8a633d9c96b97773 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 27 Jun 2023 17:18:32 +0900
Subject: [PATCH 1087/1604] Add xmldoc on LegacyTotalScore

---
 osu.Game/Scoring/ScoreInfo.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 5de1c69d8a..a0a0799fb1 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -54,6 +54,9 @@ namespace osu.Game.Scoring
 
         public long TotalScore { get; set; }
 
+        /// <summary>
+        /// Used to preserve the total score for legacy scores.
+        /// </summary>
         public long LegacyTotalScore { get; set; }
 
         public int MaxCombo { get; set; }

From 4ecc724841ac075f24f8d5695fb277672ccceca8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Jun 2023 18:18:58 +0900
Subject: [PATCH 1088/1604] Add test coverage of save failure when beatmap is
 detached from set

---
 .../Visual/Editing/TestSceneEditorSaving.cs   | 31 +++++++++++++++++--
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorSaving.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSaving.cs
index 64c48e74cf..7191ae6a57 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorSaving.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSaving.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
@@ -96,6 +94,33 @@ namespace osu.Game.Tests.Visual.Editing
             AddAssert("Beatmap still has correct timeline zoom", () => EditorBeatmap.BeatmapInfo.TimelineZoom == changedTimelineZoom);
         }
 
+        [Test]
+        public void TestSaveWithDetachedBeatmap()
+        {
+            AddStep("Set overall difficulty", () => EditorBeatmap.Difficulty.OverallDifficulty = 7);
+
+            SaveEditor();
+
+            AddStep("Detach beatmap from set", () =>
+            {
+                Realm.Write(r =>
+                {
+                    BeatmapSetInfo? beatmapSet = r.Find<BeatmapSetInfo>(EditorBeatmap.BeatmapInfo.BeatmapSet!.ID);
+                    BeatmapInfo? beatmap = r.Find<BeatmapInfo>(EditorBeatmap.BeatmapInfo.ID);
+
+                    beatmapSet.Beatmaps.Remove(beatmap);
+                });
+            });
+
+            SaveEditor();
+
+            AddAssert("Beatmap has correct overall difficulty", () => EditorBeatmap.Difficulty.OverallDifficulty == 7);
+
+            ReloadEditorToSameBeatmap();
+
+            AddAssert("Beatmap still has correct overall difficulty", () => EditorBeatmap.Difficulty.OverallDifficulty == 7);
+        }
+
         [Test]
         public void TestDifficulty()
         {
@@ -130,7 +155,7 @@ namespace osu.Game.Tests.Visual.Editing
         [Test]
         public void TestLengthAndStarRatingUpdated()
         {
-            WorkingBeatmap working = null;
+            WorkingBeatmap working = null!;
             double lastStarRating = 0;
             double lastLength = 0;
 

From 8e80e2fa323337f885ae8119a5a14b5b54e68596 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Jun 2023 18:19:59 +0900
Subject: [PATCH 1089/1604] Fix incorrect realm copy logic when a beatmap
 becomes detached from its set

The code here was assuming that if the beatmap which is having changes
copied across does not exist within the `BeatmapSet.Beatmaps` list, it
was not yet persisted to realm.

In some edge case, it can happen that the beatmap *is* persisted to
realm but not correctly attached to the beatmap set. I don't yet know
how this occurs, but it has caused loss of data for at least two users.

The fix here is to check realm-wide for the beatmap (using its primary
key) rather than only in the list. We then handle the scenario where the
beatmap needs to be reattached to the set as a seprate step.

---

This does raise others questions like "are we even structuring this
correctly? couldn't a single beatmap exist in two different sets?"

Maybe, but let's deal with that if/when it comes up.
---
 osu.Game/Database/RealmObjectExtensions.cs | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Database/RealmObjectExtensions.cs b/osu.Game/Database/RealmObjectExtensions.cs
index a771aa04df..888c1cf8ce 100644
--- a/osu.Game/Database/RealmObjectExtensions.cs
+++ b/osu.Game/Database/RealmObjectExtensions.cs
@@ -52,10 +52,19 @@ namespace osu.Game.Database
              {
                  foreach (var beatmap in s.Beatmaps)
                  {
-                     var existing = d.Beatmaps.FirstOrDefault(b => b.ID == beatmap.ID);
+                     // Importantly, search all of realm for the beatmap (not just the set's beatmaps).
+                     // It may have gotten detached, and if that's the case let's use this opportunity to fix
+                     // things up.
+                     var existingBeatmap = d.Realm.Find<BeatmapInfo>(beatmap.ID);
 
-                     if (existing != null)
-                         copyChangesToRealm(beatmap, existing);
+                     if (existingBeatmap != null)
+                     {
+                         // As above, reattach if it happens to not be in the set's beatmaps.
+                         if (!d.Beatmaps.Contains(existingBeatmap))
+                             d.Beatmaps.Add(existingBeatmap);
+
+                         copyChangesToRealm(beatmap, existingBeatmap);
+                     }
                      else
                      {
                          var newBeatmap = new BeatmapInfo
@@ -64,6 +73,7 @@ namespace osu.Game.Database
                              BeatmapSet = d,
                              Ruleset = d.Realm.Find<RulesetInfo>(beatmap.Ruleset.ShortName)
                          };
+
                          d.Beatmaps.Add(newBeatmap);
                          copyChangesToRealm(beatmap, newBeatmap);
                      }

From ada9c48bde241592c4765ed90040b66a0f67746f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 27 Jun 2023 20:14:33 +0200
Subject: [PATCH 1090/1604] Attempt to fix more test failures

---
 osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
index be73e36e11..4d81d9f707 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
@@ -63,7 +63,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             float? initialAlpha = null;
 
             createNew(h => h.OnLoadComplete += _ => initialAlpha = hideTarget.Alpha);
-            AddUntilStep("wait for load", () => hudOverlay.IsAlive);
             AddAssert("initial alpha was less than 1", () => initialAlpha < 1);
         }
 
@@ -97,6 +96,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                     return hudOverlay;
                 });
             });
+            AddUntilStep("wait for load", () => hudOverlay.IsAlive);
         }
 
         protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();

From 9681ee7eeb0d7dee7ddb44ee1a56c2afa593fd23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 27 Jun 2023 20:29:27 +0200
Subject: [PATCH 1091/1604] Fix broken test step

---
 osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
index 3df0f18558..5a66a5c7a6 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
@@ -62,7 +62,9 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("Add random", () =>
             {
                 Key key = (Key)((int)Key.A + RNG.Next(26));
-                controller.Add(new KeyCounterKeyboardTrigger(key));
+                var trigger = new KeyCounterKeyboardTrigger(key);
+                Add(trigger);
+                controller.Add(trigger);
             });
 
             InputTrigger testTrigger = controller.Triggers.First();

From 11577d1df08e96008ec9764ea731c5747ae20996 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 27 Jun 2023 20:41:03 +0200
Subject: [PATCH 1092/1604] Add test coverage for title query parsing

---
 .../NonVisual/Filtering/FilterQueryParserTest.cs     | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
index 46f91f9a67..9f7ba9ac24 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
@@ -251,6 +251,18 @@ namespace osu.Game.Tests.NonVisual.Filtering
             Assert.AreEqual("my_fav", filterCriteria.Creator.SearchTerm);
         }
 
+        [Test]
+        public void TestApplyTitleQueries()
+        {
+            const string query = "find me songs with title=\"a certain title\" please";
+            var filterCriteria = new FilterCriteria();
+            FilterQueryParser.ApplyQueries(filterCriteria, query);
+            Assert.AreEqual("find me songs with  please", filterCriteria.SearchText.Trim());
+            Assert.AreEqual(5, filterCriteria.SearchTerms.Length);
+            Assert.AreEqual("a certain title", filterCriteria.Title.SearchTerm);
+            Assert.That(filterCriteria.Title.Exact, Is.True);
+        }
+
         [Test]
         public void TestApplyArtistQueries()
         {

From 37ee3a7bbd0f1f14e03a87e29b83abd05c800e18 Mon Sep 17 00:00:00 2001
From: Bastian Pedersen <bastian.tangedal@gmail.com>
Date: Tue, 27 Jun 2023 20:56:35 +0200
Subject: [PATCH 1093/1604] Localise common game notifications

---
 osu.Game/Localisation/NotificationsStrings.cs | 25 +++++++++++++++++++
 osu.Game/OsuGame.cs                           | 10 ++++----
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Localisation/NotificationsStrings.cs b/osu.Game/Localisation/NotificationsStrings.cs
index 5e2600bc50..14ab3e7ff4 100644
--- a/osu.Game/Localisation/NotificationsStrings.cs
+++ b/osu.Game/Localisation/NotificationsStrings.cs
@@ -63,6 +63,31 @@ Please try changing your audio device to a working setting.");
         /// </summary>
         public static LocalisableString ScoreOverlayDisabled(LocalisableString arg0) => new TranslatableString(getKey(@"score_overlay_disabled"), @"The score overlay is currently disabled. You can toggle this by pressing {0}.", arg0);
 
+        /// <summary>
+        /// "The URL {0} has an unsupported or dangerous protocol and will not be opened"
+        /// </summary>
+        public static LocalisableString UnsupportedOrDangerousUrlProtocol(string url) => new TranslatableString(getKey(@"unsupported_or_dangerous_url_protocol"), @"The URL {0} has an unsupported or dangerous protocol and will not be opened.", url);
+
+        /// <summary>
+        /// "Subsequent messages have been logged. Click to view log files"
+        /// </summary>
+        public static LocalisableString SubsequentMessagesLogged => new TranslatableString(getKey(@"subsequent_messages_logged"), @"Subsequent messages have been logged. Click to view log files");
+
+        /// <summary>
+        /// "Disabling tablet support due to error: &quot;{0}&quot;"
+        /// </summary>
+        public static LocalisableString TabletSupportDisabledDueToError(string message) => new TranslatableString(getKey(@"tablet_support_disabled_due_to_error"), @"Disabling tablet support due to error: ""{0}""", message);
+
+        /// <summary>
+        /// "Encountered tablet warning, your tablet may not function correctly. Click here for a list of all tablets supported."
+        /// </summary>
+        public static LocalisableString EncounteredTabletWarning => new TranslatableString(getKey(@"encountered_tablet_warning"), @"Encountered tablet warning, your tablet may not function correctly. Click here for a list of all tablets supported.");
+
+        /// <summary>
+        /// "This link type is not yet supported!"
+        /// </summary>
+        public static LocalisableString LinkTypeNotSupported => new TranslatableString(getKey(@"unsupported_link_type"), @"This link type is not yet supported!");
+
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
 }
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 8bfe48010b..fe98a8e286 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -435,7 +435,7 @@ namespace osu.Game
                 case LinkAction.Spectate:
                     waitForReady(() => Notifications, _ => Notifications.Post(new SimpleNotification
                     {
-                        Text = @"This link type is not yet supported!",
+                        Text = NotificationsStrings.LinkTypeNotSupported,
                         Icon = FontAwesome.Solid.LifeRing,
                     }));
                     break;
@@ -477,7 +477,7 @@ namespace osu.Game
             {
                 Notifications.Post(new SimpleErrorNotification
                 {
-                    Text = $"The URL {url} has an unsupported or dangerous protocol and will not be opened.",
+                    Text = NotificationsStrings.UnsupportedOrDangerousUrlProtocol(url),
                 });
 
                 return;
@@ -1147,7 +1147,7 @@ namespace osu.Game
                     Schedule(() => Notifications.Post(new SimpleNotification
                     {
                         Icon = FontAwesome.Solid.EllipsisH,
-                        Text = "Subsequent messages have been logged. Click to view log files.",
+                        Text = NotificationsStrings.SubsequentMessagesLogged,
                         Activated = () =>
                         {
                             Storage.GetStorageForDirectory(@"logs").PresentFileExternally(logFile);
@@ -1179,7 +1179,7 @@ namespace osu.Game
                     {
                         Notifications.Post(new SimpleNotification
                         {
-                            Text = $"Disabling tablet support due to error: \"{message}\"",
+                            Text = NotificationsStrings.TabletSupportDisabledDueToError(message),
                             Icon = FontAwesome.Solid.PenSquare,
                             IconColour = Colours.RedDark,
                         });
@@ -1196,7 +1196,7 @@ namespace osu.Game
                 {
                     Schedule(() => Notifications.Post(new SimpleNotification
                     {
-                        Text = @"Encountered tablet warning, your tablet may not function correctly. Click here for a list of all tablets supported.",
+                        Text = NotificationsStrings.EncounteredTabletWarning,
                         Icon = FontAwesome.Solid.PenSquare,
                         IconColour = Colours.YellowDark,
                         Activated = () =>

From 8a2cd57f4eeca358d9f1b7bbc0042ae441fb23bb Mon Sep 17 00:00:00 2001
From: Bastian Pedersen <bastian.tangedal@gmail.com>
Date: Tue, 27 Jun 2023 21:01:39 +0200
Subject: [PATCH 1094/1604] Add back missing punctunation

---
 osu.Game/Localisation/NotificationsStrings.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Localisation/NotificationsStrings.cs b/osu.Game/Localisation/NotificationsStrings.cs
index 14ab3e7ff4..f568c47546 100644
--- a/osu.Game/Localisation/NotificationsStrings.cs
+++ b/osu.Game/Localisation/NotificationsStrings.cs
@@ -69,9 +69,9 @@ Please try changing your audio device to a working setting.");
         public static LocalisableString UnsupportedOrDangerousUrlProtocol(string url) => new TranslatableString(getKey(@"unsupported_or_dangerous_url_protocol"), @"The URL {0} has an unsupported or dangerous protocol and will not be opened.", url);
 
         /// <summary>
-        /// "Subsequent messages have been logged. Click to view log files"
+        /// "Subsequent messages have been logged. Click to view log files."
         /// </summary>
-        public static LocalisableString SubsequentMessagesLogged => new TranslatableString(getKey(@"subsequent_messages_logged"), @"Subsequent messages have been logged. Click to view log files");
+        public static LocalisableString SubsequentMessagesLogged => new TranslatableString(getKey(@"subsequent_messages_logged"), @"Subsequent messages have been logged. Click to view log files.");
 
         /// <summary>
         /// "Disabling tablet support due to error: &quot;{0}&quot;"

From 62dcd513caa6fd2e566902f503c49636598a9645 Mon Sep 17 00:00:00 2001
From: Bastian Pedersen <bastian.tangedal@gmail.com>
Date: Tue, 27 Jun 2023 21:02:44 +0200
Subject: [PATCH 1095/1604] Fix XML doc not mirroring string

---
 osu.Game/Localisation/NotificationsStrings.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Localisation/NotificationsStrings.cs b/osu.Game/Localisation/NotificationsStrings.cs
index f568c47546..b6f2a55e37 100644
--- a/osu.Game/Localisation/NotificationsStrings.cs
+++ b/osu.Game/Localisation/NotificationsStrings.cs
@@ -64,7 +64,7 @@ Please try changing your audio device to a working setting.");
         public static LocalisableString ScoreOverlayDisabled(LocalisableString arg0) => new TranslatableString(getKey(@"score_overlay_disabled"), @"The score overlay is currently disabled. You can toggle this by pressing {0}.", arg0);
 
         /// <summary>
-        /// "The URL {0} has an unsupported or dangerous protocol and will not be opened"
+        /// "The URL {0} has an unsupported or dangerous protocol and will not be opened."
         /// </summary>
         public static LocalisableString UnsupportedOrDangerousUrlProtocol(string url) => new TranslatableString(getKey(@"unsupported_or_dangerous_url_protocol"), @"The URL {0} has an unsupported or dangerous protocol and will not be opened.", url);
 

From 7052f87eb81d727ac54718c2eb25a33ea4458ac3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 27 Jun 2023 21:20:59 +0200
Subject: [PATCH 1096/1604] Add even more safety against unloaded components

---
 .../Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs           | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
index 4d81d9f707..162e279403 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
@@ -96,7 +96,9 @@ namespace osu.Game.Tests.Visual.Gameplay
                     return hudOverlay;
                 });
             });
-            AddUntilStep("wait for load", () => hudOverlay.IsAlive);
+            AddUntilStep("HUD overlay loaded", () => hudOverlay.IsAlive);
+            AddUntilStep("components container loaded",
+                () => hudOverlay.ChildrenOfType<SkinComponentsContainer>().Any(scc => scc.ComponentsLoaded));
         }
 
         protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();

From e3d97b37f120e24e96e81b41faba96b6c5898e9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 27 Jun 2023 21:28:37 +0200
Subject: [PATCH 1097/1604] Rename `MatchMode.{None -> Substring}`

---
 .../NonVisual/Filtering/FilterQueryParserTest.cs          | 8 ++++----
 osu.Game/Screens/Select/FilterCriteria.cs                 | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
index 7e7f7c95fe..ade8146774 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
@@ -39,13 +39,13 @@ namespace osu.Game.Tests.NonVisual.Filtering
             Assert.That(filterCriteria.SearchTerms[1].MatchMode, Is.EqualTo(FilterCriteria.MatchMode.IsolatedPhrase));
 
             Assert.That(filterCriteria.SearchTerms[2].SearchTerm, Is.EqualTo("looking"));
-            Assert.That(filterCriteria.SearchTerms[2].MatchMode, Is.EqualTo(FilterCriteria.MatchMode.None));
+            Assert.That(filterCriteria.SearchTerms[2].MatchMode, Is.EqualTo(FilterCriteria.MatchMode.Substring));
 
             Assert.That(filterCriteria.SearchTerms[3].SearchTerm, Is.EqualTo("for"));
-            Assert.That(filterCriteria.SearchTerms[3].MatchMode, Is.EqualTo(FilterCriteria.MatchMode.None));
+            Assert.That(filterCriteria.SearchTerms[3].MatchMode, Is.EqualTo(FilterCriteria.MatchMode.Substring));
 
             Assert.That(filterCriteria.SearchTerms[4].SearchTerm, Is.EqualTo("like"));
-            Assert.That(filterCriteria.SearchTerms[4].MatchMode, Is.EqualTo(FilterCriteria.MatchMode.None));
+            Assert.That(filterCriteria.SearchTerms[4].MatchMode, Is.EqualTo(FilterCriteria.MatchMode.Substring));
         }
 
         /*
@@ -272,7 +272,7 @@ namespace osu.Game.Tests.NonVisual.Filtering
             Assert.AreEqual("find me songs by  please", filterCriteria.SearchText.Trim());
             Assert.AreEqual(5, filterCriteria.SearchTerms.Length);
             Assert.AreEqual("singer", filterCriteria.Artist.SearchTerm);
-            Assert.That(filterCriteria.Artist.MatchMode, Is.EqualTo(FilterCriteria.MatchMode.None));
+            Assert.That(filterCriteria.Artist.MatchMode, Is.EqualTo(FilterCriteria.MatchMode.Substring));
         }
 
         [Test]
diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index 6ac6b7d5fe..36e048fd3d 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -154,7 +154,7 @@ namespace osu.Game.Screens.Select
                 switch (MatchMode)
                 {
                     default:
-                    case MatchMode.None:
+                    case MatchMode.Substring:
                         return value.Contains(SearchTerm, StringComparison.InvariantCultureIgnoreCase);
 
                     case MatchMode.IsolatedPhrase:
@@ -185,7 +185,7 @@ namespace osu.Game.Screens.Select
                         MatchMode = MatchMode.IsolatedPhrase;
                     }
                     else
-                        MatchMode = MatchMode.None;
+                        MatchMode = MatchMode.Substring;
                 }
             }
 
@@ -197,7 +197,7 @@ namespace osu.Game.Screens.Select
             /// <summary>
             /// Match using a simple "contains" substring match.
             /// </summary>
-            None,
+            Substring,
 
             /// <summary>
             /// Match for the search phrase being isolated by spaces, or at the start or end of the text.

From aba380b0018770d31264dce4d886e3fc7a61005a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 27 Jun 2023 21:33:42 +0200
Subject: [PATCH 1098/1604] Add test case for full phrase match mode trimming
 chars from inside phrase

---
 .../Filtering/FilterQueryParserTest.cs        | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
index ade8146774..be8b39b296 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
@@ -48,6 +48,38 @@ namespace osu.Game.Tests.NonVisual.Filtering
             Assert.That(filterCriteria.SearchTerms[4].MatchMode, Is.EqualTo(FilterCriteria.MatchMode.Substring));
         }
 
+        [Test]
+        public void TestApplyFullPhraseQueryWithExclamationPointInTerm()
+        {
+            const string query = "looking for \"circles!\"!";
+            var filterCriteria = new FilterCriteria();
+            FilterQueryParser.ApplyQueries(filterCriteria, query);
+            Assert.AreEqual("looking for \"circles!\"!", filterCriteria.SearchText);
+            Assert.AreEqual(3, filterCriteria.SearchTerms.Length);
+
+            Assert.That(filterCriteria.SearchTerms[0].SearchTerm, Is.EqualTo("circles!"));
+            Assert.That(filterCriteria.SearchTerms[0].MatchMode, Is.EqualTo(FilterCriteria.MatchMode.FullPhrase));
+
+            Assert.That(filterCriteria.SearchTerms[1].SearchTerm, Is.EqualTo("looking"));
+            Assert.That(filterCriteria.SearchTerms[1].MatchMode, Is.EqualTo(FilterCriteria.MatchMode.Substring));
+
+            Assert.That(filterCriteria.SearchTerms[2].SearchTerm, Is.EqualTo("for"));
+            Assert.That(filterCriteria.SearchTerms[2].MatchMode, Is.EqualTo(FilterCriteria.MatchMode.Substring));
+        }
+
+        [Test]
+        public void TestApplyBrokenFullPhraseQuery()
+        {
+            const string query = "\"!";
+            var filterCriteria = new FilterCriteria();
+            FilterQueryParser.ApplyQueries(filterCriteria, query);
+            Assert.AreEqual("\"!", filterCriteria.SearchText);
+            Assert.AreEqual(1, filterCriteria.SearchTerms.Length);
+
+            Assert.That(filterCriteria.SearchTerms[0].SearchTerm, Is.EqualTo("\"!"));
+            Assert.That(filterCriteria.SearchTerms[0].MatchMode, Is.EqualTo(FilterCriteria.MatchMode.Substring));
+        }
+
         /*
          * The following tests have been written a bit strangely (they don't check exact
          * bound equality with what the filter says).

From bf99fc61b863761b08e40345fcbb8d8eb287a771 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 27 Jun 2023 21:34:49 +0200
Subject: [PATCH 1099/1604] Trim full phrase filters in a more precise manner

---
 .../Filtering/FilterQueryParserTest.cs        |  4 ++--
 osu.Game/Screens/Select/FilterCriteria.cs     | 20 +++++++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
index be8b39b296..ce95e921b9 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
@@ -76,8 +76,8 @@ namespace osu.Game.Tests.NonVisual.Filtering
             Assert.AreEqual("\"!", filterCriteria.SearchText);
             Assert.AreEqual(1, filterCriteria.SearchTerms.Length);
 
-            Assert.That(filterCriteria.SearchTerms[0].SearchTerm, Is.EqualTo("\"!"));
-            Assert.That(filterCriteria.SearchTerms[0].MatchMode, Is.EqualTo(FilterCriteria.MatchMode.Substring));
+            Assert.That(filterCriteria.SearchTerms[0].SearchTerm, Is.EqualTo("!"));
+            Assert.That(filterCriteria.SearchTerms[0].MatchMode, Is.EqualTo(FilterCriteria.MatchMode.IsolatedPhrase));
         }
 
         /*
diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index 36e048fd3d..ab4f85fc92 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -174,15 +174,19 @@ namespace osu.Game.Screens.Select
                 {
                     searchTerm = value;
 
-                    if (searchTerm.EndsWith("\"!", StringComparison.Ordinal))
+                    if (searchTerm.StartsWith('\"'))
                     {
-                        searchTerm = searchTerm.Trim('!', '\"');
-                        MatchMode = MatchMode.FullPhrase;
-                    }
-                    else if (searchTerm.StartsWith('\"'))
-                    {
-                        searchTerm = searchTerm.Trim('\"');
-                        MatchMode = MatchMode.IsolatedPhrase;
+                        // length check ensures that the quote character in the `StartsWith()` check above and the `EndsWith()` check below is not the same character.
+                        if (searchTerm.EndsWith("\"!", StringComparison.Ordinal) && searchTerm.Length >= 3)
+                        {
+                            searchTerm = searchTerm.TrimEnd('!').Trim('\"');
+                            MatchMode = MatchMode.FullPhrase;
+                        }
+                        else
+                        {
+                            searchTerm = searchTerm.Trim('\"');
+                            MatchMode = MatchMode.IsolatedPhrase;
+                        }
                     }
                     else
                         MatchMode = MatchMode.Substring;

From bca1a910878cf48577d43bc72f92d7741fea038f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 27 Jun 2023 21:38:36 +0200
Subject: [PATCH 1100/1604] Add test cases covering full phrase case
 insensitivity

---
 osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs
index 44cff7fdd9..c7a32ebbc4 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs
@@ -171,6 +171,7 @@ namespace osu.Game.Tests.NonVisual.Filtering
         [TestCase("\"an auteur\"", true)]
         [TestCase("\"Artist\"!", true)]
         [TestCase("\"The Artist\"!", false)]
+        [TestCase("\"the artist\"!", false)]
         [TestCase("\"\\\"", true)] // nasty case, covers properly escaping user input in underlying regex.
         public void TestCriteriaMatchingExactTerms(string terms, bool filtered)
         {
@@ -238,6 +239,7 @@ namespace osu.Game.Tests.NonVisual.Filtering
         [TestCase("unknown", true)]
         [TestCase("\"Artist\"!", true)]
         [TestCase("\"The Artist\"!", false)]
+        [TestCase("\"the artist\"!", false)]
         public void TestCriteriaMatchingArtist(string artistName, bool filtered)
         {
             var exampleBeatmapInfo = getExampleBeatmap();

From ad3a470eafad8a22b678a45d6ff7a7da574764c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 27 Jun 2023 22:01:44 +0200
Subject: [PATCH 1101/1604] Enable NRT in `SelectionBox`

---
 .../Edit/Compose/Components/SelectionBox.cs   | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index d8fd18ff8f..8ab2a821a9 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -24,17 +22,17 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private const float button_padding = 5;
 
-        public Func<float, bool> OnRotation;
-        public Func<Vector2, Anchor, bool> OnScale;
-        public Func<Direction, bool, bool> OnFlip;
-        public Func<bool> OnReverse;
+        public Func<float, bool>? OnRotation;
+        public Func<Vector2, Anchor, bool>? OnScale;
+        public Func<Direction, bool, bool>? OnFlip;
+        public Func<bool>? OnReverse;
 
-        public Action OperationStarted;
-        public Action OperationEnded;
+        public Action? OperationStarted;
+        public Action? OperationEnded;
 
-        private SelectionBoxButton reverseButton;
-        private SelectionBoxButton rotateClockwiseButton;
-        private SelectionBoxButton rotateCounterClockwiseButton;
+        private SelectionBoxButton? reverseButton;
+        private SelectionBoxButton? rotateClockwiseButton;
+        private SelectionBoxButton? rotateCounterClockwiseButton;
 
         private bool canReverse;
 
@@ -138,7 +136,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             }
         }
 
-        private string text;
+        private string text = string.Empty;
 
         public string Text
         {
@@ -154,13 +152,13 @@ namespace osu.Game.Screens.Edit.Compose.Components
             }
         }
 
-        private SelectionBoxDragHandleContainer dragHandles;
-        private FillFlowContainer buttons;
+        private SelectionBoxDragHandleContainer dragHandles = null!;
+        private FillFlowContainer buttons = null!;
 
-        private OsuSpriteText selectionDetailsText;
+        private OsuSpriteText? selectionDetailsText;
 
         [Resolved]
-        private OsuColour colours { get; set; }
+        private OsuColour colours { get; set; } = null!;
 
         [BackgroundDependencyLoader]
         private void load() => recreate();

From 54280f06be5d8cb0dae7348061088278bbfd9a7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 27 Jun 2023 22:02:15 +0200
Subject: [PATCH 1102/1604] Switch to `== true`

---
 osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index 8ab2a821a9..81b501b39e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -171,13 +171,13 @@ namespace osu.Game.Screens.Edit.Compose.Components
             switch (e.Key)
             {
                 case Key.G:
-                    return reverseButton?.TriggerClick() ?? false;
+                    return reverseButton?.TriggerClick() == true;
 
                 case Key.Comma:
-                    return rotateCounterClockwiseButton?.TriggerClick() ?? false;
+                    return rotateCounterClockwiseButton?.TriggerClick() == true;
 
                 case Key.Period:
-                    return rotateClockwiseButton?.TriggerClick() ?? false;
+                    return rotateClockwiseButton?.TriggerClick() == true;
             }
 
             return base.OnKeyDown(e);

From 17ed45d07c2e8b6fba9995fc65a4963a613341ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 27 Jun 2023 22:04:15 +0200
Subject: [PATCH 1103/1604] Mention hotkeys in button tooltips

---
 osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index 81b501b39e..05fe137732 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -260,8 +260,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private void addRotationComponents()
         {
-            rotateCounterClockwiseButton = addButton(FontAwesome.Solid.Undo, "Rotate 90 degrees counter-clockwise", () => OnRotation?.Invoke(-90));
-            rotateClockwiseButton = addButton(FontAwesome.Solid.Redo, "Rotate 90 degrees clockwise", () => OnRotation?.Invoke(90));
+            rotateCounterClockwiseButton = addButton(FontAwesome.Solid.Undo, "Rotate 90 degrees counter-clockwise (Ctrl-<)", () => OnRotation?.Invoke(-90));
+            rotateClockwiseButton = addButton(FontAwesome.Solid.Redo, "Rotate 90 degrees clockwise (Ctrl->)", () => OnRotation?.Invoke(90));
 
             addRotateHandle(Anchor.TopLeft);
             addRotateHandle(Anchor.TopRight);

From 444f71541ad8894077674b7a350faf3fe7993c4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 27 Jun 2023 22:10:53 +0200
Subject: [PATCH 1104/1604] Add test coverage for rotate hotkeys

---
 .../Editing/TestSceneComposerSelection.cs     | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneComposerSelection.cs b/osu.Game.Tests/Visual/Editing/TestSceneComposerSelection.cs
index b14025c9d8..4d99c47f77 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneComposerSelection.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneComposerSelection.cs
@@ -101,6 +101,38 @@ namespace osu.Game.Tests.Visual.Editing
             AddAssert("objects reverted to original position", () => addedObjects[0].StartTime == 100);
         }
 
+        [Test]
+        public void TestRotateHotkeys()
+        {
+            HitCircle[] addedObjects = null;
+
+            AddStep("add hitobjects", () => EditorBeatmap.AddRange(addedObjects = new[]
+            {
+                new HitCircle { StartTime = 100 },
+                new HitCircle { StartTime = 200, Position = new Vector2(100) },
+                new HitCircle { StartTime = 300, Position = new Vector2(200) },
+                new HitCircle { StartTime = 400, Position = new Vector2(300) },
+            }));
+
+            AddStep("select objects", () => EditorBeatmap.SelectedHitObjects.AddRange(addedObjects));
+
+            AddStep("rotate clockwise", () =>
+            {
+                InputManager.PressKey(Key.ControlLeft);
+                InputManager.Key(Key.Period);
+                InputManager.ReleaseKey(Key.ControlLeft);
+            });
+            AddAssert("objects rotated clockwise", () => addedObjects[0].Position == new Vector2(300, 0));
+
+            AddStep("rotate counterclockwise", () =>
+            {
+                InputManager.PressKey(Key.ControlLeft);
+                InputManager.Key(Key.Comma);
+                InputManager.ReleaseKey(Key.ControlLeft);
+            });
+            AddAssert("objects reverted to original position", () => addedObjects[0].Position == new Vector2(0));
+        }
+
         [Test]
         public void TestBasicSelect()
         {

From 9be2d9d62e131d22e98b650bdb82e48c97d8f18a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 27 Jun 2023 22:25:01 +0200
Subject: [PATCH 1105/1604] Fix hotkey presses generating unnecessary undo
 history

The buttons don't check whether the operation they correspond to is
possible to perform in the current state of the selection box, so not
checking `Can{Reverse,Rotate}` causes superfluous undo states to be
added without any real changes if an attempt is made to reverse or
rotate a selection that cannot be reversed or rotated.
---
 osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index 05fe137732..e93b9f0691 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -171,13 +171,13 @@ namespace osu.Game.Screens.Edit.Compose.Components
             switch (e.Key)
             {
                 case Key.G:
-                    return reverseButton?.TriggerClick() == true;
+                    return CanReverse && reverseButton?.TriggerClick() == true;
 
                 case Key.Comma:
-                    return rotateCounterClockwiseButton?.TriggerClick() == true;
+                    return CanRotate && rotateCounterClockwiseButton?.TriggerClick() == true;
 
                 case Key.Period:
-                    return rotateClockwiseButton?.TriggerClick() == true;
+                    return CanRotate && rotateClockwiseButton?.TriggerClick() == true;
             }
 
             return base.OnKeyDown(e);

From d72a8da2951a23c526a4b9965b75871702e0a5ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 27 Jun 2023 23:40:12 +0200
Subject: [PATCH 1106/1604] Add test coverage for deleted difficulties staying
 in realm

---
 .../Visual/Editing/TestSceneDifficultyDelete.cs           | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneDifficultyDelete.cs b/osu.Game.Tests/Visual/Editing/TestSceneDifficultyDelete.cs
index 280e6de97e..12e00c4485 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneDifficultyDelete.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneDifficultyDelete.cs
@@ -72,9 +72,13 @@ namespace osu.Game.Tests.Visual.Editing
                     AddUntilStep("wait for dialog", () => DialogOverlay.CurrentDialog != null);
                     AddStep("confirm", () => InputManager.Key(Key.Number1));
 
-                    AddAssert($"difficulty {i} is deleted", () => Beatmap.Value.BeatmapSetInfo.Beatmaps.Select(b => b.ID), () => Does.Not.Contain(deletedDifficultyID));
-                    AddAssert("count decreased by one", () => Beatmap.Value.BeatmapSetInfo.Beatmaps.Count, () => Is.EqualTo(countBeforeDeletion - 1));
+                    AddAssert($"difficulty {i} is unattached from set",
+                        () => Beatmap.Value.BeatmapSetInfo.Beatmaps.Select(b => b.ID), () => Does.Not.Contain(deletedDifficultyID));
+                    AddAssert("beatmap set difficulty count decreased by one",
+                        () => Beatmap.Value.BeatmapSetInfo.Beatmaps.Count, () => Is.EqualTo(countBeforeDeletion - 1));
                     AddAssert("set hash changed", () => Beatmap.Value.BeatmapSetInfo.Hash, () => Is.Not.EqualTo(beatmapSetHashBefore));
+                    AddAssert($"difficulty {i} is deleted from realm",
+                        () => Realm.Run(r => r.Find<BeatmapInfo>(deletedDifficultyID)), () => Is.Null);
                 }
             }
         }

From 6876566530d842e90b2b7330cabcdaaf7c499faf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 27 Jun 2023 23:43:00 +0200
Subject: [PATCH 1107/1604] Fix difficulty deletion not deleting records from
 realm

---
 osu.Game/Beatmaps/BeatmapManager.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 305dc01844..73811b2e62 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -339,6 +339,8 @@ namespace osu.Game.Beatmaps
 
                 DeleteFile(setInfo, beatmapInfo.File);
                 setInfo.Beatmaps.Remove(beatmapInfo);
+                r.Remove(beatmapInfo.Metadata);
+                r.Remove(beatmapInfo);
 
                 updateHashAndMarkDirty(setInfo);
                 workingBeatmapCache.Invalidate(setInfo);

From b3f2a3ccdfd7d6bc3f9aa01a144058ca084d3220 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Jun 2023 12:11:40 +0900
Subject: [PATCH 1108/1604] Use more correct localised string source for "sign
 out" text

---
 osu.Game/Overlays/Login/UserAction.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Login/UserAction.cs b/osu.Game/Overlays/Login/UserAction.cs
index d4d639f2fb..aa2fad6cdb 100644
--- a/osu.Game/Overlays/Login/UserAction.cs
+++ b/osu.Game/Overlays/Login/UserAction.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Overlays.Login
         [LocalisableDescription(typeof(LoginPanelStrings), nameof(LoginPanelStrings.AppearOffline))]
         AppearOffline,
 
-        [LocalisableDescription(typeof(UserVerificationStrings), nameof(UserVerificationStrings.BoxInfoLogoutLink))]
+        [LocalisableDescription(typeof(LayoutStrings), nameof(LayoutStrings.PopupUserLinksLogout))]
         SignOut,
     }
 }

From 99e55bb9c03972fdee0569ee4ae7a5c37eac84a9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Jun 2023 12:21:05 +0900
Subject: [PATCH 1109/1604] Add logging and `Debug.Fail` on detached beatmap
 detection

---
 osu.Game/Database/RealmObjectExtensions.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Database/RealmObjectExtensions.cs b/osu.Game/Database/RealmObjectExtensions.cs
index 888c1cf8ce..5a6c2e3232 100644
--- a/osu.Game/Database/RealmObjectExtensions.cs
+++ b/osu.Game/Database/RealmObjectExtensions.cs
@@ -3,10 +3,12 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Runtime.Serialization;
 using AutoMapper;
 using AutoMapper.Internal;
+using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Input.Bindings;
 using osu.Game.Models;
@@ -61,7 +63,11 @@ namespace osu.Game.Database
                      {
                          // As above, reattach if it happens to not be in the set's beatmaps.
                          if (!d.Beatmaps.Contains(existingBeatmap))
+                         {
+                             Debug.Fail("Beatmaps should never become detached under normal circumstances. If this ever triggers, it should be investigated further.");
+                             Logger.Log("WARNING: One of the difficulties in a beatmap was detached from its set. Please save a copy of logs and report this to devs.", LoggingTarget.Database, LogLevel.Important);
                              d.Beatmaps.Add(existingBeatmap);
+                         }
 
                          copyChangesToRealm(beatmap, existingBeatmap);
                      }

From 29376ffcc0c7a52620ddbbe6096261b7ca6dd3ab Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Jun 2023 12:54:12 +0900
Subject: [PATCH 1110/1604] Trigger state change when flipping via hotkey in
 the editor

This will trigger a change even if nothing happens. But I think that's
okay (not easy to avoid) because the change handler should be aware that
nothing changed, if anything.

Closes https://github.com/ppy/osu/issues/24065.
---
 .../Edit/Compose/Components/SelectionHandler.cs      | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 5cedf1ca42..9ec59cf833 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -163,10 +163,18 @@ namespace osu.Game.Screens.Edit.Compose.Components
             switch (e.Action)
             {
                 case GlobalAction.EditorFlipHorizontally:
-                    return HandleFlip(Direction.Horizontal, true);
+                    ChangeHandler?.BeginChange();
+                    HandleFlip(Direction.Horizontal, true);
+                    ChangeHandler?.EndChange();
+
+                    return true;
 
                 case GlobalAction.EditorFlipVertically:
-                    return HandleFlip(Direction.Vertical, true);
+                    ChangeHandler?.BeginChange();
+                    HandleFlip(Direction.Vertical, true);
+                    ChangeHandler?.EndChange();
+
+                    return true;
             }
 
             return false;

From e291dff5ad631a15e3b4beef63e785b41a574540 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 28 Jun 2023 14:50:16 +0900
Subject: [PATCH 1111/1604] Fix imported scores not getting LegacyTotalScore

---
 osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
index c6461840aa..bf592d5988 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
@@ -123,6 +123,9 @@ namespace osu.Game.Scoring.Legacy
 
             PopulateAccuracy(score.ScoreInfo);
 
+            if (score.ScoreInfo.IsLegacyScore)
+                score.ScoreInfo.LegacyTotalScore = score.ScoreInfo.TotalScore;
+
             // before returning for database import, we must restore the database-sourced BeatmapInfo.
             // if not, the clone operation in GetPlayableBeatmap will cause a dereference and subsequent database exception.
             score.ScoreInfo.BeatmapInfo = workingBeatmap.BeatmapInfo;

From 91354b15705c5e7ea154d2229c715d7f43970c53 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Jun 2023 14:51:19 +0900
Subject: [PATCH 1112/1604] Avoid performing any actions when
 `BeatmapAvailability` is updated to `Unknown`

---
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 978d77b4f1..ecf38a956d 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -313,16 +313,26 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
             client.ChangeBeatmapAvailability(availability.NewValue).FireAndForget();
 
-            if (availability.NewValue.State != DownloadState.LocallyAvailable)
+            switch (availability.NewValue.State)
             {
-                // while this flow is handled server-side, this covers the edge case of the local user being in a ready state and then deleting the current beatmap.
-                if (client.LocalUser?.State == MultiplayerUserState.Ready)
-                    client.ChangeState(MultiplayerUserState.Idle);
-            }
-            else if (client.LocalUser?.State == MultiplayerUserState.Spectating
-                     && (client.Room?.State == MultiplayerRoomState.WaitingForLoad || client.Room?.State == MultiplayerRoomState.Playing))
-            {
-                onLoadRequested();
+                case DownloadState.LocallyAvailable:
+                    if (client.LocalUser?.State == MultiplayerUserState.Spectating
+                        && (client.Room?.State == MultiplayerRoomState.WaitingForLoad || client.Room?.State == MultiplayerRoomState.Playing))
+                    {
+                        onLoadRequested();
+                    }
+
+                    break;
+
+                case DownloadState.Unknown:
+                    // Don't do anything rash in an unknown state.
+                    break;
+
+                default:
+                    // while this flow is handled server-side, this covers the edge case of the local user being in a ready state and then deleting the current beatmap.
+                    if (client.LocalUser?.State == MultiplayerUserState.Ready)
+                        client.ChangeState(MultiplayerUserState.Idle);
+                    break;
             }
         }
 

From 664a2b2255b7e4e59ce6dac72ca04cca3323f528 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Jun 2023 14:51:41 +0900
Subject: [PATCH 1113/1604] Force a beatmap availability state change when
 selected item is changed

---
 osu.Game/Online/Rooms/BeatmapAvailability.cs             | 1 +
 .../Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/osu.Game/Online/Rooms/BeatmapAvailability.cs b/osu.Game/Online/Rooms/BeatmapAvailability.cs
index f2b981c075..a907ee0d3b 100644
--- a/osu.Game/Online/Rooms/BeatmapAvailability.cs
+++ b/osu.Game/Online/Rooms/BeatmapAvailability.cs
@@ -34,6 +34,7 @@ namespace osu.Game.Online.Rooms
             DownloadProgress = downloadProgress;
         }
 
+        public static BeatmapAvailability Unknown() => new BeatmapAvailability(DownloadState.Unknown);
         public static BeatmapAvailability NotDownloaded() => new BeatmapAvailability(DownloadState.NotDownloaded);
         public static BeatmapAvailability Downloading(float progress) => new BeatmapAvailability(DownloadState.Downloading, progress);
         public static BeatmapAvailability Importing() => new BeatmapAvailability(DownloadState.Importing);
diff --git a/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs
index cce633d46a..29f75bed97 100644
--- a/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs
+++ b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs
@@ -60,6 +60,15 @@ namespace osu.Game.Online.Rooms
                 if (item.NewValue == null)
                     return;
 
+                // Initially set to unknown until we have attained a good state.
+                // This has the wanted side effect of forcing a state change when the current playlist
+                // item changes at the server but our local availability doesn't necessarily change
+                // (ie. we have both the previous and next item LocallyAvailable).
+                //
+                // Note that even without this, the server will trigger a state change and things will work.
+                // This is just for safety.
+                availability.Value = BeatmapAvailability.Unknown();
+
                 downloadTracker?.RemoveAndDisposeImmediately();
                 selectedBeatmap = null;
 

From 3883c28b1567eaf1e3e6286ea78fc559e8a29a02 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Jun 2023 15:39:32 +0900
Subject: [PATCH 1114/1604] Add visual display in participants list when
 availability is still being established

---
 .../Multiplayer/TestSceneMultiplayerParticipantsList.cs     | 1 +
 .../OnlinePlay/Multiplayer/Participants/StateDisplay.cs     | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
index 2da29ccc95..a01d2bf9fc 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
@@ -107,6 +107,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Test]
         public void TestBeatmapDownloadingStates()
         {
+            AddStep("set to unknown", () => MultiplayerClient.ChangeBeatmapAvailability(BeatmapAvailability.Unknown()));
             AddStep("set to no map", () => MultiplayerClient.ChangeBeatmapAvailability(BeatmapAvailability.NotDownloaded()));
             AddStep("set to downloading map", () => MultiplayerClient.ChangeBeatmapAvailability(BeatmapAvailability.Downloading(0)));
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
index bfdc0c02ac..b0cc13d645 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
@@ -154,6 +154,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
                     this.FadeOut(fade_time);
                     break;
 
+                case DownloadState.Unknown:
+                    text.Text = "checking availability";
+                    icon.Icon = FontAwesome.Solid.Question;
+                    icon.Colour = colours.Orange0;
+                    break;
+
                 case DownloadState.NotDownloaded:
                     text.Text = "no map";
                     icon.Icon = FontAwesome.Solid.MinusCircle;

From fec086aec8d456eb7d6a71f4d29dcebe53f12516 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Jun 2023 15:42:53 +0900
Subject: [PATCH 1115/1604] Fix `OnlinePlayBeatmapAvailabilityTracker` not
 passing through `Unknown` state

---
 osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs
index 29f75bed97..331a471ad5 100644
--- a/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs
+++ b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs
@@ -124,6 +124,9 @@ namespace osu.Game.Online.Rooms
             switch (downloadTracker.State.Value)
             {
                 case DownloadState.Unknown:
+                    availability.Value = BeatmapAvailability.Unknown();
+                    break;
+
                 case DownloadState.NotDownloaded:
                     availability.Value = BeatmapAvailability.NotDownloaded();
                     break;

From 09bc8e45de43b44a4b0e235a99c8f69fac7624bc Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 28 Jun 2023 15:04:13 +0900
Subject: [PATCH 1116/1604] Refactoring

---
 .../Difficulty/CatchDifficultyCalculator.cs   |  2 +-
 ...cessor.cs => CatchLegacyScoreProcessor.cs} | 12 +--
 .../Difficulty/ManiaDifficultyCalculator.cs   |  2 +-
 ...cessor.cs => ManiaLegacyScoreProcessor.cs} |  2 +-
 .../Difficulty/OsuDifficultyCalculator.cs     |  2 +-
 ...rocessor.cs => OsuLegacyScoreProcessor.cs} | 12 +--
 osu.Game.Rulesets.Osu/OsuRuleset.cs           |  2 +-
 .../Difficulty/TaikoDifficultyCalculator.cs   |  2 +-
 ...cessor.cs => TaikoLegacyScoreProcessor.cs} | 12 +--
 osu.Game/BackgroundBeatmapProcessor.cs        |  8 +-
 osu.Game/Database/RealmAccess.cs              | 13 ++-
 .../StandardisedScoreMigrationTools.cs        | 87 +++++++++++++++++++
 osu.Game/OsuGameBase.cs                       |  2 +-
 .../Rulesets/Scoring/ILegacyScoreProcessor.cs |  7 ++
 osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs |  2 +-
 osu.Game/Scoring/ScoreImporter.cs             | 61 +------------
 osu.Game/Scoring/ScoreInfo.cs                 | 11 +++
 osu.Game/Scoring/ScoreManager.cs              |  2 -
 18 files changed, 133 insertions(+), 108 deletions(-)
 rename osu.Game.Rulesets.Catch/Difficulty/{CatchScoreV1Processor.cs => CatchLegacyScoreProcessor.cs} (88%)
 rename osu.Game.Rulesets.Mania/Difficulty/{ManiaScoreV1Processor.cs => ManiaLegacyScoreProcessor.cs} (93%)
 rename osu.Game.Rulesets.Osu/Difficulty/{OsuScoreV1Processor.cs => OsuLegacyScoreProcessor.cs} (91%)
 rename osu.Game.Rulesets.Taiko/Difficulty/{TaikoScoreV1Processor.cs => TaikoLegacyScoreProcessor.cs} (92%)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
index 5e562237c8..446a76486b 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
 
             if (ComputeLegacyScoringValues)
             {
-                CatchScoreV1Processor sv1Processor = new CatchScoreV1Processor();
+                CatchLegacyScoreProcessor sv1Processor = new CatchLegacyScoreProcessor();
                 sv1Processor.Simulate(workingBeatmap, beatmap, mods);
                 attributes.LegacyAccuracyScore = sv1Processor.AccuracyScore;
                 attributes.LegacyComboScore = sv1Processor.ComboScore;
diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchScoreV1Processor.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreProcessor.cs
similarity index 88%
rename from osu.Game.Rulesets.Catch/Difficulty/CatchScoreV1Processor.cs
rename to osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreProcessor.cs
index b4cca610c3..67a813300d 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchScoreV1Processor.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreProcessor.cs
@@ -14,22 +14,12 @@ using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Catch.Difficulty
 {
-    internal class CatchScoreV1Processor : ILegacyScoreProcessor
+    internal class CatchLegacyScoreProcessor : ILegacyScoreProcessor
     {
-        /// <summary>
-        /// The accuracy portion of the legacy (ScoreV1) total score.
-        /// </summary>
         public int AccuracyScore { get; private set; }
 
-        /// <summary>
-        /// The combo-multiplied portion of the legacy (ScoreV1) total score.
-        /// </summary>
         public int ComboScore { get; private set; }
 
-        /// <summary>
-        /// A ratio of <c>new_bonus_score / old_bonus_score</c> for converting the bonus score of legacy scores to the new scoring.
-        /// This is made up of all judgements that would be <see cref="HitResult.SmallBonus"/> or <see cref="HitResult.LargeBonus"/>.
-        /// </summary>
         public double BonusScoreRatio => legacyBonusScore == 0 ? 0 : (double)modernBonusScore / legacyBonusScore;
 
         private int legacyBonusScore;
diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
index 5403c1f860..e94e9b667d 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Rulesets.Mania.Difficulty
 
             if (ComputeLegacyScoringValues)
             {
-                ManiaScoreV1Processor sv1Processor = new ManiaScoreV1Processor();
+                ManiaLegacyScoreProcessor sv1Processor = new ManiaLegacyScoreProcessor();
                 sv1Processor.Simulate(workingBeatmap, beatmap, mods);
                 attributes.LegacyAccuracyScore = sv1Processor.AccuracyScore;
                 attributes.LegacyComboScore = sv1Processor.ComboScore;
diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaScoreV1Processor.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreProcessor.cs
similarity index 93%
rename from osu.Game.Rulesets.Mania/Difficulty/ManiaScoreV1Processor.cs
rename to osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreProcessor.cs
index 9134ca4e2a..e30d06c7b0 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/ManiaScoreV1Processor.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreProcessor.cs
@@ -10,7 +10,7 @@ using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mania.Difficulty
 {
-    internal class ManiaScoreV1Processor : ILegacyScoreProcessor
+    internal class ManiaLegacyScoreProcessor : ILegacyScoreProcessor
     {
         public int AccuracyScore => 0;
         public int ComboScore { get; private set; }
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
index 7ecbb48ae6..e28dbd96ac 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
@@ -111,7 +111,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
             if (ComputeLegacyScoringValues)
             {
-                OsuScoreV1Processor sv1Processor = new OsuScoreV1Processor();
+                OsuLegacyScoreProcessor sv1Processor = new OsuLegacyScoreProcessor();
                 sv1Processor.Simulate(workingBeatmap, beatmap, mods);
                 attributes.LegacyAccuracyScore = sv1Processor.AccuracyScore;
                 attributes.LegacyComboScore = sv1Processor.ComboScore;
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuScoreV1Processor.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreProcessor.cs
similarity index 91%
rename from osu.Game.Rulesets.Osu/Difficulty/OsuScoreV1Processor.cs
rename to osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreProcessor.cs
index 2e40d03fc0..a5e12e5564 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuScoreV1Processor.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreProcessor.cs
@@ -14,22 +14,12 @@ using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Difficulty
 {
-    internal class OsuScoreV1Processor : ILegacyScoreProcessor
+    internal class OsuLegacyScoreProcessor : ILegacyScoreProcessor
     {
-        /// <summary>
-        /// The accuracy portion of the legacy (ScoreV1) total score.
-        /// </summary>
         public int AccuracyScore { get; private set; }
 
-        /// <summary>
-        /// The combo-multiplied portion of the legacy (ScoreV1) total score.
-        /// </summary>
         public int ComboScore { get; private set; }
 
-        /// <summary>
-        /// A ratio of <c>new_bonus_score / old_bonus_score</c> for converting the bonus score of legacy scores to the new scoring.
-        /// This is made up of all judgements that would be <see cref="HitResult.SmallBonus"/> or <see cref="HitResult.LargeBonus"/>.
-        /// </summary>
         public double BonusScoreRatio => legacyBonusScore == 0 ? 0 : (double)modernBonusScore / legacyBonusScore;
 
         private int legacyBonusScore;
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index c82f10c017..9b094ea1b1 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -323,6 +323,6 @@ namespace osu.Game.Rulesets.Osu
 
         public override RulesetSetupSection CreateEditorSetupSection() => new OsuSetupSection();
 
-        public override ILegacyScoreProcessor CreateLegacyScoreProcessor() => new OsuScoreV1Processor();
+        public override ILegacyScoreProcessor CreateLegacyScoreProcessor() => new OsuLegacyScoreProcessor();
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
index b7f82b7512..28268d9a13 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
@@ -101,7 +101,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
 
             if (ComputeLegacyScoringValues)
             {
-                TaikoScoreV1Processor sv1Processor = new TaikoScoreV1Processor();
+                TaikoLegacyScoreProcessor sv1Processor = new TaikoLegacyScoreProcessor();
                 sv1Processor.Simulate(workingBeatmap, beatmap, mods);
                 attributes.LegacyAccuracyScore = sv1Processor.AccuracyScore;
                 attributes.LegacyComboScore = sv1Processor.ComboScore;
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoScoreV1Processor.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreProcessor.cs
similarity index 92%
rename from osu.Game.Rulesets.Taiko/Difficulty/TaikoScoreV1Processor.cs
rename to osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreProcessor.cs
index eaa82e695e..c9f508f5e9 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoScoreV1Processor.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreProcessor.cs
@@ -14,22 +14,12 @@ using osu.Game.Rulesets.Taiko.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Difficulty
 {
-    internal class TaikoScoreV1Processor : ILegacyScoreProcessor
+    internal class TaikoLegacyScoreProcessor : ILegacyScoreProcessor
     {
-        /// <summary>
-        /// The accuracy portion of the legacy (ScoreV1) total score.
-        /// </summary>
         public int AccuracyScore { get; private set; }
 
-        /// <summary>
-        /// The combo-multiplied portion of the legacy (ScoreV1) total score.
-        /// </summary>
         public int ComboScore { get; private set; }
 
-        /// <summary>
-        /// A ratio of <c>new_bonus_score / old_bonus_score</c> for converting the bonus score of legacy scores to the new scoring.
-        /// This is made up of all judgements that would be <see cref="HitResult.SmallBonus"/> or <see cref="HitResult.LargeBonus"/>.
-        /// </summary>
         public double BonusScoreRatio => legacyBonusScore == 0 ? 0 : (double)modernBonusScore / legacyBonusScore;
 
         private int legacyBonusScore;
diff --git a/osu.Game/BackgroundBeatmapProcessor.cs b/osu.Game/BackgroundBeatmapProcessor.cs
index c49edec87d..44aceac1ca 100644
--- a/osu.Game/BackgroundBeatmapProcessor.cs
+++ b/osu.Game/BackgroundBeatmapProcessor.cs
@@ -18,6 +18,7 @@ using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Rulesets;
 using osu.Game.Scoring;
+using osu.Game.Scoring.Legacy;
 using osu.Game.Screens.Play;
 
 namespace osu.Game
@@ -27,6 +28,9 @@ namespace osu.Game
         [Resolved]
         private RulesetStore rulesetStore { get; set; } = null!;
 
+        [Resolved]
+        private BeatmapManager beatmapManager { get; set; } = null!;
+
         [Resolved]
         private ScoreManager scoreManager { get; set; } = null!;
 
@@ -241,7 +245,7 @@ namespace osu.Game
                 try
                 {
                     var score = scoreManager.Query(s => s.ID == id);
-                    long newTotalScore = scoreManager.ConvertFromLegacyTotalScore(score);
+                    long newTotalScore = StandardisedScoreMigrationTools.ConvertFromLegacyTotalScore(score, beatmapManager);
 
                     // Can't use async overload because we're not on the update thread.
                     // ReSharper disable once MethodHasAsyncOverload
@@ -249,7 +253,7 @@ namespace osu.Game
                     {
                         ScoreInfo s = r.Find<ScoreInfo>(id);
                         s.TotalScore = newTotalScore;
-                        s.Version = 30000003;
+                        s.Version = LegacyScoreEncoder.LATEST_VERSION;
                     });
 
                     Logger.Log($"Converted total score for score {id}");
diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index 727ddf06d7..93d70d7aea 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Database
         /// 28   2023-06-08    Added IsLegacyScore to ScoreInfo, parsed from replay files.
         /// 29   2023-06-12    Run migration of old lazer scores to be best-effort in the new scoring number space. No actual realm changes.
         /// 30   2023-06-16    Run migration of old lazer scores again. This time with more correct rounding considerations.
-        /// 31   2023-06-26    Add Version and LegacyTotalScore to ScoreInfo, set Version to 30000002 and move TotalScore into LegacyTotalScore for legacy scores.
+        /// 31   2023-06-26    Add Version and LegacyTotalScore to ScoreInfo, set Version to 30000002 and copy TotalScore into LegacyTotalScore for legacy scores.
         /// </summary>
         private const int schema_version = 31;
 
@@ -974,8 +974,15 @@ namespace osu.Game.Database
 
                     foreach (var score in scores)
                     {
-                        score.LegacyTotalScore = score.TotalScore;
-                        score.Version = 30000002; // Last version before legacy total score conversion.
+                        if (score.IsLegacyScore)
+                        {
+                            score.LegacyTotalScore = score.TotalScore;
+
+                            // Scores with this version will trigger the update process in BackgroundBeatmapProcessor.
+                            score.Version = 30000002;
+                        }
+                        else
+                            score.Version = LegacyScoreEncoder.LATEST_VERSION;
                     }
 
                     break;
diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index 582a656efa..98e8671ede 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
@@ -185,6 +186,92 @@ namespace osu.Game.Database
             return (long)Math.Round((1000000 * (accuracyPortion * accuracyScore + (1 - accuracyPortion) * comboScore) + bonusScore) * modMultiplier);
         }
 
+        /// <summary>
+        /// Converts from <see cref="ScoreInfo.LegacyTotalScore"/> to the new standardised scoring of <see cref="ScoreProcessor"/>.
+        /// </summary>
+        /// <param name="score">The score to convert the total score of.</param>
+        /// <param name="beatmaps">A <see cref="BeatmapManager"/> used for <see cref="WorkingBeatmap"/> lookups.</param>
+        /// <returns>The standardised total score.</returns>
+        public static long ConvertFromLegacyTotalScore(ScoreInfo score, BeatmapManager beatmaps)
+        {
+            if (!score.IsLegacyScore)
+                return score.TotalScore;
+
+            var beatmap = beatmaps.GetWorkingBeatmap(score.BeatmapInfo);
+            var ruleset = score.Ruleset.CreateInstance();
+
+            var sv1Processor = ruleset.CreateLegacyScoreProcessor();
+            if (sv1Processor == null)
+                return score.TotalScore;
+
+            sv1Processor.Simulate(beatmap, beatmap.GetPlayableBeatmap(ruleset.RulesetInfo, score.Mods), score.Mods);
+
+            return ConvertFromLegacyTotalScore(score, new DifficultyAttributes
+            {
+                LegacyAccuracyScore = sv1Processor.AccuracyScore,
+                LegacyComboScore = sv1Processor.ComboScore,
+                LegacyBonusScoreRatio = sv1Processor.BonusScoreRatio
+            });
+        }
+
+        /// <summary>
+        /// Converts from <see cref="ScoreInfo.LegacyTotalScore"/> to the new standardised scoring of <see cref="ScoreProcessor"/>.
+        /// </summary>
+        /// <param name="score">The score to convert the total score of.</param>
+        /// <param name="attributes">Difficulty attributes providing the legacy scoring values
+        /// (<see cref="DifficultyAttributes.LegacyAccuracyScore"/>, <see cref="DifficultyAttributes.LegacyComboScore"/>, and <see cref="DifficultyAttributes.LegacyBonusScoreRatio"/>)
+        /// for the beatmap which the score was set on.</param>
+        /// <returns>The standardised total score.</returns>
+        public static long ConvertFromLegacyTotalScore(ScoreInfo score, DifficultyAttributes attributes)
+        {
+            if (!score.IsLegacyScore)
+                return score.TotalScore;
+
+            int maximumLegacyAccuracyScore = attributes.LegacyAccuracyScore;
+            int maximumLegacyComboScore = attributes.LegacyComboScore;
+            double maximumLegacyBonusRatio = attributes.LegacyBonusScoreRatio;
+            double modMultiplier = score.Mods.Select(m => m.ScoreMultiplier).Aggregate(1.0, (c, n) => c * n);
+
+            // The part of total score that doesn't include bonus.
+            int maximumLegacyBaseScore = maximumLegacyAccuracyScore + maximumLegacyComboScore;
+
+            // The combo proportion is calculated as a proportion of maximumLegacyBaseScore.
+            double comboProportion = Math.Min(1, (double)score.LegacyTotalScore / maximumLegacyBaseScore);
+
+            // The bonus proportion makes up the rest of the score that exceeds maximumLegacyBaseScore.
+            double bonusProportion = Math.Max(0, (score.LegacyTotalScore - maximumLegacyBaseScore) * maximumLegacyBonusRatio);
+
+            switch (score.Ruleset.OnlineID)
+            {
+                case 0:
+                    return (long)Math.Round((
+                        700000 * comboProportion
+                        + 300000 * Math.Pow(score.Accuracy, 10)
+                        + bonusProportion) * modMultiplier);
+
+                case 1:
+                    return (long)Math.Round((
+                        250000 * comboProportion
+                        + 750000 * Math.Pow(score.Accuracy, 3.6)
+                        + bonusProportion) * modMultiplier);
+
+                case 2:
+                    return (long)Math.Round((
+                        600000 * comboProportion
+                        + 400000 * score.Accuracy
+                        + bonusProportion) * modMultiplier);
+
+                case 3:
+                    return (long)Math.Round((
+                        990000 * comboProportion
+                        + 10000 * Math.Pow(score.Accuracy, 2 + 2 * score.Accuracy)
+                        + bonusProportion) * modMultiplier);
+
+                default:
+                    return score.TotalScore;
+            }
+        }
+
         private class FakeHit : HitObject
         {
             private readonly Judgement judgement;
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 6737caa5f9..cdd3b368bd 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -99,7 +99,7 @@ namespace osu.Game
         /// </summary>
         private const double global_track_volume_adjust = 0.8;
 
-        public virtual bool UseDevelopmentServer => DebugUtils.IsDebugBuild;
+        public virtual bool UseDevelopmentServer => false;
 
         public virtual EndpointConfiguration CreateEndpoints() =>
             UseDevelopmentServer ? new DevelopmentEndpointConfiguration() : new ExperimentalEndpointConfiguration();
diff --git a/osu.Game/Rulesets/Scoring/ILegacyScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ILegacyScoreProcessor.cs
index 70234a9b17..c689d3610d 100644
--- a/osu.Game/Rulesets/Scoring/ILegacyScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ILegacyScoreProcessor.cs
@@ -25,6 +25,13 @@ namespace osu.Game.Rulesets.Scoring
         /// </summary>
         double BonusScoreRatio { get; }
 
+        /// <summary>
+        /// Performs the simulation, computing the maximum <see cref="AccuracyScore"/>, <see cref="ComboScore"/>,
+        /// and <see cref="BonusScoreRatio"/> achievable for the given beatmap.
+        /// </summary>
+        /// <param name="workingBeatmap">The working beatmap.</param>
+        /// <param name="playableBeatmap">A playable version of the beatmap for the ruleset.</param>
+        /// <param name="mods">The applied mods.</param>
         void Simulate(IWorkingBeatmap workingBeatmap, IBeatmap playableBeatmap, IReadOnlyList<Mod> mods);
     }
 }
diff --git a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
index 6c8b99b842..a5ac151cf8 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Scoring.Legacy
         /// <list type="bullet">
         /// <item><description>30000001: Appends <see cref="LegacyReplaySoloScoreInfo"/> to the end of scores.</description></item>
         /// <item><description>30000002: Score stored to replay calculated using the Score V2 algorithm.</description></item>
-        /// <item><description>30000003: First version after legacy total score migration.</description></item>
+        /// <item><description>30000003: First version after converting legacy total score to standardised.</description></item>
         /// </list>
         /// </remarks>
         public const int LATEST_VERSION = 30000003;
diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index e8f23fdc10..eb57f9a560 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -89,7 +89,7 @@ namespace osu.Game.Scoring
             if (StandardisedScoreMigrationTools.ShouldMigrateToNewStandardised(model))
                 model.TotalScore = StandardisedScoreMigrationTools.GetNewStandardised(model);
             else if (model.IsLegacyScore)
-                model.TotalScore = ConvertFromLegacyTotalScore(model);
+                model.TotalScore = StandardisedScoreMigrationTools.ConvertFromLegacyTotalScore(model, beatmaps());
         }
 
         /// <summary>
@@ -153,65 +153,6 @@ namespace osu.Game.Scoring
 #pragma warning restore CS0618
         }
 
-        public long ConvertFromLegacyTotalScore(ScoreInfo score)
-        {
-            if (!score.IsLegacyScore)
-                return score.TotalScore;
-
-            var beatmap = beatmaps().GetWorkingBeatmap(score.BeatmapInfo);
-            var ruleset = score.Ruleset.CreateInstance();
-
-            var sv1Processor = ruleset.CreateLegacyScoreProcessor();
-            if (sv1Processor == null)
-                return score.TotalScore;
-
-            sv1Processor.Simulate(beatmap, beatmap.GetPlayableBeatmap(ruleset.RulesetInfo, score.Mods), score.Mods);
-
-            int maximumLegacyAccuracyScore = sv1Processor.AccuracyScore;
-            int maximumLegacyComboScore = sv1Processor.ComboScore;
-            double maximumLegacyBonusRatio = sv1Processor.BonusScoreRatio;
-            double modMultiplier = score.Mods.Select(m => m.ScoreMultiplier).Aggregate(1.0, (c, n) => c * n);
-
-            // The part of total score that doesn't include bonus.
-            int maximumLegacyBaseScore = maximumLegacyAccuracyScore + maximumLegacyComboScore;
-
-            // The combo proportion is calculated as a proportion of maximumLegacyBaseScore.
-            double comboProportion = Math.Min(1, (double)score.LegacyTotalScore / maximumLegacyBaseScore);
-
-            // The bonus proportion makes up the rest of the score that exceeds maximumLegacyBaseScore.
-            double bonusProportion = Math.Max(0, (score.LegacyTotalScore - maximumLegacyBaseScore) * maximumLegacyBonusRatio);
-
-            switch (ruleset.RulesetInfo.OnlineID)
-            {
-                case 0:
-                    return (long)Math.Round((
-                        700000 * comboProportion
-                        + 300000 * Math.Pow(score.Accuracy, 10)
-                        + bonusProportion) * modMultiplier);
-
-                case 1:
-                    return (long)Math.Round((
-                        250000 * comboProportion
-                        + 750000 * Math.Pow(score.Accuracy, 3.6)
-                        + bonusProportion) * modMultiplier);
-
-                case 2:
-                    return (long)Math.Round((
-                        600000 * comboProportion
-                        + 400000 * score.Accuracy
-                        + bonusProportion) * modMultiplier);
-
-                case 3:
-                    return (long)Math.Round((
-                        990000 * comboProportion
-                        + 10000 * Math.Pow(score.Accuracy, 2 + 2 * score.Accuracy)
-                        + bonusProportion) * modMultiplier);
-
-                default:
-                    return score.TotalScore;
-            }
-        }
-
         // Very naive local caching to improve performance of large score imports (where the username is usually the same for most or all scores).
         private readonly Dictionary<string, APIUser> usernameLookupCache = new Dictionary<string, APIUser>();
 
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index a0a0799fb1..99b91318fd 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -57,6 +57,9 @@ namespace osu.Game.Scoring
         /// <summary>
         /// Used to preserve the total score for legacy scores.
         /// </summary>
+        /// <remarks>
+        /// Not populated if <see cref="IsLegacyScore"/> is <c>false</c>.
+        /// </remarks>
         public long LegacyTotalScore { get; set; }
 
         public int MaxCombo { get; set; }
@@ -69,6 +72,14 @@ namespace osu.Game.Scoring
 
         public double? PP { get; set; }
 
+        /// <summary>
+        /// The version of this score as stored in the database.
+        /// If this does not match <see cref="LegacyScoreEncoder.LATEST_VERSION"/>,
+        /// then the score has not yet been updated to reflect the current scoring values.
+        /// </summary>
+        /// <remarks>
+        /// This may not match the version stored in the replay files.
+        /// </remarks>
         public int Version { get; set; } = LegacyScoreEncoder.LATEST_VERSION;
 
         [Indexed]
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index fd5e9c851c..55bcb9f79d 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -169,8 +169,6 @@ namespace osu.Game.Scoring
         /// <param name="score">The score to populate the statistics of.</param>
         public void PopulateMaximumStatistics(ScoreInfo score) => scoreImporter.PopulateMaximumStatistics(score);
 
-        public long ConvertFromLegacyTotalScore(ScoreInfo score) => scoreImporter.ConvertFromLegacyTotalScore(score);
-
         #region Implementation of IPresentImports<ScoreInfo>
 
         public Action<IEnumerable<Live<ScoreInfo>>> PresentImport

From af25ffbe8122587e437aeac0e42084412296d09c Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 28 Jun 2023 16:14:44 +0900
Subject: [PATCH 1117/1604] Remove JSON output

---
 osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs b/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
index 48e67ff425..5a01faa417 100644
--- a/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
+++ b/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
@@ -39,32 +39,29 @@ namespace osu.Game.Rulesets.Difficulty
         /// <summary>
         /// The combined star rating of all skills.
         /// </summary>
-        [JsonProperty("star_rating", Order = -7)]
+        [JsonProperty("star_rating", Order = -3)]
         public double StarRating { get; set; }
 
         /// <summary>
         /// The maximum achievable combo.
         /// </summary>
-        [JsonProperty("max_combo", Order = -6)]
+        [JsonProperty("max_combo", Order = -2)]
         public int MaxCombo { get; set; }
 
         /// <summary>
         /// The accuracy portion of the legacy (ScoreV1) total score.
         /// </summary>
-        [JsonProperty("legacy_accuracy_score", Order = -5)]
         public int LegacyAccuracyScore { get; set; }
 
         /// <summary>
         /// The combo-multiplied portion of the legacy (ScoreV1) total score.
         /// </summary>
-        [JsonProperty("legacy_combo_score", Order = -4)]
         public int LegacyComboScore { get; set; }
 
         /// <summary>
         /// A ratio of <c>new_bonus_score / old_bonus_score</c> for converting the bonus score of legacy scores to the new scoring.
         /// This is made up of all judgements that would be <see cref="HitResult.SmallBonus"/> or <see cref="HitResult.LargeBonus"/>.
         /// </summary>
-        [JsonProperty("legacy_bonus_score_ratio", Order = -3)]
         public double LegacyBonusScoreRatio { get; set; }
 
         /// <summary>

From 1ca4e39fc33f090046bc0aa2fffe191d0bc24807 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 28 Jun 2023 16:30:50 +0900
Subject: [PATCH 1118/1604] Allow legacy scores to be displayed in "classic"
 scoring mode

---
 osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs b/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
index e298d51ccb..980b742585 100644
--- a/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
+++ b/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
@@ -14,13 +14,7 @@ namespace osu.Game.Scoring.Legacy
             => getDisplayScore(scoreProcessor.Ruleset.RulesetInfo.OnlineID, scoreProcessor.TotalScore.Value, mode, scoreProcessor.MaximumStatistics);
 
         public static long GetDisplayScore(this ScoreInfo scoreInfo, ScoringMode mode)
-        {
-            // Temporary to not scale stable scores that are already in the XX-millions with the classic scoring mode.
-            if (scoreInfo.IsLegacyScore)
-                return scoreInfo.TotalScore;
-
-            return getDisplayScore(scoreInfo.Ruleset.OnlineID, scoreInfo.TotalScore, mode, scoreInfo.MaximumStatistics);
-        }
+            => getDisplayScore(scoreInfo.Ruleset.OnlineID, scoreInfo.TotalScore, mode, scoreInfo.MaximumStatistics);
 
         private static long getDisplayScore(int rulesetId, long score, ScoringMode mode, IReadOnlyDictionary<HitResult, int> maximumStatistics)
         {

From 5d209b3ffc2d1bfd6d3274616f5f2a5b4d4d7371 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Jun 2023 16:38:20 +0900
Subject: [PATCH 1119/1604] Change default availability in
 `MultiplayerRoomUser` to `Unknown`

---
 osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
index d70a2797c4..f769b4c805 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Online.Multiplayer
         /// The availability state of the current beatmap.
         /// </summary>
         [Key(2)]
-        public BeatmapAvailability BeatmapAvailability { get; set; } = BeatmapAvailability.LocallyAvailable();
+        public BeatmapAvailability BeatmapAvailability { get; set; } = BeatmapAvailability.Unknown();
 
         /// <summary>
         /// Any mods applicable only to the local user.

From 6ce0ca832e57f2b9d4e96d9a3b9a908d49896f28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 28 Jun 2023 19:52:08 +0200
Subject: [PATCH 1120/1604] Delete test case covering beatmap detach scenario

Due to being fundamentally incompatible with the `Debug.Fail()` call
added in 99e55bb9c03972fdee0569ee4ae7a5c37eac84a9.

This reverts commit 4ecc724841ac075f24f8d5695fb277672ccceca8.
---
 .../Visual/Editing/TestSceneEditorSaving.cs   | 31 ++-----------------
 1 file changed, 3 insertions(+), 28 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorSaving.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSaving.cs
index 7191ae6a57..64c48e74cf 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorSaving.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSaving.cs
@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+#nullable disable
+
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
@@ -94,33 +96,6 @@ namespace osu.Game.Tests.Visual.Editing
             AddAssert("Beatmap still has correct timeline zoom", () => EditorBeatmap.BeatmapInfo.TimelineZoom == changedTimelineZoom);
         }
 
-        [Test]
-        public void TestSaveWithDetachedBeatmap()
-        {
-            AddStep("Set overall difficulty", () => EditorBeatmap.Difficulty.OverallDifficulty = 7);
-
-            SaveEditor();
-
-            AddStep("Detach beatmap from set", () =>
-            {
-                Realm.Write(r =>
-                {
-                    BeatmapSetInfo? beatmapSet = r.Find<BeatmapSetInfo>(EditorBeatmap.BeatmapInfo.BeatmapSet!.ID);
-                    BeatmapInfo? beatmap = r.Find<BeatmapInfo>(EditorBeatmap.BeatmapInfo.ID);
-
-                    beatmapSet.Beatmaps.Remove(beatmap);
-                });
-            });
-
-            SaveEditor();
-
-            AddAssert("Beatmap has correct overall difficulty", () => EditorBeatmap.Difficulty.OverallDifficulty == 7);
-
-            ReloadEditorToSameBeatmap();
-
-            AddAssert("Beatmap still has correct overall difficulty", () => EditorBeatmap.Difficulty.OverallDifficulty == 7);
-        }
-
         [Test]
         public void TestDifficulty()
         {
@@ -155,7 +130,7 @@ namespace osu.Game.Tests.Visual.Editing
         [Test]
         public void TestLengthAndStarRatingUpdated()
         {
-            WorkingBeatmap working = null!;
+            WorkingBeatmap working = null;
             double lastStarRating = 0;
             double lastLength = 0;
 

From 0940ab1e11cb246975908f8f00974511f1864fa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 28 Jun 2023 20:47:00 +0200
Subject: [PATCH 1121/1604] Add failing tests covering correct flip handling

---
 .../Editing/TestSceneComposerSelection.cs     | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneComposerSelection.cs b/osu.Game.Tests/Visual/Editing/TestSceneComposerSelection.cs
index 4d99c47f77..d6934a3770 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneComposerSelection.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneComposerSelection.cs
@@ -133,6 +133,32 @@ namespace osu.Game.Tests.Visual.Editing
             AddAssert("objects reverted to original position", () => addedObjects[0].Position == new Vector2(0));
         }
 
+        [Test]
+        public void TestGlobalFlipHotkeys()
+        {
+            HitCircle addedObject = null;
+
+            AddStep("add hitobjects", () => EditorBeatmap.Add(addedObject = new HitCircle { StartTime = 100 }));
+
+            AddStep("select objects", () => EditorBeatmap.SelectedHitObjects.Add(addedObject));
+
+            AddStep("flip horizontally across playfield", () =>
+            {
+                InputManager.PressKey(Key.ControlLeft);
+                InputManager.Key(Key.H);
+                InputManager.ReleaseKey(Key.ControlLeft);
+            });
+            AddAssert("objects flipped horizontally", () => addedObject.Position == new Vector2(OsuPlayfield.BASE_SIZE.X, 0));
+
+            AddStep("flip vertically across playfield", () =>
+            {
+                InputManager.PressKey(Key.ControlLeft);
+                InputManager.Key(Key.J);
+                InputManager.ReleaseKey(Key.ControlLeft);
+            });
+            AddAssert("objects flipped vertically", () => addedObject.Position == OsuPlayfield.BASE_SIZE);
+        }
+
         [Test]
         public void TestBasicSelect()
         {

From e4e08c0f5fb787091d28a38b4e67bc59b2b0b846 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 28 Jun 2023 20:48:22 +0200
Subject: [PATCH 1122/1604] Fix selection handlers eating hotkey presses they
 didn't handle

---
 .../Edit/Compose/Components/SelectionHandler.cs        | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 9ec59cf833..052cb18a5d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -160,21 +160,23 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (e.Repeat)
                 return false;
 
+            bool handled;
+
             switch (e.Action)
             {
                 case GlobalAction.EditorFlipHorizontally:
                     ChangeHandler?.BeginChange();
-                    HandleFlip(Direction.Horizontal, true);
+                    handled = HandleFlip(Direction.Horizontal, true);
                     ChangeHandler?.EndChange();
 
-                    return true;
+                    return handled;
 
                 case GlobalAction.EditorFlipVertically:
                     ChangeHandler?.BeginChange();
-                    HandleFlip(Direction.Vertical, true);
+                    handled = HandleFlip(Direction.Vertical, true);
                     ChangeHandler?.EndChange();
 
-                    return true;
+                    return handled;
             }
 
             return false;

From ea8700053917628b69aa37a64d508753cac63f11 Mon Sep 17 00:00:00 2001
From: Bastian Pedersen <bastian.tangedal@gmail.com>
Date: Wed, 28 Jun 2023 21:11:56 +0200
Subject: [PATCH 1123/1604] Localise chat related notifications

---
 osu.Game/Localisation/NotificationsStrings.cs | 10 ++++++++++
 osu.Game/Online/Chat/MessageNotifier.cs       |  5 +++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Localisation/NotificationsStrings.cs b/osu.Game/Localisation/NotificationsStrings.cs
index b6f2a55e37..44e440e8d9 100644
--- a/osu.Game/Localisation/NotificationsStrings.cs
+++ b/osu.Game/Localisation/NotificationsStrings.cs
@@ -88,6 +88,16 @@ Please try changing your audio device to a working setting.");
         /// </summary>
         public static LocalisableString LinkTypeNotSupported => new TranslatableString(getKey(@"unsupported_link_type"), @"This link type is not yet supported!");
 
+        /// <summary>
+        /// "You received a private message from '{0}'. Click to read it!"
+        /// </summary>
+        public static LocalisableString PrivateMessageReceived(string username) => new TranslatableString(getKey(@"private_message_received"), @"You received a private message from '{0}'. Click to read it!", username);
+
+        /// <summary>
+        /// "Your name was mentioned in chat by '{0}'. Click to find out why!"
+        /// </summary>
+        public static LocalisableString YourNameWasMentioned(string username) => new TranslatableString(getKey(@"your_name_was_mentioned"), @"Your name was mentioned in chat by '{0}'. Click to find out why!", username);
+
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
 }
diff --git a/osu.Game/Online/Chat/MessageNotifier.cs b/osu.Game/Online/Chat/MessageNotifier.cs
index 52bdd36169..ae249d1b7f 100644
--- a/osu.Game/Online/Chat/MessageNotifier.cs
+++ b/osu.Game/Online/Chat/MessageNotifier.cs
@@ -15,6 +15,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Platform;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
+using osu.Game.Localisation;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays;
@@ -154,7 +155,7 @@ namespace osu.Game.Online.Chat
                 : base(message, channel)
             {
                 Icon = FontAwesome.Solid.Envelope;
-                Text = $"You received a private message from '{message.Sender.Username}'. Click to read it!";
+                Text = NotificationsStrings.PrivateMessageReceived(message.Sender.Username);
             }
         }
 
@@ -164,7 +165,7 @@ namespace osu.Game.Online.Chat
                 : base(message, channel)
             {
                 Icon = FontAwesome.Solid.At;
-                Text = $"Your name was mentioned in chat by '{message.Sender.Username}'. Click to find out why!";
+                Text = NotificationsStrings.YourNameWasMentioned(message.Sender.Username);
             }
         }
 

From 537404440d427dad03c1d784023ee4871b93a77c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Jun 2023 13:17:42 +0900
Subject: [PATCH 1124/1604] Set the beatmap locally available for participants
 list tests

---
 .../Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
index a01d2bf9fc..95ae4c5e80 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
@@ -383,6 +383,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
             });
 
             AddUntilStep("wait for list to load", () => participantsList?.IsLoaded == true);
+
+            AddStep("set beatmap available", () => MultiplayerClient.ChangeBeatmapAvailability(BeatmapAvailability.LocallyAvailable()));
         }
 
         private void checkProgressBarVisibility(bool visible) =>

From 34f53965c4fe2cc4c577a3c88aeb8b54f6c94644 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Jun 2023 13:55:03 +0900
Subject: [PATCH 1125/1604] Never remove significant digits from stsar rating
 displays

Closes https://github.com/ppy/osu/issues/24079.
---
 osu.Game.Tournament/Components/SongBar.cs     | 2 +-
 osu.Game/Overlays/BeatmapSet/BeatmapPicker.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/Components/SongBar.cs b/osu.Game.Tournament/Components/SongBar.cs
index aeceece160..4f4a02ccf1 100644
--- a/osu.Game.Tournament/Components/SongBar.cs
+++ b/osu.Game.Tournament/Components/SongBar.cs
@@ -188,7 +188,7 @@ namespace osu.Game.Tournament.Components
                                         Children = new Drawable[]
                                         {
                                             new DiffPiece(stats),
-                                            new DiffPiece(("Star Rating", $"{beatmap.StarRating:0.##}{srExtra}"))
+                                            new DiffPiece(("Star Rating", $"{beatmap.StarRating:0.00}{srExtra}"))
                                         }
                                     },
                                     new FillFlowContainer
diff --git a/osu.Game/Overlays/BeatmapSet/BeatmapPicker.cs b/osu.Game/Overlays/BeatmapSet/BeatmapPicker.cs
index 104f861df7..1f38e2ed6c 100644
--- a/osu.Game/Overlays/BeatmapSet/BeatmapPicker.cs
+++ b/osu.Game/Overlays/BeatmapSet/BeatmapPicker.cs
@@ -185,7 +185,7 @@ namespace osu.Game.Overlays.BeatmapSet
                                                                 OnHovered = beatmap =>
                                                                 {
                                                                     showBeatmap(beatmap);
-                                                                    starRating.Text = beatmap.StarRating.ToLocalisableString(@"0.##");
+                                                                    starRating.Text = beatmap.StarRating.ToLocalisableString(@"0.00");
                                                                     starRatingContainer.FadeIn(100);
                                                                 },
                                                                 OnClicked = beatmap => { Beatmap.Value = beatmap; },

From 351f217c8c54f96df61aebafb1ae7273087cc89c Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Thu, 29 Jun 2023 08:07:43 +0300
Subject: [PATCH 1126/1604] Reassign existing scores to new/re-exported beatmap

---
 osu.Game/Beatmaps/BeatmapImporter.cs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/osu.Game/Beatmaps/BeatmapImporter.cs b/osu.Game/Beatmaps/BeatmapImporter.cs
index 7d367ef77d..04c00ed98a 100644
--- a/osu.Game/Beatmaps/BeatmapImporter.cs
+++ b/osu.Game/Beatmaps/BeatmapImporter.cs
@@ -20,6 +20,7 @@ using osu.Game.IO;
 using osu.Game.IO.Archives;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Rulesets;
+using osu.Game.Scoring;
 using Realms;
 
 namespace osu.Game.Beatmaps
@@ -199,6 +200,16 @@ namespace osu.Game.Beatmaps
                     LogForModel(beatmapSet, $"Found existing beatmap set with same OnlineID ({beatmapSet.OnlineID}). It will be disassociated and marked for deletion.");
                 }
             }
+
+            //Because of specific score storing in Osu! database can already contain scores for imported beatmap.
+            //To restore scores we need to manually reassign them to new/re-exported beatmap.
+            foreach (BeatmapInfo beatmap in beatmapSet.Beatmaps)
+            {
+                IQueryable<ScoreInfo> scores = realm.All<ScoreInfo>().Where(score => score.BeatmapHash == beatmap.Hash);
+
+                if (scores.Any())
+                    scores.ForEach(score => score.BeatmapInfo = beatmap); //We intentionally ignore BeatmapHash because we checked hash equality
+            }
         }
 
         protected override void PostImport(BeatmapSetInfo model, Realm realm, ImportParameters parameters)

From 47ccbddfb1d0d3a583a649dd531a6dfd63120ed2 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Thu, 29 Jun 2023 08:08:10 +0300
Subject: [PATCH 1127/1604] Reword comment

---
 osu.Game/Beatmaps/BeatmapImporter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/BeatmapImporter.cs b/osu.Game/Beatmaps/BeatmapImporter.cs
index 04c00ed98a..bf549f40c4 100644
--- a/osu.Game/Beatmaps/BeatmapImporter.cs
+++ b/osu.Game/Beatmaps/BeatmapImporter.cs
@@ -201,7 +201,7 @@ namespace osu.Game.Beatmaps
                 }
             }
 
-            //Because of specific score storing in Osu! database can already contain scores for imported beatmap.
+            //Because of specific score storing in Osu! database, it can already contain scores for imported beatmap.
             //To restore scores we need to manually reassign them to new/re-exported beatmap.
             foreach (BeatmapInfo beatmap in beatmapSet.Beatmaps)
             {

From 829044de59deed0445ed4670838fbd76cebb2508 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 29 Jun 2023 17:15:48 +0900
Subject: [PATCH 1128/1604] Revert unintented change

---
 osu.Game/OsuGameBase.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index cdd3b368bd..6737caa5f9 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -99,7 +99,7 @@ namespace osu.Game
         /// </summary>
         private const double global_track_volume_adjust = 0.8;
 
-        public virtual bool UseDevelopmentServer => false;
+        public virtual bool UseDevelopmentServer => DebugUtils.IsDebugBuild;
 
         public virtual EndpointConfiguration CreateEndpoints() =>
             UseDevelopmentServer ? new DevelopmentEndpointConfiguration() : new ExperimentalEndpointConfiguration();

From c8162814945f48dcc233a45a6738678a1e4c688c Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 29 Jun 2023 17:16:33 +0900
Subject: [PATCH 1129/1604] Make BackgroundBeatmapProcessor task long-running

---
 osu.Game/BackgroundBeatmapProcessor.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/BackgroundBeatmapProcessor.cs b/osu.Game/BackgroundBeatmapProcessor.cs
index 44aceac1ca..0b49bb26b2 100644
--- a/osu.Game/BackgroundBeatmapProcessor.cs
+++ b/osu.Game/BackgroundBeatmapProcessor.cs
@@ -55,14 +55,14 @@ namespace osu.Game
         {
             base.LoadComplete();
 
-            Task.Run(() =>
+            Task.Factory.StartNew(() =>
             {
                 Logger.Log("Beginning background beatmap processing..");
                 checkForOutdatedStarRatings();
                 processBeatmapSetsWithMissingMetrics();
                 processScoresWithMissingStatistics();
                 convertLegacyTotalScoreToStandardised();
-            }).ContinueWith(t =>
+            }, TaskCreationOptions.LongRunning).ContinueWith(t =>
             {
                 if (t.Exception?.InnerException is ObjectDisposedException)
                 {

From ddd870e843a26263e82bc5696ee1259fa47c2415 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 29 Jun 2023 17:19:10 +0900
Subject: [PATCH 1130/1604] Make LegacyTotalScore nullable

---
 osu.Game/Database/StandardisedScoreMigrationTools.cs | 5 ++++-
 osu.Game/Scoring/ScoreInfo.cs                        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index 98e8671ede..c736c7e20e 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Difficulty;
@@ -227,6 +228,8 @@ namespace osu.Game.Database
             if (!score.IsLegacyScore)
                 return score.TotalScore;
 
+            Debug.Assert(score.LegacyTotalScore != null);
+
             int maximumLegacyAccuracyScore = attributes.LegacyAccuracyScore;
             int maximumLegacyComboScore = attributes.LegacyComboScore;
             double maximumLegacyBonusRatio = attributes.LegacyBonusScoreRatio;
@@ -239,7 +242,7 @@ namespace osu.Game.Database
             double comboProportion = Math.Min(1, (double)score.LegacyTotalScore / maximumLegacyBaseScore);
 
             // The bonus proportion makes up the rest of the score that exceeds maximumLegacyBaseScore.
-            double bonusProportion = Math.Max(0, (score.LegacyTotalScore - maximumLegacyBaseScore) * maximumLegacyBonusRatio);
+            double bonusProportion = Math.Max(0, ((long)score.LegacyTotalScore - maximumLegacyBaseScore) * maximumLegacyBonusRatio);
 
             switch (score.Ruleset.OnlineID)
             {
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 99b91318fd..bdba81c685 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Scoring
         /// <remarks>
         /// Not populated if <see cref="IsLegacyScore"/> is <c>false</c>.
         /// </remarks>
-        public long LegacyTotalScore { get; set; }
+        public long? LegacyTotalScore { get; set; }
 
         public int MaxCombo { get; set; }
 

From 6822871dab4dd6fc45667946c3308194dfcee8ec Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 29 Jun 2023 17:21:24 +0900
Subject: [PATCH 1131/1604] Move population of LegacyTotalScore to
 ScoreImporter

---
 osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs | 3 ---
 osu.Game/Scoring/ScoreImporter.cs             | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
index bf592d5988..c6461840aa 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
@@ -123,9 +123,6 @@ namespace osu.Game.Scoring.Legacy
 
             PopulateAccuracy(score.ScoreInfo);
 
-            if (score.ScoreInfo.IsLegacyScore)
-                score.ScoreInfo.LegacyTotalScore = score.ScoreInfo.TotalScore;
-
             // before returning for database import, we must restore the database-sourced BeatmapInfo.
             // if not, the clone operation in GetPlayableBeatmap will cause a dereference and subsequent database exception.
             score.ScoreInfo.BeatmapInfo = workingBeatmap.BeatmapInfo;
diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index eb57f9a560..5ada2a410d 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -89,7 +89,10 @@ namespace osu.Game.Scoring
             if (StandardisedScoreMigrationTools.ShouldMigrateToNewStandardised(model))
                 model.TotalScore = StandardisedScoreMigrationTools.GetNewStandardised(model);
             else if (model.IsLegacyScore)
+            {
+                model.LegacyTotalScore = model.TotalScore;
                 model.TotalScore = StandardisedScoreMigrationTools.ConvertFromLegacyTotalScore(model, beatmaps());
+            }
         }
 
         /// <summary>

From c6ad184d94ae15a26a16825fd7620498ec133935 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 29 Jun 2023 17:24:37 +0900
Subject: [PATCH 1132/1604] Move Ruleset method to ILegacyRuleset interface

---
 osu.Game.Rulesets.Catch/CatchRuleset.cs              | 2 ++
 osu.Game.Rulesets.Mania/ManiaRuleset.cs              | 2 ++
 osu.Game.Rulesets.Osu/OsuRuleset.cs                  | 4 ++--
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs              | 2 ++
 osu.Game/Database/StandardisedScoreMigrationTools.cs | 6 +++++-
 osu.Game/Rulesets/ILegacyRuleset.cs                  | 4 ++++
 osu.Game/Rulesets/Ruleset.cs                         | 2 --
 7 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index 8a0b8250d5..9862b7d886 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -202,6 +202,8 @@ namespace osu.Game.Rulesets.Catch
 
         public int LegacyID => 2;
 
+        public ILegacyScoreProcessor CreateLegacyScoreProcessor() => new CatchLegacyScoreProcessor();
+
         public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new CatchReplayFrame();
 
         public override HitObjectComposer CreateHitObjectComposer() => new CatchHitObjectComposer(this);
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index e8fda3ec80..77cc3e06d2 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -302,6 +302,8 @@ namespace osu.Game.Rulesets.Mania
 
         public int LegacyID => 3;
 
+        public ILegacyScoreProcessor CreateLegacyScoreProcessor() => new ManiaLegacyScoreProcessor();
+
         public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new ManiaReplayFrame();
 
         public override IRulesetConfigManager CreateConfig(SettingsStore? settings) => new ManiaRulesetConfigManager(settings, RulesetInfo);
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 9b094ea1b1..abbd4a43c8 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -253,6 +253,8 @@ namespace osu.Game.Rulesets.Osu
 
         public int LegacyID => 0;
 
+        public ILegacyScoreProcessor CreateLegacyScoreProcessor() => new OsuLegacyScoreProcessor();
+
         public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new OsuReplayFrame();
 
         public override IRulesetConfigManager CreateConfig(SettingsStore? settings) => new OsuRulesetConfigManager(settings, RulesetInfo);
@@ -322,7 +324,5 @@ namespace osu.Game.Rulesets.Osu
         }
 
         public override RulesetSetupSection CreateEditorSetupSection() => new OsuSetupSection();
-
-        public override ILegacyScoreProcessor CreateLegacyScoreProcessor() => new OsuLegacyScoreProcessor();
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index d6824109b3..af02c94d38 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -197,6 +197,8 @@ namespace osu.Game.Rulesets.Taiko
 
         public int LegacyID => 1;
 
+        public ILegacyScoreProcessor CreateLegacyScoreProcessor() => new TaikoLegacyScoreProcessor();
+
         public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new TaikoReplayFrame();
 
         public override IRulesetConfigManager CreateConfig(SettingsStore? settings) => new TaikoRulesetConfigManager(settings, RulesetInfo);
diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index c736c7e20e..89bb908b1f 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
 using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
@@ -201,7 +202,10 @@ namespace osu.Game.Database
             var beatmap = beatmaps.GetWorkingBeatmap(score.BeatmapInfo);
             var ruleset = score.Ruleset.CreateInstance();
 
-            var sv1Processor = ruleset.CreateLegacyScoreProcessor();
+            if (ruleset is not ILegacyRuleset legacyRuleset)
+                return score.TotalScore;
+
+            var sv1Processor = legacyRuleset.CreateLegacyScoreProcessor();
             if (sv1Processor == null)
                 return score.TotalScore;
 
diff --git a/osu.Game/Rulesets/ILegacyRuleset.cs b/osu.Game/Rulesets/ILegacyRuleset.cs
index f4b03baccd..ba12c1f559 100644
--- a/osu.Game/Rulesets/ILegacyRuleset.cs
+++ b/osu.Game/Rulesets/ILegacyRuleset.cs
@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Game.Rulesets.Scoring;
+
 namespace osu.Game.Rulesets
 {
     public interface ILegacyRuleset
@@ -11,5 +13,7 @@ namespace osu.Game.Rulesets
         /// Identifies the server-side ID of a legacy ruleset.
         /// </summary>
         int LegacyID { get; }
+
+        ILegacyScoreProcessor CreateLegacyScoreProcessor();
     }
 }
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index 5501a3a7c5..490ec1475c 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -380,7 +380,5 @@ namespace osu.Game.Rulesets
         /// Can be overridden to add a ruleset-specific section to the editor beatmap setup screen.
         /// </summary>
         public virtual RulesetSetupSection? CreateEditorSetupSection() => null;
-
-        public virtual ILegacyScoreProcessor? CreateLegacyScoreProcessor() => null;
     }
 }

From 426f11b824e770a901741dcda2385c719198eae3 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 29 Jun 2023 17:28:06 +0900
Subject: [PATCH 1133/1604] Apply a few other code reviews

---
 .../Difficulty/ManiaDifficultyCalculator.cs                    | 2 +-
 osu.Game.Rulesets.Taiko.Tests/TestSceneFlyingHits.cs           | 2 +-
 osu.Game/BackgroundBeatmapProcessor.cs                         | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
index e94e9b667d..d7994e6a0c 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Mania.Difficulty
 
         public override int Version => 20220902;
 
-        private IWorkingBeatmap workingBeatmap;
+        private readonly IWorkingBeatmap workingBeatmap;
 
         public ManiaDifficultyCalculator(IRulesetInfo ruleset, IWorkingBeatmap beatmap)
             : base(ruleset, beatmap)
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneFlyingHits.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneFlyingHits.cs
index 88af50d36b..0e10f75378 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneFlyingHits.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneFlyingHits.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
         private void addFlyingHit(HitType hitType)
         {
-            var tick = new DrumRollTick(null) { HitWindows = HitWindows.Empty, StartTime = DrawableRuleset.Playfield.Time.Current };
+            var tick = new DrumRollTick(new DrumRoll()) { HitWindows = HitWindows.Empty, StartTime = DrawableRuleset.Playfield.Time.Current };
 
             DrawableDrumRollTick h;
             DrawableRuleset.Playfield.Add(h = new DrawableDrumRollTick(tick) { JudgementType = hitType });
diff --git a/osu.Game/BackgroundBeatmapProcessor.cs b/osu.Game/BackgroundBeatmapProcessor.cs
index 0b49bb26b2..11e6a4619b 100644
--- a/osu.Game/BackgroundBeatmapProcessor.cs
+++ b/osu.Game/BackgroundBeatmapProcessor.cs
@@ -14,6 +14,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
+using osu.Game.Extensions;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Rulesets;
@@ -214,7 +215,7 @@ namespace osu.Game
             {
                 foreach (var score in r.All<ScoreInfo>().Where(s => s.IsLegacyScore))
                 {
-                    if (score.RulesetID is not (0 or 1 or 2 or 3))
+                    if (!score.Ruleset.IsLegacyRuleset())
                         continue;
 
                     if (score.Version >= 30000003)

From e2db6159d6436e4b341d1a76864b4bdf10ef4d17 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Jun 2023 13:46:02 +0900
Subject: [PATCH 1134/1604] Ensure "tablet support disabled" notification is
 only shown once

---
 osu.Game/OsuGame.cs | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index fe98a8e286..93dd97ea15 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -1164,7 +1164,9 @@ namespace osu.Game
         private void forwardTabletLogsToNotifications()
         {
             const string tablet_prefix = @"[Tablet] ";
+
             bool notifyOnWarning = true;
+            bool notifyOnError = true;
 
             Logger.NewEntry += entry =>
             {
@@ -1175,6 +1177,11 @@ namespace osu.Game
 
                 if (entry.Level == LogLevel.Error)
                 {
+                    if (!notifyOnError)
+                        return;
+
+                    notifyOnError = false;
+
                     Schedule(() =>
                     {
                         Notifications.Post(new SimpleNotification
@@ -1213,7 +1220,11 @@ namespace osu.Game
             Schedule(() =>
             {
                 ITabletHandler tablet = Host.AvailableInputHandlers.OfType<ITabletHandler>().SingleOrDefault();
-                tablet?.Tablet.BindValueChanged(_ => notifyOnWarning = true, true);
+                tablet?.Tablet.BindValueChanged(_ =>
+                {
+                    notifyOnWarning = true;
+                    notifyOnError = true;
+                }, true);
             });
         }
 

From e87cf6d2567da36e72e7f983e216daed68fd78db Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Jun 2023 15:06:32 +0900
Subject: [PATCH 1135/1604] Move all remaining osu!taiko sample playback logic
 out of `DrawableHitObject`s

---
 .../Objects/Drawables/DrawableHit.cs          | 36 -------------------
 .../Drawables/DrawableTaikoHitObject.cs       |  4 +--
 .../UI/DrumSampleTriggerSource.cs             | 19 +++++++---
 3 files changed, 17 insertions(+), 42 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index 62c8457c58..5b79151225 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -4,14 +4,12 @@
 #nullable disable
 
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
-using osu.Game.Audio;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Skinning.Default;
@@ -93,40 +91,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             ? new SkinnableDrawable(new TaikoSkinComponentLookup(TaikoSkinComponents.CentreHit), _ => new CentreHitCirclePiece(), confineMode: ConfineMode.ScaleToFit)
             : new SkinnableDrawable(new TaikoSkinComponentLookup(TaikoSkinComponents.RimHit), _ => new RimHitCirclePiece(), confineMode: ConfineMode.ScaleToFit);
 
-        public override IEnumerable<HitSampleInfo> GetSamples()
-        {
-            // normal and claps are always handled by the drum (see DrumSampleMapping).
-            // in addition, whistles are excluded as they are an alternative rim marker.
-
-            var samples = HitObject.Samples.Where(s =>
-                s.Name != HitSampleInfo.HIT_NORMAL
-                && s.Name != HitSampleInfo.HIT_CLAP
-                && s.Name != HitSampleInfo.HIT_WHISTLE);
-
-            if (HitObject.Type == HitType.Rim && HitObject.IsStrong)
-            {
-                // strong + rim always maps to whistle.
-                // TODO: this should really be in the legacy decoder, but can't be because legacy encoding parity would be broken.
-                // when we add a taiko editor, this is probably not going to play nice.
-
-                var corrected = samples.ToList();
-
-                for (int i = 0; i < corrected.Count; i++)
-                {
-                    var s = corrected[i];
-
-                    if (s.Name != HitSampleInfo.HIT_FINISH)
-                        continue;
-
-                    corrected[i] = s.With(HitSampleInfo.HIT_WHISTLE);
-                }
-
-                return corrected;
-            }
-
-            return samples;
-        }
-
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
             Debug.Assert(HitObject.HitWindows != null);
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
index 1b5d641612..3f4694d71d 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
@@ -119,8 +119,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             public override bool RemoveWhenNotAlive => false;
         }
 
-        // Most osu!taiko hitsounds are managed by the drum (see DrumSampleTriggerSource).
-        public override IEnumerable<HitSampleInfo> GetSamples() => Enumerable.Empty<HitSampleInfo>();
+        // osu!taiko hitsounds are managed by the drum (see DrumSampleTriggerSource).
+        public sealed override IEnumerable<HitSampleInfo> GetSamples() => Enumerable.Empty<HitSampleInfo>();
     }
 
     public abstract partial class DrawableTaikoHitObject<TObject> : DrawableTaikoHitObject
diff --git a/osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs b/osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs
index 92f2b74568..c732cc000f 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs
@@ -2,7 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Linq;
+using System.Collections.Generic;
 using osu.Game.Audio;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.UI;
@@ -18,12 +18,23 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         public void Play(HitType hitType)
         {
-            var hitSample = GetMostValidObject()?.Samples?.FirstOrDefault(o => o.Name == HitSampleInfo.HIT_NORMAL);
+            TaikoHitObject? hitObject = GetMostValidObject() as TaikoHitObject;
 
-            if (hitSample == null)
+            if (hitObject == null)
                 return;
 
-            PlaySamples(new ISampleInfo[] { new HitSampleInfo(hitType == HitType.Rim ? HitSampleInfo.HIT_CLAP : HitSampleInfo.HIT_NORMAL, hitSample.Bank, volume: hitSample.Volume) });
+            List<ISampleInfo> samplesToPlay = new List<ISampleInfo>
+            {
+                hitObject.CreateHitSampleInfo(hitType == HitType.Rim ? HitSampleInfo.HIT_CLAP : HitSampleInfo.HIT_NORMAL)
+            };
+
+            // strong + rim always maps to whistle.
+            if ((hitObject as TaikoStrongableHitObject)?.IsStrong == true)
+            {
+                samplesToPlay.Add(hitObject.CreateHitSampleInfo(hitType == HitType.Rim ? HitSampleInfo.HIT_WHISTLE : HitSampleInfo.HIT_FINISH));
+            }
+
+            PlaySamples(samplesToPlay.ToArray());
         }
 
         public override void Play() => throw new InvalidOperationException(@"Use override with HitType parameter instead");

From c98abf1723f6bcc32896adb6ac1e9864c1826299 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Jun 2023 15:38:17 +0900
Subject: [PATCH 1136/1604] More correctly handle `StrongNestedHitObject`s

---
 osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs b/osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs
index c732cc000f..adf02d88ce 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             };
 
             // strong + rim always maps to whistle.
-            if ((hitObject as TaikoStrongableHitObject)?.IsStrong == true)
+            if ((hitObject as TaikoStrongableHitObject)?.IsStrong == true || hitObject is StrongNestedHitObject)
             {
                 samplesToPlay.Add(hitObject.CreateHitSampleInfo(hitType == HitType.Rim ? HitSampleInfo.HIT_WHISTLE : HitSampleInfo.HIT_FINISH));
             }

From 32c0f13f79b1c6474e08d70721ef12deee088607 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Jun 2023 15:38:24 +0900
Subject: [PATCH 1137/1604] Update tests to match new expectations

---
 .../TestSceneDrumSampleTriggerSource.cs       | 117 +++++++++---------
 .../TestSceneSampleOutput.cs                  |  15 +--
 2 files changed, 67 insertions(+), 65 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs
index bce855ae45..4133b96d42 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs
@@ -72,13 +72,13 @@ namespace osu.Game.Rulesets.Taiko.Tests
             });
 
             AddAssert("most valid object is hit", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Hit>);
-            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
-            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
+            checkSamples(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
+            checkSamples(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
 
             seekTo(200);
             AddAssert("most valid object is hit", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Hit>);
-            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
-            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
+            checkSamples(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
+            checkSamples(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
         }
 
         [Test]
@@ -100,13 +100,13 @@ namespace osu.Game.Rulesets.Taiko.Tests
             });
 
             AddAssert("most valid object is hit", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Hit>);
-            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT);
-            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT);
+            checkSamples(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT);
+            checkSamples(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT);
 
             seekTo(200);
             AddAssert("most valid object is hit", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Hit>);
-            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT);
-            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT);
+            checkSamples(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT);
+            checkSamples(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT);
         }
 
         [Test]
@@ -145,23 +145,23 @@ namespace osu.Game.Rulesets.Taiko.Tests
             });
 
             AddAssert("most valid object is first hit", () => triggerSource.GetMostValidObject(), () => Is.EqualTo(first));
-            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_NORMAL);
-            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_NORMAL);
+            checkSamples(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_NORMAL);
+            checkSamples(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_NORMAL);
 
             seekTo(120);
             AddAssert("most valid object is first hit", () => triggerSource.GetMostValidObject(), () => Is.EqualTo(first));
-            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_NORMAL);
-            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_NORMAL);
+            checkSamples(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_NORMAL);
+            checkSamples(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_NORMAL);
 
             seekTo(480);
             AddAssert("most valid object is second hit", () => triggerSource.GetMostValidObject(), () => Is.EqualTo(second));
-            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT);
-            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT);
+            checkSamples(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT);
+            checkSamples(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT);
 
             seekTo(700);
             AddAssert("most valid object is second hit", () => triggerSource.GetMostValidObject(), () => Is.EqualTo(second));
-            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT);
-            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT);
+            checkSamples(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT);
+            checkSamples(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT);
         }
 
         [Test]
@@ -174,8 +174,8 @@ namespace osu.Game.Rulesets.Taiko.Tests
                     StartTime = 100,
                     Samples = new List<HitSampleInfo>
                     {
-                        new HitSampleInfo(HitSampleInfo.HIT_NORMAL, "drum"),
-                        new HitSampleInfo(HitSampleInfo.HIT_FINISH, "drum") // implies strong
+                        new HitSampleInfo(HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_DRUM),
+                        new HitSampleInfo(HitSampleInfo.HIT_FINISH, HitSampleInfo.BANK_DRUM) // implies strong
                     }
                 };
                 hit.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
@@ -184,13 +184,13 @@ namespace osu.Game.Rulesets.Taiko.Tests
             });
 
             AddAssert("most valid object is nested strong hit", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Hit.StrongNestedHit>);
-            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, "drum");
-            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, "drum");
+            checkSamples(HitType.Centre, $"{HitSampleInfo.HIT_NORMAL},{HitSampleInfo.HIT_FINISH}", HitSampleInfo.BANK_DRUM);
+            checkSamples(HitType.Rim, $"{HitSampleInfo.HIT_CLAP},{HitSampleInfo.HIT_WHISTLE}", HitSampleInfo.BANK_DRUM);
 
             seekTo(200);
             AddAssert("most valid object is hit", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Hit>);
-            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, "drum");
-            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, "drum");
+            checkSamples(HitType.Centre, $"{HitSampleInfo.HIT_NORMAL},{HitSampleInfo.HIT_FINISH}", HitSampleInfo.BANK_DRUM);
+            checkSamples(HitType.Rim, $"{HitSampleInfo.HIT_CLAP},{HitSampleInfo.HIT_WHISTLE}", HitSampleInfo.BANK_DRUM);
         }
 
         [Test]
@@ -213,18 +213,18 @@ namespace osu.Game.Rulesets.Taiko.Tests
             });
 
             AddAssert("most valid object is drum roll tick", () => triggerSource.GetMostValidObject(), Is.InstanceOf<DrumRollTick>);
-            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
-            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
+            checkSamples(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
+            checkSamples(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
 
             seekTo(600);
             AddAssert("most valid object is drum roll tick", () => triggerSource.GetMostValidObject(), Is.InstanceOf<DrumRollTick>);
-            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
-            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
+            checkSamples(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
+            checkSamples(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
 
             seekTo(1200);
             AddAssert("most valid object is drum roll", () => triggerSource.GetMostValidObject(), Is.InstanceOf<DrumRoll>);
-            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
-            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
+            checkSamples(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
+            checkSamples(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
         }
 
         [Test]
@@ -247,18 +247,18 @@ namespace osu.Game.Rulesets.Taiko.Tests
             });
 
             AddAssert("most valid object is drum roll tick", () => triggerSource.GetMostValidObject(), Is.InstanceOf<DrumRollTick>);
-            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT);
-            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT);
+            checkSamples(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT);
+            checkSamples(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT);
 
             seekTo(600);
             AddAssert("most valid object is drum roll tick", () => triggerSource.GetMostValidObject(), Is.InstanceOf<DrumRollTick>);
-            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT);
-            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT);
+            checkSamples(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT);
+            checkSamples(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT);
 
             seekTo(1200);
             AddAssert("most valid object is drum roll", () => triggerSource.GetMostValidObject(), Is.InstanceOf<DrumRoll>);
-            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT);
-            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT);
+            checkSamples(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT);
+            checkSamples(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT);
         }
 
         [Test]
@@ -272,8 +272,8 @@ namespace osu.Game.Rulesets.Taiko.Tests
                     EndTime = 1100,
                     Samples = new List<HitSampleInfo>
                     {
-                        new HitSampleInfo(HitSampleInfo.HIT_NORMAL, "drum"),
-                        new HitSampleInfo(HitSampleInfo.HIT_FINISH, "drum") // implies strong
+                        new HitSampleInfo(HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_DRUM),
+                        new HitSampleInfo(HitSampleInfo.HIT_FINISH, HitSampleInfo.BANK_DRUM) // implies strong
                     }
                 };
                 drumRoll.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
@@ -282,18 +282,18 @@ namespace osu.Game.Rulesets.Taiko.Tests
             });
 
             AddAssert("most valid object is drum roll tick", () => triggerSource.GetMostValidObject(), Is.InstanceOf<DrumRollTick>);
-            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, "drum");
-            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, "drum");
+            checkSamples(HitType.Centre, $"{HitSampleInfo.HIT_NORMAL},{HitSampleInfo.HIT_FINISH}", HitSampleInfo.BANK_DRUM);
+            checkSamples(HitType.Rim, $"{HitSampleInfo.HIT_CLAP},{HitSampleInfo.HIT_WHISTLE}", HitSampleInfo.BANK_DRUM);
 
             seekTo(600);
             AddAssert("most valid object is drum roll tick", () => triggerSource.GetMostValidObject(), Is.InstanceOf<DrumRollTick>);
-            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, "drum");
-            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, "drum");
+            checkSamples(HitType.Centre, $"{HitSampleInfo.HIT_NORMAL},{HitSampleInfo.HIT_FINISH}", HitSampleInfo.BANK_DRUM);
+            checkSamples(HitType.Rim, $"{HitSampleInfo.HIT_CLAP},{HitSampleInfo.HIT_WHISTLE}", HitSampleInfo.BANK_DRUM);
 
             seekTo(1200);
             AddAssert("most valid object is drum roll", () => triggerSource.GetMostValidObject(), Is.InstanceOf<DrumRoll>);
-            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, "drum");
-            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, "drum");
+            checkSamples(HitType.Centre, $"{HitSampleInfo.HIT_NORMAL},{HitSampleInfo.HIT_FINISH}", HitSampleInfo.BANK_DRUM);
+            checkSamples(HitType.Rim, $"{HitSampleInfo.HIT_CLAP},{HitSampleInfo.HIT_WHISTLE}", HitSampleInfo.BANK_DRUM);
         }
 
         [Test]
@@ -319,18 +319,18 @@ namespace osu.Game.Rulesets.Taiko.Tests
             // This works fine in gameplay because they are judged whenever the user pressed, rather than being timed hits.
             // But for sample playback purposes they can be ignored as noise.
             AddAssert("most valid object is swell", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Swell>);
-            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
-            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
+            checkSamples(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
+            checkSamples(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
 
             seekTo(600);
             AddAssert("most valid object is swell", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Swell>);
-            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
-            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
+            checkSamples(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
+            checkSamples(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
 
             seekTo(1200);
             AddAssert("most valid object is swell", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Swell>);
-            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
-            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
+            checkSamples(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
+            checkSamples(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
         }
 
         [Test]
@@ -344,7 +344,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
                     EndTime = 1100,
                     Samples = new List<HitSampleInfo>
                     {
-                        new HitSampleInfo(HitSampleInfo.HIT_NORMAL, "drum")
+                        new HitSampleInfo(HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_DRUM)
                     }
                 };
                 swell.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
@@ -356,25 +356,26 @@ namespace osu.Game.Rulesets.Taiko.Tests
             // This works fine in gameplay because they are judged whenever the user pressed, rather than being timed hits.
             // But for sample playback purposes they can be ignored as noise.
             AddAssert("most valid object is swell", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Swell>);
-            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, "drum");
-            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, "drum");
+            checkSamples(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_DRUM);
+            checkSamples(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_DRUM);
 
             seekTo(600);
             AddAssert("most valid object is swell", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Swell>);
-            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, "drum");
-            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, "drum");
+            checkSamples(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_DRUM);
+            checkSamples(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_DRUM);
 
             seekTo(1200);
             AddAssert("most valid object is swell", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Swell>);
-            checkSound(HitType.Centre, HitSampleInfo.HIT_NORMAL, "drum");
-            checkSound(HitType.Rim, HitSampleInfo.HIT_CLAP, "drum");
+            checkSamples(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_DRUM);
+            checkSamples(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_DRUM);
         }
 
-        private void checkSound(HitType hitType, string expectedName, string expectedBank)
+        private void checkSamples(HitType hitType, string expectedSamplesCsv, string expectedBank)
         {
             AddStep($"hit {hitType}", () => triggerSource.Play(hitType));
-            AddAssert($"last played sample is {expectedName}", () => triggerSource.LastPlayedSamples!.OfType<HitSampleInfo>().Single().Name, () => Is.EqualTo(expectedName));
-            AddAssert($"last played sample has {expectedBank} bank", () => triggerSource.LastPlayedSamples!.OfType<HitSampleInfo>().Single().Bank, () => Is.EqualTo(expectedBank));
+            AddAssert($"last played sample is {expectedSamplesCsv}", () => string.Join(',', triggerSource.LastPlayedSamples!.OfType<HitSampleInfo>().Select(s => s.Name)),
+                () => Is.EqualTo(expectedSamplesCsv));
+            AddAssert($"last played sample has {expectedBank} bank", () => triggerSource.LastPlayedSamples!.OfType<HitSampleInfo>().First().Bank, () => Is.EqualTo(expectedBank));
         }
 
         private void seekTo(double time) => AddStep($"seek to {time}", () => gameplayClock.Seek(time));
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneSampleOutput.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneSampleOutput.cs
index 2429b71095..a548a14d88 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneSampleOutput.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneSampleOutput.cs
@@ -3,15 +3,16 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using NUnit.Framework;
 using osu.Framework.Testing;
-using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Taiko.Objects.Drawables;
+using osu.Game.Rulesets.Taiko.UI;
 
 namespace osu.Game.Rulesets.Taiko.Tests
 {
     /// <summary>
-    /// Taiko has some interesting rules for legacy mappings.
+    /// Taiko doesn't output any samples. They are all handled externally by <see cref="DrumSamplePlayer"/>.
     /// </summary>
     [HeadlessTest]
     public partial class TestSceneSampleOutput : TestSceneTaikoPlayer
@@ -26,10 +27,10 @@ namespace osu.Game.Rulesets.Taiko.Tests
                 string.Empty,
                 string.Empty,
                 string.Empty,
-                HitSampleInfo.HIT_FINISH,
-                HitSampleInfo.HIT_WHISTLE,
-                HitSampleInfo.HIT_WHISTLE,
-                HitSampleInfo.HIT_WHISTLE,
+                string.Empty,
+                string.Empty,
+                string.Empty,
+                string.Empty,
             };
 
             var actualSampleNames = new List<string>();
@@ -46,7 +47,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
             AddUntilStep("all samples collected", () => actualSampleNames.Count == expectedSampleNames.Length);
 
-            AddAssert("samples are correct", () => actualSampleNames.SequenceEqual(expectedSampleNames));
+            AddAssert("samples are correct", () => actualSampleNames, () => Is.EqualTo(expectedSampleNames));
         }
 
         protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new TaikoBeatmapConversionTest().GetBeatmap("sample-to-type-conversions");

From 571dbf5ab8d58e4d5712f18da4c400ca6f7c3f8a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Jun 2023 15:42:39 +0900
Subject: [PATCH 1138/1604] Adjust logic to avoid creating `List<>` each
 playback

---
 .../UI/DrumSampleTriggerSource.cs             | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs b/osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs
index adf02d88ce..a04c4b60f2 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
 using osu.Game.Audio;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.UI;
@@ -23,18 +22,20 @@ namespace osu.Game.Rulesets.Taiko.UI
             if (hitObject == null)
                 return;
 
-            List<ISampleInfo> samplesToPlay = new List<ISampleInfo>
-            {
-                hitObject.CreateHitSampleInfo(hitType == HitType.Rim ? HitSampleInfo.HIT_CLAP : HitSampleInfo.HIT_NORMAL)
-            };
+            var baseSample = hitObject.CreateHitSampleInfo(hitType == HitType.Rim ? HitSampleInfo.HIT_CLAP : HitSampleInfo.HIT_NORMAL);
 
-            // strong + rim always maps to whistle.
             if ((hitObject as TaikoStrongableHitObject)?.IsStrong == true || hitObject is StrongNestedHitObject)
             {
-                samplesToPlay.Add(hitObject.CreateHitSampleInfo(hitType == HitType.Rim ? HitSampleInfo.HIT_WHISTLE : HitSampleInfo.HIT_FINISH));
+                PlaySamples(new ISampleInfo[]
+                {
+                    hitObject.CreateHitSampleInfo(hitType == HitType.Rim ? HitSampleInfo.HIT_WHISTLE : HitSampleInfo.HIT_FINISH),
+                    baseSample
+                });
+            }
+            else
+            {
+                PlaySamples(new ISampleInfo[] { baseSample });
             }
-
-            PlaySamples(samplesToPlay.ToArray());
         }
 
         public override void Play() => throw new InvalidOperationException(@"Use override with HitType parameter instead");

From 428383708c1ec2483ba2c39b8b6575aa28e09537 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Fri, 30 Jun 2023 20:13:14 +0300
Subject: [PATCH 1139/1604] Add test for import

---
 .../Database/BeatmapImporterTests.cs          | 68 +++++++++++++++----
 1 file changed, 56 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Database/BeatmapImporterTests.cs b/osu.Game.Tests/Database/BeatmapImporterTests.cs
index 446eb72b04..53e5fec075 100644
--- a/osu.Game.Tests/Database/BeatmapImporterTests.cs
+++ b/osu.Game.Tests/Database/BeatmapImporterTests.cs
@@ -18,6 +18,7 @@ using osu.Game.Extensions;
 using osu.Game.Models;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Rulesets;
+using osu.Game.Scoring;
 using osu.Game.Tests.Resources;
 using Realms;
 using SharpCompress.Archives;
@@ -416,6 +417,51 @@ namespace osu.Game.Tests.Database
             });
         }
 
+        [Test]
+        public void TestImport_ThenChangeMapWithScore_ThenImport()
+        {
+            RunTestWithRealmAsync(async (realm, storage) =>
+            {
+                var importer = new BeatmapImporter(storage, realm);
+
+                string? temp = TestResources.GetTestBeatmapForImport();
+
+                var imported = await LoadOszIntoStore(importer, realm.Realm);
+
+                await createScoreForBeatmap(realm.Realm, imported.Beatmaps.First());
+
+                //editor work imitation
+                realm.Run(r =>
+                {
+                    r.Write(() =>
+                    {
+                        BeatmapInfo beatmap = imported.Beatmaps.First();
+                        beatmap.Hash = "new_hash";
+                        beatmap.ResetOnlineInfo();
+                    });
+                });
+
+                Assert.That(imported.Beatmaps.First().Scores.Any());
+
+                var importedSecondTime = await importer.Import(new ImportTask(temp));
+
+                EnsureLoaded(realm.Realm);
+
+                // check the newly "imported" beatmap is not the original.
+                Assert.NotNull(importedSecondTime);
+                Debug.Assert(importedSecondTime != null);
+                Assert.That(imported.ID != importedSecondTime.ID);
+
+                var importedFirstTimeBeatmap = imported.Beatmaps.First();
+                var importedSecondTimeBeatmap = importedSecondTime.PerformRead(s => s.Beatmaps.First());
+
+                Assert.That(importedFirstTimeBeatmap.ID != importedSecondTimeBeatmap.ID);
+                Assert.That(importedFirstTimeBeatmap.Hash != importedSecondTimeBeatmap.Hash);
+                Assert.That(!importedFirstTimeBeatmap.Scores.Any());
+                Assert.That(importedSecondTimeBeatmap.Scores.Count() == 1);
+            });
+        }
+
         [Test]
         public void TestImportThenImportWithChangedFile()
         {
@@ -1074,18 +1120,16 @@ namespace osu.Game.Tests.Database
             Assert.IsTrue(realm.All<BeatmapSetInfo>().First(_ => true).DeletePending);
         }
 
-        private static Task createScoreForBeatmap(Realm realm, BeatmapInfo beatmap)
-        {
-            // TODO: reimplement when we have score support in realm.
-            // return ImportScoreTest.LoadScoreIntoOsu(osu, new ScoreInfo
-            // {
-            //     OnlineID = 2,
-            //     Beatmap = beatmap,
-            //     BeatmapInfoID = beatmap.ID
-            // }, new ImportScoreTest.TestArchiveReader());
-
-            return Task.CompletedTask;
-        }
+        private static Task createScoreForBeatmap(Realm realm, BeatmapInfo beatmap) =>
+            realm.WriteAsync(() =>
+            {
+                realm.Add(new ScoreInfo
+                {
+                    OnlineID = 2,
+                    BeatmapInfo = beatmap,
+                    BeatmapHash = beatmap.Hash
+                });
+            });
 
         private static void checkBeatmapSetCount(Realm realm, int expected, bool includeDeletePending = false)
         {

From f5d3a2458272fe6de9b8024e56d250318df1b0d2 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Fri, 30 Jun 2023 20:15:38 +0300
Subject: [PATCH 1140/1604] Rename test

---
 osu.Game.Tests/Database/BeatmapImporterTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Database/BeatmapImporterTests.cs b/osu.Game.Tests/Database/BeatmapImporterTests.cs
index 53e5fec075..1f42979d11 100644
--- a/osu.Game.Tests/Database/BeatmapImporterTests.cs
+++ b/osu.Game.Tests/Database/BeatmapImporterTests.cs
@@ -418,7 +418,7 @@ namespace osu.Game.Tests.Database
         }
 
         [Test]
-        public void TestImport_ThenChangeMapWithScore_ThenImport()
+        public void TestImport_ThenModifyMapWithScore_ThenImport()
         {
             RunTestWithRealmAsync(async (realm, storage) =>
             {

From e505e71d07ae4109ad66de2e6fee801bd217cc16 Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Fri, 30 Jun 2023 21:40:00 +0200
Subject: [PATCH 1141/1604] Merge the two `app.manifest` files

---
 app.manifest                   |  1 +
 osu.Desktop/app.manifest       | 21 ---------------------
 osu.Desktop/osu.Desktop.csproj |  1 -
 3 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 osu.Desktop/app.manifest

diff --git a/app.manifest b/app.manifest
index 533c6ff208..b85df82c4d 100644
--- a/app.manifest
+++ b/app.manifest
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
   <assemblyIdentity version="1.0.0.0" name="osu!" />
+  <SquirrelAwareVersion xmlns="urn:schema-squirrel-com:asm.v1">1</SquirrelAwareVersion>
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
     <security>
       <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
diff --git a/osu.Desktop/app.manifest b/osu.Desktop/app.manifest
deleted file mode 100644
index a11cee132c..0000000000
--- a/osu.Desktop/app.manifest
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
-  <assemblyIdentity version="1.0.0.0" name="osu!" />
-  <SquirrelAwareVersion xmlns="urn:schema-squirrel-com:asm.v1">1</SquirrelAwareVersion>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
-      </requestedPrivileges>
-      <applicationRequestMinimum>
-        <defaultAssemblyRequest permissionSetReference="Custom" />
-        <PermissionSet class="System.Security.PermissionSet" version="1" Unrestricted="true" ID="Custom" SameSite="site" />
-      </applicationRequestMinimum>
-    </security>
-  </trustInfo>
-  <asmv3:application>
-    <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
-      <dpiAware>true</dpiAware>
-    </asmv3:windowsSettings>
-  </asmv3:application>
-</asmv1:assembly>
diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index f1b9c92429..16d6a81d40 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -8,7 +8,6 @@
     <Title>osu!</Title>
     <Product>osu!(lazer)</Product>
     <ApplicationIcon>lazer.ico</ApplicationIcon>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
     <Version>0.0.0</Version>
     <FileVersion>0.0.0</FileVersion>
   </PropertyGroup>

From 909edefa2048f59ffb6cf623f8fce8d16f5ca2d2 Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Fri, 30 Jun 2023 21:41:18 +0200
Subject: [PATCH 1142/1604] Remove unnecessary `<dependentAssembly>`

osu! was working fine without this.
---
 app.manifest | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/app.manifest b/app.manifest
index b85df82c4d..2e5ba1b18a 100644
--- a/app.manifest
+++ b/app.manifest
@@ -32,16 +32,4 @@
       <dpiAware>true</dpiAware>
     </asmv3:windowsSettings>
   </asmv3:application>
-  <dependency>
-    <dependentAssembly>
-      <assemblyIdentity
-          type="win32"
-          name="Microsoft.Windows.Common-Controls"
-          version="6.0.0.0"
-          processorArchitecture="*"
-          publicKeyToken="6595b64144ccf1df"
-          language="*"
-        />
-    </dependentAssembly>
-  </dependency>
 </asmv1:assembly>

From bfa5bcb2a77de4b3416128b8d829e99fee06036d Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Fri, 30 Jun 2023 21:43:01 +0200
Subject: [PATCH 1143/1604] Update `<supportedOS>` to match what osu! actually
 supports

---
 app.manifest | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/app.manifest b/app.manifest
index 2e5ba1b18a..69702111ce 100644
--- a/app.manifest
+++ b/app.manifest
@@ -15,15 +15,9 @@
   </trustInfo>
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
     <application>
-      <!-- Windows Vista -->
-      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />
-      <!-- Windows 7 -->
-      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />
-      <!-- Windows 8 -->
-      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />
       <!-- Windows 8.1 -->
       <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />
-      <!-- Windows 10 -->
+      <!-- Windows 10 and Windows 11 -->
       <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
     </application>
   </compatibility>

From b0e716feab3f728e4bf59b3800a86fdaf1e030ee Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Fri, 30 Jun 2023 21:59:46 +0200
Subject: [PATCH 1144/1604] Use correct `perMonitorV2` `<dpiAwareness>`

Yes, `xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings"` is required
else the game will exit with code 500 on startup.
---
 app.manifest | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app.manifest b/app.manifest
index 69702111ce..ad8b5d005a 100644
--- a/app.manifest
+++ b/app.manifest
@@ -23,7 +23,8 @@
   </compatibility>
   <asmv3:application>
     <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
-      <dpiAware>true</dpiAware>
+      <dpiAware>per Monitor</dpiAware>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">perMonitorV2</dpiAwareness>
     </asmv3:windowsSettings>
   </asmv3:application>
 </asmv1:assembly>

From 2b1d637292621f9d5edfd73b142b30bb5485a6c7 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Sat, 1 Jul 2023 09:48:42 +0300
Subject: [PATCH 1145/1604] Add missing ruleset store

---
 osu.Game.Tests/Database/BeatmapImporterTests.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tests/Database/BeatmapImporterTests.cs b/osu.Game.Tests/Database/BeatmapImporterTests.cs
index 1f42979d11..69496630ce 100644
--- a/osu.Game.Tests/Database/BeatmapImporterTests.cs
+++ b/osu.Game.Tests/Database/BeatmapImporterTests.cs
@@ -423,6 +423,7 @@ namespace osu.Game.Tests.Database
             RunTestWithRealmAsync(async (realm, storage) =>
             {
                 var importer = new BeatmapImporter(storage, realm);
+                using var store = new RealmRulesetStore(realm, storage);
 
                 string? temp = TestResources.GetTestBeatmapForImport();
 

From 8d25e2c3e1d419a18cf40ff99f2d9cd454991d91 Mon Sep 17 00:00:00 2001
From: Cootz <artem2004799@gmail.com>
Date: Sat, 1 Jul 2023 09:49:06 +0300
Subject: [PATCH 1146/1604] Add importer update test

---
 .../Database/BeatmapImporterUpdateTests.cs    | 65 +++++++++++++++++++
 osu.Game/Scoring/ScoreInfo.cs                 |  1 +
 2 files changed, 66 insertions(+)

diff --git a/osu.Game.Tests/Database/BeatmapImporterUpdateTests.cs b/osu.Game.Tests/Database/BeatmapImporterUpdateTests.cs
index b94cff2a9a..20fe0bfca6 100644
--- a/osu.Game.Tests/Database/BeatmapImporterUpdateTests.cs
+++ b/osu.Game.Tests/Database/BeatmapImporterUpdateTests.cs
@@ -347,6 +347,71 @@ namespace osu.Game.Tests.Database
             });
         }
 
+        [Test]
+        public void TestDandlingScoreTransferred()
+        {
+            RunTestWithRealmAsync(async (realm, storage) =>
+            {
+                var importer = new BeatmapImporter(storage, realm);
+                using var rulesets = new RealmRulesetStore(realm, storage);
+
+                using var __ = getBeatmapArchive(out string pathOriginal);
+                using var _ = getBeatmapArchive(out string pathOnlineCopy);
+
+                var importBeforeUpdate = await importer.Import(new ImportTask(pathOriginal));
+
+                Assert.That(importBeforeUpdate, Is.Not.Null);
+                Debug.Assert(importBeforeUpdate != null);
+
+                string scoreTargetBeatmapHash = string.Empty;
+
+                //Set score
+                importBeforeUpdate.PerformWrite(s =>
+                {
+                    var beatmapInfo = s.Beatmaps.First();
+
+                    scoreTargetBeatmapHash = beatmapInfo.Hash;
+
+                    s.Realm.Add(new ScoreInfo(beatmapInfo, s.Realm.All<RulesetInfo>().First(), new RealmUser()));
+                });
+
+                //Modify beatmap
+                const string new_beatmap_hash = "new_hash";
+                importBeforeUpdate.PerformWrite(s =>
+                {
+                    var beatmapInfo = s.Beatmaps.First(b => b.Hash == scoreTargetBeatmapHash);
+
+                    beatmapInfo.Hash = new_beatmap_hash;
+                    beatmapInfo.ResetOnlineInfo();
+                });
+
+                realm.Run(r => r.Refresh());
+
+                checkCount<ScoreInfo>(realm, 1);
+
+                //second import matches first before modification,
+                //in other words beatmap version where score have been set
+                var importAfterUpdate = await importer.ImportAsUpdate(new ProgressNotification(), new ImportTask(pathOnlineCopy), importBeforeUpdate.Value);
+
+                Assert.That(importAfterUpdate, Is.Not.Null);
+                Debug.Assert(importAfterUpdate != null);
+
+                realm.Run(r => r.Refresh());
+
+                //account modified beatmap
+                checkCount<BeatmapInfo>(realm, count_beatmaps + 1);
+                checkCount<BeatmapMetadata>(realm, count_beatmaps + 1);
+                checkCount<BeatmapSetInfo>(realm, 2);
+
+                // score is transferred across to the new set
+                checkCount<ScoreInfo>(realm, 1);
+
+                //score is transferred to new beatmap
+                Assert.That(importBeforeUpdate.Value.Beatmaps.First(b => b.Hash == new_beatmap_hash).Scores, Has.Count.EqualTo(0));
+                Assert.That(importAfterUpdate.Value.Beatmaps.First(b => b.Hash == scoreTargetBeatmapHash).Scores, Has.Count.EqualTo(1));
+            });
+        }
+
         [Test]
         public void TestScoreLostOnModification()
         {
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index d56338c6a4..6dfac419e5 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -82,6 +82,7 @@ namespace osu.Game.Scoring
         {
             Ruleset = ruleset ?? new RulesetInfo();
             BeatmapInfo = beatmap ?? new BeatmapInfo();
+            BeatmapHash = BeatmapInfo.Hash;
             RealmUser = realmUser ?? new RealmUser();
             ID = Guid.NewGuid();
         }

From a4a9223726b35d5dcba09af3fde12c58d0b3063a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 1 Jul 2023 23:12:04 +0900
Subject: [PATCH 1147/1604] Move score re-attach to `PostImport`

---
 osu.Game/Beatmaps/BeatmapImporter.cs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapImporter.cs b/osu.Game/Beatmaps/BeatmapImporter.cs
index bf549f40c4..b0f58d0298 100644
--- a/osu.Game/Beatmaps/BeatmapImporter.cs
+++ b/osu.Game/Beatmaps/BeatmapImporter.cs
@@ -200,21 +200,22 @@ namespace osu.Game.Beatmaps
                     LogForModel(beatmapSet, $"Found existing beatmap set with same OnlineID ({beatmapSet.OnlineID}). It will be disassociated and marked for deletion.");
                 }
             }
+        }
+
+        protected override void PostImport(BeatmapSetInfo model, Realm realm, ImportParameters parameters)
+        {
+            base.PostImport(model, realm, parameters);
 
             //Because of specific score storing in Osu! database, it can already contain scores for imported beatmap.
             //To restore scores we need to manually reassign them to new/re-exported beatmap.
-            foreach (BeatmapInfo beatmap in beatmapSet.Beatmaps)
+            foreach (BeatmapInfo beatmap in model.Beatmaps)
             {
                 IQueryable<ScoreInfo> scores = realm.All<ScoreInfo>().Where(score => score.BeatmapHash == beatmap.Hash);
 
                 if (scores.Any())
                     scores.ForEach(score => score.BeatmapInfo = beatmap); //We intentionally ignore BeatmapHash because we checked hash equality
             }
-        }
 
-        protected override void PostImport(BeatmapSetInfo model, Realm realm, ImportParameters parameters)
-        {
-            base.PostImport(model, realm, parameters);
             ProcessBeatmap?.Invoke(model, parameters.Batch ? MetadataLookupScope.LocalCacheFirst : MetadataLookupScope.OnlineFirst);
         }
 

From 5bd91a531d37c4a89e7cc1925ca80888c81d276b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 1 Jul 2023 23:37:22 +0900
Subject: [PATCH 1148/1604] Tidy up comments and code

---
 osu.Game/Beatmaps/BeatmapImporter.cs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapImporter.cs b/osu.Game/Beatmaps/BeatmapImporter.cs
index b0f58d0298..da987eb752 100644
--- a/osu.Game/Beatmaps/BeatmapImporter.cs
+++ b/osu.Game/Beatmaps/BeatmapImporter.cs
@@ -206,14 +206,12 @@ namespace osu.Game.Beatmaps
         {
             base.PostImport(model, realm, parameters);
 
-            //Because of specific score storing in Osu! database, it can already contain scores for imported beatmap.
-            //To restore scores we need to manually reassign them to new/re-exported beatmap.
+            // Scores are stored separately from beatmaps, and persisted when a beatmap is modified or deleted.
+            // Let's reattach any matching scores that exist in the database, based on hash.
             foreach (BeatmapInfo beatmap in model.Beatmaps)
             {
-                IQueryable<ScoreInfo> scores = realm.All<ScoreInfo>().Where(score => score.BeatmapHash == beatmap.Hash);
-
-                if (scores.Any())
-                    scores.ForEach(score => score.BeatmapInfo = beatmap); //We intentionally ignore BeatmapHash because we checked hash equality
+                foreach (var score in realm.All<ScoreInfo>().Where(score => score.BeatmapHash == beatmap.Hash))
+                    score.BeatmapInfo = beatmap;
             }
 
             ProcessBeatmap?.Invoke(model, parameters.Batch ? MetadataLookupScope.LocalCacheFirst : MetadataLookupScope.OnlineFirst);

From 5f880397a94ea968aba752e7ab658c28bab58312 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 2 Jul 2023 00:04:53 +0900
Subject: [PATCH 1149/1604] Increase the minimum size of the scroll bar

Allows easier targetting when there is a lot of content in the scroll view

As discussed in https://github.com/ppy/osu/discussions/24095#discussioncomment-6332398.
---
 osu.Game/Collections/CollectionDropdown.cs            |  2 +-
 osu.Game/Graphics/Containers/OsuScrollContainer.cs    | 11 ++++++-----
 osu.Game/Overlays/OverlaySidebar.cs                   |  2 +-
 .../OnlinePlay/Components/ParticipantsDisplay.cs      |  2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Collections/CollectionDropdown.cs b/osu.Game/Collections/CollectionDropdown.cs
index 19fa3a3d66..e95565a5c8 100644
--- a/osu.Game/Collections/CollectionDropdown.cs
+++ b/osu.Game/Collections/CollectionDropdown.cs
@@ -188,7 +188,7 @@ namespace osu.Game.Collections
                 {
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.CentreRight,
-                    X = -OsuScrollContainer.SCROLL_BAR_HEIGHT,
+                    X = -OsuScrollContainer.SCROLL_BAR_WIDTH,
                     Scale = new Vector2(0.65f),
                     Action = addOrRemove,
                 });
diff --git a/osu.Game/Graphics/Containers/OsuScrollContainer.cs b/osu.Game/Graphics/Containers/OsuScrollContainer.cs
index e39fd45a16..da6996c170 100644
--- a/osu.Game/Graphics/Containers/OsuScrollContainer.cs
+++ b/osu.Game/Graphics/Containers/OsuScrollContainer.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Graphics.Containers
 
     public partial class OsuScrollContainer<T> : ScrollContainer<T> where T : Drawable
     {
-        public const float SCROLL_BAR_HEIGHT = 10;
+        public const float SCROLL_BAR_WIDTH = 10;
         public const float SCROLL_BAR_PADDING = 3;
 
         /// <summary>
@@ -139,6 +139,8 @@ namespace osu.Game.Graphics.Containers
 
             private readonly Box box;
 
+            protected override float MinimumDimSize => SCROLL_BAR_WIDTH * 3;
+
             public OsuScrollbar(Direction scrollDir)
                 : base(scrollDir)
             {
@@ -147,7 +149,7 @@ namespace osu.Game.Graphics.Containers
                 CornerRadius = 5;
 
                 // needs to be set initially for the ResizeTo to respect minimum size
-                Size = new Vector2(SCROLL_BAR_HEIGHT);
+                Size = new Vector2(SCROLL_BAR_WIDTH);
 
                 const float margin = 3;
 
@@ -173,11 +175,10 @@ namespace osu.Game.Graphics.Containers
 
             public override void ResizeTo(float val, int duration = 0, Easing easing = Easing.None)
             {
-                Vector2 size = new Vector2(SCROLL_BAR_HEIGHT)
+                this.ResizeTo(new Vector2(SCROLL_BAR_WIDTH)
                 {
                     [(int)ScrollDirection] = val
-                };
-                this.ResizeTo(size, duration, easing);
+                }, duration, easing);
             }
 
             protected override bool OnHover(HoverEvent e)
diff --git a/osu.Game/Overlays/OverlaySidebar.cs b/osu.Game/Overlays/OverlaySidebar.cs
index f1bdfbddac..070f1f0c37 100644
--- a/osu.Game/Overlays/OverlaySidebar.cs
+++ b/osu.Game/Overlays/OverlaySidebar.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Overlays
                 scrollbarBackground = new Box
                 {
                     RelativeSizeAxes = Axes.Y,
-                    Width = OsuScrollContainer.SCROLL_BAR_HEIGHT,
+                    Width = OsuScrollContainer.SCROLL_BAR_WIDTH,
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
                     Alpha = 0.5f
diff --git a/osu.Game/Screens/OnlinePlay/Components/ParticipantsDisplay.cs b/osu.Game/Screens/OnlinePlay/Components/ParticipantsDisplay.cs
index e6999771d3..5128bc4c14 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ParticipantsDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ParticipantsDisplay.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Screens.OnlinePlay.Components
                     RelativeSizeAxes = Axes.X;
 
                     scroll.RelativeSizeAxes = Axes.X;
-                    scroll.Height = ParticipantsList.TILE_SIZE + OsuScrollContainer.SCROLL_BAR_HEIGHT + OsuScrollContainer.SCROLL_BAR_PADDING * 2;
+                    scroll.Height = ParticipantsList.TILE_SIZE + OsuScrollContainer.SCROLL_BAR_WIDTH + OsuScrollContainer.SCROLL_BAR_PADDING * 2;
 
                     list.RelativeSizeAxes = Axes.Y;
                     list.AutoSizeAxes = Axes.X;

From e38ac4185cdd630a105452d19c6bdf627e794621 Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Sat, 1 Jul 2023 19:02:09 +0200
Subject: [PATCH 1150/1604] Update inline with framework `IWindow` changes

---
 osu.Desktop/OsuGameDesktop.cs | 8 +++-----
 osu.Game/OsuGame.cs           | 4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index efd3d358b7..a0db896f46 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -147,14 +147,12 @@ namespace osu.Desktop
         {
             base.SetHost(host);
 
-            var desktopWindow = (SDL2DesktopWindow)host.Window;
-
             var iconStream = Assembly.GetExecutingAssembly().GetManifestResourceStream(GetType(), "lazer.ico");
             if (iconStream != null)
-                desktopWindow.SetIconFromStream(iconStream);
+                host.Window.SetIconFromStream(iconStream);
 
-            desktopWindow.CursorState |= CursorState.Hidden;
-            desktopWindow.Title = Name;
+            host.Window.CursorState |= CursorState.Hidden;
+            host.Window.Title = Name;
         }
 
         protected override BatteryInfo CreateBatteryInfo() => new SDL2BatteryInfo();
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 93dd97ea15..5b654e0c16 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -289,9 +289,9 @@ namespace osu.Game
         {
             base.SetHost(host);
 
-            if (host.Window is SDL2Window sdlWindow)
+            if (host.Window != null)
             {
-                sdlWindow.DragDrop += path =>
+                host.Window.DragDrop += path =>
                 {
                     // on macOS/iOS, URL associations are handled via SDL_DROPFILE events.
                     if (path.StartsWith(OSU_PROTOCOL, StringComparison.Ordinal))

From caba571263b6fca21fde60d25ac755a8308e21ec Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Sat, 1 Jul 2023 19:11:48 +0200
Subject: [PATCH 1151/1604] Remove manifest DPI awareness entires

It'll be properly handled by osu!framework with https://github.com/ppy/osu/pull/24092
---
 app.manifest | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app.manifest b/app.manifest
index ad8b5d005a..088ad1dde7 100644
--- a/app.manifest
+++ b/app.manifest
@@ -21,10 +21,4 @@
       <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
     </application>
   </compatibility>
-  <asmv3:application>
-    <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
-      <dpiAware>per Monitor</dpiAware>
-      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">perMonitorV2</dpiAwareness>
-    </asmv3:windowsSettings>
-  </asmv3:application>
 </asmv1:assembly>

From 1ce60378be4ced5619533c2aaa25d46667dca777 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 1 Jul 2023 20:37:33 +0200
Subject: [PATCH 1152/1604] Rewrite comments further

---
 osu.Game.Tests/Database/BeatmapImporterTests.cs  |  5 ++++-
 .../Database/BeatmapImporterUpdateTests.cs       | 16 +++++++++-------
 osu.Game/Beatmaps/BeatmapImporter.cs             |  2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Database/BeatmapImporterTests.cs b/osu.Game.Tests/Database/BeatmapImporterTests.cs
index 69496630ce..84e84f030c 100644
--- a/osu.Game.Tests/Database/BeatmapImporterTests.cs
+++ b/osu.Game.Tests/Database/BeatmapImporterTests.cs
@@ -431,7 +431,7 @@ namespace osu.Game.Tests.Database
 
                 await createScoreForBeatmap(realm.Realm, imported.Beatmaps.First());
 
-                //editor work imitation
+                // imitate making local changes via editor
                 realm.Run(r =>
                 {
                     r.Write(() =>
@@ -442,6 +442,9 @@ namespace osu.Game.Tests.Database
                     });
                 });
 
+                // for now, making changes to a beatmap doesn't remove the backlink from the score to the beatmap.
+                // the logic of ensuring that scores match the beatmap is upheld via comparing the hash in usages (see: https://github.com/ppy/osu/pull/22539).
+                // TODO: revisit when fixing https://github.com/ppy/osu/issues/24069.
                 Assert.That(imported.Beatmaps.First().Scores.Any());
 
                 var importedSecondTime = await importer.Import(new ImportTask(temp));
diff --git a/osu.Game.Tests/Database/BeatmapImporterUpdateTests.cs b/osu.Game.Tests/Database/BeatmapImporterUpdateTests.cs
index 20fe0bfca6..8f48a96ac9 100644
--- a/osu.Game.Tests/Database/BeatmapImporterUpdateTests.cs
+++ b/osu.Game.Tests/Database/BeatmapImporterUpdateTests.cs
@@ -365,7 +365,7 @@ namespace osu.Game.Tests.Database
 
                 string scoreTargetBeatmapHash = string.Empty;
 
-                //Set score
+                // set a score on the beatmap
                 importBeforeUpdate.PerformWrite(s =>
                 {
                     var beatmapInfo = s.Beatmaps.First();
@@ -375,7 +375,7 @@ namespace osu.Game.Tests.Database
                     s.Realm.Add(new ScoreInfo(beatmapInfo, s.Realm.All<RulesetInfo>().First(), new RealmUser()));
                 });
 
-                //Modify beatmap
+                // locally modify beatmap
                 const string new_beatmap_hash = "new_hash";
                 importBeforeUpdate.PerformWrite(s =>
                 {
@@ -387,10 +387,12 @@ namespace osu.Game.Tests.Database
 
                 realm.Run(r => r.Refresh());
 
+                // for now, making changes to a beatmap doesn't remove the backlink from the score to the beatmap.
+                // the logic of ensuring that scores match the beatmap is upheld via comparing the hash in usages (https://github.com/ppy/osu/pull/22539).
+                // TODO: revisit when fixing https://github.com/ppy/osu/issues/24069.
                 checkCount<ScoreInfo>(realm, 1);
 
-                //second import matches first before modification,
-                //in other words beatmap version where score have been set
+                // reimport the original beatmap before local modifications
                 var importAfterUpdate = await importer.ImportAsUpdate(new ProgressNotification(), new ImportTask(pathOnlineCopy), importBeforeUpdate.Value);
 
                 Assert.That(importAfterUpdate, Is.Not.Null);
@@ -398,15 +400,15 @@ namespace osu.Game.Tests.Database
 
                 realm.Run(r => r.Refresh());
 
-                //account modified beatmap
+                // both original and locally modified versions present
                 checkCount<BeatmapInfo>(realm, count_beatmaps + 1);
                 checkCount<BeatmapMetadata>(realm, count_beatmaps + 1);
                 checkCount<BeatmapSetInfo>(realm, 2);
 
-                // score is transferred across to the new set
+                // score is preserved
                 checkCount<ScoreInfo>(realm, 1);
 
-                //score is transferred to new beatmap
+                // score is transferred to new beatmap
                 Assert.That(importBeforeUpdate.Value.Beatmaps.First(b => b.Hash == new_beatmap_hash).Scores, Has.Count.EqualTo(0));
                 Assert.That(importAfterUpdate.Value.Beatmaps.First(b => b.Hash == scoreTargetBeatmapHash).Scores, Has.Count.EqualTo(1));
             });
diff --git a/osu.Game/Beatmaps/BeatmapImporter.cs b/osu.Game/Beatmaps/BeatmapImporter.cs
index da987eb752..fd766490fc 100644
--- a/osu.Game/Beatmaps/BeatmapImporter.cs
+++ b/osu.Game/Beatmaps/BeatmapImporter.cs
@@ -206,7 +206,7 @@ namespace osu.Game.Beatmaps
         {
             base.PostImport(model, realm, parameters);
 
-            // Scores are stored separately from beatmaps, and persisted when a beatmap is modified or deleted.
+            // Scores are stored separately from beatmaps, and persist even when a beatmap is modified or deleted.
             // Let's reattach any matching scores that exist in the database, based on hash.
             foreach (BeatmapInfo beatmap in model.Beatmaps)
             {

From b6e9422aa4c714799f5f5fcf26010a8a60baedba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 1 Jul 2023 20:38:00 +0200
Subject: [PATCH 1153/1604] Fix typo in test name

---
 osu.Game.Tests/Database/BeatmapImporterUpdateTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Database/BeatmapImporterUpdateTests.cs b/osu.Game.Tests/Database/BeatmapImporterUpdateTests.cs
index 8f48a96ac9..83cb54df3f 100644
--- a/osu.Game.Tests/Database/BeatmapImporterUpdateTests.cs
+++ b/osu.Game.Tests/Database/BeatmapImporterUpdateTests.cs
@@ -348,7 +348,7 @@ namespace osu.Game.Tests.Database
         }
 
         [Test]
-        public void TestDandlingScoreTransferred()
+        public void TestDanglingScoreTransferred()
         {
             RunTestWithRealmAsync(async (realm, storage) =>
             {

From 746212be7b4c1d8b44517a1d4aeecd5709ff64f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 1 Jul 2023 20:42:34 +0200
Subject: [PATCH 1154/1604] Remove weird `.Run(r => r.Write(...))` construction

---
 osu.Game.Tests/Database/BeatmapImporterTests.cs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Database/BeatmapImporterTests.cs b/osu.Game.Tests/Database/BeatmapImporterTests.cs
index 84e84f030c..84e6a6c00f 100644
--- a/osu.Game.Tests/Database/BeatmapImporterTests.cs
+++ b/osu.Game.Tests/Database/BeatmapImporterTests.cs
@@ -432,14 +432,12 @@ namespace osu.Game.Tests.Database
                 await createScoreForBeatmap(realm.Realm, imported.Beatmaps.First());
 
                 // imitate making local changes via editor
-                realm.Run(r =>
+                // ReSharper disable once MethodHasAsyncOverload
+                realm.Write(_ =>
                 {
-                    r.Write(() =>
-                    {
-                        BeatmapInfo beatmap = imported.Beatmaps.First();
-                        beatmap.Hash = "new_hash";
-                        beatmap.ResetOnlineInfo();
-                    });
+                    BeatmapInfo beatmap = imported.Beatmaps.First();
+                    beatmap.Hash = "new_hash";
+                    beatmap.ResetOnlineInfo();
                 });
 
                 // for now, making changes to a beatmap doesn't remove the backlink from the score to the beatmap.

From 183777f8df4e0139818d7df1be50a38b5f0f848d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 1 Jul 2023 21:22:51 +0200
Subject: [PATCH 1155/1604] Fix edge cases where selection buttons go outside
 playfield bounds

Addresses
https://github.com/ppy/osu/discussions/23599#discussioncomment-6300885.
---
 osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index e93b9f0691..ad264dd8f0 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -381,6 +381,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             {
                 buttons.Anchor = Anchor.BottomCentre;
                 buttons.Origin = Anchor.BottomCentre;
+                buttons.Y = Math.Min(0, ToLocalSpace(Parent.ScreenSpaceDrawQuad.BottomLeft).Y - DrawHeight);
             }
             else if (topExcess > bottomExcess)
             {

From 9eec1337b33169992abd67b7fc9063b7c6ce70a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 1 Jul 2023 21:30:41 +0200
Subject: [PATCH 1156/1604] Use slightly different condition for better UX

---
 osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index ad264dd8f0..5d9fac739c 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -377,7 +377,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
             float leftExcess = thisQuad.TopLeft.X - parentQuad.TopLeft.X;
             float rightExcess = parentQuad.TopRight.X - thisQuad.TopRight.X;
 
-            if (topExcess + bottomExcess < buttons.Height + button_padding)
+            float minHeight = buttons.ScreenSpaceDrawQuad.Height;
+
+            if (topExcess < minHeight && bottomExcess < minHeight)
             {
                 buttons.Anchor = Anchor.BottomCentre;
                 buttons.Origin = Anchor.BottomCentre;

From 95c30fe12a6906aae2475514261454dd71fa8141 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 2 Jul 2023 21:51:32 +0900
Subject: [PATCH 1157/1604] Duplicate sign out string for now

---
 osu.Game/Localisation/LoginPanelStrings.cs | 5 +++++
 osu.Game/Overlays/Login/UserAction.cs      | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Localisation/LoginPanelStrings.cs b/osu.Game/Localisation/LoginPanelStrings.cs
index 19b0ca3b52..925c2b9146 100644
--- a/osu.Game/Localisation/LoginPanelStrings.cs
+++ b/osu.Game/Localisation/LoginPanelStrings.cs
@@ -24,6 +24,11 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString SignedIn => new TranslatableString(getKey(@"signed_in"), @"Signed in");
 
+        /// <summary>
+        /// "Sign out"
+        /// </summary>
+        public static LocalisableString SignOut => new TranslatableString(getKey(@"sign_out"), @"Sign out");
+
         /// <summary>
         /// "Account"
         /// </summary>
diff --git a/osu.Game/Overlays/Login/UserAction.cs b/osu.Game/Overlays/Login/UserAction.cs
index aa2fad6cdb..813968a053 100644
--- a/osu.Game/Overlays/Login/UserAction.cs
+++ b/osu.Game/Overlays/Login/UserAction.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Overlays.Login
         [LocalisableDescription(typeof(LoginPanelStrings), nameof(LoginPanelStrings.AppearOffline))]
         AppearOffline,
 
-        [LocalisableDescription(typeof(LayoutStrings), nameof(LayoutStrings.PopupUserLinksLogout))]
+        [LocalisableDescription(typeof(LoginPanelStrings), nameof(LoginPanelStrings.SignOut))]
         SignOut,
     }
 }

From 67650831bd07fe8756c5595d9117ca04064b9439 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 Jul 2023 14:19:25 +0900
Subject: [PATCH 1158/1604] Remove unnecessary null check

---
 osu.Game/Database/StandardisedScoreMigrationTools.cs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index 89bb908b1f..046563fad7 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -199,15 +199,13 @@ namespace osu.Game.Database
             if (!score.IsLegacyScore)
                 return score.TotalScore;
 
-            var beatmap = beatmaps.GetWorkingBeatmap(score.BeatmapInfo);
-            var ruleset = score.Ruleset.CreateInstance();
+            WorkingBeatmap beatmap = beatmaps.GetWorkingBeatmap(score.BeatmapInfo);
+            Ruleset ruleset = score.Ruleset.CreateInstance();
 
             if (ruleset is not ILegacyRuleset legacyRuleset)
                 return score.TotalScore;
 
-            var sv1Processor = legacyRuleset.CreateLegacyScoreProcessor();
-            if (sv1Processor == null)
-                return score.TotalScore;
+            ILegacyScoreProcessor sv1Processor = legacyRuleset.CreateLegacyScoreProcessor();
 
             sv1Processor.Simulate(beatmap, beatmap.GetPlayableBeatmap(ruleset.RulesetInfo, score.Mods), score.Mods);
 

From d74b1e148dd0afae80603afb2b16e68e1c3640a3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 Jul 2023 14:50:34 +0900
Subject: [PATCH 1159/1604] Make `ScoreInfo.BeatmapInfo` nullable

---
 osu.Desktop/DiscordRichPresence.cs                        | 2 +-
 .../Difficulty/TaikoPerformanceCalculator.cs              | 2 +-
 osu.Game.Tests/Models/DisplayStringTest.cs                | 8 ++++----
 .../Ranking/TestSceneContractedPanelMiddleContent.cs      | 2 +-
 osu.Game/Database/RealmAccess.cs                          | 2 +-
 osu.Game/Online/Spectator/SpectatorClient.cs              | 2 +-
 osu.Game/Scoring/IScoreInfo.cs                            | 2 +-
 osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs             | 2 +-
 osu.Game/Scoring/ScoreImporter.cs                         | 4 +++-
 osu.Game/Scoring/ScoreInfo.cs                             | 6 ++----
 osu.Game/Scoring/ScoreInfoExtensions.cs                   | 2 +-
 osu.Game/Scoring/ScorePerformanceCache.cs                 | 2 +-
 osu.Game/Screens/Ranking/SoloResultsScreen.cs             | 2 +-
 osu.Game/Screens/Select/LocalScoreDeleteDialog.cs         | 7 +------
 osu.Game/Users/UserActivity.cs                            | 2 +-
 15 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/osu.Desktop/DiscordRichPresence.cs b/osu.Desktop/DiscordRichPresence.cs
index fe3e08537e..b1e11d7a60 100644
--- a/osu.Desktop/DiscordRichPresence.cs
+++ b/osu.Desktop/DiscordRichPresence.cs
@@ -187,7 +187,7 @@ namespace osu.Desktop
                     return edit.BeatmapInfo.ToString() ?? string.Empty;
 
                 case UserActivity.WatchingReplay watching:
-                    return watching.BeatmapInfo.ToString();
+                    return watching.BeatmapInfo?.ToString() ?? string.Empty;
 
                 case UserActivity.InLobby lobby:
                     return privacyMode.Value == DiscordRichPresenceMode.Limited ? string.Empty : lobby.Room.Name.Value;
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs
index a193bacde5..ac4462c18b 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
                 effectiveMissCount = Math.Max(1.0, 1000.0 / totalSuccessfulHits) * countMiss;
 
             // TODO: The detection of rulesets is temporary until the leftover old skills have been reworked.
-            bool isConvert = score.BeatmapInfo.Ruleset.OnlineID != 1;
+            bool isConvert = score.BeatmapInfo!.Ruleset.OnlineID != 1;
 
             double multiplier = 1.13;
 
diff --git a/osu.Game.Tests/Models/DisplayStringTest.cs b/osu.Game.Tests/Models/DisplayStringTest.cs
index d585a0eb9f..b5303e1dd6 100644
--- a/osu.Game.Tests/Models/DisplayStringTest.cs
+++ b/osu.Game.Tests/Models/DisplayStringTest.cs
@@ -87,10 +87,10 @@ namespace osu.Game.Tests.Models
             var mock = new Mock<IScoreInfo>();
 
             mock.Setup(m => m.User).Returns(new APIUser { Username = "user" }); // TODO: temporary.
-            mock.Setup(m => m.Beatmap.Metadata.Artist).Returns("artist");
-            mock.Setup(m => m.Beatmap.Metadata.Title).Returns("title");
-            mock.Setup(m => m.Beatmap.Metadata.Author.Username).Returns("author");
-            mock.Setup(m => m.Beatmap.DifficultyName).Returns("difficulty");
+            mock.Setup(m => m.Beatmap!.Metadata.Artist).Returns("artist");
+            mock.Setup(m => m.Beatmap!.Metadata.Title).Returns("title");
+            mock.Setup(m => m.Beatmap!.Metadata.Author.Username).Returns("author");
+            mock.Setup(m => m.Beatmap!.DifficultyName).Returns("difficulty");
 
             Assert.That(mock.Object.GetDisplayString(), Is.EqualTo("user playing artist - title (author) [difficulty]"));
         }
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneContractedPanelMiddleContent.cs b/osu.Game.Tests/Visual/Ranking/TestSceneContractedPanelMiddleContent.cs
index 3004cb8a0c..0f17b08b7b 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneContractedPanelMiddleContent.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneContractedPanelMiddleContent.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Tests.Visual.Ranking
             AddStep("show excess mods score", () =>
             {
                 var score = TestResources.CreateTestScoreInfo();
-                score.Mods = score.BeatmapInfo.Ruleset.CreateInstance().CreateAllMods().ToArray();
+                score.Mods = score.BeatmapInfo!.Ruleset.CreateInstance().CreateAllMods().ToArray();
                 showPanel(CreateWorkingBeatmap(CreateBeatmap(new OsuRuleset().RulesetInfo)), score);
             });
         }
diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index da4caa42ba..f8b3f24a72 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -896,7 +896,7 @@ namespace osu.Game.Database
                     var scores = migration.NewRealm.All<ScoreInfo>();
 
                     foreach (var score in scores)
-                        score.BeatmapHash = score.BeatmapInfo.Hash;
+                        score.BeatmapHash = score.BeatmapInfo?.Hash ?? string.Empty;
 
                     break;
                 }
diff --git a/osu.Game/Online/Spectator/SpectatorClient.cs b/osu.Game/Online/Spectator/SpectatorClient.cs
index 89da8b9d32..14e137caf1 100644
--- a/osu.Game/Online/Spectator/SpectatorClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorClient.cs
@@ -185,7 +185,7 @@ namespace osu.Game.Online.Spectator
                 IsPlaying = true;
 
                 // transfer state at point of beginning play
-                currentState.BeatmapID = score.ScoreInfo.BeatmapInfo.OnlineID;
+                currentState.BeatmapID = score.ScoreInfo.BeatmapInfo!.OnlineID;
                 currentState.RulesetID = score.ScoreInfo.RulesetID;
                 currentState.Mods = score.ScoreInfo.Mods.Select(m => new APIMod(m)).ToArray();
                 currentState.State = SpectatedUserState.Playing;
diff --git a/osu.Game/Scoring/IScoreInfo.cs b/osu.Game/Scoring/IScoreInfo.cs
index 3644d099d9..d17558f800 100644
--- a/osu.Game/Scoring/IScoreInfo.cs
+++ b/osu.Game/Scoring/IScoreInfo.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Scoring
 
         double? PP { get; }
 
-        IBeatmapInfo Beatmap { get; }
+        IBeatmapInfo? Beatmap { get; }
 
         IRulesetInfo Ruleset { get; }
 
diff --git a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
index f71da6c7e0..6cad8716b1 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Scoring.Legacy
             {
                 sw.Write((byte)(score.ScoreInfo.Ruleset.OnlineID));
                 sw.Write(LATEST_VERSION);
-                sw.Write(score.ScoreInfo.BeatmapInfo.MD5Hash);
+                sw.Write(score.ScoreInfo.BeatmapInfo!.MD5Hash);
                 sw.Write(score.ScoreInfo.User.Username);
                 sw.Write(FormattableString.Invariant($"lazer-{score.ScoreInfo.User.Username}-{score.ScoreInfo.Date}").ComputeMD5Hash());
                 sw.Write((ushort)(score.ScoreInfo.GetCount300() ?? 0));
diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index 16658a598a..5770da10be 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -64,6 +64,8 @@ namespace osu.Game.Scoring
 
         protected override void Populate(ScoreInfo model, ArchiveReader? archive, Realm realm, CancellationToken cancellationToken = default)
         {
+            Debug.Assert(model.BeatmapInfo != null);
+
             // Ensure the beatmap is not detached.
             if (!model.BeatmapInfo.IsManaged)
                 model.BeatmapInfo = realm.Find<BeatmapInfo>(model.BeatmapInfo.ID);
@@ -99,7 +101,7 @@ namespace osu.Game.Scoring
             if (score.MaximumStatistics.Select(kvp => kvp.Value).Sum() > 0)
                 return;
 
-            var beatmap = score.BeatmapInfo.Detach();
+            var beatmap = score.BeatmapInfo?.Detach();
             var ruleset = score.Ruleset.Detach();
             var rulesetInstance = ruleset.CreateInstance();
 
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 6dfac419e5..6816e86e9d 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Scoring
         /// <remarks>
         /// When setting this, make sure to also set <see cref="BeatmapHash"/> to allow relational consistency when a beatmap is potentially changed.
         /// </remarks>
-        public BeatmapInfo BeatmapInfo { get; set; } = null!;
+        public BeatmapInfo? BeatmapInfo { get; set; }
 
         /// <summary>
         /// The <see cref="osu.Game.Beatmaps.BeatmapInfo.Hash"/> at the point in time when the score was set.
@@ -129,14 +129,12 @@ namespace osu.Game.Scoring
         public int RankInt { get; set; }
 
         IRulesetInfo IScoreInfo.Ruleset => Ruleset;
-        IBeatmapInfo IScoreInfo.Beatmap => BeatmapInfo;
+        IBeatmapInfo? IScoreInfo.Beatmap => BeatmapInfo;
         IUser IScoreInfo.User => User;
         IEnumerable<INamedFileUsage> IHasNamedFiles.Files => Files;
 
         #region Properties required to make things work with existing usages
 
-        public Guid BeatmapInfoID => BeatmapInfo.ID;
-
         public int UserID => RealmUser.OnlineID;
 
         public int RulesetID => Ruleset.OnlineID;
diff --git a/osu.Game/Scoring/ScoreInfoExtensions.cs b/osu.Game/Scoring/ScoreInfoExtensions.cs
index 85598076d6..6e57a9fd0b 100644
--- a/osu.Game/Scoring/ScoreInfoExtensions.cs
+++ b/osu.Game/Scoring/ScoreInfoExtensions.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Scoring
         /// <summary>
         /// A user-presentable display title representing this score.
         /// </summary>
-        public static string GetDisplayTitle(this IScoreInfo scoreInfo) => $"{scoreInfo.User.Username} playing {scoreInfo.Beatmap.GetDisplayTitle()}";
+        public static string GetDisplayTitle(this IScoreInfo scoreInfo) => $"{scoreInfo.User.Username} playing {scoreInfo.Beatmap?.GetDisplayTitle() ?? "unknown"}";
 
         /// <summary>
         /// Orders an array of <see cref="ScoreInfo"/>s by total score.
diff --git a/osu.Game/Scoring/ScorePerformanceCache.cs b/osu.Game/Scoring/ScorePerformanceCache.cs
index bdbcfe4efe..1f2b1aeb95 100644
--- a/osu.Game/Scoring/ScorePerformanceCache.cs
+++ b/osu.Game/Scoring/ScorePerformanceCache.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Scoring
         {
             var score = lookup.ScoreInfo;
 
-            var attributes = await difficultyCache.GetDifficultyAsync(score.BeatmapInfo, score.Ruleset, score.Mods, token).ConfigureAwait(false);
+            var attributes = await difficultyCache.GetDifficultyAsync(score.BeatmapInfo!, score.Ruleset, score.Mods, token).ConfigureAwait(false);
 
             // Performance calculation requires the beatmap and ruleset to be locally available. If not, return a default value.
             if (attributes?.Attributes == null)
diff --git a/osu.Game/Screens/Ranking/SoloResultsScreen.cs b/osu.Game/Screens/Ranking/SoloResultsScreen.cs
index c8920a734d..f187b8a302 100644
--- a/osu.Game/Screens/Ranking/SoloResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/SoloResultsScreen.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Screens.Ranking
 
         protected override APIRequest? FetchScores(Action<IEnumerable<ScoreInfo>>? scoresCallback)
         {
-            if (Score.BeatmapInfo.OnlineID <= 0 || Score.BeatmapInfo.Status <= BeatmapOnlineStatus.Pending)
+            if (Score.BeatmapInfo!.OnlineID <= 0 || Score.BeatmapInfo.Status <= BeatmapOnlineStatus.Pending)
                 return null;
 
             getScoreRequest = new GetScoresRequest(Score.BeatmapInfo, Score.Ruleset);
diff --git a/osu.Game/Screens/Select/LocalScoreDeleteDialog.cs b/osu.Game/Screens/Select/LocalScoreDeleteDialog.cs
index c4add31a4f..cd98872b65 100644
--- a/osu.Game/Screens/Select/LocalScoreDeleteDialog.cs
+++ b/osu.Game/Screens/Select/LocalScoreDeleteDialog.cs
@@ -4,9 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Game.Overlays.Dialog;
 using osu.Game.Scoring;
-using System.Diagnostics;
 using osu.Framework.Graphics.Sprites;
-using osu.Game.Beatmaps;
 
 namespace osu.Game.Screens.Select
 {
@@ -20,11 +18,8 @@ namespace osu.Game.Screens.Select
         }
 
         [BackgroundDependencyLoader]
-        private void load(BeatmapManager beatmapManager, ScoreManager scoreManager)
+        private void load(ScoreManager scoreManager)
         {
-            BeatmapInfo? beatmapInfo = beatmapManager.QueryBeatmap(b => b.ID == score.BeatmapInfoID);
-            Debug.Assert(beatmapInfo != null);
-
             BodyText = $"{score.User} ({score.DisplayAccuracy}, {score.Rank})";
 
             Icon = FontAwesome.Regular.TrashAlt;
diff --git a/osu.Game/Users/UserActivity.cs b/osu.Game/Users/UserActivity.cs
index 1761282e2e..c82f642fdc 100644
--- a/osu.Game/Users/UserActivity.cs
+++ b/osu.Game/Users/UserActivity.cs
@@ -111,7 +111,7 @@ namespace osu.Game.Users
 
             protected string Username => score.User.Username;
 
-            public BeatmapInfo BeatmapInfo => score.BeatmapInfo;
+            public BeatmapInfo? BeatmapInfo => score.BeatmapInfo;
 
             public WatchingReplay(ScoreInfo score)
             {

From f30dc59afec1c670e4c791026224a4c50862e6e1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 Jul 2023 14:50:50 +0900
Subject: [PATCH 1160/1604] Update tests to show expected score retention
 behaviour when saving a beatmap

---
 osu.Game.Tests/Database/BeatmapImporterTests.cs       | 10 +++++-----
 osu.Game.Tests/Database/BeatmapImporterUpdateTests.cs |  5 ++---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Database/BeatmapImporterTests.cs b/osu.Game.Tests/Database/BeatmapImporterTests.cs
index 84e6a6c00f..84d13ac85e 100644
--- a/osu.Game.Tests/Database/BeatmapImporterTests.cs
+++ b/osu.Game.Tests/Database/BeatmapImporterTests.cs
@@ -431,19 +431,18 @@ namespace osu.Game.Tests.Database
 
                 await createScoreForBeatmap(realm.Realm, imported.Beatmaps.First());
 
+                Assert.That(imported.Beatmaps.First().Scores.Any());
+
                 // imitate making local changes via editor
                 // ReSharper disable once MethodHasAsyncOverload
-                realm.Write(_ =>
+                realm.Write(r =>
                 {
                     BeatmapInfo beatmap = imported.Beatmaps.First();
                     beatmap.Hash = "new_hash";
                     beatmap.ResetOnlineInfo();
                 });
 
-                // for now, making changes to a beatmap doesn't remove the backlink from the score to the beatmap.
-                // the logic of ensuring that scores match the beatmap is upheld via comparing the hash in usages (see: https://github.com/ppy/osu/pull/22539).
-                // TODO: revisit when fixing https://github.com/ppy/osu/issues/24069.
-                Assert.That(imported.Beatmaps.First().Scores.Any());
+                Assert.That(!imported.Beatmaps.First().Scores.Any());
 
                 var importedSecondTime = await importer.Import(new ImportTask(temp));
 
@@ -461,6 +460,7 @@ namespace osu.Game.Tests.Database
                 Assert.That(importedFirstTimeBeatmap.Hash != importedSecondTimeBeatmap.Hash);
                 Assert.That(!importedFirstTimeBeatmap.Scores.Any());
                 Assert.That(importedSecondTimeBeatmap.Scores.Count() == 1);
+                Assert.That(importedSecondTimeBeatmap.Scores.Single().BeatmapInfo, Is.EqualTo(importedSecondTimeBeatmap));
             });
         }
 
diff --git a/osu.Game.Tests/Database/BeatmapImporterUpdateTests.cs b/osu.Game.Tests/Database/BeatmapImporterUpdateTests.cs
index 83cb54df3f..3934a67be0 100644
--- a/osu.Game.Tests/Database/BeatmapImporterUpdateTests.cs
+++ b/osu.Game.Tests/Database/BeatmapImporterUpdateTests.cs
@@ -387,10 +387,9 @@ namespace osu.Game.Tests.Database
 
                 realm.Run(r => r.Refresh());
 
-                // for now, making changes to a beatmap doesn't remove the backlink from the score to the beatmap.
-                // the logic of ensuring that scores match the beatmap is upheld via comparing the hash in usages (https://github.com/ppy/osu/pull/22539).
-                // TODO: revisit when fixing https://github.com/ppy/osu/issues/24069.
+                // making changes to a beatmap doesn't remove the score from realm, but should disassociate the beatmap.
                 checkCount<ScoreInfo>(realm, 1);
+                Assert.That(realm.Run(r => r.All<ScoreInfo>().First().BeatmapInfo), Is.Null);
 
                 // reimport the original beatmap before local modifications
                 var importAfterUpdate = await importer.ImportAsUpdate(new ProgressNotification(), new ImportTask(pathOnlineCopy), importBeforeUpdate.Value);

From 64fc5e40e8377b4a38e3ef28f9e8544021485566 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 Jul 2023 14:51:09 +0900
Subject: [PATCH 1161/1604] Move score attach logic to a helper method and call
 during editor save

---
 osu.Game.Tests/Database/BeatmapImporterTests.cs  |  1 +
 .../Database/BeatmapImporterUpdateTests.cs       |  1 +
 osu.Game/Beatmaps/BeatmapImporter.cs             |  4 +---
 osu.Game/Beatmaps/BeatmapInfo.cs                 | 16 ++++++++++++++++
 osu.Game/Beatmaps/BeatmapManager.cs              |  3 +++
 5 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Database/BeatmapImporterTests.cs b/osu.Game.Tests/Database/BeatmapImporterTests.cs
index 84d13ac85e..1440f540b4 100644
--- a/osu.Game.Tests/Database/BeatmapImporterTests.cs
+++ b/osu.Game.Tests/Database/BeatmapImporterTests.cs
@@ -440,6 +440,7 @@ namespace osu.Game.Tests.Database
                     BeatmapInfo beatmap = imported.Beatmaps.First();
                     beatmap.Hash = "new_hash";
                     beatmap.ResetOnlineInfo();
+                    beatmap.UpdateLocalScores(r);
                 });
 
                 Assert.That(!imported.Beatmaps.First().Scores.Any());
diff --git a/osu.Game.Tests/Database/BeatmapImporterUpdateTests.cs b/osu.Game.Tests/Database/BeatmapImporterUpdateTests.cs
index 3934a67be0..e1bf8f5eae 100644
--- a/osu.Game.Tests/Database/BeatmapImporterUpdateTests.cs
+++ b/osu.Game.Tests/Database/BeatmapImporterUpdateTests.cs
@@ -383,6 +383,7 @@ namespace osu.Game.Tests.Database
 
                     beatmapInfo.Hash = new_beatmap_hash;
                     beatmapInfo.ResetOnlineInfo();
+                    beatmapInfo.UpdateLocalScores(s.Realm);
                 });
 
                 realm.Run(r => r.Refresh());
diff --git a/osu.Game/Beatmaps/BeatmapImporter.cs b/osu.Game/Beatmaps/BeatmapImporter.cs
index fd766490fc..d20027892f 100644
--- a/osu.Game/Beatmaps/BeatmapImporter.cs
+++ b/osu.Game/Beatmaps/BeatmapImporter.cs
@@ -20,7 +20,6 @@ using osu.Game.IO;
 using osu.Game.IO.Archives;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Rulesets;
-using osu.Game.Scoring;
 using Realms;
 
 namespace osu.Game.Beatmaps
@@ -210,8 +209,7 @@ namespace osu.Game.Beatmaps
             // Let's reattach any matching scores that exist in the database, based on hash.
             foreach (BeatmapInfo beatmap in model.Beatmaps)
             {
-                foreach (var score in realm.All<ScoreInfo>().Where(score => score.BeatmapHash == beatmap.Hash))
-                    score.BeatmapInfo = beatmap;
+                beatmap.UpdateLocalScores(realm);
             }
 
             ProcessBeatmap?.Invoke(model, parameters.Batch ? MetadataLookupScope.LocalCacheFirst : MetadataLookupScope.OnlineFirst);
diff --git a/osu.Game/Beatmaps/BeatmapInfo.cs b/osu.Game/Beatmaps/BeatmapInfo.cs
index 5019d64276..c1aeec1f71 100644
--- a/osu.Game/Beatmaps/BeatmapInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapInfo.cs
@@ -234,6 +234,22 @@ namespace osu.Game.Beatmaps
             }
         }
 
+        /// <summary>
+        /// Local scores are retained separate from a beatmap's lifetime, matched via <see cref="ScoreInfo.BeatmapHash"/>.
+        /// Therefore we need to detach / reattach scores when a beatmap is edited or imported.
+        /// </summary>
+        /// <param name="realm">A realm instance in an active write transaction.</param>
+        public void UpdateLocalScores(Realm realm)
+        {
+            // first disassociate any scores which are already attached and no longer valid.
+            foreach (var score in Scores)
+                score.BeatmapInfo = null;
+
+            // then attach any scores which match the new hash.
+            foreach (var score in realm.All<ScoreInfo>().Where(s => s.BeatmapHash == Hash))
+                score.BeatmapInfo = this;
+        }
+
         IBeatmapMetadataInfo IBeatmapInfo.Metadata => Metadata;
         IBeatmapSetInfo? IBeatmapInfo.BeatmapSet => BeatmapSet;
         IRulesetInfo IBeatmapInfo.Ruleset => Ruleset;
diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 73811b2e62..295f6ed91a 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -467,6 +467,9 @@ namespace osu.Game.Beatmaps
                     if (transferCollections)
                         beatmapInfo.TransferCollectionReferences(r, oldMd5Hash);
 
+                    liveBeatmapSet.Beatmaps.Single(b => b.ID == beatmapInfo.ID)
+                                  .UpdateLocalScores(r);
+
                     // do not look up metadata.
                     // this is a locally-modified set now, so looking up metadata is busy work at best and harmful at worst.
                     ProcessBeatmap?.Invoke(liveBeatmapSet, MetadataLookupScope.None);

From a0bed0fceccb370700b98c559572c7f4f5dbbd08 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 Jul 2023 15:18:51 +0900
Subject: [PATCH 1162/1604] Add full flow test of `UpdateLocalScores`

---
 .../Database/BeatmapImporterTests.cs          | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/osu.Game.Tests/Database/BeatmapImporterTests.cs b/osu.Game.Tests/Database/BeatmapImporterTests.cs
index 1440f540b4..2766e4509e 100644
--- a/osu.Game.Tests/Database/BeatmapImporterTests.cs
+++ b/osu.Game.Tests/Database/BeatmapImporterTests.cs
@@ -417,6 +417,60 @@ namespace osu.Game.Tests.Database
             });
         }
 
+        [Test]
+        public void TestImport_Modify_Revert()
+        {
+            RunTestWithRealmAsync(async (realm, storage) =>
+            {
+                var importer = new BeatmapImporter(storage, realm);
+                using var store = new RealmRulesetStore(realm, storage);
+
+                var imported = await LoadOszIntoStore(importer, realm.Realm);
+
+                await createScoreForBeatmap(realm.Realm, imported.Beatmaps.First());
+
+                var score = realm.Run(r => r.All<ScoreInfo>().Single());
+
+                string originalHash = imported.Beatmaps.First().Hash;
+                const string modified_hash = "new_hash";
+
+                Assert.That(imported.Beatmaps.First().Scores.Single(), Is.EqualTo(score));
+
+                Assert.That(score.BeatmapHash, Is.EqualTo(originalHash));
+                Assert.That(score.BeatmapInfo, Is.EqualTo(imported.Beatmaps.First()));
+
+                // imitate making local changes via editor
+                // ReSharper disable once MethodHasAsyncOverload
+                realm.Write(r =>
+                {
+                    BeatmapInfo beatmap = imported.Beatmaps.First();
+                    beatmap.Hash = modified_hash;
+                    beatmap.ResetOnlineInfo();
+                    beatmap.UpdateLocalScores(r);
+                });
+
+                Assert.That(!imported.Beatmaps.First().Scores.Any());
+
+                Assert.That(score.BeatmapInfo, Is.Null);
+                Assert.That(score.BeatmapHash, Is.EqualTo(originalHash));
+
+                // imitate making local changes via editor
+                // ReSharper disable once MethodHasAsyncOverload
+                realm.Write(r =>
+                {
+                    BeatmapInfo beatmap = imported.Beatmaps.First();
+                    beatmap.Hash = originalHash;
+                    beatmap.ResetOnlineInfo();
+                    beatmap.UpdateLocalScores(r);
+                });
+
+                Assert.That(imported.Beatmaps.First().Scores.Single(), Is.EqualTo(score));
+
+                Assert.That(score.BeatmapHash, Is.EqualTo(originalHash));
+                Assert.That(score.BeatmapInfo, Is.EqualTo(imported.Beatmaps.First()));
+            });
+        }
+
         [Test]
         public void TestImport_ThenModifyMapWithScore_ThenImport()
         {

From 1a6381bcbb26fc649a99a88cb07368ae0b249e7b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 Jul 2023 15:35:09 +0900
Subject: [PATCH 1163/1604] Reduce code repetition for sleep logic

---
 osu.Game/BackgroundBeatmapProcessor.cs | 33 +++++++++++++-------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/osu.Game/BackgroundBeatmapProcessor.cs b/osu.Game/BackgroundBeatmapProcessor.cs
index 11e6a4619b..9a2d029724 100644
--- a/osu.Game/BackgroundBeatmapProcessor.cs
+++ b/osu.Game/BackgroundBeatmapProcessor.cs
@@ -132,11 +132,7 @@ namespace osu.Game
 
             foreach (var id in beatmapSetIds)
             {
-                while (localUserPlayInfo?.IsPlaying.Value == true)
-                {
-                    Logger.Log("Background processing sleeping due to active gameplay...");
-                    Thread.Sleep(TimeToSleepDuringGameplay);
-                }
+                sleepIfRequired();
 
                 realmAccess.Run(r =>
                 {
@@ -177,11 +173,7 @@ namespace osu.Game
 
             foreach (var id in scoreIds)
             {
-                while (localUserPlayInfo?.IsPlaying.Value == true)
-                {
-                    Logger.Log("Background processing sleeping due to active gameplay...");
-                    Thread.Sleep(TimeToSleepDuringGameplay);
-                }
+                sleepIfRequired();
 
                 try
                 {
@@ -229,19 +221,17 @@ namespace osu.Game
 
             ProgressNotification? notification = null;
 
-            if (scoreIds.Count > 0)
-                notificationOverlay?.Post(notification = new ProgressNotification { State = ProgressNotificationState.Active });
+            if (scoreIds.Count == 0)
+                return;
+
+            notificationOverlay?.Post(notification = new ProgressNotification { State = ProgressNotificationState.Active });
 
             int count = 0;
             updateNotification();
 
             foreach (var id in scoreIds)
             {
-                while (localUserPlayInfo?.IsPlaying.Value == true)
-                {
-                    Logger.Log("Background processing sleeping due to active gameplay...");
-                    Thread.Sleep(TimeToSleepDuringGameplay);
-                }
+                sleepIfRequired();
 
                 try
                 {
@@ -286,5 +276,14 @@ namespace osu.Game
                 }
             }
         }
+
+        private void sleepIfRequired()
+        {
+            while (localUserPlayInfo?.IsPlaying.Value == true)
+            {
+                Logger.Log("Background processing sleeping due to active gameplay...");
+                Thread.Sleep(TimeToSleepDuringGameplay);
+            }
+        }
     }
 }

From 3b5f3b67a7672a07896ce50a83a43d1b089a2ff0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 Jul 2023 15:42:04 +0900
Subject: [PATCH 1164/1604] Tidy up and improve messaging on completion
 notification

---
 osu.Game/BackgroundBeatmapProcessor.cs | 40 +++++++++++---------------
 1 file changed, 17 insertions(+), 23 deletions(-)

diff --git a/osu.Game/BackgroundBeatmapProcessor.cs b/osu.Game/BackgroundBeatmapProcessor.cs
index 9a2d029724..b3fb938f48 100644
--- a/osu.Game/BackgroundBeatmapProcessor.cs
+++ b/osu.Game/BackgroundBeatmapProcessor.cs
@@ -219,18 +219,20 @@ namespace osu.Game
 
             Logger.Log($"Found {scoreIds.Count} scores which require total score conversion.");
 
-            ProgressNotification? notification = null;
-
             if (scoreIds.Count == 0)
                 return;
 
-            notificationOverlay?.Post(notification = new ProgressNotification { State = ProgressNotificationState.Active });
+            ProgressNotification notification = new ProgressNotification { State = ProgressNotificationState.Active };
 
-            int count = 0;
-            updateNotification();
+            notificationOverlay?.Post(notification);
+
+            int processedCount = 0;
 
             foreach (var id in scoreIds)
             {
+                notification.Text = $"Upgrading scores to new scoring algorithm ({processedCount} of {scoreIds.Count})";
+                notification.Progress = (float)processedCount / scoreIds.Count;
+
                 sleepIfRequired();
 
                 try
@@ -248,32 +250,24 @@ namespace osu.Game
                     });
 
                     Logger.Log($"Converted total score for score {id}");
+                    ++processedCount;
                 }
                 catch (Exception e)
                 {
                     Logger.Log($"Failed to convert total score for {id}: {e}");
                 }
-
-                ++count;
-                updateNotification();
             }
 
-            void updateNotification()
+            if (processedCount == scoreIds.Count)
             {
-                if (notification == null)
-                    return;
-
-                if (count == scoreIds.Count)
-                {
-                    notification.CompletionText = $"Total score updated for {scoreIds.Count} scores";
-                    notification.Progress = 1;
-                    notification.State = ProgressNotificationState.Completed;
-                }
-                else
-                {
-                    notification.Text = $"Total score updated for {count} of {scoreIds.Count} scores";
-                    notification.Progress = (float)count / scoreIds.Count;
-                }
+                notification.CompletionText = $"{processedCount} score(s) have been upgraded to the new scoring algorithm";
+                notification.Progress = 1;
+                notification.State = ProgressNotificationState.Completed;
+            }
+            else
+            {
+                notification.CompletionText = $"{processedCount} of {scoreIds.Count} score(s) have been upgraded to the new scoring algorithm. Check logs for issues with remaining scores.";
+                notification.State = ProgressNotificationState.Cancelled;
             }
         }
 

From 16290241114691382a91116ba15e926043496afb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 Jul 2023 17:32:54 +0900
Subject: [PATCH 1165/1604] `ILegacyScoreProcessor` -> `ILegacyScoreSimulator`

---
 osu.Game.Rulesets.Catch/CatchRuleset.cs                |  2 +-
 .../Difficulty/CatchDifficultyCalculator.cs            | 10 +++++-----
 ...yScoreProcessor.cs => CatchLegacyScoreSimulator.cs} |  2 +-
 .../Difficulty/ManiaDifficultyCalculator.cs            | 10 +++++-----
 ...yScoreProcessor.cs => ManiaLegacyScoreSimulator.cs} |  2 +-
 osu.Game.Rulesets.Mania/ManiaRuleset.cs                |  2 +-
 .../Difficulty/OsuDifficultyCalculator.cs              | 10 +++++-----
 ...acyScoreProcessor.cs => OsuLegacyScoreSimulator.cs} |  2 +-
 osu.Game.Rulesets.Osu/OsuRuleset.cs                    |  2 +-
 .../Difficulty/TaikoDifficultyCalculator.cs            | 10 +++++-----
 ...yScoreProcessor.cs => TaikoLegacyScoreSimulator.cs} |  2 +-
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs                |  2 +-
 osu.Game/Database/StandardisedScoreMigrationTools.cs   | 10 +++++-----
 osu.Game/Rulesets/ILegacyRuleset.cs                    |  2 +-
 ...egacyScoreProcessor.cs => ILegacyScoreSimulator.cs} |  5 ++++-
 15 files changed, 38 insertions(+), 35 deletions(-)
 rename osu.Game.Rulesets.Catch/Difficulty/{CatchLegacyScoreProcessor.cs => CatchLegacyScoreSimulator.cs} (98%)
 rename osu.Game.Rulesets.Mania/Difficulty/{ManiaLegacyScoreProcessor.cs => ManiaLegacyScoreSimulator.cs} (93%)
 rename osu.Game.Rulesets.Osu/Difficulty/{OsuLegacyScoreProcessor.cs => OsuLegacyScoreSimulator.cs} (99%)
 rename osu.Game.Rulesets.Taiko/Difficulty/{TaikoLegacyScoreProcessor.cs => TaikoLegacyScoreSimulator.cs} (99%)
 rename osu.Game/Rulesets/Scoring/{ILegacyScoreProcessor.cs => ILegacyScoreSimulator.cs} (90%)

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index 9862b7d886..8f1a1b8ef5 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -202,7 +202,7 @@ namespace osu.Game.Rulesets.Catch
 
         public int LegacyID => 2;
 
-        public ILegacyScoreProcessor CreateLegacyScoreProcessor() => new CatchLegacyScoreProcessor();
+        public ILegacyScoreSimulator CreateLegacyScoreSimulator() => new CatchLegacyScoreSimulator();
 
         public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new CatchReplayFrame();
 
diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
index 446a76486b..0b56405299 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
@@ -51,11 +51,11 @@ namespace osu.Game.Rulesets.Catch.Difficulty
 
             if (ComputeLegacyScoringValues)
             {
-                CatchLegacyScoreProcessor sv1Processor = new CatchLegacyScoreProcessor();
-                sv1Processor.Simulate(workingBeatmap, beatmap, mods);
-                attributes.LegacyAccuracyScore = sv1Processor.AccuracyScore;
-                attributes.LegacyComboScore = sv1Processor.ComboScore;
-                attributes.LegacyBonusScoreRatio = sv1Processor.BonusScoreRatio;
+                CatchLegacyScoreSimulator sv1Simulator = new CatchLegacyScoreSimulator();
+                sv1Simulator.Simulate(workingBeatmap, beatmap, mods);
+                attributes.LegacyAccuracyScore = sv1Simulator.AccuracyScore;
+                attributes.LegacyComboScore = sv1Simulator.ComboScore;
+                attributes.LegacyBonusScoreRatio = sv1Simulator.BonusScoreRatio;
             }
 
             return attributes;
diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreProcessor.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs
similarity index 98%
rename from osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreProcessor.cs
rename to osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs
index 67a813300d..c79fd36d96 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs
@@ -14,7 +14,7 @@ using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Catch.Difficulty
 {
-    internal class CatchLegacyScoreProcessor : ILegacyScoreProcessor
+    internal class CatchLegacyScoreSimulator : ILegacyScoreSimulator
     {
         public int AccuracyScore { get; private set; }
 
diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
index d7994e6a0c..de9f0d91ae 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
@@ -62,11 +62,11 @@ namespace osu.Game.Rulesets.Mania.Difficulty
 
             if (ComputeLegacyScoringValues)
             {
-                ManiaLegacyScoreProcessor sv1Processor = new ManiaLegacyScoreProcessor();
-                sv1Processor.Simulate(workingBeatmap, beatmap, mods);
-                attributes.LegacyAccuracyScore = sv1Processor.AccuracyScore;
-                attributes.LegacyComboScore = sv1Processor.ComboScore;
-                attributes.LegacyBonusScoreRatio = sv1Processor.BonusScoreRatio;
+                ManiaLegacyScoreSimulator sv1Simulator = new ManiaLegacyScoreSimulator();
+                sv1Simulator.Simulate(workingBeatmap, beatmap, mods);
+                attributes.LegacyAccuracyScore = sv1Simulator.AccuracyScore;
+                attributes.LegacyComboScore = sv1Simulator.ComboScore;
+                attributes.LegacyBonusScoreRatio = sv1Simulator.BonusScoreRatio;
             }
 
             return attributes;
diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreProcessor.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreSimulator.cs
similarity index 93%
rename from osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreProcessor.cs
rename to osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreSimulator.cs
index e30d06c7b0..e544428979 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreProcessor.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreSimulator.cs
@@ -10,7 +10,7 @@ using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mania.Difficulty
 {
-    internal class ManiaLegacyScoreProcessor : ILegacyScoreProcessor
+    internal class ManiaLegacyScoreSimulator : ILegacyScoreSimulator
     {
         public int AccuracyScore => 0;
         public int ComboScore { get; private set; }
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 77cc3e06d2..2e96c89516 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -302,7 +302,7 @@ namespace osu.Game.Rulesets.Mania
 
         public int LegacyID => 3;
 
-        public ILegacyScoreProcessor CreateLegacyScoreProcessor() => new ManiaLegacyScoreProcessor();
+        public ILegacyScoreSimulator CreateLegacyScoreSimulator() => new ManiaLegacyScoreSimulator();
 
         public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new ManiaReplayFrame();
 
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
index e28dbd96ac..b92092c674 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
@@ -111,11 +111,11 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
             if (ComputeLegacyScoringValues)
             {
-                OsuLegacyScoreProcessor sv1Processor = new OsuLegacyScoreProcessor();
-                sv1Processor.Simulate(workingBeatmap, beatmap, mods);
-                attributes.LegacyAccuracyScore = sv1Processor.AccuracyScore;
-                attributes.LegacyComboScore = sv1Processor.ComboScore;
-                attributes.LegacyBonusScoreRatio = sv1Processor.BonusScoreRatio;
+                OsuLegacyScoreSimulator sv1Simulator = new OsuLegacyScoreSimulator();
+                sv1Simulator.Simulate(workingBeatmap, beatmap, mods);
+                attributes.LegacyAccuracyScore = sv1Simulator.AccuracyScore;
+                attributes.LegacyComboScore = sv1Simulator.ComboScore;
+                attributes.LegacyBonusScoreRatio = sv1Simulator.BonusScoreRatio;
             }
 
             return attributes;
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreProcessor.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
similarity index 99%
rename from osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreProcessor.cs
rename to osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
index a5e12e5564..980d86e4ad 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
@@ -14,7 +14,7 @@ using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Difficulty
 {
-    internal class OsuLegacyScoreProcessor : ILegacyScoreProcessor
+    internal class OsuLegacyScoreSimulator : ILegacyScoreSimulator
     {
         public int AccuracyScore { get; private set; }
 
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index abbd4a43c8..b44d999d4f 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -253,7 +253,7 @@ namespace osu.Game.Rulesets.Osu
 
         public int LegacyID => 0;
 
-        public ILegacyScoreProcessor CreateLegacyScoreProcessor() => new OsuLegacyScoreProcessor();
+        public ILegacyScoreSimulator CreateLegacyScoreSimulator() => new OsuLegacyScoreSimulator();
 
         public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new OsuReplayFrame();
 
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
index 28268d9a13..25adba5ab6 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
@@ -101,11 +101,11 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
 
             if (ComputeLegacyScoringValues)
             {
-                TaikoLegacyScoreProcessor sv1Processor = new TaikoLegacyScoreProcessor();
-                sv1Processor.Simulate(workingBeatmap, beatmap, mods);
-                attributes.LegacyAccuracyScore = sv1Processor.AccuracyScore;
-                attributes.LegacyComboScore = sv1Processor.ComboScore;
-                attributes.LegacyBonusScoreRatio = sv1Processor.BonusScoreRatio;
+                TaikoLegacyScoreSimulator sv1Simulator = new TaikoLegacyScoreSimulator();
+                sv1Simulator.Simulate(workingBeatmap, beatmap, mods);
+                attributes.LegacyAccuracyScore = sv1Simulator.AccuracyScore;
+                attributes.LegacyComboScore = sv1Simulator.ComboScore;
+                attributes.LegacyBonusScoreRatio = sv1Simulator.BonusScoreRatio;
             }
 
             return attributes;
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreProcessor.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
similarity index 99%
rename from osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreProcessor.cs
rename to osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
index c9f508f5e9..e77327d622 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreProcessor.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
@@ -14,7 +14,7 @@ using osu.Game.Rulesets.Taiko.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Difficulty
 {
-    internal class TaikoLegacyScoreProcessor : ILegacyScoreProcessor
+    internal class TaikoLegacyScoreSimulator : ILegacyScoreSimulator
     {
         public int AccuracyScore { get; private set; }
 
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index af02c94d38..aa31b1924f 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -197,7 +197,7 @@ namespace osu.Game.Rulesets.Taiko
 
         public int LegacyID => 1;
 
-        public ILegacyScoreProcessor CreateLegacyScoreProcessor() => new TaikoLegacyScoreProcessor();
+        public ILegacyScoreSimulator CreateLegacyScoreSimulator() => new TaikoLegacyScoreSimulator();
 
         public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new TaikoReplayFrame();
 
diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index 046563fad7..7ab90c337c 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -205,15 +205,15 @@ namespace osu.Game.Database
             if (ruleset is not ILegacyRuleset legacyRuleset)
                 return score.TotalScore;
 
-            ILegacyScoreProcessor sv1Processor = legacyRuleset.CreateLegacyScoreProcessor();
+            ILegacyScoreSimulator sv1Simulator = legacyRuleset.CreateLegacyScoreSimulator();
 
-            sv1Processor.Simulate(beatmap, beatmap.GetPlayableBeatmap(ruleset.RulesetInfo, score.Mods), score.Mods);
+            sv1Simulator.Simulate(beatmap, beatmap.GetPlayableBeatmap(ruleset.RulesetInfo, score.Mods), score.Mods);
 
             return ConvertFromLegacyTotalScore(score, new DifficultyAttributes
             {
-                LegacyAccuracyScore = sv1Processor.AccuracyScore,
-                LegacyComboScore = sv1Processor.ComboScore,
-                LegacyBonusScoreRatio = sv1Processor.BonusScoreRatio
+                LegacyAccuracyScore = sv1Simulator.AccuracyScore,
+                LegacyComboScore = sv1Simulator.ComboScore,
+                LegacyBonusScoreRatio = sv1Simulator.BonusScoreRatio
             });
         }
 
diff --git a/osu.Game/Rulesets/ILegacyRuleset.cs b/osu.Game/Rulesets/ILegacyRuleset.cs
index ba12c1f559..24aa672219 100644
--- a/osu.Game/Rulesets/ILegacyRuleset.cs
+++ b/osu.Game/Rulesets/ILegacyRuleset.cs
@@ -14,6 +14,6 @@ namespace osu.Game.Rulesets
         /// </summary>
         int LegacyID { get; }
 
-        ILegacyScoreProcessor CreateLegacyScoreProcessor();
+        ILegacyScoreSimulator CreateLegacyScoreSimulator();
     }
 }
diff --git a/osu.Game/Rulesets/Scoring/ILegacyScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ILegacyScoreSimulator.cs
similarity index 90%
rename from osu.Game/Rulesets/Scoring/ILegacyScoreProcessor.cs
rename to osu.Game/Rulesets/Scoring/ILegacyScoreSimulator.cs
index c689d3610d..7240f0d73e 100644
--- a/osu.Game/Rulesets/Scoring/ILegacyScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ILegacyScoreSimulator.cs
@@ -7,7 +7,10 @@ using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Rulesets.Scoring
 {
-    public interface ILegacyScoreProcessor
+    /// <summary>
+    /// Generates attributes which are required to calculate old-style Score V1 scores.
+    /// </summary>
+    public interface ILegacyScoreSimulator
     {
         /// <summary>
         /// The accuracy portion of the legacy (ScoreV1) total score.

From a0c3fa9c138a15f668b06a5ca5eea3b1a7722090 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 Jul 2023 17:53:53 +0900
Subject: [PATCH 1166/1604] Move preconditions to realm migration step to
 simplify marker version logic

---
 osu.Game/BackgroundBeatmapProcessor.cs        | 17 +----------------
 osu.Game/Database/RealmAccess.cs              | 13 ++++++-------
 osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs |  2 +-
 3 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/osu.Game/BackgroundBeatmapProcessor.cs b/osu.Game/BackgroundBeatmapProcessor.cs
index b3fb938f48..3af6f0771c 100644
--- a/osu.Game/BackgroundBeatmapProcessor.cs
+++ b/osu.Game/BackgroundBeatmapProcessor.cs
@@ -14,7 +14,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
-using osu.Game.Extensions;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Rulesets;
@@ -199,23 +198,9 @@ namespace osu.Game
 
         private void convertLegacyTotalScoreToStandardised()
         {
-            HashSet<Guid> scoreIds = new HashSet<Guid>();
-
             Logger.Log("Querying for scores that need total score conversion...");
 
-            realmAccess.Run(r =>
-            {
-                foreach (var score in r.All<ScoreInfo>().Where(s => s.IsLegacyScore))
-                {
-                    if (!score.Ruleset.IsLegacyRuleset())
-                        continue;
-
-                    if (score.Version >= 30000003)
-                        continue;
-
-                    scoreIds.Add(score.ID);
-                }
-            });
+            HashSet<Guid> scoreIds = realmAccess.Run(r => new HashSet<Guid>(r.All<ScoreInfo>().Where(s => s.Version == 30000002).Select(s => s.ID)));
 
             Logger.Log($"Found {scoreIds.Count} scores which require total score conversion.");
 
diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index 93d70d7aea..95297e9cd6 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -970,16 +970,15 @@ namespace osu.Game.Database
 
                 case 31:
                 {
-                    var scores = migration.NewRealm.All<ScoreInfo>();
-
-                    foreach (var score in scores)
+                    foreach (var score in migration.NewRealm.All<ScoreInfo>())
                     {
-                        if (score.IsLegacyScore)
+                        if (score.IsLegacyScore && score.Ruleset.IsLegacyRuleset())
                         {
-                            score.LegacyTotalScore = score.TotalScore;
-
-                            // Scores with this version will trigger the update process in BackgroundBeatmapProcessor.
+                            // Scores with this version will trigger the score upgrade process in BackgroundBeatmapProcessor.
                             score.Version = 30000002;
+
+                            // Set a sane default while background processing runs.
+                            score.LegacyTotalScore = score.TotalScore;
                         }
                         else
                             score.Version = LegacyScoreEncoder.LATEST_VERSION;
diff --git a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
index a5ac151cf8..ef033bf5bd 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Scoring.Legacy
         /// <remarks>
         /// <list type="bullet">
         /// <item><description>30000001: Appends <see cref="LegacyReplaySoloScoreInfo"/> to the end of scores.</description></item>
-        /// <item><description>30000002: Score stored to replay calculated using the Score V2 algorithm.</description></item>
+        /// <item><description>30000002: Score stored to replay calculated using the Score V2 algorithm. Legacy scores on this version are candidate to Score V1 -> V2 conversion.</description></item>
         /// <item><description>30000003: First version after converting legacy total score to standardised.</description></item>
         /// </list>
         /// </remarks>

From 4de15f975e1acf5bd91077f8464f35aba68c3805 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 Jul 2023 18:08:26 +0900
Subject: [PATCH 1167/1604] Fix realm silly business

---
 osu.Game/BackgroundBeatmapProcessor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/BackgroundBeatmapProcessor.cs b/osu.Game/BackgroundBeatmapProcessor.cs
index 3af6f0771c..0b8323eb41 100644
--- a/osu.Game/BackgroundBeatmapProcessor.cs
+++ b/osu.Game/BackgroundBeatmapProcessor.cs
@@ -200,7 +200,7 @@ namespace osu.Game
         {
             Logger.Log("Querying for scores that need total score conversion...");
 
-            HashSet<Guid> scoreIds = realmAccess.Run(r => new HashSet<Guid>(r.All<ScoreInfo>().Where(s => s.Version == 30000002).Select(s => s.ID)));
+            HashSet<Guid> scoreIds = realmAccess.Run(r => new HashSet<Guid>(r.All<ScoreInfo>().Where(s => s.Version == 30000002).AsEnumerable().Select(s => s.ID)));
 
             Logger.Log($"Found {scoreIds.Count} scores which require total score conversion.");
 

From 257a96ef604a494122ec564a20405bbe6ad63be8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 Jul 2023 18:21:22 +0900
Subject: [PATCH 1168/1604] Fix background beatmap processor thread not
 correctly exiting

---
 osu.Game/BackgroundBeatmapProcessor.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/BackgroundBeatmapProcessor.cs b/osu.Game/BackgroundBeatmapProcessor.cs
index 0b8323eb41..f5e3f721f7 100644
--- a/osu.Game/BackgroundBeatmapProcessor.cs
+++ b/osu.Game/BackgroundBeatmapProcessor.cs
@@ -189,6 +189,10 @@ namespace osu.Game
 
                     Logger.Log($"Populated maximum statistics for score {id}");
                 }
+                catch (ObjectDisposedException)
+                {
+                    throw;
+                }
                 catch (Exception e)
                 {
                     Logger.Log(@$"Failed to populate maximum statistics for {id}: {e}");
@@ -237,6 +241,10 @@ namespace osu.Game
                     Logger.Log($"Converted total score for score {id}");
                     ++processedCount;
                 }
+                catch (ObjectDisposedException)
+                {
+                    throw;
+                }
                 catch (Exception e)
                 {
                     Logger.Log($"Failed to convert total score for {id}: {e}");

From 56bfb92ba656ccb216bc10c64a1fb5e0144bc847 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 Jul 2023 18:22:10 +0900
Subject: [PATCH 1169/1604] Allow user cancellation

---
 osu.Game/BackgroundBeatmapProcessor.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/BackgroundBeatmapProcessor.cs b/osu.Game/BackgroundBeatmapProcessor.cs
index f5e3f721f7..ca33a74c57 100644
--- a/osu.Game/BackgroundBeatmapProcessor.cs
+++ b/osu.Game/BackgroundBeatmapProcessor.cs
@@ -219,6 +219,9 @@ namespace osu.Game
 
             foreach (var id in scoreIds)
             {
+                if (notification.State == ProgressNotificationState.Cancelled)
+                    break;
+
                 notification.Text = $"Upgrading scores to new scoring algorithm ({processedCount} of {scoreIds.Count})";
                 notification.Progress = (float)processedCount / scoreIds.Count;
 

From d3eb06578e96a75be4521fe92a461d043aaa3d45 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 Jul 2023 18:34:53 +0900
Subject: [PATCH 1170/1604] Improve messaging around failed scores

---
 osu.Game/BackgroundBeatmapProcessor.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game/BackgroundBeatmapProcessor.cs b/osu.Game/BackgroundBeatmapProcessor.cs
index ca33a74c57..018b1352b2 100644
--- a/osu.Game/BackgroundBeatmapProcessor.cs
+++ b/osu.Game/BackgroundBeatmapProcessor.cs
@@ -216,6 +216,7 @@ namespace osu.Game
             notificationOverlay?.Post(notification);
 
             int processedCount = 0;
+            int failedCount = 0;
 
             foreach (var id in scoreIds)
             {
@@ -251,6 +252,7 @@ namespace osu.Game
                 catch (Exception e)
                 {
                     Logger.Log($"Failed to convert total score for {id}: {e}");
+                    ++failedCount;
                 }
             }
 
@@ -262,7 +264,12 @@ namespace osu.Game
             }
             else
             {
-                notification.CompletionText = $"{processedCount} of {scoreIds.Count} score(s) have been upgraded to the new scoring algorithm. Check logs for issues with remaining scores.";
+                notification.Text = $"{processedCount} of {scoreIds.Count} score(s) have been upgraded to the new scoring algorithm.";
+
+                // We may have arrived here due to user cancellation or completion with failures.
+                if (failedCount > 0)
+                    notification.Text += $" Check logs for issues with {failedCount} failed upgrades.";
+
                 notification.State = ProgressNotificationState.Cancelled;
             }
         }

From dd9998127eb8e1d9899bca50cbd6b6fbf8af0650 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 Jul 2023 18:35:03 +0900
Subject: [PATCH 1171/1604] Count missing beatmaps as errored items

---
 osu.Game/Database/StandardisedScoreMigrationTools.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index 7ab90c337c..60530c31cb 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -205,9 +205,14 @@ namespace osu.Game.Database
             if (ruleset is not ILegacyRuleset legacyRuleset)
                 return score.TotalScore;
 
+            var playableBeatmap = beatmap.GetPlayableBeatmap(ruleset.RulesetInfo, score.Mods);
+
+            if (playableBeatmap.HitObjects.Count == 0)
+                throw new InvalidOperationException("Beatmap contains no hit objects!");
+
             ILegacyScoreSimulator sv1Simulator = legacyRuleset.CreateLegacyScoreSimulator();
 
-            sv1Simulator.Simulate(beatmap, beatmap.GetPlayableBeatmap(ruleset.RulesetInfo, score.Mods), score.Mods);
+            sv1Simulator.Simulate(beatmap, playableBeatmap, score.Mods);
 
             return ConvertFromLegacyTotalScore(score, new DifficultyAttributes
             {

From 664294cef4728d4b35d51fa58cf9480913a2a10d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 Jul 2023 18:39:19 +0900
Subject: [PATCH 1172/1604] Fix cancelled progress notifications requiring exit
 confirmation

---
 osu.Game/Overlays/INotificationOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/INotificationOverlay.cs b/osu.Game/Overlays/INotificationOverlay.cs
index 6a1b66bbd2..c5ff10c619 100644
--- a/osu.Game/Overlays/INotificationOverlay.cs
+++ b/osu.Game/Overlays/INotificationOverlay.cs
@@ -44,6 +44,6 @@ namespace osu.Game.Overlays
         /// <summary>
         /// All ongoing operations (ie. any <see cref="ProgressNotification"/> not in a completed state).
         /// </summary>
-        public IEnumerable<ProgressNotification> OngoingOperations => AllNotifications.OfType<ProgressNotification>().Where(p => p.State != ProgressNotificationState.Completed);
+        public IEnumerable<ProgressNotification> OngoingOperations => AllNotifications.OfType<ProgressNotification>().Where(p => p.State != ProgressNotificationState.Completed && p.State != ProgressNotificationState.Cancelled);
     }
 }

From aee89e5e4bacfbfe4263f941457f28837a595135 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 Jul 2023 19:59:57 +0900
Subject: [PATCH 1173/1604] Rewrite comment regarding `LegacyTotalScore`

---
 osu.Game/Database/RealmAccess.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index 95297e9cd6..02abed2495 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -977,7 +977,7 @@ namespace osu.Game.Database
                             // Scores with this version will trigger the score upgrade process in BackgroundBeatmapProcessor.
                             score.Version = 30000002;
 
-                            // Set a sane default while background processing runs.
+                            // Transfer known legacy scores to a permanent storage field for preservation.
                             score.LegacyTotalScore = score.TotalScore;
                         }
                         else

From f2aa80f4138452c4a859e463f780c1c87b106cc1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 Jul 2023 20:02:25 +0900
Subject: [PATCH 1174/1604] Rename and adjust xmldoc on `TotalScoreVersion`

---
 osu.Game/BackgroundBeatmapProcessor.cs |  4 ++--
 osu.Game/Database/RealmAccess.cs       |  4 ++--
 osu.Game/Scoring/ScoreInfo.cs          | 24 +++++++++++++-----------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/osu.Game/BackgroundBeatmapProcessor.cs b/osu.Game/BackgroundBeatmapProcessor.cs
index 018b1352b2..9fe3a41b03 100644
--- a/osu.Game/BackgroundBeatmapProcessor.cs
+++ b/osu.Game/BackgroundBeatmapProcessor.cs
@@ -204,7 +204,7 @@ namespace osu.Game
         {
             Logger.Log("Querying for scores that need total score conversion...");
 
-            HashSet<Guid> scoreIds = realmAccess.Run(r => new HashSet<Guid>(r.All<ScoreInfo>().Where(s => s.Version == 30000002).AsEnumerable().Select(s => s.ID)));
+            HashSet<Guid> scoreIds = realmAccess.Run(r => new HashSet<Guid>(r.All<ScoreInfo>().Where(s => s.TotalScoreVersion == 30000002).AsEnumerable().Select(s => s.ID)));
 
             Logger.Log($"Found {scoreIds.Count} scores which require total score conversion.");
 
@@ -239,7 +239,7 @@ namespace osu.Game
                     {
                         ScoreInfo s = r.Find<ScoreInfo>(id);
                         s.TotalScore = newTotalScore;
-                        s.Version = LegacyScoreEncoder.LATEST_VERSION;
+                        s.TotalScoreVersion = LegacyScoreEncoder.LATEST_VERSION;
                     });
 
                     Logger.Log($"Converted total score for score {id}");
diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index 02abed2495..2bc932f307 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -975,13 +975,13 @@ namespace osu.Game.Database
                         if (score.IsLegacyScore && score.Ruleset.IsLegacyRuleset())
                         {
                             // Scores with this version will trigger the score upgrade process in BackgroundBeatmapProcessor.
-                            score.Version = 30000002;
+                            score.TotalScoreVersion = 30000002;
 
                             // Transfer known legacy scores to a permanent storage field for preservation.
                             score.LegacyTotalScore = score.TotalScore;
                         }
                         else
-                            score.Version = LegacyScoreEncoder.LATEST_VERSION;
+                            score.TotalScoreVersion = LegacyScoreEncoder.LATEST_VERSION;
                     }
 
                     break;
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 94376300fa..eddd1bb80a 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -54,13 +54,25 @@ namespace osu.Game.Scoring
 
         public long TotalScore { get; set; }
 
+        /// <summary>
+        /// The version of processing applied to calculate total score as stored in the database.
+        /// If this does not match <see cref="LegacyScoreEncoder.LATEST_VERSION"/>,
+        /// the total score has not yet been updated to reflect the current scoring values.
+        ///
+        /// See <see cref="BackgroundBeatmapProcessor"/>'s conversion logic.
+        /// </summary>
+        /// <remarks>
+        /// This may not match the version stored in the replay files.
+        /// </remarks>
+        internal int TotalScoreVersion { get; set; } = LegacyScoreEncoder.LATEST_VERSION;
+
         /// <summary>
         /// Used to preserve the total score for legacy scores.
         /// </summary>
         /// <remarks>
         /// Not populated if <see cref="IsLegacyScore"/> is <c>false</c>.
         /// </remarks>
-        public long? LegacyTotalScore { get; set; }
+        internal long? LegacyTotalScore { get; set; }
 
         public int MaxCombo { get; set; }
 
@@ -72,16 +84,6 @@ namespace osu.Game.Scoring
 
         public double? PP { get; set; }
 
-        /// <summary>
-        /// The version of this score as stored in the database.
-        /// If this does not match <see cref="LegacyScoreEncoder.LATEST_VERSION"/>,
-        /// then the score has not yet been updated to reflect the current scoring values.
-        /// </summary>
-        /// <remarks>
-        /// This may not match the version stored in the replay files.
-        /// </remarks>
-        public int Version { get; set; } = LegacyScoreEncoder.LATEST_VERSION;
-
         [Indexed]
         public long OnlineID { get; set; } = -1;
 

From a55809733dd1c9ec05f2a9ecfadcc97da827c17e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 4 Jul 2023 22:20:50 +0200
Subject: [PATCH 1175/1604] Expand `ScoreInfo.BeatmapInfo` xmldoc

---
 osu.Game/Scoring/ScoreInfo.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 6816e86e9d..4798a105c5 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -34,7 +34,14 @@ namespace osu.Game.Scoring
         /// The <see cref="BeatmapInfo"/> this score was made against.
         /// </summary>
         /// <remarks>
-        /// When setting this, make sure to also set <see cref="BeatmapHash"/> to allow relational consistency when a beatmap is potentially changed.
+        /// <para>
+        /// This property may be <see langword="null"/> if the score was set on a beatmap (or a version of the beatmap) that is not available locally
+        /// e.g. due to online updates, or local modifications to the beatmap.
+        /// The property will only link to a <see cref="BeatmapInfo"/> if its <see cref="Beatmaps.BeatmapInfo.Hash"/> matches <see cref="BeatmapHash"/>.
+        /// </para>
+        /// <para>
+        /// Due to the above, whenever setting this, make sure to also set <see cref="BeatmapHash"/> to allow relational consistency when a beatmap is potentially changed.
+        /// </para>
         /// </remarks>
         public BeatmapInfo? BeatmapInfo { get; set; }
 

From bcdbdf57efe1218e2f378a2a4830425bf508a0b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 4 Jul 2023 22:22:57 +0200
Subject: [PATCH 1176/1604] Reword comment

---
 osu.Game.Tests/Database/BeatmapImporterTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Database/BeatmapImporterTests.cs b/osu.Game.Tests/Database/BeatmapImporterTests.cs
index 2766e4509e..0eac70f9c8 100644
--- a/osu.Game.Tests/Database/BeatmapImporterTests.cs
+++ b/osu.Game.Tests/Database/BeatmapImporterTests.cs
@@ -454,7 +454,7 @@ namespace osu.Game.Tests.Database
                 Assert.That(score.BeatmapInfo, Is.Null);
                 Assert.That(score.BeatmapHash, Is.EqualTo(originalHash));
 
-                // imitate making local changes via editor
+                // imitate reverting the local changes made above
                 // ReSharper disable once MethodHasAsyncOverload
                 realm.Write(r =>
                 {

From e2ddcb23497468c45d1285797984fb531d0cef1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 4 Jul 2023 22:39:26 +0200
Subject: [PATCH 1177/1604] Silence a few remaining nullability warnings

---
 .../Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs       | 2 +-
 osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs         | 2 +-
 osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs               | 2 +-
 .../Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs     | 2 +-
 osu.Game/Screens/Play/SoloPlayer.cs                             | 2 +-
 osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
index c05774400f..d71c72f4ec 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Tests.Visual.Ranking
                 var author = new RealmUser { Username = "mapper_name" };
 
                 var score = TestResources.CreateTestScoreInfo(createTestBeatmap(author));
-                score.Mods = score.BeatmapInfo.Ruleset.CreateInstance().CreateAllMods().ToArray();
+                score.Mods = score.BeatmapInfo!.Ruleset.CreateInstance().CreateAllMods().ToArray();
 
                 showPanel(score);
             });
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
index 42068ff117..c5b61c1a90 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
@@ -405,7 +405,7 @@ namespace osu.Game.Tests.Visual.Ranking
             public UnrankedSoloResultsScreen(ScoreInfo score)
                 : base(score, true)
             {
-                Score.BeatmapInfo.OnlineID = 0;
+                Score.BeatmapInfo!.OnlineID = 0;
                 Score.BeatmapInfo.Status = BeatmapOnlineStatus.Pending;
             }
 
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index 425f40258e..615a3e39af 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -163,7 +163,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 },
                 username,
 #pragma warning disable 618
-                new StatisticText(score.MaxCombo, score.BeatmapInfo.MaxCombo, @"0\x"),
+                new StatisticText(score.MaxCombo, score.BeatmapInfo!.MaxCombo, @"0\x"),
 #pragma warning restore 618
             };
 
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index e030b1e34f..c92b79cb4d 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -123,7 +123,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 accuracyColumn.Text = value.DisplayAccuracy;
                 maxComboColumn.Text = value.MaxCombo.ToLocalisableString(@"0\x");
 
-                ppColumn.Alpha = value.BeatmapInfo.Status.GrantsPerformancePoints() ? 1 : 0;
+                ppColumn.Alpha = value.BeatmapInfo!.Status.GrantsPerformancePoints() ? 1 : 0;
 
                 if (value.PP is double pp)
                     ppColumn.Text = pp.ToLocalisableString(@"N0");
diff --git a/osu.Game/Screens/Play/SoloPlayer.cs b/osu.Game/Screens/Play/SoloPlayer.cs
index dafdf00136..f7ae3eb62b 100644
--- a/osu.Game/Screens/Play/SoloPlayer.cs
+++ b/osu.Game/Screens/Play/SoloPlayer.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Screens.Play
         {
             IBeatmapInfo beatmap = score.ScoreInfo.BeatmapInfo;
 
-            Debug.Assert(beatmap.OnlineID > 0);
+            Debug.Assert(beatmap!.OnlineID > 0);
 
             return new SubmitSoloScoreRequest(score.ScoreInfo, token, beatmap.OnlineID);
         }
diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index 82c429798e..d1dc1a81db 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Screens.Ranking.Expanded
         [BackgroundDependencyLoader]
         private void load(BeatmapDifficultyCache beatmapDifficultyCache)
         {
-            var beatmap = score.BeatmapInfo;
+            var beatmap = score.BeatmapInfo!;
             var metadata = beatmap.BeatmapSet?.Metadata ?? beatmap.Metadata;
             string creator = metadata.Author.Username;
 

From 6dc8c7b617038a87898c0a847788c4cd502c7c79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 3 Jul 2023 22:26:41 +0200
Subject: [PATCH 1178/1604] Add `HitObjectLifetimeEntry.NestedEntries`

---
 osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs b/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
index b517f6b9e6..4e058e7c31 100644
--- a/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
+++ b/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Performance;
 using osu.Game.Rulesets.Judgements;
@@ -19,6 +20,11 @@ namespace osu.Game.Rulesets.Objects
         /// </summary>
         public readonly HitObject HitObject;
 
+        /// <summary>
+        /// The list of <see cref="HitObjectLifetimeEntry"/> for the <see cref="HitObject"/>'s nested objects (if any).
+        /// </summary>
+        public readonly List<HitObjectLifetimeEntry> NestedEntries = new List<HitObjectLifetimeEntry>();
+
         /// <summary>
         /// The result that <see cref="HitObject"/> was judged with.
         /// This is set by the accompanying <see cref="DrawableHitObject"/>, and reused when required for rewinding.

From 2b098bdf6120120e8f1985bf98d16ea26a578f6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 4 Jul 2023 23:23:23 +0200
Subject: [PATCH 1179/1604] Add test coverage for mixed pooled/non-pooled
 usages

---
 .../Gameplay/TestScenePoolingRuleset.cs       | 85 ++++++++++++++++---
 1 file changed, 73 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs
index d16f51f36e..e3afb91040 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs
@@ -170,7 +170,16 @@ namespace osu.Game.Tests.Visual.Gameplay
             ManualClock clock = null;
 
             var beatmap = new Beatmap();
-            beatmap.HitObjects.Add(new TestHitObjectWithNested { Duration = 40 });
+            beatmap.HitObjects.Add(new TestHitObjectWithNested
+            {
+                Duration = 40,
+                NestedObjects = new HitObject[]
+                {
+                    new PooledNestedHitObject { StartTime = 10 },
+                    new PooledNestedHitObject { StartTime = 20 },
+                    new PooledNestedHitObject { StartTime = 30 }
+                }
+            });
 
             createTest(beatmap, 10, () => new FramedClock(clock = new ManualClock()));
 
@@ -209,6 +218,44 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("object judged", () => playfield.JudgedObjects.Count == 1);
         }
 
+        [Test]
+        public void TestPooledObjectWithNonPooledNesteds()
+        {
+            ManualClock clock = null;
+            TestHitObjectWithNested hitObjectWithNested;
+
+            var beatmap = new Beatmap();
+            beatmap.HitObjects.Add(hitObjectWithNested = new TestHitObjectWithNested
+            {
+                Duration = 40,
+                NestedObjects = new HitObject[]
+                {
+                    new PooledNestedHitObject { StartTime = 10 },
+                    new NonPooledNestedHitObject { StartTime = 20 },
+                    new NonPooledNestedHitObject { StartTime = 30 }
+                }
+            });
+
+            createTest(beatmap, 10, () => new FramedClock(clock = new ManualClock()));
+
+            AddAssert("hitobject entry has all nesteds", () => playfield.HitObjectContainer.Entries.Single().NestedEntries, () => Has.Count.EqualTo(3));
+
+            AddStep("skip to middle of object", () => clock.CurrentTime = (hitObjectWithNested.StartTime + hitObjectWithNested.GetEndTime()) / 2);
+            AddAssert("2 objects judged", () => playfield.JudgedObjects.Count, () => Is.EqualTo(2));
+
+            AddStep("skip to before end of object", () => clock.CurrentTime = hitObjectWithNested.GetEndTime() - 1);
+            AddAssert("3 objects judged", () => playfield.JudgedObjects.Count, () => Is.EqualTo(3));
+
+            AddStep("removing object doesn't crash", () => playfield.Remove(hitObjectWithNested));
+            AddStep("clear judged", () => playfield.JudgedObjects.Clear());
+            AddStep("add object back", () => playfield.Add(hitObjectWithNested));
+
+            AddStep("skip to long past object", () => clock.CurrentTime = 100_000);
+            // the parent entry should still be linked to nested entries of pooled objects that are managed externally
+            // but not contain synthetic entries that were created for the non-pooled objects.
+            AddAssert("entry still has non-synthetic nested entries", () => playfield.HitObjectContainer.Entries.Single().NestedEntries, () => Has.Count.EqualTo(1));
+        }
+
         private void createTest(IBeatmap beatmap, int poolSize, Func<IFrameBasedClock> createClock = null)
         {
             AddStep("create test", () =>
@@ -289,7 +336,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 RegisterPool<TestHitObject, DrawableTestHitObject>(poolSize);
                 RegisterPool<TestKilledHitObject, DrawableTestKilledHitObject>(poolSize);
                 RegisterPool<TestHitObjectWithNested, DrawableTestHitObjectWithNested>(poolSize);
-                RegisterPool<NestedHitObject, DrawableNestedHitObject>(poolSize);
+                RegisterPool<PooledNestedHitObject, DrawableNestedHitObject>(poolSize);
             }
 
             protected override HitObjectLifetimeEntry CreateLifetimeEntry(HitObject hitObject) => new TestHitObjectLifetimeEntry(hitObject);
@@ -422,16 +469,22 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private class TestHitObjectWithNested : TestHitObject
         {
+            public IEnumerable<HitObject> NestedObjects { get; init; } = Array.Empty<HitObject>();
+
             protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
             {
                 base.CreateNestedHitObjects(cancellationToken);
 
-                for (int i = 0; i < 3; ++i)
-                    AddNested(new NestedHitObject { StartTime = (float)Duration * (i + 1) / 4 });
+                foreach (var ho in NestedObjects)
+                    AddNested(ho);
             }
         }
 
-        private class NestedHitObject : ConvertHitObject
+        private class PooledNestedHitObject : ConvertHitObject
+        {
+        }
+
+        private class NonPooledNestedHitObject : ConvertHitObject
         {
         }
 
@@ -482,6 +535,9 @@ namespace osu.Game.Tests.Visual.Gameplay
                 nestedContainer.Clear(false);
             }
 
+            protected override DrawableHitObject CreateNestedHitObject(HitObject hitObject)
+                => hitObject is NonPooledNestedHitObject nonPooled ? new DrawableNestedHitObject(nonPooled) : null;
+
             protected override void CheckForResult(bool userTriggered, double timeOffset)
             {
                 base.CheckForResult(userTriggered, timeOffset);
@@ -490,25 +546,30 @@ namespace osu.Game.Tests.Visual.Gameplay
             }
         }
 
-        private partial class DrawableNestedHitObject : DrawableHitObject<NestedHitObject>
+        private partial class DrawableNestedHitObject : DrawableHitObject
         {
             public DrawableNestedHitObject()
-                : this(null)
             {
             }
 
-            public DrawableNestedHitObject(NestedHitObject hitObject)
+            public DrawableNestedHitObject(PooledNestedHitObject hitObject)
+                : base(hitObject)
+            {
+            }
+
+            public DrawableNestedHitObject(NonPooledNestedHitObject hitObject)
                 : base(hitObject)
             {
-                Size = new Vector2(15);
-                Colour = Colour4.White;
-                RelativePositionAxes = Axes.Both;
-                Origin = Anchor.Centre;
             }
 
             [BackgroundDependencyLoader]
             private void load()
             {
+                Size = new Vector2(15);
+                Colour = Colour4.White;
+                RelativePositionAxes = Axes.Both;
+                Origin = Anchor.Centre;
+
                 AddInternal(new Circle
                 {
                     RelativeSizeAxes = Axes.Both,

From bae7670855a9060d9eec38628039ceca573a6feb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 3 Jul 2023 22:33:11 +0200
Subject: [PATCH 1180/1604] Redirect `HitObjectEntryManager` child mapping to
 HOLE

---
 .../Objects/HitObjectLifetimeEntry.cs         |  2 +-
 .../Objects/Pooling/HitObjectEntryManager.cs  | 35 +++++++------------
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs b/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
index 4e058e7c31..69a78c6bd0 100644
--- a/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
+++ b/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Objects
         /// <summary>
         /// The list of <see cref="HitObjectLifetimeEntry"/> for the <see cref="HitObject"/>'s nested objects (if any).
         /// </summary>
-        public readonly List<HitObjectLifetimeEntry> NestedEntries = new List<HitObjectLifetimeEntry>();
+        public List<HitObjectLifetimeEntry> NestedEntries { get; internal set; } = new List<HitObjectLifetimeEntry>();
 
         /// <summary>
         /// The result that <see cref="HitObject"/> was judged with.
diff --git a/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs b/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
index 6c39ea44da..08f693bae3 100644
--- a/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
+++ b/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
@@ -43,11 +43,6 @@ namespace osu.Game.Rulesets.Objects.Pooling
         /// </remarks>
         private readonly Dictionary<HitObjectLifetimeEntry, HitObject> parentMap = new Dictionary<HitObjectLifetimeEntry, HitObject>();
 
-        /// <summary>
-        /// Stores the list of child entries for each hit object managed by this <see cref="HitObjectEntryManager"/>.
-        /// </summary>
-        private readonly Dictionary<HitObject, List<HitObjectLifetimeEntry>> childrenMap = new Dictionary<HitObject, List<HitObjectLifetimeEntry>>();
-
         public void Add(HitObjectLifetimeEntry entry, HitObject? parent)
         {
             HitObject hitObject = entry.HitObject;
@@ -57,14 +52,13 @@ namespace osu.Game.Rulesets.Objects.Pooling
 
             // Add the entry.
             entryMap[hitObject] = entry;
-            childrenMap[hitObject] = new List<HitObjectLifetimeEntry>();
 
             // If the entry has a parent, set it and add the entry to the parent's children.
             if (parent != null)
             {
                 parentMap[entry] = parent;
-                if (childrenMap.TryGetValue(parent, out var parentChildEntries))
-                    parentChildEntries.Add(entry);
+                if (entryMap.TryGetValue(parent, out var parentEntry))
+                    parentEntry.NestedEntries.Add(entry);
             }
 
             hitObject.DefaultsApplied += onDefaultsApplied;
@@ -81,15 +75,12 @@ namespace osu.Game.Rulesets.Objects.Pooling
             entryMap.Remove(hitObject);
 
             // If the entry has a parent, unset it and remove the entry from the parents' children.
-            if (parentMap.Remove(entry, out var parent) && childrenMap.TryGetValue(parent, out var parentChildEntries))
-                parentChildEntries.Remove(entry);
+            if (parentMap.Remove(entry, out var parent) && entryMap.TryGetValue(parent, out var parentEntry))
+                parentEntry.NestedEntries.Remove(entry);
 
             // Remove all the entries' children.
-            if (childrenMap.Remove(hitObject, out var childEntries))
-            {
-                foreach (var childEntry in childEntries)
-                    Remove(childEntry);
-            }
+            foreach (var childEntry in entry.NestedEntries)
+                Remove(childEntry);
 
             hitObject.DefaultsApplied -= onDefaultsApplied;
             OnEntryRemoved?.Invoke(entry, parent);
@@ -105,16 +96,16 @@ namespace osu.Game.Rulesets.Objects.Pooling
         /// </summary>
         private void onDefaultsApplied(HitObject hitObject)
         {
-            if (!childrenMap.Remove(hitObject, out var childEntries))
+            if (!entryMap.TryGetValue(hitObject, out var entry))
                 return;
 
-            // Remove all the entries' children. At this point the parents' (this entries') children list has been removed from the map, so this does not cause upwards traversal.
-            foreach (var entry in childEntries)
-                Remove(entry);
+            // Replace the entire list rather than clearing to prevent circular traversal later.
+            var previousEntries = entry.NestedEntries;
+            entry.NestedEntries = new List<HitObjectLifetimeEntry>();
 
-            // The removed children list needs to be added back to the map for the entry to potentially receive children.
-            childEntries.Clear();
-            childrenMap[hitObject] = childEntries;
+            // Remove all the entries' children. At this point the parents' (this entries') children list has been reconstructed, so this does not cause upwards traversal.
+            foreach (var nested in previousEntries)
+                Remove(nested);
         }
     }
 }

From 0ceaf3c451e0135d529d7ddba9b8e55069d62031 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 3 Jul 2023 22:39:39 +0200
Subject: [PATCH 1181/1604] Ensure synthetic entries from non-pooled DHO are
 linked to parents

---
 .../Rulesets/Objects/Drawables/DrawableHitObject.cs  | 12 ++++++++++++
 .../Objects/Pooling/HitObjectEntryManager.cs         |  6 +++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 07c0d1f8a1..41d46fe85d 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -218,6 +218,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
         protected sealed override void OnApply(HitObjectLifetimeEntry entry)
         {
+            Debug.Assert(Entry != null);
+
             // LifetimeStart is already computed using HitObjectLifetimeEntry's InitialLifetimeOffset.
             // We override this with DHO's InitialLifetimeOffset for a non-pooled DHO.
             if (entry is SyntheticHitObjectEntry)
@@ -247,6 +249,12 @@ namespace osu.Game.Rulesets.Objects.Drawables
                 drawableNested.ParentHitObject = this;
 
                 nestedHitObjects.Add(drawableNested);
+
+                // assume that synthetic entries are not pooled and therefore need to be managed from within the DHO.
+                // this is important for the correctness of value of flags such as `AllJudged`.
+                if (drawableNested.Entry is SyntheticHitObjectEntry syntheticNestedEntry)
+                    Entry.NestedEntries.Add(syntheticNestedEntry);
+
                 AddNestedHitObject(drawableNested);
             }
 
@@ -290,6 +298,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
         protected sealed override void OnFree(HitObjectLifetimeEntry entry)
         {
+            Debug.Assert(Entry != null);
+
             StartTimeBindable.UnbindFrom(HitObject.StartTimeBindable);
 
             if (HitObject is IHasComboInformation combo)
@@ -318,6 +328,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
             }
 
             nestedHitObjects.Clear();
+            // clean up synthetic entries manually added in `Apply()`.
+            Entry.NestedEntries.RemoveAll(nestedEntry => nestedEntry is SyntheticHitObjectEntry);
             ClearNestedHitObjects();
 
             HitObject.DefaultsApplied -= onDefaultsApplied;
diff --git a/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs b/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
index 08f693bae3..fabf4fc444 100644
--- a/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
+++ b/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
@@ -65,8 +65,11 @@ namespace osu.Game.Rulesets.Objects.Pooling
             OnEntryAdded?.Invoke(entry, parent);
         }
 
-        public void Remove(HitObjectLifetimeEntry entry)
+        public bool Remove(HitObjectLifetimeEntry entry)
         {
+            if (entry is SyntheticHitObjectEntry)
+                return false;
+
             HitObject hitObject = entry.HitObject;
 
             if (!entryMap.ContainsKey(hitObject))
@@ -84,6 +87,7 @@ namespace osu.Game.Rulesets.Objects.Pooling
 
             hitObject.DefaultsApplied -= onDefaultsApplied;
             OnEntryRemoved?.Invoke(entry, parent);
+            return true;
         }
 
         public bool TryGet(HitObject hitObject, [MaybeNullWhen(false)] out HitObjectLifetimeEntry entry)

From 6c4e52821de1214a0c8aa75e47f5d7c1fe64f6b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 3 Jul 2023 22:42:50 +0200
Subject: [PATCH 1182/1604] Redirect judgement-related flags from DHO to HOLE

---
 .../Rulesets/Objects/Drawables/DrawableHitObject.cs  | 10 +++++-----
 osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs  | 12 ++++++++++++
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 41d46fe85d..08dcf91e52 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -98,9 +98,9 @@ namespace osu.Game.Rulesets.Objects.Drawables
         public virtual bool DisplayResult => true;
 
         /// <summary>
-        /// Whether this <see cref="DrawableHitObject"/> and all of its nested <see cref="DrawableHitObject"/>s have been judged.
+        /// The scoring result of this <see cref="DrawableHitObject"/>.
         /// </summary>
-        public bool AllJudged => Judged && NestedHitObjects.All(h => h.AllJudged);
+        public JudgementResult Result => Entry?.Result;
 
         /// <summary>
         /// Whether this <see cref="DrawableHitObject"/> has been hit. This occurs if <see cref="Result"/> is hit.
@@ -112,12 +112,12 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// Whether this <see cref="DrawableHitObject"/> has been judged.
         /// Note: This does NOT include nested hitobjects.
         /// </summary>
-        public bool Judged => Result?.HasResult ?? true;
+        public bool Judged => Entry?.Judged ?? true;
 
         /// <summary>
-        /// The scoring result of this <see cref="DrawableHitObject"/>.
+        /// Whether this <see cref="DrawableHitObject"/> and all of its nested <see cref="DrawableHitObject"/>s have been judged.
         /// </summary>
-        public JudgementResult Result => Entry?.Result;
+        public bool AllJudged => Entry?.AllJudged ?? true;
 
         /// <summary>
         /// The relative X position of this hit object for sample playback balance adjustment.
diff --git a/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs b/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
index 69a78c6bd0..1d99e7440f 100644
--- a/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
+++ b/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Performance;
 using osu.Game.Rulesets.Judgements;
@@ -31,6 +32,17 @@ namespace osu.Game.Rulesets.Objects
         /// </summary>
         internal JudgementResult? Result;
 
+        /// <summary>
+        /// Whether <see cref="HitObject"/> has been judged.
+        /// Note: This does NOT include nested hitobjects.
+        /// </summary>
+        public bool Judged => Result?.HasResult ?? true;
+
+        /// <summary>
+        /// Whether <see cref="HitObject"/> and all of its nested objects have been judged.
+        /// </summary>
+        public bool AllJudged => Judged && NestedEntries.All(h => h.AllJudged);
+
         private readonly IBindable<double> startTimeBindable = new BindableDouble();
 
         internal event Action? RevertResult;

From b0f6b22fa7872b4eab09b6782af2297568ec17ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 4 Jul 2023 23:48:46 +0200
Subject: [PATCH 1183/1604] Add assertions covering correctness of judged flags
 on entry

---
 osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs
index e3afb91040..fea7456472 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs
@@ -242,18 +242,23 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddStep("skip to middle of object", () => clock.CurrentTime = (hitObjectWithNested.StartTime + hitObjectWithNested.GetEndTime()) / 2);
             AddAssert("2 objects judged", () => playfield.JudgedObjects.Count, () => Is.EqualTo(2));
+            AddAssert("entry not all judged", () => playfield.HitObjectContainer.Entries.Single().AllJudged, () => Is.False);
 
             AddStep("skip to before end of object", () => clock.CurrentTime = hitObjectWithNested.GetEndTime() - 1);
             AddAssert("3 objects judged", () => playfield.JudgedObjects.Count, () => Is.EqualTo(3));
+            AddAssert("entry not all judged", () => playfield.HitObjectContainer.Entries.Single().AllJudged, () => Is.False);
 
             AddStep("removing object doesn't crash", () => playfield.Remove(hitObjectWithNested));
             AddStep("clear judged", () => playfield.JudgedObjects.Clear());
+
             AddStep("add object back", () => playfield.Add(hitObjectWithNested));
+            AddAssert("entry not all judged", () => playfield.HitObjectContainer.Entries.Single().AllJudged, () => Is.False);
 
             AddStep("skip to long past object", () => clock.CurrentTime = 100_000);
             // the parent entry should still be linked to nested entries of pooled objects that are managed externally
             // but not contain synthetic entries that were created for the non-pooled objects.
             AddAssert("entry still has non-synthetic nested entries", () => playfield.HitObjectContainer.Entries.Single().NestedEntries, () => Has.Count.EqualTo(1));
+            AddAssert("entry all judged", () => playfield.HitObjectContainer.Entries.Single().AllJudged, () => Is.True);
         }
 
         private void createTest(IBeatmap beatmap, int poolSize, Func<IFrameBasedClock> createClock = null)

From 5947c2b298096e936eefb70943615153c20f5a87 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Jul 2023 16:07:12 +0900
Subject: [PATCH 1184/1604] Throw if a null `BeatmapInfo` arrives during score
 import process

---
 osu.Game/Scoring/ScoreImporter.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index 5770da10be..5a52f72cd5 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -98,10 +98,12 @@ namespace osu.Game.Scoring
         /// <param name="score">The score to populate the statistics of.</param>
         public void PopulateMaximumStatistics(ScoreInfo score)
         {
+            Debug.Assert(score.BeatmapInfo != null);
+
             if (score.MaximumStatistics.Select(kvp => kvp.Value).Sum() > 0)
                 return;
 
-            var beatmap = score.BeatmapInfo?.Detach();
+            var beatmap = score.BeatmapInfo!.Detach();
             var ruleset = score.Ruleset.Detach();
             var rulesetInstance = ruleset.CreateInstance();
 

From 3b9d7af9ee284ec5269da4495eb9ed2e4dfb85fa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Jul 2023 17:25:31 +0900
Subject: [PATCH 1185/1604] Fix taiko hit overlay animation timing not
 accounting for timing section start time

---
 .../Skinning/Legacy/LegacyCirclePiece.cs      | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
index 37eb95b86f..5516e025cd 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -8,6 +9,7 @@ using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Taiko.Objects;
@@ -26,11 +28,12 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
         private Bindable<int> currentCombo { get; } = new BindableInt();
 
         private int animationFrame;
-        private double beatLength;
 
         // required for editor blueprints (not sure why these circle pieces are zero size).
         public override Quad ScreenSpaceDrawQuad => backgroundLayer.ScreenSpaceDrawQuad;
 
+        private TimingControlPoint timingPoint = TimingControlPoint.DEFAULT;
+
         public LegacyCirclePiece()
         {
             RelativeSizeAxes = Axes.Both;
@@ -39,11 +42,8 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
         [Resolved(canBeNull: true)]
         private GameplayState? gameplayState { get; set; }
 
-        [Resolved(canBeNull: true)]
-        private IBeatSyncProvider? beatSyncProvider { get; set; }
-
         [BackgroundDependencyLoader]
-        private void load(ISkinSource skin, DrawableHitObject drawableHitObject)
+        private void load(ISkinSource skin, DrawableHitObject drawableHitObject, IBeatSyncProvider? beatSyncProvider)
         {
             Drawable? getDrawableFor(string lookup)
             {
@@ -64,6 +64,11 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
             if (foregroundLayer != null)
                 AddInternal(foregroundLayer);
 
+            drawableHitObject.StartTimeBindable.BindValueChanged(startTime =>
+            {
+                timingPoint = beatSyncProvider?.ControlPoints?.TimingPointAt(startTime.NewValue) ?? TimingControlPoint.DEFAULT;
+            }, true);
+
             // Animations in taiko skins are used in a custom way (>150 combo and animating in time with beat).
             // For now just stop at first frame for sanity.
             foreach (var c in InternalChildren)
@@ -115,14 +120,8 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
                 return;
             }
 
-            if (beatSyncProvider?.ControlPoints != null)
-            {
-                beatLength = beatSyncProvider.ControlPoints.TimingPointAt(Time.Current).BeatLength;
-
-                animationFrame = Time.Current % ((beatLength * 2) / multiplier) >= beatLength / multiplier ? 0 : 1;
-
-                animatableForegroundLayer.GotoFrame(animationFrame);
-            }
+            animationFrame = Math.Abs(Time.Current - timingPoint.Time) % ((timingPoint.BeatLength * 2) / multiplier) >= timingPoint.BeatLength / multiplier ? 0 : 1;
+            animatableForegroundLayer.GotoFrame(animationFrame);
         }
 
         private Color4 accentColour;

From 3f8dfc7cb035adc38e849ac1fc895739aec86b6a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Jul 2023 18:02:03 +0900
Subject: [PATCH 1186/1604] Fix fallback for `Judged` to be more correct

Without this change, when the `Judged` value is checked on an
`HitObjectLifetimeEntry` it would return `true` if a `DrawableHitObject`
has not yet been associated with the entry. Which is completely wrong.

Of note, the usage in `DrawableHitObject` will have never fallen through
to this incorrect value as they always have a result populated:

https://github.com/ppy/osu/blob/f26f001e1d01ca6bb53225da7bf06c0ad21153c5/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs#L721-L726
---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 4 ++--
 osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 08dcf91e52..e4d8eb2335 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -112,12 +112,12 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// Whether this <see cref="DrawableHitObject"/> has been judged.
         /// Note: This does NOT include nested hitobjects.
         /// </summary>
-        public bool Judged => Entry?.Judged ?? true;
+        public bool Judged => Entry?.Judged ?? false;
 
         /// <summary>
         /// Whether this <see cref="DrawableHitObject"/> and all of its nested <see cref="DrawableHitObject"/>s have been judged.
         /// </summary>
-        public bool AllJudged => Entry?.AllJudged ?? true;
+        public bool AllJudged => Entry?.AllJudged ?? false;
 
         /// <summary>
         /// The relative X position of this hit object for sample playback balance adjustment.
diff --git a/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs b/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
index 1d99e7440f..4450f026b4 100644
--- a/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
+++ b/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Objects
         /// Whether <see cref="HitObject"/> has been judged.
         /// Note: This does NOT include nested hitobjects.
         /// </summary>
-        public bool Judged => Result?.HasResult ?? true;
+        public bool Judged => Result?.HasResult ?? false;
 
         /// <summary>
         /// Whether <see cref="HitObject"/> and all of its nested objects have been judged.

From e21dc56fcbc307b517ee51491d06a29cc8f07e9c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Jul 2023 18:20:25 +0900
Subject: [PATCH 1187/1604] Add test coverage of `Judged` state

---
 .../Gameplay/TestSceneDrawableHitObject.cs    | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs b/osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs
index 04fc4cafbd..10dbede2e0 100644
--- a/osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs
@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using System;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
@@ -80,7 +81,9 @@ namespace osu.Game.Tests.Gameplay
         {
             TestLifetimeEntry entry = null;
             AddStep("Create entry", () => entry = new TestLifetimeEntry(new HitObject()) { LifetimeStart = 1 });
+            assertJudged(() => entry, false);
             AddStep("ApplyDefaults", () => entry.HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty()));
+            assertJudged(() => entry, false);
             AddAssert("Lifetime is updated", () => entry.LifetimeStart == -TestLifetimeEntry.INITIAL_LIFETIME_OFFSET);
 
             TestDrawableHitObject dho = null;
@@ -91,6 +94,7 @@ namespace osu.Game.Tests.Gameplay
             });
             AddStep("ApplyDefaults", () => entry.HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty()));
             AddAssert("Lifetime is correct", () => dho.LifetimeStart == TestDrawableHitObject.LIFETIME_ON_APPLY && entry.LifetimeStart == TestDrawableHitObject.LIFETIME_ON_APPLY);
+            assertJudged(() => entry, false);
         }
 
         [Test]
@@ -138,6 +142,29 @@ namespace osu.Game.Tests.Gameplay
             AddAssert("DHO state is correct", () => dho.State.Value == ArmedState.Miss);
         }
 
+        [Test]
+        public void TestJudgedStateThroughLifetime()
+        {
+            TestDrawableHitObject dho = null;
+            HitObjectLifetimeEntry lifetimeEntry = null;
+
+            AddStep("Create lifetime entry", () => lifetimeEntry = new HitObjectLifetimeEntry(new HitObject { StartTime = Time.Current }));
+
+            assertJudged(() => lifetimeEntry, false);
+
+            AddStep("Create DHO and apply entry", () =>
+            {
+                Child = dho = new TestDrawableHitObject();
+                dho.Apply(lifetimeEntry);
+            });
+
+            assertJudged(() => lifetimeEntry, false);
+
+            AddStep("Apply result", () => dho.MissForcefully());
+
+            assertJudged(() => lifetimeEntry, true);
+        }
+
         [Test]
         public void TestResultSetBeforeLoadComplete()
         {
@@ -154,15 +181,20 @@ namespace osu.Game.Tests.Gameplay
                     }
                 };
             });
+            assertJudged(() => lifetimeEntry, true);
             AddStep("Create DHO and apply entry", () =>
             {
                 dho = new TestDrawableHitObject();
                 dho.Apply(lifetimeEntry);
                 Child = dho;
             });
+            assertJudged(() => lifetimeEntry, true);
             AddAssert("DHO state is correct", () => dho.State.Value, () => Is.EqualTo(ArmedState.Hit));
         }
 
+        private void assertJudged(Func<HitObjectLifetimeEntry> entry, bool val) =>
+            AddAssert(val ? "Is judged" : "Not judged", () => entry().Judged, () => Is.EqualTo(val));
+
         private partial class TestDrawableHitObject : DrawableHitObject
         {
             public const double INITIAL_LIFETIME_OFFSET = 100;

From 9a7bf1beddecdcdb5281f2a1cf62be26f1f513bc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Jul 2023 18:44:01 +0900
Subject: [PATCH 1188/1604] Fix reversed order of sample return

---
 osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs b/osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs
index a04c4b60f2..6098db4f7a 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs
@@ -28,8 +28,8 @@ namespace osu.Game.Rulesets.Taiko.UI
             {
                 PlaySamples(new ISampleInfo[]
                 {
-                    hitObject.CreateHitSampleInfo(hitType == HitType.Rim ? HitSampleInfo.HIT_WHISTLE : HitSampleInfo.HIT_FINISH),
-                    baseSample
+                    baseSample,
+                    hitObject.CreateHitSampleInfo(hitType == HitType.Rim ? HitSampleInfo.HIT_WHISTLE : HitSampleInfo.HIT_FINISH)
                 });
             }
             else

From f54eb8d7fa7c3b97514afcee2fa7bb38f3a31b62 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Jun 2023 15:07:07 +0900
Subject: [PATCH 1189/1604] Move `DrumSamplePlayer` to be a skinnable component

---
 .../Skinning/Argon/TaikoArgonSkinTransformer.cs    |  3 +++
 .../Skinning/Legacy/TaikoLegacySkinTransformer.cs  |  3 +++
 osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs     |  3 ++-
 osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs     | 14 +++++++++-----
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs       |  5 ++++-
 5 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Argon/TaikoArgonSkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/Argon/TaikoArgonSkinTransformer.cs
index 780018af4e..7e3b0e99b6 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Argon/TaikoArgonSkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Argon/TaikoArgonSkinTransformer.cs
@@ -60,6 +60,9 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
                             // the drawable needs to expire as soon as possible to avoid accumulating empty drawables on the playfield.
                             return Drawable.Empty().With(d => d.Expire());
 
+                        case TaikoSkinComponents.DrumSamplePlayer:
+                            return Drawable.Empty();
+
                         case TaikoSkinComponents.TaikoExplosionGreat:
                         case TaikoSkinComponents.TaikoExplosionMiss:
                         case TaikoSkinComponents.TaikoExplosionOk:
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
index d61f9ac35d..894b91e9ce 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
@@ -52,6 +52,9 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
 
                         return null;
 
+                    case TaikoSkinComponents.DrumSamplePlayer:
+                        return null;
+
                     case TaikoSkinComponents.CentreHit:
                     case TaikoSkinComponents.RimHit:
                         if (hasHitCircle)
diff --git a/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs b/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
index b8e3313e1b..28133ffcb2 100644
--- a/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
@@ -21,6 +21,7 @@ namespace osu.Game.Rulesets.Taiko
         TaikoExplosionKiai,
         Scroller,
         Mascot,
-        KiaiGlow
+        KiaiGlow,
+        DrumSamplePlayer
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs b/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
index 6454fb5afa..f1dcd23698 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Bindings;
@@ -12,13 +13,16 @@ namespace osu.Game.Rulesets.Taiko.UI
 {
     internal partial class DrumSamplePlayer : CompositeDrawable, IKeyBindingHandler<TaikoAction>
     {
-        private readonly DrumSampleTriggerSource leftRimSampleTriggerSource;
-        private readonly DrumSampleTriggerSource leftCentreSampleTriggerSource;
-        private readonly DrumSampleTriggerSource rightCentreSampleTriggerSource;
-        private readonly DrumSampleTriggerSource rightRimSampleTriggerSource;
+        private DrumSampleTriggerSource leftRimSampleTriggerSource = null!;
+        private DrumSampleTriggerSource leftCentreSampleTriggerSource = null!;
+        private DrumSampleTriggerSource rightCentreSampleTriggerSource = null!;
+        private DrumSampleTriggerSource rightRimSampleTriggerSource = null!;
 
-        public DrumSamplePlayer(HitObjectContainer hitObjectContainer)
+        [BackgroundDependencyLoader]
+        private void load(DrawableRuleset drawableRuleset)
         {
+            var hitObjectContainer = drawableRuleset.Playfield.HitObjectContainer;
+
             InternalChildren = new Drawable[]
             {
                 leftRimSampleTriggerSource = new DrumSampleTriggerSource(hitObjectContainer),
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 9f9debe7d7..23ffac1f63 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -170,7 +170,10 @@ namespace osu.Game.Rulesets.Taiko.UI
                     RelativeSizeAxes = Axes.Both,
                 },
                 drumRollHitContainer.CreateProxy(),
-                new DrumSamplePlayer(HitObjectContainer),
+                new SkinnableDrawable(new TaikoSkinComponentLookup(TaikoSkinComponents.DrumSamplePlayer), _ => new DrumSamplePlayer())
+                {
+                    RelativeSizeAxes = Axes.Both,
+                },
                 // this is added at the end of the hierarchy to receive input before taiko objects.
                 // but is proxied below everything to not cover visual effects such as hit explosions.
                 inputDrum,

From 6d4fa6569f7e189368d345605c5ddf9ab0b4f0d3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Jun 2023 16:13:32 +0900
Subject: [PATCH 1190/1604] Add back required pieces to
 `GameplaySampleTriggerSource` from old PR

---
 .../UI/GameplaySampleTriggerSource.cs         | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs b/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
index c554318357..efbf823058 100644
--- a/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
+++ b/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
@@ -34,14 +34,19 @@ namespace osu.Game.Rulesets.UI
         [Resolved]
         private IGameplayClock? gameplayClock { get; set; }
 
+        protected readonly AudioContainer AudioContainer;
+
         public GameplaySampleTriggerSource(HitObjectContainer hitObjectContainer)
         {
             this.hitObjectContainer = hitObjectContainer;
 
-            InternalChild = hitSounds = new Container<SkinnableSound>
+            InternalChild = AudioContainer = new AudioContainer
             {
-                Name = "concurrent sample pool",
-                ChildrenEnumerable = Enumerable.Range(0, max_concurrent_hitsounds).Select(_ => new PausableSkinnableSound())
+                Child = hitSounds = new Container<SkinnableSound>
+                {
+                    Name = "concurrent sample pool",
+                    ChildrenEnumerable = Enumerable.Range(0, max_concurrent_hitsounds).Select(_ => new PausableSkinnableSound())
+                }
             };
         }
 
@@ -64,11 +69,22 @@ namespace osu.Game.Rulesets.UI
 
         protected virtual void PlaySamples(ISampleInfo[] samples) => Schedule(() =>
         {
-            var hitSound = getNextSample();
-            hitSound.Samples = samples;
+            var hitSound = GetNextSample();
+            ApplySampleInfo(hitSound, samples);
             hitSound.Play();
         });
 
+        protected virtual void ApplySampleInfo(SkinnableSound hitSound, ISampleInfo[] samples)
+        {
+            hitSound.Samples = samples;
+        }
+
+        public void StopAllPlayback() => Schedule(() =>
+        {
+            foreach (var sound in hitSounds)
+                sound.Stop();
+        });
+
         protected HitObject? GetMostValidObject()
         {
             if (mostValidObject == null || isAlreadyHit(mostValidObject))

From ae86fc736a51d6e5c8d454ade8fe5a028664dc8f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Jun 2023 16:03:11 +0900
Subject: [PATCH 1191/1604] Add argon-specific `DrumSamplePlayer`

---
 .../Skinning/Argon/ArgonDrumSamplePlayer.cs   | 49 +++++++++++++++++++
 .../Argon/TaikoArgonSkinTransformer.cs        |  2 +-
 .../UI/DrumSamplePlayer.cs                    | 13 +++--
 .../UI/DrumSampleTriggerSource.cs             |  2 +-
 4 files changed, 59 insertions(+), 7 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs
new file mode 100644
index 0000000000..5b690be780
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs
@@ -0,0 +1,49 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Game.Audio;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.UI;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Rulesets.Taiko.Skinning.Argon
+{
+    public partial class ArgonDrumSamplePlayer : DrumSamplePlayer
+    {
+        protected override DrumSampleTriggerSource CreateTriggerSource(HitObjectContainer hitObjectContainer) =>
+            new ArgonDrumSampleTriggerSource(hitObjectContainer);
+
+        public partial class ArgonDrumSampleTriggerSource : DrumSampleTriggerSource
+        {
+            public ArgonDrumSampleTriggerSource(HitObjectContainer hitObjectContainer)
+                : base(hitObjectContainer)
+            {
+            }
+
+            public override void Play(HitType hitType)
+            {
+                // let the magic begin...
+
+                TaikoHitObject? hitObject = GetMostValidObject() as TaikoHitObject;
+
+                if (hitObject == null)
+                    return;
+
+                var baseSample = hitObject.CreateHitSampleInfo(hitType == HitType.Rim ? HitSampleInfo.HIT_CLAP : HitSampleInfo.HIT_NORMAL);
+
+                if ((hitObject as TaikoStrongableHitObject)?.IsStrong == true || hitObject is StrongNestedHitObject)
+                {
+                    PlaySamples(new ISampleInfo[]
+                    {
+                        hitObject.CreateHitSampleInfo(hitType == HitType.Rim ? HitSampleInfo.HIT_WHISTLE : HitSampleInfo.HIT_FINISH),
+                        baseSample
+                    });
+                }
+                else
+                {
+                    PlaySamples(new ISampleInfo[] { baseSample });
+                }
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Argon/TaikoArgonSkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/Argon/TaikoArgonSkinTransformer.cs
index 7e3b0e99b6..9fcecd2b1a 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Argon/TaikoArgonSkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Argon/TaikoArgonSkinTransformer.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
                             return Drawable.Empty().With(d => d.Expire());
 
                         case TaikoSkinComponents.DrumSamplePlayer:
-                            return Drawable.Empty();
+                            return new ArgonDrumSamplePlayer();
 
                         case TaikoSkinComponents.TaikoExplosionGreat:
                         case TaikoSkinComponents.TaikoExplosionMiss:
diff --git a/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs b/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
index f1dcd23698..b60ad209ff 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
@@ -11,7 +11,7 @@ using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Taiko.UI
 {
-    internal partial class DrumSamplePlayer : CompositeDrawable, IKeyBindingHandler<TaikoAction>
+    public partial class DrumSamplePlayer : CompositeDrawable, IKeyBindingHandler<TaikoAction>
     {
         private DrumSampleTriggerSource leftRimSampleTriggerSource = null!;
         private DrumSampleTriggerSource leftCentreSampleTriggerSource = null!;
@@ -25,13 +25,16 @@ namespace osu.Game.Rulesets.Taiko.UI
 
             InternalChildren = new Drawable[]
             {
-                leftRimSampleTriggerSource = new DrumSampleTriggerSource(hitObjectContainer),
-                leftCentreSampleTriggerSource = new DrumSampleTriggerSource(hitObjectContainer),
-                rightCentreSampleTriggerSource = new DrumSampleTriggerSource(hitObjectContainer),
-                rightRimSampleTriggerSource = new DrumSampleTriggerSource(hitObjectContainer),
+                leftRimSampleTriggerSource = CreateTriggerSource(hitObjectContainer),
+                leftCentreSampleTriggerSource = CreateTriggerSource(hitObjectContainer),
+                rightCentreSampleTriggerSource = CreateTriggerSource(hitObjectContainer),
+                rightRimSampleTriggerSource = CreateTriggerSource(hitObjectContainer),
             };
         }
 
+        protected virtual DrumSampleTriggerSource CreateTriggerSource(HitObjectContainer hitObjectContainer)
+            => new DrumSampleTriggerSource(hitObjectContainer);
+
         public bool OnPressed(KeyBindingPressEvent<TaikoAction> e)
         {
             switch (e.Action)
diff --git a/osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs b/osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs
index 6098db4f7a..939eba684b 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
         }
 
-        public void Play(HitType hitType)
+        public virtual void Play(HitType hitType)
         {
             TaikoHitObject? hitObject = GetMostValidObject() as TaikoHitObject;
 

From beed390031bf015910cbb2da91a2d8c313e24a03 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Jun 2023 16:14:52 +0900
Subject: [PATCH 1192/1604] Add balance adjust to base implementation of
 `DrumSampleTriggerSource`

---
 .../Skinning/Argon/ArgonDrumSamplePlayer.cs   |  8 ++---
 .../UI/DrumSamplePlayer.cs                    | 10 +++---
 .../UI/DrumSampleTriggerSource.cs             | 34 ++++++++++++++++++-
 .../UI/GameplaySampleTriggerSource.cs         |  2 +-
 4 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs
index 5b690be780..9ceea14802 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs
@@ -10,13 +10,13 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
 {
     public partial class ArgonDrumSamplePlayer : DrumSamplePlayer
     {
-        protected override DrumSampleTriggerSource CreateTriggerSource(HitObjectContainer hitObjectContainer) =>
-            new ArgonDrumSampleTriggerSource(hitObjectContainer);
+        protected override DrumSampleTriggerSource CreateTriggerSource(HitObjectContainer hitObjectContainer, SampleBalance balance) =>
+            new ArgonDrumSampleTriggerSource(hitObjectContainer, balance);
 
         public partial class ArgonDrumSampleTriggerSource : DrumSampleTriggerSource
         {
-            public ArgonDrumSampleTriggerSource(HitObjectContainer hitObjectContainer)
-                : base(hitObjectContainer)
+            public ArgonDrumSampleTriggerSource(HitObjectContainer hitObjectContainer, SampleBalance balance)
+                : base(hitObjectContainer, balance)
             {
             }
 
diff --git a/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs b/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
index b60ad209ff..410072994f 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
@@ -25,14 +25,14 @@ namespace osu.Game.Rulesets.Taiko.UI
 
             InternalChildren = new Drawable[]
             {
-                leftRimSampleTriggerSource = CreateTriggerSource(hitObjectContainer),
-                leftCentreSampleTriggerSource = CreateTriggerSource(hitObjectContainer),
-                rightCentreSampleTriggerSource = CreateTriggerSource(hitObjectContainer),
-                rightRimSampleTriggerSource = CreateTriggerSource(hitObjectContainer),
+                leftRimSampleTriggerSource = CreateTriggerSource(hitObjectContainer, SampleBalance.Left),
+                leftCentreSampleTriggerSource = CreateTriggerSource(hitObjectContainer, SampleBalance.Left),
+                rightCentreSampleTriggerSource = CreateTriggerSource(hitObjectContainer, SampleBalance.Right),
+                rightRimSampleTriggerSource = CreateTriggerSource(hitObjectContainer, SampleBalance.Right),
             };
         }
 
-        protected virtual DrumSampleTriggerSource CreateTriggerSource(HitObjectContainer hitObjectContainer)
+        protected virtual DrumSampleTriggerSource CreateTriggerSource(HitObjectContainer hitObjectContainer, SampleBalance balance)
             => new DrumSampleTriggerSource(hitObjectContainer);
 
         public bool OnPressed(KeyBindingPressEvent<TaikoAction> e)
diff --git a/osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs b/osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs
index 939eba684b..50ff20f473 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs
@@ -2,17 +2,35 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Framework.Utils;
 using osu.Game.Audio;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.UI;
+using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.UI
 {
     public partial class DrumSampleTriggerSource : GameplaySampleTriggerSource
     {
-        public DrumSampleTriggerSource(HitObjectContainer hitObjectContainer)
+        private const double stereo_separation = 0.2;
+
+        public DrumSampleTriggerSource(HitObjectContainer hitObjectContainer, SampleBalance balance = SampleBalance.Centre)
             : base(hitObjectContainer)
         {
+            switch (balance)
+            {
+                case SampleBalance.Left:
+                    AudioContainer.Balance.Value = -stereo_separation;
+                    break;
+
+                case SampleBalance.Centre:
+                    AudioContainer.Balance.Value = 0;
+                    break;
+
+                case SampleBalance.Right:
+                    AudioContainer.Balance.Value = stereo_separation;
+                    break;
+            }
         }
 
         public virtual void Play(HitType hitType)
@@ -39,5 +57,19 @@ namespace osu.Game.Rulesets.Taiko.UI
         }
 
         public override void Play() => throw new InvalidOperationException(@"Use override with HitType parameter instead");
+
+        protected override void ApplySampleInfo(SkinnableSound hitSound, ISampleInfo[] samples)
+        {
+            base.ApplySampleInfo(hitSound, samples);
+
+            hitSound.Balance.Value = -0.05 + RNG.NextDouble(0.1);
+        }
+    }
+
+    public enum SampleBalance
+    {
+        Left,
+        Centre,
+        Right
     }
 }
diff --git a/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs b/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
index efbf823058..58410ea14b 100644
--- a/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
+++ b/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
@@ -142,7 +142,7 @@ namespace osu.Game.Rulesets.UI
             }
         }
 
-        private SkinnableSound getNextSample()
+        protected SkinnableSound GetNextSample()
         {
             SkinnableSound hitSound = hitSounds[nextHitSoundIndex];
 

From 27af07b74be9a67b82bb8823d86f6044ef9ec044 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Jun 2023 16:17:45 +0900
Subject: [PATCH 1193/1604] Add basic implementation of argon osu!taiko
 hitsounds (volume / flourish / strong)

---
 .../Skinning/Argon/ArgonDrumSamplePlayer.cs   | 70 +++++++++++++++++--
 osu.Game/Audio/HitSampleInfo.cs               |  6 ++
 2 files changed, 71 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs
index 9ceea14802..b91e0f9901 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs
@@ -1,10 +1,13 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
+using osu.Framework.Allocation;
 using osu.Game.Audio;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.Taiko.UI;
 using osu.Game.Rulesets.UI;
+using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.Skinning.Argon
 {
@@ -15,33 +18,90 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
 
         public partial class ArgonDrumSampleTriggerSource : DrumSampleTriggerSource
         {
+            [Resolved]
+            private ISkinSource skinSource { get; set; } = null!;
+
             public ArgonDrumSampleTriggerSource(HitObjectContainer hitObjectContainer, SampleBalance balance)
                 : base(hitObjectContainer, balance)
             {
+                // TODO: pool flourish sample
             }
 
             public override void Play(HitType hitType)
             {
-                // let the magic begin...
-
                 TaikoHitObject? hitObject = GetMostValidObject() as TaikoHitObject;
 
                 if (hitObject == null)
                     return;
 
-                var baseSample = hitObject.CreateHitSampleInfo(hitType == HitType.Rim ? HitSampleInfo.HIT_CLAP : HitSampleInfo.HIT_NORMAL);
+                var baseSample = new VolumeAwareHitSampleInfo(hitObject.CreateHitSampleInfo(hitType == HitType.Rim ? HitSampleInfo.HIT_CLAP : HitSampleInfo.HIT_NORMAL));
+
+                // If the sample is provided by a legacy skin, we should not try and do anything special.
+                if (skinSource.FindProvider(s => s.GetSample(baseSample) != null) is LegacySkin)
+                {
+                    base.Play(hitType);
+                    return;
+                }
+
+                // let the magic begin...
 
                 if ((hitObject as TaikoStrongableHitObject)?.IsStrong == true || hitObject is StrongNestedHitObject)
                 {
                     PlaySamples(new ISampleInfo[]
                     {
-                        hitObject.CreateHitSampleInfo(hitType == HitType.Rim ? HitSampleInfo.HIT_WHISTLE : HitSampleInfo.HIT_FINISH),
+                        new VolumeAwareHitSampleInfo(hitObject.CreateHitSampleInfo(hitType == HitType.Rim ? HitSampleInfo.HIT_CLAP : HitSampleInfo.HIT_NORMAL), true),
+                        // TODO: flourish should only play every time_between_flourishes.
+                        new VolumeAwareHitSampleInfo(hitObject.CreateHitSampleInfo(hitType == HitType.Rim ? HitSampleInfo.HIT_FLOURISH : string.Empty), true),
                         baseSample
                     });
                 }
                 else
                 {
-                    PlaySamples(new ISampleInfo[] { baseSample });
+                    PlaySamples(new ISampleInfo[] { new VolumeAwareHitSampleInfo(baseSample) });
+                }
+            }
+
+            private class VolumeAwareHitSampleInfo : HitSampleInfo
+            {
+                public const int SAMPLE_VOLUME_THRESHOLD_HARD = 90;
+                public const int SAMPLE_VOLUME_THRESHOLD_MEDIUM = 60;
+
+                public VolumeAwareHitSampleInfo(HitSampleInfo sampleInfo, bool isStrong = false)
+                    : base(sampleInfo.Name, isStrong ? BANK_STRONG : getBank(sampleInfo.Bank, sampleInfo.Name, sampleInfo.Volume), sampleInfo.Suffix, sampleInfo.Volume)
+                {
+                }
+
+                public override IEnumerable<string> LookupNames
+                {
+                    get
+                    {
+                        foreach (string name in base.LookupNames)
+                            yield return name.Insert(name.LastIndexOf('/') + 1, "Argon/taiko-");
+                    }
+                }
+
+                private static string getBank(string originalBank, string sampleName, int volume)
+                {
+                    // So basically we're overwriting mapper's bank intentions here.
+                    // The rationale is that most taiko beatmaps only use a single bank, but regularly adjust volume.
+
+                    switch (sampleName)
+                    {
+                        case HIT_NORMAL:
+                        case HIT_CLAP:
+                        {
+                            if (volume >= SAMPLE_VOLUME_THRESHOLD_HARD)
+                                return BANK_DRUM;
+
+                            if (volume >= SAMPLE_VOLUME_THRESHOLD_MEDIUM)
+                                return BANK_NORMAL;
+
+                            return BANK_SOFT;
+                        }
+
+                        default:
+                            return originalBank;
+                    }
                 }
             }
         }
diff --git a/osu.Game/Audio/HitSampleInfo.cs b/osu.Game/Audio/HitSampleInfo.cs
index 9573a9a4aa..24cb1730bf 100644
--- a/osu.Game/Audio/HitSampleInfo.cs
+++ b/osu.Game/Audio/HitSampleInfo.cs
@@ -24,6 +24,12 @@ namespace osu.Game.Audio
         public const string BANK_SOFT = @"soft";
         public const string BANK_DRUM = @"drum";
 
+        // new sample used exclusively by taiko for now.
+        public const string HIT_FLOURISH = "hitflourish";
+
+        // new bank used exclusively by taiko for now.
+        public const string BANK_STRONG = @"strong";
+
         /// <summary>
         /// All valid sample addition constants.
         /// </summary>

From a9587fd1aa03f2916cf75d2987957b08238ed0de Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Jun 2023 17:02:08 +0900
Subject: [PATCH 1194/1604] Move strong hit handling to `DrumSamplePlayer` and
 separte trigger sources

---
 .../Objects/Drawables/DrawableHit.cs          |   6 +-
 .../Skinning/Argon/ArgonDrumSamplePlayer.cs   |   3 +-
 .../UI/DrumSamplePlayer.cs                    | 106 +++++++++++++++---
 .../UI/DrumSampleTriggerSource.cs             |   1 +
 4 files changed, 95 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index 5b79151225..44225ab289 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -195,7 +195,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             /// The lenience for the second key press.
             /// This does not adjust by map difficulty in ScoreV2 yet.
             /// </summary>
-            private const double second_hit_window = 30;
+            public const double SECOND_HIT_WINDOW = 30;
 
             public StrongNestedHit()
                 : this(null)
@@ -223,12 +223,12 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
                 if (!userTriggered)
                 {
-                    if (timeOffset - ParentHitObject.Result.TimeOffset > second_hit_window)
+                    if (timeOffset - ParentHitObject.Result.TimeOffset > SECOND_HIT_WINDOW)
                         ApplyResult(r => r.Type = r.Judgement.MinResult);
                     return;
                 }
 
-                if (Math.Abs(timeOffset - ParentHitObject.Result.TimeOffset) <= second_hit_window)
+                if (Math.Abs(timeOffset - ParentHitObject.Result.TimeOffset) <= SECOND_HIT_WINDOW)
                     ApplyResult(r => r.Type = r.Judgement.MaxResult);
             }
 
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs
index b91e0f9901..a692260f10 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs
@@ -11,7 +11,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.Skinning.Argon
 {
-    public partial class ArgonDrumSamplePlayer : DrumSamplePlayer
+    internal partial class ArgonDrumSamplePlayer : DrumSamplePlayer
     {
         protected override DrumSampleTriggerSource CreateTriggerSource(HitObjectContainer hitObjectContainer, SampleBalance balance) =>
             new ArgonDrumSampleTriggerSource(hitObjectContainer, balance);
@@ -45,6 +45,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
 
                 // let the magic begin...
 
+                // TODO: should we only play strong samples if the user correctly hits them? arguable.
                 if ((hitObject as TaikoStrongableHitObject)?.IsStrong == true || hitObject is StrongNestedHitObject)
                 {
                     PlaySamples(new ISampleInfo[]
diff --git a/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs b/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
index 410072994f..99449ecbda 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
@@ -7,28 +7,35 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.Objects.Drawables;
 using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Taiko.UI
 {
-    public partial class DrumSamplePlayer : CompositeDrawable, IKeyBindingHandler<TaikoAction>
+    internal partial class DrumSamplePlayer : CompositeDrawable, IKeyBindingHandler<TaikoAction>
     {
-        private DrumSampleTriggerSource leftRimSampleTriggerSource = null!;
-        private DrumSampleTriggerSource leftCentreSampleTriggerSource = null!;
-        private DrumSampleTriggerSource rightCentreSampleTriggerSource = null!;
-        private DrumSampleTriggerSource rightRimSampleTriggerSource = null!;
+        private DrumSampleTriggerSource leftCentreTrigger = null!;
+        private DrumSampleTriggerSource rightCentreTrigger = null!;
+        private DrumSampleTriggerSource leftRimTrigger = null!;
+        private DrumSampleTriggerSource rightRimTrigger = null!;
+        private DrumSampleTriggerSource strongCentreTrigger = null!;
+        private DrumSampleTriggerSource strongRimTrigger = null!;
+
+        private double lastHitTime;
+        private TaikoAction? lastAction;
 
         [BackgroundDependencyLoader]
         private void load(DrawableRuleset drawableRuleset)
         {
             var hitObjectContainer = drawableRuleset.Playfield.HitObjectContainer;
-
             InternalChildren = new Drawable[]
             {
-                leftRimSampleTriggerSource = CreateTriggerSource(hitObjectContainer, SampleBalance.Left),
-                leftCentreSampleTriggerSource = CreateTriggerSource(hitObjectContainer, SampleBalance.Left),
-                rightCentreSampleTriggerSource = CreateTriggerSource(hitObjectContainer, SampleBalance.Right),
-                rightRimSampleTriggerSource = CreateTriggerSource(hitObjectContainer, SampleBalance.Right),
+                leftCentreTrigger = CreateTriggerSource(hitObjectContainer, SampleBalance.Left),
+                rightCentreTrigger = CreateTriggerSource(hitObjectContainer, SampleBalance.Right),
+                leftRimTrigger = CreateTriggerSource(hitObjectContainer, SampleBalance.Left),
+                rightRimTrigger = CreateTriggerSource(hitObjectContainer, SampleBalance.Right),
+                strongCentreTrigger = CreateTriggerSource(hitObjectContainer, SampleBalance.Centre),
+                strongRimTrigger = CreateTriggerSource(hitObjectContainer, SampleBalance.Centre)
             };
         }
 
@@ -37,28 +44,93 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         public bool OnPressed(KeyBindingPressEvent<TaikoAction> e)
         {
+            HitType hitType;
+
+            DrumSampleTriggerSource triggerSource;
+
+            bool strong = checkStrongValidity(e.Action, lastAction, Time.Current - lastHitTime);
+
             switch (e.Action)
             {
-                case TaikoAction.LeftRim:
-                    leftRimSampleTriggerSource.Play(HitType.Rim);
-                    break;
-
                 case TaikoAction.LeftCentre:
-                    leftCentreSampleTriggerSource.Play(HitType.Centre);
+                    hitType = HitType.Centre;
+                    triggerSource = strong ? strongCentreTrigger : leftCentreTrigger;
                     break;
 
                 case TaikoAction.RightCentre:
-                    rightCentreSampleTriggerSource.Play(HitType.Centre);
+                    hitType = HitType.Centre;
+                    triggerSource = strong ? strongCentreTrigger : rightCentreTrigger;
+                    break;
+
+                case TaikoAction.LeftRim:
+                    hitType = HitType.Rim;
+                    triggerSource = strong ? strongRimTrigger : leftRimTrigger;
                     break;
 
                 case TaikoAction.RightRim:
-                    rightRimSampleTriggerSource.Play(HitType.Rim);
+                    hitType = HitType.Rim;
+                    triggerSource = strong ? strongRimTrigger : rightRimTrigger;
                     break;
+
+                default:
+                    return false;
             }
 
+            if (strong && hitType == HitType.Centre)
+                flushCenterTriggerSources();
+
+            if (strong && hitType == HitType.Rim)
+                flushRimTriggerSources();
+
+            triggerSource.Play(hitType);
+
+            lastHitTime = Time.Current;
+            lastAction = e.Action;
+
             return false;
         }
 
+        private bool checkStrongValidity(TaikoAction newAction, TaikoAction? lastAction, double timeBetweenActions)
+        {
+            if (lastAction == null)
+                return false;
+
+            if (timeBetweenActions > DrawableHit.StrongNestedHit.SECOND_HIT_WINDOW)
+                return false;
+
+            switch (newAction)
+            {
+                case TaikoAction.LeftCentre:
+                    return lastAction == TaikoAction.RightCentre;
+
+                case TaikoAction.RightCentre:
+                    return lastAction == TaikoAction.LeftCentre;
+
+                case TaikoAction.LeftRim:
+                    return lastAction == TaikoAction.RightRim;
+
+                case TaikoAction.RightRim:
+                    return lastAction == TaikoAction.LeftRim;
+
+                default:
+                    return false;
+            }
+        }
+
+        private void flushCenterTriggerSources()
+        {
+            leftCentreTrigger.StopAllPlayback();
+            rightCentreTrigger.StopAllPlayback();
+            strongCentreTrigger.StopAllPlayback();
+        }
+
+        private void flushRimTriggerSources()
+        {
+            leftRimTrigger.StopAllPlayback();
+            rightRimTrigger.StopAllPlayback();
+            strongRimTrigger.StopAllPlayback();
+        }
+
         public void OnReleased(KeyBindingReleaseEvent<TaikoAction> e)
         {
         }
diff --git a/osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs b/osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs
index 50ff20f473..a205d4fee1 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs
@@ -42,6 +42,7 @@ namespace osu.Game.Rulesets.Taiko.UI
 
             var baseSample = hitObject.CreateHitSampleInfo(hitType == HitType.Rim ? HitSampleInfo.HIT_CLAP : HitSampleInfo.HIT_NORMAL);
 
+            // TODO: should we only play strong samples if the user correctly hits them? arguable.
             if ((hitObject as TaikoStrongableHitObject)?.IsStrong == true || hitObject is StrongNestedHitObject)
             {
                 PlaySamples(new ISampleInfo[]

From 010262c764cbcd58280f2b209a541476068f078f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Jun 2023 17:50:32 +0900
Subject: [PATCH 1195/1604] Change strong hit sample handling to be user input
 based, not hit object based

---
 .../Skinning/Argon/ArgonDrumSamplePlayer.cs                | 7 +++----
 osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs             | 2 +-
 osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs      | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs
index a692260f10..5996ba2d05 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
                 // TODO: pool flourish sample
             }
 
-            public override void Play(HitType hitType)
+            public override void Play(HitType hitType, bool strong)
             {
                 TaikoHitObject? hitObject = GetMostValidObject() as TaikoHitObject;
 
@@ -39,14 +39,13 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
                 // If the sample is provided by a legacy skin, we should not try and do anything special.
                 if (skinSource.FindProvider(s => s.GetSample(baseSample) != null) is LegacySkin)
                 {
-                    base.Play(hitType);
+                    base.Play(hitType, strong);
                     return;
                 }
 
                 // let the magic begin...
 
-                // TODO: should we only play strong samples if the user correctly hits them? arguable.
-                if ((hitObject as TaikoStrongableHitObject)?.IsStrong == true || hitObject is StrongNestedHitObject)
+                if (strong)
                 {
                     PlaySamples(new ISampleInfo[]
                     {
diff --git a/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs b/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
index 99449ecbda..dba61a9b41 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             if (strong && hitType == HitType.Rim)
                 flushRimTriggerSources();
 
-            triggerSource.Play(hitType);
+            triggerSource.Play(hitType, strong);
 
             lastHitTime = Time.Current;
             lastAction = e.Action;
diff --git a/osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs b/osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs
index a205d4fee1..c87f95430f 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             }
         }
 
-        public virtual void Play(HitType hitType)
+        public virtual void Play(HitType hitType, bool strong)
         {
             TaikoHitObject? hitObject = GetMostValidObject() as TaikoHitObject;
 
@@ -43,7 +43,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             var baseSample = hitObject.CreateHitSampleInfo(hitType == HitType.Rim ? HitSampleInfo.HIT_CLAP : HitSampleInfo.HIT_NORMAL);
 
             // TODO: should we only play strong samples if the user correctly hits them? arguable.
-            if ((hitObject as TaikoStrongableHitObject)?.IsStrong == true || hitObject is StrongNestedHitObject)
+            if (strong)
             {
                 PlaySamples(new ISampleInfo[]
                 {

From c72ebcfd539f8cca5b95dae78512d0f24ac7e4aa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Jun 2023 18:09:50 +0900
Subject: [PATCH 1196/1604] Fix skin fallback not working as expected

---
 .../Skinning/Argon/ArgonDrumSamplePlayer.cs            | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs
index 5996ba2d05..67d417c599 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs
@@ -34,10 +34,10 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
                 if (hitObject == null)
                     return;
 
-                var baseSample = new VolumeAwareHitSampleInfo(hitObject.CreateHitSampleInfo(hitType == HitType.Rim ? HitSampleInfo.HIT_CLAP : HitSampleInfo.HIT_NORMAL));
+                var originalSample = hitObject.CreateHitSampleInfo(hitType == HitType.Rim ? HitSampleInfo.HIT_CLAP : HitSampleInfo.HIT_NORMAL);
 
                 // If the sample is provided by a legacy skin, we should not try and do anything special.
-                if (skinSource.FindProvider(s => s.GetSample(baseSample) != null) is LegacySkin)
+                if (skinSource.FindProvider(s => s.GetSample(originalSample) != null) is LegacySkinTransformer)
                 {
                     base.Play(hitType, strong);
                     return;
@@ -49,15 +49,15 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
                 {
                     PlaySamples(new ISampleInfo[]
                     {
-                        new VolumeAwareHitSampleInfo(hitObject.CreateHitSampleInfo(hitType == HitType.Rim ? HitSampleInfo.HIT_CLAP : HitSampleInfo.HIT_NORMAL), true),
+                        new VolumeAwareHitSampleInfo(originalSample, true),
                         // TODO: flourish should only play every time_between_flourishes.
                         new VolumeAwareHitSampleInfo(hitObject.CreateHitSampleInfo(hitType == HitType.Rim ? HitSampleInfo.HIT_FLOURISH : string.Empty), true),
-                        baseSample
+                        new VolumeAwareHitSampleInfo(originalSample)
                     });
                 }
                 else
                 {
-                    PlaySamples(new ISampleInfo[] { new VolumeAwareHitSampleInfo(baseSample) });
+                    PlaySamples(new ISampleInfo[] { new VolumeAwareHitSampleInfo(new VolumeAwareHitSampleInfo(originalSample)) });
                 }
             }
 

From 16f1a7694d9397a9acac2acfd0c39f38ef438547 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Jun 2023 18:43:37 +0900
Subject: [PATCH 1197/1604] Add time-based flourish support

---
 .../Skinning/Argon/ArgonDrumSamplePlayer.cs   | 53 ++++++++++++++-----
 1 file changed, 41 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs
index 67d417c599..72e5ac5b3d 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Game.Audio;
 using osu.Game.Rulesets.Taiko.Objects;
@@ -18,12 +19,20 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
 
         public partial class ArgonDrumSampleTriggerSource : DrumSampleTriggerSource
         {
+            private readonly HitObjectContainer hitObjectContainer;
+
             [Resolved]
             private ISkinSource skinSource { get; set; } = null!;
 
+            /// <summary>
+            /// The minimum time to leave between flourishes that are added to strong rim hits.
+            /// </summary>
+            private const double time_between_flourishes = 2000;
+
             public ArgonDrumSampleTriggerSource(HitObjectContainer hitObjectContainer, SampleBalance balance)
                 : base(hitObjectContainer, balance)
             {
+                this.hitObjectContainer = hitObjectContainer;
                 // TODO: pool flourish sample
             }
 
@@ -44,21 +53,41 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
                 }
 
                 // let the magic begin...
+                var samplesToPlay = new List<ISampleInfo> { new VolumeAwareHitSampleInfo(originalSample, strong) };
 
-                if (strong)
+                if (strong && hitType == HitType.Rim && canPlayFlourish(hitObject))
+                    samplesToPlay.Add(new VolumeAwareHitSampleInfo(hitObject.CreateHitSampleInfo(HitSampleInfo.HIT_FLOURISH), true));
+
+                PlaySamples(samplesToPlay.ToArray());
+            }
+
+            private bool canPlayFlourish(TaikoHitObject hitObject)
+            {
+                double? lastFlourish = null;
+
+                // TODO: check on nested strong hits. we're not accounting for them here yet.
+
+                var hitObjects = hitObjectContainer.AliveObjects
+                                                   .Reverse()
+                                                   .Select(d => d.HitObject)
+                                                   .OfType<Hit>()
+                                                   .Where(h => h.IsStrong && h.Type == HitType.Rim);
+
+                // Add an additional 'flourish' sample to strong rim hits (that are at least `time_between_flourishes` apart).
+                // This is applied to hitobjects in reverse order, as to sound more musically coherent by biasing towards to
+                // end of groups/combos of strong rim hits instead of the start.
+                foreach (var h in hitObjects)
                 {
-                    PlaySamples(new ISampleInfo[]
-                    {
-                        new VolumeAwareHitSampleInfo(originalSample, true),
-                        // TODO: flourish should only play every time_between_flourishes.
-                        new VolumeAwareHitSampleInfo(hitObject.CreateHitSampleInfo(hitType == HitType.Rim ? HitSampleInfo.HIT_FLOURISH : string.Empty), true),
-                        new VolumeAwareHitSampleInfo(originalSample)
-                    });
-                }
-                else
-                {
-                    PlaySamples(new ISampleInfo[] { new VolumeAwareHitSampleInfo(new VolumeAwareHitSampleInfo(originalSample)) });
+                    bool canFlourish = lastFlourish == null || lastFlourish - h.StartTime >= time_between_flourishes;
+
+                    if (canFlourish)
+                        lastFlourish = h.StartTime;
+
+                    if (h == hitObject)
+                        return canFlourish;
                 }
+
+                return false;
             }
 
             private class VolumeAwareHitSampleInfo : HitSampleInfo

From f08690883118dfaa5bf78af204178d17a007f771 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 Jul 2023 13:49:14 +0900
Subject: [PATCH 1198/1604] Don't attempt to play drum samples when rewinding

---
 osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs b/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
index dba61a9b41..4f727e8c90 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
@@ -44,6 +44,9 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         public bool OnPressed(KeyBindingPressEvent<TaikoAction> e)
         {
+            if (Time.Elapsed < 0)
+                return false;
+
             HitType hitType;
 
             DrumSampleTriggerSource triggerSource;

From 759cd5aec79686df8553efc5582524b27d0044c4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 Jul 2023 14:05:40 +0900
Subject: [PATCH 1199/1604] Warm up pool with argon-specific drum samples

---
 .../Skinning/Argon/ArgonDrumSamplePlayer.cs        | 14 ++++++++++----
 osu.Game/Skinning/IPooledSampleProvider.cs         |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs
index 72e5ac5b3d..91393d99fe 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs
@@ -14,6 +14,15 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
 {
     internal partial class ArgonDrumSamplePlayer : DrumSamplePlayer
     {
+        [BackgroundDependencyLoader]
+        private void load(IPooledSampleProvider sampleProvider)
+        {
+            // Warm up pools for non-standard samples.
+            sampleProvider.GetPooledSample(new ArgonDrumSampleTriggerSource.VolumeAwareHitSampleInfo(new HitSampleInfo(HitSampleInfo.HIT_NORMAL), true));
+            sampleProvider.GetPooledSample(new ArgonDrumSampleTriggerSource.VolumeAwareHitSampleInfo(new HitSampleInfo(HitSampleInfo.HIT_CLAP), true));
+            sampleProvider.GetPooledSample(new ArgonDrumSampleTriggerSource.VolumeAwareHitSampleInfo(new HitSampleInfo(HitSampleInfo.HIT_FLOURISH), true));
+        }
+
         protected override DrumSampleTriggerSource CreateTriggerSource(HitObjectContainer hitObjectContainer, SampleBalance balance) =>
             new ArgonDrumSampleTriggerSource(hitObjectContainer, balance);
 
@@ -33,7 +42,6 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
                 : base(hitObjectContainer, balance)
             {
                 this.hitObjectContainer = hitObjectContainer;
-                // TODO: pool flourish sample
             }
 
             public override void Play(HitType hitType, bool strong)
@@ -65,8 +73,6 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
             {
                 double? lastFlourish = null;
 
-                // TODO: check on nested strong hits. we're not accounting for them here yet.
-
                 var hitObjects = hitObjectContainer.AliveObjects
                                                    .Reverse()
                                                    .Select(d => d.HitObject)
@@ -90,7 +96,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
                 return false;
             }
 
-            private class VolumeAwareHitSampleInfo : HitSampleInfo
+            public class VolumeAwareHitSampleInfo : HitSampleInfo
             {
                 public const int SAMPLE_VOLUME_THRESHOLD_HARD = 90;
                 public const int SAMPLE_VOLUME_THRESHOLD_MEDIUM = 60;
diff --git a/osu.Game/Skinning/IPooledSampleProvider.cs b/osu.Game/Skinning/IPooledSampleProvider.cs
index 3ea299f5e2..0e57050c4d 100644
--- a/osu.Game/Skinning/IPooledSampleProvider.cs
+++ b/osu.Game/Skinning/IPooledSampleProvider.cs
@@ -8,7 +8,7 @@ namespace osu.Game.Skinning
     /// <summary>
     /// Provides pooled samples to be used by <see cref="SkinnableSound"/>s.
     /// </summary>
-    internal interface IPooledSampleProvider
+    public interface IPooledSampleProvider
     {
         /// <summary>
         /// Retrieves a <see cref="PoolableSkinnableSample"/> from a pool.

From 561fff801a5c33d28f67b08ede925f17fdc5b8d2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 Jul 2023 13:29:44 +0900
Subject: [PATCH 1200/1604] Consume nested object states in
 `HitObjectLifetimeEntry`

---
 osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs b/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
index 58410ea14b..18d412ab44 100644
--- a/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
+++ b/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
@@ -126,7 +126,7 @@ namespace osu.Game.Rulesets.UI
             return getAllNested(mostValidObject.HitObject).OrderBy(h => h.GetEndTime()).SkipWhile(h => h.GetEndTime() <= getReferenceTime()).FirstOrDefault() ?? mostValidObject.HitObject;
         }
 
-        private bool isAlreadyHit(HitObjectLifetimeEntry h) => h.Result?.HasResult == true;
+        private bool isAlreadyHit(HitObjectLifetimeEntry h) => h.AllJudged;
         private bool isCloseEnoughToCurrentTime(HitObject h) => getReferenceTime() >= h.StartTime - h.HitWindows.WindowFor(HitResult.Miss) * 2;
 
         private double getReferenceTime() => gameplayClock?.CurrentTime ?? Clock.CurrentTime;

From 8413247773ba495307a15085ec2302fce690e901 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Jul 2023 13:10:02 +0900
Subject: [PATCH 1201/1604] Fix failing test

---
 .../TestSceneDrumSampleTriggerSource.cs                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs
index 4133b96d42..06e88643de 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs
@@ -372,7 +372,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
         private void checkSamples(HitType hitType, string expectedSamplesCsv, string expectedBank)
         {
-            AddStep($"hit {hitType}", () => triggerSource.Play(hitType));
+            AddStep($"hit {hitType}", () => triggerSource.Play(hitType, false));
             AddAssert($"last played sample is {expectedSamplesCsv}", () => string.Join(',', triggerSource.LastPlayedSamples!.OfType<HitSampleInfo>().Select(s => s.Name)),
                 () => Is.EqualTo(expectedSamplesCsv));
             AddAssert($"last played sample has {expectedBank} bank", () => triggerSource.LastPlayedSamples!.OfType<HitSampleInfo>().First().Bank, () => Is.EqualTo(expectedBank));

From 4364736ccd6f8a0d06e654dd9fee061910997643 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Jul 2023 18:02:03 +0900
Subject: [PATCH 1202/1604] Fix fallback for `Judged` to be more correct

Without this change, when the `Judged` value is checked on an
`HitObjectLifetimeEntry` it would return `true` if a `DrawableHitObject`
has not yet been associated with the entry. Which is completely wrong.

Of note, the usage in `DrawableHitObject` will have never fallen through
to this incorrect value as they always have a result populated:

https://github.com/ppy/osu/blob/f26f001e1d01ca6bb53225da7bf06c0ad21153c5/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs#L721-L726
---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 4 ++--
 osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 08dcf91e52..e4d8eb2335 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -112,12 +112,12 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// Whether this <see cref="DrawableHitObject"/> has been judged.
         /// Note: This does NOT include nested hitobjects.
         /// </summary>
-        public bool Judged => Entry?.Judged ?? true;
+        public bool Judged => Entry?.Judged ?? false;
 
         /// <summary>
         /// Whether this <see cref="DrawableHitObject"/> and all of its nested <see cref="DrawableHitObject"/>s have been judged.
         /// </summary>
-        public bool AllJudged => Entry?.AllJudged ?? true;
+        public bool AllJudged => Entry?.AllJudged ?? false;
 
         /// <summary>
         /// The relative X position of this hit object for sample playback balance adjustment.
diff --git a/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs b/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
index 1d99e7440f..4450f026b4 100644
--- a/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
+++ b/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Objects
         /// Whether <see cref="HitObject"/> has been judged.
         /// Note: This does NOT include nested hitobjects.
         /// </summary>
-        public bool Judged => Result?.HasResult ?? true;
+        public bool Judged => Result?.HasResult ?? false;
 
         /// <summary>
         /// Whether <see cref="HitObject"/> and all of its nested objects have been judged.

From 168b6c70a98ed59b56d52572bcfe29abcf1ab6cc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Jul 2023 15:12:40 +0900
Subject: [PATCH 1203/1604] Update resources

---
 osu.Game/osu.Game.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index b4d8dd513f..83d4bcb336 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -37,7 +37,7 @@
     </PackageReference>
     <PackageReference Include="Realm" Version="10.20.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2023.625.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.625.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.705.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />

From 7355a6a66bf695a0addd9cd2a1f5a310edfc284f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Jul 2023 18:20:25 +0900
Subject: [PATCH 1204/1604] Add test coverage of `Judged` state

---
 .../Gameplay/TestSceneDrawableHitObject.cs    | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs b/osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs
index 04fc4cafbd..10dbede2e0 100644
--- a/osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs
@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using System;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
@@ -80,7 +81,9 @@ namespace osu.Game.Tests.Gameplay
         {
             TestLifetimeEntry entry = null;
             AddStep("Create entry", () => entry = new TestLifetimeEntry(new HitObject()) { LifetimeStart = 1 });
+            assertJudged(() => entry, false);
             AddStep("ApplyDefaults", () => entry.HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty()));
+            assertJudged(() => entry, false);
             AddAssert("Lifetime is updated", () => entry.LifetimeStart == -TestLifetimeEntry.INITIAL_LIFETIME_OFFSET);
 
             TestDrawableHitObject dho = null;
@@ -91,6 +94,7 @@ namespace osu.Game.Tests.Gameplay
             });
             AddStep("ApplyDefaults", () => entry.HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty()));
             AddAssert("Lifetime is correct", () => dho.LifetimeStart == TestDrawableHitObject.LIFETIME_ON_APPLY && entry.LifetimeStart == TestDrawableHitObject.LIFETIME_ON_APPLY);
+            assertJudged(() => entry, false);
         }
 
         [Test]
@@ -138,6 +142,29 @@ namespace osu.Game.Tests.Gameplay
             AddAssert("DHO state is correct", () => dho.State.Value == ArmedState.Miss);
         }
 
+        [Test]
+        public void TestJudgedStateThroughLifetime()
+        {
+            TestDrawableHitObject dho = null;
+            HitObjectLifetimeEntry lifetimeEntry = null;
+
+            AddStep("Create lifetime entry", () => lifetimeEntry = new HitObjectLifetimeEntry(new HitObject { StartTime = Time.Current }));
+
+            assertJudged(() => lifetimeEntry, false);
+
+            AddStep("Create DHO and apply entry", () =>
+            {
+                Child = dho = new TestDrawableHitObject();
+                dho.Apply(lifetimeEntry);
+            });
+
+            assertJudged(() => lifetimeEntry, false);
+
+            AddStep("Apply result", () => dho.MissForcefully());
+
+            assertJudged(() => lifetimeEntry, true);
+        }
+
         [Test]
         public void TestResultSetBeforeLoadComplete()
         {
@@ -154,15 +181,20 @@ namespace osu.Game.Tests.Gameplay
                     }
                 };
             });
+            assertJudged(() => lifetimeEntry, true);
             AddStep("Create DHO and apply entry", () =>
             {
                 dho = new TestDrawableHitObject();
                 dho.Apply(lifetimeEntry);
                 Child = dho;
             });
+            assertJudged(() => lifetimeEntry, true);
             AddAssert("DHO state is correct", () => dho.State.Value, () => Is.EqualTo(ArmedState.Hit));
         }
 
+        private void assertJudged(Func<HitObjectLifetimeEntry> entry, bool val) =>
+            AddAssert(val ? "Is judged" : "Not judged", () => entry().Judged, () => Is.EqualTo(val));
+
         private partial class TestDrawableHitObject : DrawableHitObject
         {
             public const double INITIAL_LIFETIME_OFFSET = 100;

From 51b0d18c04e458b7785db34dfe4613e682bf7396 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Jul 2023 17:41:51 +0900
Subject: [PATCH 1205/1604] Fix weird test assertion output

---
 .../Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs
index 6701871e8d..59c9c4587a 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs
@@ -197,7 +197,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         private void checkValidObjectIndex(int index) =>
-            AddAssert($"check valid object is {index}", () => sampleTriggerSource.GetMostValidObject(), () => Is.EqualTo(beatmap.HitObjects[index]));
+            AddAssert($"check object at index {index} is correct", () => sampleTriggerSource.GetMostValidObject(), () => Is.EqualTo(beatmap.HitObjects[index]));
 
         private DrawableHitObject? getNextAliveObject() =>
             Player.DrawableRuleset.Playfield.HitObjectContainer.AliveObjects.FirstOrDefault();

From 289f916cd7e37bcb6164a5412ea86f7db25cae94 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Jul 2023 18:36:41 +0900
Subject: [PATCH 1206/1604] Remove outdated TODO

---
 osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs b/osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs
index c87f95430f..1de16c2294 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrumSampleTriggerSource.cs
@@ -42,7 +42,6 @@ namespace osu.Game.Rulesets.Taiko.UI
 
             var baseSample = hitObject.CreateHitSampleInfo(hitType == HitType.Rim ? HitSampleInfo.HIT_CLAP : HitSampleInfo.HIT_NORMAL);
 
-            // TODO: should we only play strong samples if the user correctly hits them? arguable.
             if (strong)
             {
                 PlaySamples(new ISampleInfo[]

From 8f6b06fe4004bfc3be183080fee05d0e802b05eb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Jul 2023 18:38:19 +0900
Subject: [PATCH 1207/1604] Update test assumptions

---
 .../TestSceneDrumSampleTriggerSource.cs       | 104 +++++++++---------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs
index 06e88643de..ced2e4b98c 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs
@@ -72,13 +72,13 @@ namespace osu.Game.Rulesets.Taiko.Tests
             });
 
             AddAssert("most valid object is hit", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Hit>);
-            checkSamples(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
-            checkSamples(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
+            checkSamples(HitType.Centre, false, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
+            checkSamples(HitType.Rim, false, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
 
             seekTo(200);
             AddAssert("most valid object is hit", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Hit>);
-            checkSamples(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
-            checkSamples(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
+            checkSamples(HitType.Centre, false, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
+            checkSamples(HitType.Rim, false, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
         }
 
         [Test]
@@ -100,13 +100,13 @@ namespace osu.Game.Rulesets.Taiko.Tests
             });
 
             AddAssert("most valid object is hit", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Hit>);
-            checkSamples(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT);
-            checkSamples(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT);
+            checkSamples(HitType.Centre, false, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT);
+            checkSamples(HitType.Rim, false, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT);
 
             seekTo(200);
             AddAssert("most valid object is hit", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Hit>);
-            checkSamples(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT);
-            checkSamples(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT);
+            checkSamples(HitType.Centre, false, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT);
+            checkSamples(HitType.Rim, false, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT);
         }
 
         [Test]
@@ -145,23 +145,23 @@ namespace osu.Game.Rulesets.Taiko.Tests
             });
 
             AddAssert("most valid object is first hit", () => triggerSource.GetMostValidObject(), () => Is.EqualTo(first));
-            checkSamples(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_NORMAL);
-            checkSamples(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_NORMAL);
+            checkSamples(HitType.Centre, false, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_NORMAL);
+            checkSamples(HitType.Rim, false, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_NORMAL);
 
             seekTo(120);
             AddAssert("most valid object is first hit", () => triggerSource.GetMostValidObject(), () => Is.EqualTo(first));
-            checkSamples(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_NORMAL);
-            checkSamples(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_NORMAL);
+            checkSamples(HitType.Centre, false, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_NORMAL);
+            checkSamples(HitType.Rim, false, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_NORMAL);
 
             seekTo(480);
             AddAssert("most valid object is second hit", () => triggerSource.GetMostValidObject(), () => Is.EqualTo(second));
-            checkSamples(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT);
-            checkSamples(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT);
+            checkSamples(HitType.Centre, false, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT);
+            checkSamples(HitType.Rim, false, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT);
 
             seekTo(700);
             AddAssert("most valid object is second hit", () => triggerSource.GetMostValidObject(), () => Is.EqualTo(second));
-            checkSamples(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT);
-            checkSamples(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT);
+            checkSamples(HitType.Centre, false, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT);
+            checkSamples(HitType.Rim, false, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT);
         }
 
         [Test]
@@ -184,13 +184,13 @@ namespace osu.Game.Rulesets.Taiko.Tests
             });
 
             AddAssert("most valid object is nested strong hit", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Hit.StrongNestedHit>);
-            checkSamples(HitType.Centre, $"{HitSampleInfo.HIT_NORMAL},{HitSampleInfo.HIT_FINISH}", HitSampleInfo.BANK_DRUM);
-            checkSamples(HitType.Rim, $"{HitSampleInfo.HIT_CLAP},{HitSampleInfo.HIT_WHISTLE}", HitSampleInfo.BANK_DRUM);
+            checkSamples(HitType.Centre, true, $"{HitSampleInfo.HIT_NORMAL},{HitSampleInfo.HIT_FINISH}", HitSampleInfo.BANK_DRUM);
+            checkSamples(HitType.Rim, true, $"{HitSampleInfo.HIT_CLAP},{HitSampleInfo.HIT_WHISTLE}", HitSampleInfo.BANK_DRUM);
 
             seekTo(200);
             AddAssert("most valid object is hit", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Hit>);
-            checkSamples(HitType.Centre, $"{HitSampleInfo.HIT_NORMAL},{HitSampleInfo.HIT_FINISH}", HitSampleInfo.BANK_DRUM);
-            checkSamples(HitType.Rim, $"{HitSampleInfo.HIT_CLAP},{HitSampleInfo.HIT_WHISTLE}", HitSampleInfo.BANK_DRUM);
+            checkSamples(HitType.Centre, true, $"{HitSampleInfo.HIT_NORMAL},{HitSampleInfo.HIT_FINISH}", HitSampleInfo.BANK_DRUM);
+            checkSamples(HitType.Rim, true, $"{HitSampleInfo.HIT_CLAP},{HitSampleInfo.HIT_WHISTLE}", HitSampleInfo.BANK_DRUM);
         }
 
         [Test]
@@ -213,18 +213,18 @@ namespace osu.Game.Rulesets.Taiko.Tests
             });
 
             AddAssert("most valid object is drum roll tick", () => triggerSource.GetMostValidObject(), Is.InstanceOf<DrumRollTick>);
-            checkSamples(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
-            checkSamples(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
+            checkSamples(HitType.Centre, false, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
+            checkSamples(HitType.Rim, false, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
 
             seekTo(600);
             AddAssert("most valid object is drum roll tick", () => triggerSource.GetMostValidObject(), Is.InstanceOf<DrumRollTick>);
-            checkSamples(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
-            checkSamples(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
+            checkSamples(HitType.Centre, false, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
+            checkSamples(HitType.Rim, false, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
 
             seekTo(1200);
             AddAssert("most valid object is drum roll", () => triggerSource.GetMostValidObject(), Is.InstanceOf<DrumRoll>);
-            checkSamples(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
-            checkSamples(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
+            checkSamples(HitType.Centre, false, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
+            checkSamples(HitType.Rim, false, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
         }
 
         [Test]
@@ -247,18 +247,18 @@ namespace osu.Game.Rulesets.Taiko.Tests
             });
 
             AddAssert("most valid object is drum roll tick", () => triggerSource.GetMostValidObject(), Is.InstanceOf<DrumRollTick>);
-            checkSamples(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT);
-            checkSamples(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT);
+            checkSamples(HitType.Centre, false, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT);
+            checkSamples(HitType.Rim, false, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT);
 
             seekTo(600);
             AddAssert("most valid object is drum roll tick", () => triggerSource.GetMostValidObject(), Is.InstanceOf<DrumRollTick>);
-            checkSamples(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT);
-            checkSamples(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT);
+            checkSamples(HitType.Centre, false, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT);
+            checkSamples(HitType.Rim, false, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT);
 
             seekTo(1200);
             AddAssert("most valid object is drum roll", () => triggerSource.GetMostValidObject(), Is.InstanceOf<DrumRoll>);
-            checkSamples(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT);
-            checkSamples(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT);
+            checkSamples(HitType.Centre, false, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_SOFT);
+            checkSamples(HitType.Rim, false, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_SOFT);
         }
 
         [Test]
@@ -282,18 +282,18 @@ namespace osu.Game.Rulesets.Taiko.Tests
             });
 
             AddAssert("most valid object is drum roll tick", () => triggerSource.GetMostValidObject(), Is.InstanceOf<DrumRollTick>);
-            checkSamples(HitType.Centre, $"{HitSampleInfo.HIT_NORMAL},{HitSampleInfo.HIT_FINISH}", HitSampleInfo.BANK_DRUM);
-            checkSamples(HitType.Rim, $"{HitSampleInfo.HIT_CLAP},{HitSampleInfo.HIT_WHISTLE}", HitSampleInfo.BANK_DRUM);
+            checkSamples(HitType.Centre, true, $"{HitSampleInfo.HIT_NORMAL},{HitSampleInfo.HIT_FINISH}", HitSampleInfo.BANK_DRUM);
+            checkSamples(HitType.Rim, true, $"{HitSampleInfo.HIT_CLAP},{HitSampleInfo.HIT_WHISTLE}", HitSampleInfo.BANK_DRUM);
 
             seekTo(600);
             AddAssert("most valid object is drum roll tick", () => triggerSource.GetMostValidObject(), Is.InstanceOf<DrumRollTick>);
-            checkSamples(HitType.Centre, $"{HitSampleInfo.HIT_NORMAL},{HitSampleInfo.HIT_FINISH}", HitSampleInfo.BANK_DRUM);
-            checkSamples(HitType.Rim, $"{HitSampleInfo.HIT_CLAP},{HitSampleInfo.HIT_WHISTLE}", HitSampleInfo.BANK_DRUM);
+            checkSamples(HitType.Centre, true, $"{HitSampleInfo.HIT_NORMAL},{HitSampleInfo.HIT_FINISH}", HitSampleInfo.BANK_DRUM);
+            checkSamples(HitType.Rim, true, $"{HitSampleInfo.HIT_CLAP},{HitSampleInfo.HIT_WHISTLE}", HitSampleInfo.BANK_DRUM);
 
             seekTo(1200);
             AddAssert("most valid object is drum roll", () => triggerSource.GetMostValidObject(), Is.InstanceOf<DrumRoll>);
-            checkSamples(HitType.Centre, $"{HitSampleInfo.HIT_NORMAL},{HitSampleInfo.HIT_FINISH}", HitSampleInfo.BANK_DRUM);
-            checkSamples(HitType.Rim, $"{HitSampleInfo.HIT_CLAP},{HitSampleInfo.HIT_WHISTLE}", HitSampleInfo.BANK_DRUM);
+            checkSamples(HitType.Centre, true, $"{HitSampleInfo.HIT_NORMAL},{HitSampleInfo.HIT_FINISH}", HitSampleInfo.BANK_DRUM);
+            checkSamples(HitType.Rim, true, $"{HitSampleInfo.HIT_CLAP},{HitSampleInfo.HIT_WHISTLE}", HitSampleInfo.BANK_DRUM);
         }
 
         [Test]
@@ -319,18 +319,18 @@ namespace osu.Game.Rulesets.Taiko.Tests
             // This works fine in gameplay because they are judged whenever the user pressed, rather than being timed hits.
             // But for sample playback purposes they can be ignored as noise.
             AddAssert("most valid object is swell", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Swell>);
-            checkSamples(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
-            checkSamples(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
+            checkSamples(HitType.Centre, false, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
+            checkSamples(HitType.Rim, false, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
 
             seekTo(600);
             AddAssert("most valid object is swell", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Swell>);
-            checkSamples(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
-            checkSamples(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
+            checkSamples(HitType.Centre, false, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
+            checkSamples(HitType.Rim, false, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
 
             seekTo(1200);
             AddAssert("most valid object is swell", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Swell>);
-            checkSamples(HitType.Centre, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
-            checkSamples(HitType.Rim, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
+            checkSamples(HitType.Centre, false, HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK);
+            checkSamples(HitType.Rim, false, HitSampleInfo.HIT_CLAP, SampleControlPoint.DEFAULT_BANK);
         }
 
         [Test]
@@ -356,23 +356,23 @@ namespace osu.Game.Rulesets.Taiko.Tests
             // This works fine in gameplay because they are judged whenever the user pressed, rather than being timed hits.
             // But for sample playback purposes they can be ignored as noise.
             AddAssert("most valid object is swell", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Swell>);
-            checkSamples(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_DRUM);
-            checkSamples(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_DRUM);
+            checkSamples(HitType.Centre, false, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_DRUM);
+            checkSamples(HitType.Rim, false, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_DRUM);
 
             seekTo(600);
             AddAssert("most valid object is swell", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Swell>);
-            checkSamples(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_DRUM);
-            checkSamples(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_DRUM);
+            checkSamples(HitType.Centre, false, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_DRUM);
+            checkSamples(HitType.Rim, false, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_DRUM);
 
             seekTo(1200);
             AddAssert("most valid object is swell", () => triggerSource.GetMostValidObject(), Is.InstanceOf<Swell>);
-            checkSamples(HitType.Centre, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_DRUM);
-            checkSamples(HitType.Rim, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_DRUM);
+            checkSamples(HitType.Centre, false, HitSampleInfo.HIT_NORMAL, HitSampleInfo.BANK_DRUM);
+            checkSamples(HitType.Rim, false, HitSampleInfo.HIT_CLAP, HitSampleInfo.BANK_DRUM);
         }
 
-        private void checkSamples(HitType hitType, string expectedSamplesCsv, string expectedBank)
+        private void checkSamples(HitType hitType, bool strong, string expectedSamplesCsv, string expectedBank)
         {
-            AddStep($"hit {hitType}", () => triggerSource.Play(hitType, false));
+            AddStep($"hit {hitType}", () => triggerSource.Play(hitType, strong));
             AddAssert($"last played sample is {expectedSamplesCsv}", () => string.Join(',', triggerSource.LastPlayedSamples!.OfType<HitSampleInfo>().Select(s => s.Name)),
                 () => Is.EqualTo(expectedSamplesCsv));
             AddAssert($"last played sample has {expectedBank} bank", () => triggerSource.LastPlayedSamples!.OfType<HitSampleInfo>().First().Bank, () => Is.EqualTo(expectedBank));

From 8f61f5e4c6c60d0c8933756929f16efd6728f279 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Jul 2023 18:41:32 +0900
Subject: [PATCH 1208/1604] Cache `Playfield` for the sake of tests

I'm open to an alternative. Name it.
---
 osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs | 4 ++--
 osu.Game/Rulesets/UI/Playfield.cs              | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs b/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
index 4f727e8c90..2797492b0a 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
@@ -25,9 +25,9 @@ namespace osu.Game.Rulesets.Taiko.UI
         private TaikoAction? lastAction;
 
         [BackgroundDependencyLoader]
-        private void load(DrawableRuleset drawableRuleset)
+        private void load(Playfield playfield)
         {
-            var hitObjectContainer = drawableRuleset.Playfield.HitObjectContainer;
+            var hitObjectContainer = playfield.HitObjectContainer;
             InternalChildren = new Drawable[]
             {
                 leftCentreTrigger = CreateTriggerSource(hitObjectContainer, SampleBalance.Left),
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index 6016a53918..3f263aba63 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -28,6 +28,7 @@ namespace osu.Game.Rulesets.UI
 {
     [Cached(typeof(IPooledHitObjectProvider))]
     [Cached(typeof(IPooledSampleProvider))]
+    [Cached]
     public abstract partial class Playfield : CompositeDrawable, IPooledHitObjectProvider, IPooledSampleProvider
     {
         /// <summary>

From 00c68cad532d5898f5d6135d6df202db00caf9f3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Jul 2023 19:47:44 +0900
Subject: [PATCH 1209/1604] Fix new scoring related properties not storing to
 realm due to `internal` spec

---
 osu.Game/Scoring/ScoreInfo.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index eddd1bb80a..ea9007f4dc 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Scoring
         /// <remarks>
         /// This may not match the version stored in the replay files.
         /// </remarks>
-        internal int TotalScoreVersion { get; set; } = LegacyScoreEncoder.LATEST_VERSION;
+        public int TotalScoreVersion { get; set; } = LegacyScoreEncoder.LATEST_VERSION;
 
         /// <summary>
         /// Used to preserve the total score for legacy scores.
@@ -72,7 +72,7 @@ namespace osu.Game.Scoring
         /// <remarks>
         /// Not populated if <see cref="IsLegacyScore"/> is <c>false</c>.
         /// </remarks>
-        internal long? LegacyTotalScore { get; set; }
+        public long? LegacyTotalScore { get; set; }
 
         public int MaxCombo { get; set; }
 

From fbab5acac100211f0cffe6bdf7182eff6297baf1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Jul 2023 00:46:09 +0900
Subject: [PATCH 1210/1604] Remove not-yet-implemented settings group comments

---
 osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs b/osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs
index b6b385e262..2fd2ed30f6 100644
--- a/osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs
+++ b/osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs
@@ -37,8 +37,6 @@ namespace osu.Game.Screens.Play.HUD
                 Spacing = new Vector2(0, 20),
                 Children = new PlayerSettingsGroup[]
                 {
-                    //CollectionSettings = new CollectionSettings(),
-                    //DiscussionSettings = new DiscussionSettings(),
                     PlaybackSettings = new PlaybackSettings { Expanded = { Value = false } },
                     VisualSettings = new VisualSettings { Expanded = { Value = false } },
                     new AudioSettings { Expanded = { Value = false } }

From 95a9b532dfc8feff57e524a2361798a6968ff2e9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Jul 2023 00:46:28 +0900
Subject: [PATCH 1211/1604] Remember state of replay settings visibility

---
 osu.Game/Configuration/OsuConfigManager.cs    |  4 +-
 .../Localisation/GameplaySettingsStrings.cs   |  9 +++-
 .../Settings/Sections/Gameplay/HUDSettings.cs | 14 ++++--
 .../Screens/Play/HUD/PlayerSettingsOverlay.cs | 25 ----------
 osu.Game/Screens/Play/HUDOverlay.cs           | 47 ++++++++++---------
 5 files changed, 45 insertions(+), 54 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index ba555a7926..edcbb94368 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -129,6 +129,7 @@ namespace osu.Game.Configuration
             SetDefault(OsuSetting.ShowHealthDisplayWhenCantFail, true);
             SetDefault(OsuSetting.FadePlayfieldWhenHealthLow, true);
             SetDefault(OsuSetting.KeyOverlay, false);
+            SetDefault(OsuSetting.ReplaySettingsOverlay, true);
             SetDefault(OsuSetting.GameplayLeaderboard, true);
             SetDefault(OsuSetting.AlwaysPlayFirstComboBreak, true);
 
@@ -382,6 +383,7 @@ namespace osu.Game.Configuration
         SafeAreaConsiderations,
         ComboColourNormalisationAmount,
         ProfileCoverExpanded,
-        EditorLimitedDistanceSnap
+        EditorLimitedDistanceSnap,
+        ReplaySettingsOverlay
     }
 }
diff --git a/osu.Game/Localisation/GameplaySettingsStrings.cs b/osu.Game/Localisation/GameplaySettingsStrings.cs
index 40f39d927d..f52f6abb89 100644
--- a/osu.Game/Localisation/GameplaySettingsStrings.cs
+++ b/osu.Game/Localisation/GameplaySettingsStrings.cs
@@ -65,10 +65,15 @@ namespace osu.Game.Localisation
         public static LocalisableString HUDVisibilityMode => new TranslatableString(getKey(@"hud_visibility_mode"), @"HUD overlay visibility mode");
 
         /// <summary>
-        /// "Show health display even when you can't fail"
+        /// "Show health display even when you can&#39;t fail"
         /// </summary>
         public static LocalisableString ShowHealthDisplayWhenCantFail => new TranslatableString(getKey(@"show_health_display_when_cant_fail"), @"Show health display even when you can't fail");
 
+        /// <summary>
+        /// "Show replay settings overlay"
+        /// </summary>
+        public static LocalisableString ShowReplaySettingsOverlay => new TranslatableString(getKey(@"show_replay_settings_overlay"), @"Show replay settings overlay");
+
         /// <summary>
         /// "Fade playfield to red when health is low"
         /// </summary>
@@ -134,6 +139,6 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString ClassicScoreDisplay => new TranslatableString(getKey(@"classic_score_display"), @"Classic");
 
-        private static string getKey(string key) => $"{prefix}:{key}";
+        private static string getKey(string key) => $@"{prefix}:{key}";
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/HUDSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/HUDSettings.cs
index e7c83159cd..3e67b2f103 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/HUDSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/HUDSettings.cs
@@ -25,10 +25,9 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                 },
                 new SettingsCheckbox
                 {
-                    ClassicDefault = false,
-                    LabelText = GameplaySettingsStrings.ShowHealthDisplayWhenCantFail,
-                    Current = config.GetBindable<bool>(OsuSetting.ShowHealthDisplayWhenCantFail),
-                    Keywords = new[] { "hp", "bar" }
+                    LabelText = GameplaySettingsStrings.ShowReplaySettingsOverlay,
+                    Current = config.GetBindable<bool>(OsuSetting.ReplaySettingsOverlay),
+                    Keywords = new[] { "hide" },
                 },
                 new SettingsCheckbox
                 {
@@ -41,6 +40,13 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                     LabelText = GameplaySettingsStrings.AlwaysShowGameplayLeaderboard,
                     Current = config.GetBindable<bool>(OsuSetting.GameplayLeaderboard),
                 },
+                new SettingsCheckbox
+                {
+                    ClassicDefault = false,
+                    LabelText = GameplaySettingsStrings.ShowHealthDisplayWhenCantFail,
+                    Current = config.GetBindable<bool>(OsuSetting.ShowHealthDisplayWhenCantFail),
+                    Keywords = new[] { "hp", "bar" }
+                },
             };
         }
     }
diff --git a/osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs b/osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs
index 2fd2ed30f6..dbb0456cd0 100644
--- a/osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs
+++ b/osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs
@@ -3,10 +3,8 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Input.Events;
 using osuTK;
 using osu.Game.Screens.Play.PlayerSettings;
-using osuTK.Input;
 
 namespace osu.Game.Screens.Play.HUD
 {
@@ -14,16 +12,12 @@ namespace osu.Game.Screens.Play.HUD
     {
         private const int fade_duration = 200;
 
-        public bool ReplayLoaded;
-
         public readonly PlaybackSettings PlaybackSettings;
 
         public readonly VisualSettings VisualSettings;
 
         public PlayerSettingsOverlay()
         {
-            AlwaysPresent = true;
-
             Anchor = Anchor.TopRight;
             Origin = Anchor.TopRight;
             AutoSizeAxes = Axes.Both;
@@ -46,24 +40,5 @@ namespace osu.Game.Screens.Play.HUD
 
         protected override void PopIn() => this.FadeIn(fade_duration);
         protected override void PopOut() => this.FadeOut(fade_duration);
-
-        // We want to handle keyboard inputs all the time in order to trigger ToggleVisibility() when not visible
-        public override bool PropagateNonPositionalInputSubTree => true;
-
-        protected override bool OnKeyDown(KeyDownEvent e)
-        {
-            if (e.Repeat) return false;
-
-            if (e.ControlPressed)
-            {
-                if (e.Key == Key.H && ReplayLoaded)
-                {
-                    ToggleVisibility();
-                    return true;
-                }
-            }
-
-            return base.OnKeyDown(e);
-        }
     }
 }
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index f0a2975958..55843ec17c 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -28,6 +28,7 @@ using osu.Game.Screens.Play.HUD.ClicksPerSecond;
 using osu.Game.Screens.Play.HUD.JudgementCounter;
 using osu.Game.Skinning;
 using osuTK;
+using MarginPadding = osu.Framework.Graphics.MarginPadding;
 
 namespace osu.Game.Screens.Play
 {
@@ -78,6 +79,7 @@ namespace osu.Game.Screens.Play
         public Bindable<bool> ShowHud { get; } = new BindableBool();
 
         private Bindable<HUDVisibilityMode> configVisibilityMode;
+        private Bindable<bool> configSettingsOverlay;
 
         private readonly BindableBool replayLoaded = new BindableBool();
 
@@ -178,6 +180,7 @@ namespace osu.Game.Screens.Play
             ModDisplay.Current.Value = mods;
 
             configVisibilityMode = config.GetBindable<HUDVisibilityMode>(OsuSetting.HUDVisibilityMode);
+            configSettingsOverlay = config.GetBindable<bool>(OsuSetting.ReplaySettingsOverlay);
 
             if (configVisibilityMode.Value == HUDVisibilityMode.Never && !hasShownNotificationOnce)
             {
@@ -204,9 +207,24 @@ namespace osu.Game.Screens.Play
 
             holdingForHUD.BindValueChanged(_ => updateVisibility());
             IsPlaying.BindValueChanged(_ => updateVisibility());
-            configVisibilityMode.BindValueChanged(_ => updateVisibility(), true);
+            configVisibilityMode.BindValueChanged(_ => updateVisibility());
+            configSettingsOverlay.BindValueChanged(_ => updateVisibility());
 
-            replayLoaded.BindValueChanged(replayLoadedValueChanged, true);
+            replayLoaded.BindValueChanged(e =>
+            {
+                if (e.NewValue)
+                {
+                    ModDisplay.FadeIn(200);
+                    InputCountController.Margin = new MarginPadding(10) { Bottom = 30 };
+                }
+                else
+                {
+                    ModDisplay.Delay(2000).FadeOut(200);
+                    InputCountController.Margin = new MarginPadding(10);
+                }
+
+                updateVisibility();
+            }, true);
         }
 
         protected override void Update()
@@ -280,6 +298,11 @@ namespace osu.Game.Screens.Play
                 return;
             }
 
+            if (configSettingsOverlay.Value && replayLoaded.Value)
+                PlayerSettingsOverlay.Show();
+            else
+                PlayerSettingsOverlay.Hide();
+
             switch (configVisibilityMode.Value)
             {
                 case HUDVisibilityMode.Never:
@@ -297,26 +320,6 @@ namespace osu.Game.Screens.Play
             }
         }
 
-        private void replayLoadedValueChanged(ValueChangedEvent<bool> e)
-        {
-            PlayerSettingsOverlay.ReplayLoaded = e.NewValue;
-
-            if (e.NewValue)
-            {
-                PlayerSettingsOverlay.Show();
-                ModDisplay.FadeIn(200);
-                InputCountController.Margin = new MarginPadding(10) { Bottom = 30 };
-            }
-            else
-            {
-                PlayerSettingsOverlay.Hide();
-                ModDisplay.Delay(2000).FadeOut(200);
-                InputCountController.Margin = new MarginPadding(10);
-            }
-
-            updateVisibility();
-        }
-
         protected virtual void BindDrawableRuleset(DrawableRuleset drawableRuleset)
         {
             if (drawableRuleset is ICanAttachHUDPieces attachTarget)

From 929189530529ec3129e84b838f84bdf6e07441ce Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Jul 2023 01:00:41 +0900
Subject: [PATCH 1212/1604] Make key for toggling replay settings customisable

---
 osu.Game/Input/Bindings/GlobalActionContainer.cs       | 4 ++++
 osu.Game/Localisation/GlobalActionKeyBindingStrings.cs | 5 +++++
 osu.Game/Screens/Play/HUDOverlay.cs                    | 4 ++++
 3 files changed, 13 insertions(+)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 64268c73d0..c2d08ffff8 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -116,6 +116,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.F3 }, GlobalAction.DecreaseScrollSpeed),
             new KeyBinding(new[] { InputKey.F4 }, GlobalAction.IncreaseScrollSpeed),
             new KeyBinding(new[] { InputKey.Shift, InputKey.Tab }, GlobalAction.ToggleInGameInterface),
+            new KeyBinding(new[] { InputKey.Control, InputKey.H }, GlobalAction.ToggleReplaySettings),
             new KeyBinding(InputKey.MouseMiddle, GlobalAction.PauseGameplay),
             new KeyBinding(InputKey.Control, GlobalAction.HoldForHUD),
             new KeyBinding(InputKey.Tab, GlobalAction.ToggleChatFocus),
@@ -374,5 +375,8 @@ namespace osu.Game.Input.Bindings
 
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.ExportReplay))]
         ExportReplay,
+
+        [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.ToggleReplaySettings))]
+        ToggleReplaySettings,
     }
 }
diff --git a/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs b/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
index 9e53b23180..f93d86225c 100644
--- a/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
+++ b/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
@@ -324,6 +324,11 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString ToggleChatFocus => new TranslatableString(getKey(@"toggle_chat_focus"), @"Toggle chat focus");
 
+        /// <summary>
+        /// "Toggle replay settings"
+        /// </summary>
+        public static LocalisableString ToggleReplaySettings => new TranslatableString(getKey(@"toggle_replay_settings"), @"Toggle replay settings");
+
         /// <summary>
         /// "Save replay"
         /// </summary>
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 55843ec17c..d8d4daf143 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -357,6 +357,10 @@ namespace osu.Game.Screens.Play
 
             switch (e.Action)
             {
+                case GlobalAction.ToggleReplaySettings:
+                    configSettingsOverlay.Value = !configSettingsOverlay.Value;
+                    return true;
+
                 case GlobalAction.HoldForHUD:
                     holdingForHUD.Value = true;
                     return true;

From cdb8a56df40b83c40f243d2dab9df2a531139084 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 5 Jul 2023 22:41:20 +0200
Subject: [PATCH 1213/1604] Remove weird aliased using

Doesn't appear to be required.
---
 osu.Game/Screens/Play/HUDOverlay.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index d8d4daf143..d11171e3fe 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -28,7 +28,6 @@ using osu.Game.Screens.Play.HUD.ClicksPerSecond;
 using osu.Game.Screens.Play.HUD.JudgementCounter;
 using osu.Game.Skinning;
 using osuTK;
-using MarginPadding = osu.Framework.Graphics.MarginPadding;
 
 namespace osu.Game.Screens.Play
 {

From 1938bdbf9d42a69d6a718b8022fb886eaf78a554 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 5 Jul 2023 22:45:10 +0200
Subject: [PATCH 1214/1604] Move replay settings toggle to replay key bindings
 section

---
 osu.Game/Input/Bindings/GlobalActionContainer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index c2d08ffff8..01c454e3f9 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -116,7 +116,6 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.F3 }, GlobalAction.DecreaseScrollSpeed),
             new KeyBinding(new[] { InputKey.F4 }, GlobalAction.IncreaseScrollSpeed),
             new KeyBinding(new[] { InputKey.Shift, InputKey.Tab }, GlobalAction.ToggleInGameInterface),
-            new KeyBinding(new[] { InputKey.Control, InputKey.H }, GlobalAction.ToggleReplaySettings),
             new KeyBinding(InputKey.MouseMiddle, GlobalAction.PauseGameplay),
             new KeyBinding(InputKey.Control, GlobalAction.HoldForHUD),
             new KeyBinding(InputKey.Tab, GlobalAction.ToggleChatFocus),
@@ -130,6 +129,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(InputKey.MouseMiddle, GlobalAction.TogglePauseReplay),
             new KeyBinding(InputKey.Left, GlobalAction.SeekReplayBackward),
             new KeyBinding(InputKey.Right, GlobalAction.SeekReplayForward),
+            new KeyBinding(new[] { InputKey.Control, InputKey.H }, GlobalAction.ToggleReplaySettings),
         };
 
         public IEnumerable<KeyBinding> SongSelectKeyBindings => new[]

From 170bc5bfcec23252a836c31829aa971af778ce84 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Jul 2023 12:25:15 +0900
Subject: [PATCH 1215/1604] Add support for skinnable "retry" sound

---
 osu.Game/Screens/Play/Player.cs | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index b979fc2740..2cb7748a15 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -11,8 +11,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
-using osu.Framework.Audio;
-using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
@@ -114,7 +112,7 @@ namespace osu.Game.Screens.Play
 
         private Ruleset ruleset;
 
-        private Sample sampleRestart;
+        private SkinnableSound sampleRestart;
 
         public BreakOverlay BreakOverlay;
 
@@ -195,7 +193,7 @@ namespace osu.Game.Screens.Play
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(AudioManager audio, OsuConfigManager config, OsuGameBase game, CancellationToken cancellationToken)
+        private void load(OsuConfigManager config, OsuGameBase game, CancellationToken cancellationToken)
         {
             var gameplayMods = Mods.Value.Select(m => m.DeepClone()).ToArray();
 
@@ -213,8 +211,6 @@ namespace osu.Game.Screens.Play
             if (playableBeatmap == null)
                 return;
 
-            sampleRestart = audio.Samples.Get(@"Gameplay/restart");
-
             mouseWheelDisabled = config.GetBindable<bool>(OsuSetting.MouseDisableWheel);
 
             if (game != null)
@@ -295,15 +291,19 @@ namespace osu.Game.Screens.Play
 
             if (Configuration.AllowRestart)
             {
-                rulesetSkinProvider.Add(new HotkeyRetryOverlay
+                rulesetSkinProvider.AddRange(new Drawable[]
                 {
-                    Action = () =>
+                    new HotkeyRetryOverlay
                     {
-                        if (!this.IsCurrentScreen()) return;
+                        Action = () =>
+                        {
+                            if (!this.IsCurrentScreen()) return;
 
-                        fadeOut(true);
-                        Restart(true);
+                            fadeOut(true);
+                            Restart(true);
+                        },
                     },
+                    sampleRestart = new SkinnableSound(new SampleInfo(@"Gameplay/restart", @"pause-retry-click"))
                 });
             }
 

From b679ab88a161cca1331c5bf939927c498af44df0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Jul 2023 12:29:03 +0900
Subject: [PATCH 1216/1604] Avoid attempting to process missing statistics on
 scores without linked beatmaps

---
 osu.Game/BackgroundBeatmapProcessor.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/BackgroundBeatmapProcessor.cs b/osu.Game/BackgroundBeatmapProcessor.cs
index 9fe3a41b03..9c140bdda9 100644
--- a/osu.Game/BackgroundBeatmapProcessor.cs
+++ b/osu.Game/BackgroundBeatmapProcessor.cs
@@ -163,8 +163,12 @@ namespace osu.Game
             {
                 foreach (var score in r.All<ScoreInfo>())
                 {
-                    if (score.Statistics.Sum(kvp => kvp.Value) > 0 && score.MaximumStatistics.Sum(kvp => kvp.Value) == 0)
+                    if (score.BeatmapInfo != null
+                        && score.Statistics.Sum(kvp => kvp.Value) > 0
+                        && score.MaximumStatistics.Sum(kvp => kvp.Value) == 0)
+                    {
                         scoreIds.Add(score.ID);
+                    }
                 }
             });
 

From a98a36872e286da460737d92e0658713ba690292 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Jul 2023 13:37:42 +0900
Subject: [PATCH 1217/1604] Bring realm library up-to-date

---
 .../Beatmaps/WorkingBeatmapManagerTest.cs     |  6 ++---
 .../BackgroundBeatmapProcessorTests.cs        | 14 +++++------
 .../Database/BeatmapImporterUpdateTests.cs    | 14 +++++------
 osu.Game.Tests/Database/GeneralUsageTests.cs  |  2 +-
 osu.Game.Tests/Database/RealmLiveTests.cs     |  2 +-
 .../RealmSubscriptionRegistrationTests.cs     |  7 +++---
 osu.Game.Tests/Database/RulesetStoreTests.cs  | 10 ++++----
 .../TestScenePlayerLocalScoreImport.cs        |  2 +-
 .../UserInterface/TestSceneModPresetColumn.cs |  6 ++---
 .../TestSceneModSelectOverlay.cs              |  4 ++--
 osu.Game/BackgroundBeatmapProcessor.cs        |  6 ++---
 osu.Game/Beatmaps/BeatmapImporter.cs          |  2 +-
 osu.Game/Beatmaps/BeatmapManager.cs           |  8 +++----
 osu.Game/Beatmaps/BeatmapUpdater.cs           |  2 +-
 osu.Game/Collections/CollectionDropdown.cs    |  2 +-
 .../Collections/DrawableCollectionList.cs     |  2 +-
 .../Collections/DrawableCollectionListItem.cs |  2 +-
 osu.Game/Database/EmptyRealmSet.cs            |  4 ++--
 osu.Game/Database/ModelManager.cs             | 24 ++++++++++---------
 osu.Game/Database/RealmAccess.cs              | 14 +++++------
 osu.Game/Database/RealmLive.cs                |  6 ++---
 osu.Game/Database/RealmObjectExtensions.cs    |  8 +++----
 .../Bindings/DatabasedKeyBindingContainer.cs  |  2 +-
 osu.Game/Online/BeatmapDownloadTracker.cs     |  2 +-
 .../OnlinePlayBeatmapAvailabilityTracker.cs   |  2 +-
 osu.Game/Online/ScoreDownloadTracker.cs       |  2 +-
 .../Overlays/FirstRunSetup/ScreenBeatmaps.cs  |  2 +-
 osu.Game/Overlays/Mods/AddPresetPopover.cs    |  2 +-
 osu.Game/Overlays/Mods/ModPresetColumn.cs     |  2 +-
 osu.Game/Overlays/Music/PlaylistOverlay.cs    |  2 +-
 .../Overlays/Settings/Sections/SkinSection.cs |  2 +-
 osu.Game/Scoring/ScoreImporter.cs             |  4 ++--
 osu.Game/Screens/Select/BeatmapCarousel.cs    |  8 +++----
 .../Screens/Select/Carousel/TopLocalRank.cs   |  2 +-
 .../Select/Leaderboards/BeatmapLeaderboard.cs |  2 +-
 osu.Game/Screens/Spectate/SpectatorScreen.cs  |  2 +-
 osu.Game/Skinning/RealmBackedResourceStore.cs |  2 +-
 osu.Game/Skinning/SkinImporter.cs             |  6 ++---
 osu.Game/osu.Game.csproj                      |  2 +-
 39 files changed, 97 insertions(+), 96 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/WorkingBeatmapManagerTest.cs b/osu.Game.Tests/Beatmaps/WorkingBeatmapManagerTest.cs
index 89b8c8927d..237fe758b5 100644
--- a/osu.Game.Tests/Beatmaps/WorkingBeatmapManagerTest.cs
+++ b/osu.Game.Tests/Beatmaps/WorkingBeatmapManagerTest.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Tests.Beatmaps
         [Test]
         public void TestCachedRetrievalWithFiles() => AddStep("run test", () =>
         {
-            var beatmap = Realm.Run(r => r.Find<BeatmapInfo>(importedSet.Beatmaps.First().ID).Detach());
+            var beatmap = Realm.Run(r => r.Find<BeatmapInfo>(importedSet.Beatmaps.First().ID)!.Detach());
 
             Assert.That(beatmap.BeatmapSet?.Files, Has.Count.GreaterThan(0));
 
@@ -90,7 +90,7 @@ namespace osu.Game.Tests.Beatmaps
         [Test]
         public void TestForcedRefetchRetrievalWithFiles() => AddStep("run test", () =>
         {
-            var beatmap = Realm.Run(r => r.Find<BeatmapInfo>(importedSet.Beatmaps.First().ID).Detach());
+            var beatmap = Realm.Run(r => r.Find<BeatmapInfo>(importedSet.Beatmaps.First().ID)!.Detach());
 
             Assert.That(beatmap.BeatmapSet?.Files, Has.Count.GreaterThan(0));
 
@@ -102,7 +102,7 @@ namespace osu.Game.Tests.Beatmaps
         [Test]
         public void TestSavePreservesCollections() => AddStep("run test", () =>
         {
-            var beatmap = Realm.Run(r => r.Find<BeatmapInfo>(importedSet.Beatmaps.First().ID).Detach());
+            var beatmap = Realm.Run(r => r.Find<BeatmapInfo>(importedSet.Beatmaps.First().ID)!.Detach());
 
             var working = beatmaps.GetWorkingBeatmap(beatmap);
 
diff --git a/osu.Game.Tests/Database/BackgroundBeatmapProcessorTests.cs b/osu.Game.Tests/Database/BackgroundBeatmapProcessorTests.cs
index ddb60606ec..c876316be4 100644
--- a/osu.Game.Tests/Database/BackgroundBeatmapProcessorTests.cs
+++ b/osu.Game.Tests/Database/BackgroundBeatmapProcessorTests.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Tests.Database
             {
                 return Realm.Run(r =>
                 {
-                    var beatmapSetInfo = r.Find<BeatmapSetInfo>(importedSet.ID);
+                    var beatmapSetInfo = r.Find<BeatmapSetInfo>(importedSet.ID)!;
                     return beatmapSetInfo.Beatmaps.All(b => b.StarRating > 0);
                 });
             });
@@ -51,7 +51,7 @@ namespace osu.Game.Tests.Database
             {
                 Realm.Write(r =>
                 {
-                    var beatmapSetInfo = r.Find<BeatmapSetInfo>(importedSet.ID);
+                    var beatmapSetInfo = r.Find<BeatmapSetInfo>(importedSet.ID)!;
                     foreach (var b in beatmapSetInfo.Beatmaps)
                         b.StarRating = -1;
                 });
@@ -66,7 +66,7 @@ namespace osu.Game.Tests.Database
             {
                 return Realm.Run(r =>
                 {
-                    var beatmapSetInfo = r.Find<BeatmapSetInfo>(importedSet.ID);
+                    var beatmapSetInfo = r.Find<BeatmapSetInfo>(importedSet.ID)!;
                     return beatmapSetInfo.Beatmaps.All(b => b.StarRating > 0);
                 });
             });
@@ -79,7 +79,7 @@ namespace osu.Game.Tests.Database
             {
                 return Realm.Run(r =>
                 {
-                    var beatmapSetInfo = r.Find<BeatmapSetInfo>(importedSet.ID);
+                    var beatmapSetInfo = r.Find<BeatmapSetInfo>(importedSet.ID)!;
                     return beatmapSetInfo.Beatmaps.All(b => b.StarRating > 0);
                 });
             });
@@ -90,7 +90,7 @@ namespace osu.Game.Tests.Database
             {
                 Realm.Write(r =>
                 {
-                    var beatmapSetInfo = r.Find<BeatmapSetInfo>(importedSet.ID);
+                    var beatmapSetInfo = r.Find<BeatmapSetInfo>(importedSet.ID)!;
                     foreach (var b in beatmapSetInfo.Beatmaps)
                         b.StarRating = -1;
                 });
@@ -107,7 +107,7 @@ namespace osu.Game.Tests.Database
             {
                 return Realm.Run(r =>
                 {
-                    var beatmapSetInfo = r.Find<BeatmapSetInfo>(importedSet.ID);
+                    var beatmapSetInfo = r.Find<BeatmapSetInfo>(importedSet.ID)!;
                     return beatmapSetInfo.Beatmaps.All(b => b.StarRating == -1);
                 });
             });
@@ -118,7 +118,7 @@ namespace osu.Game.Tests.Database
             {
                 return Realm.Run(r =>
                 {
-                    var beatmapSetInfo = r.Find<BeatmapSetInfo>(importedSet.ID);
+                    var beatmapSetInfo = r.Find<BeatmapSetInfo>(importedSet.ID)!;
                     return beatmapSetInfo.Beatmaps.All(b => b.StarRating > 0);
                 });
             });
diff --git a/osu.Game.Tests/Database/BeatmapImporterUpdateTests.cs b/osu.Game.Tests/Database/BeatmapImporterUpdateTests.cs
index 83cb54df3f..437a8c75e2 100644
--- a/osu.Game.Tests/Database/BeatmapImporterUpdateTests.cs
+++ b/osu.Game.Tests/Database/BeatmapImporterUpdateTests.cs
@@ -323,7 +323,7 @@ namespace osu.Game.Tests.Database
                     var beatmapInfo = s.Beatmaps.First(b => b.File?.Filename != removedFilename);
 
                     scoreTargetBeatmapHash = beatmapInfo.Hash;
-                    s.Realm.Add(new ScoreInfo(beatmapInfo, s.Realm.All<RulesetInfo>().First(), new RealmUser()));
+                    s.Realm!.Add(new ScoreInfo(beatmapInfo, s.Realm.All<RulesetInfo>().First(), new RealmUser()));
                 });
 
                 realm.Run(r => r.Refresh());
@@ -372,7 +372,7 @@ namespace osu.Game.Tests.Database
 
                     scoreTargetBeatmapHash = beatmapInfo.Hash;
 
-                    s.Realm.Add(new ScoreInfo(beatmapInfo, s.Realm.All<RulesetInfo>().First(), new RealmUser()));
+                    s.Realm!.Add(new ScoreInfo(beatmapInfo, s.Realm.All<RulesetInfo>().First(), new RealmUser()));
                 });
 
                 // locally modify beatmap
@@ -435,7 +435,7 @@ namespace osu.Game.Tests.Database
                 {
                     var beatmapInfo = s.Beatmaps.Last();
                     scoreTargetFilename = beatmapInfo.File?.Filename;
-                    s.Realm.Add(new ScoreInfo(beatmapInfo, s.Realm.All<RulesetInfo>().First(), new RealmUser()));
+                    s.Realm!.Add(new ScoreInfo(beatmapInfo, s.Realm.All<RulesetInfo>().First(), new RealmUser()));
                 });
 
                 realm.Run(r => r.Refresh());
@@ -528,7 +528,7 @@ namespace osu.Game.Tests.Database
 
                 importBeforeUpdate.PerformWrite(s =>
                 {
-                    var beatmapCollection = s.Realm.Add(new BeatmapCollection("test collection"));
+                    var beatmapCollection = s.Realm!.Add(new BeatmapCollection("test collection"));
                     beatmapsToAddToCollection = s.Beatmaps.Count - (allOriginalBeatmapsInCollection ? 0 : 1);
 
                     for (int i = 0; i < beatmapsToAddToCollection; i++)
@@ -543,7 +543,7 @@ namespace osu.Game.Tests.Database
 
                 importAfterUpdate.PerformRead(updated =>
                 {
-                    updated.Realm.Refresh();
+                    updated.Realm!.Refresh();
 
                     string[] hashes = updated.Realm.All<BeatmapCollection>().Single().BeatmapMD5Hashes.ToArray();
 
@@ -593,7 +593,7 @@ namespace osu.Game.Tests.Database
 
                 importBeforeUpdate.PerformWrite(s =>
                 {
-                    var beatmapCollection = s.Realm.Add(new BeatmapCollection("test collection"));
+                    var beatmapCollection = s.Realm!.Add(new BeatmapCollection("test collection"));
                     originalHash = s.Beatmaps.Single(b => b.DifficultyName == "Hard").MD5Hash;
 
                     beatmapCollection.BeatmapMD5Hashes.Add(originalHash);
@@ -607,7 +607,7 @@ namespace osu.Game.Tests.Database
 
                 importAfterUpdate.PerformRead(updated =>
                 {
-                    updated.Realm.Refresh();
+                    updated.Realm!.Refresh();
 
                     string[] hashes = updated.Realm.All<BeatmapCollection>().Single().BeatmapMD5Hashes.ToArray();
                     string updatedHash = updated.Beatmaps.Single(b => b.DifficultyName == "Hard").MD5Hash;
diff --git a/osu.Game.Tests/Database/GeneralUsageTests.cs b/osu.Game.Tests/Database/GeneralUsageTests.cs
index fd0b391d0d..b8073a65bc 100644
--- a/osu.Game.Tests/Database/GeneralUsageTests.cs
+++ b/osu.Game.Tests/Database/GeneralUsageTests.cs
@@ -128,7 +128,7 @@ namespace osu.Game.Tests.Database
 
                 realm.RegisterCustomSubscription(r =>
                 {
-                    var subscription = r.All<BeatmapInfo>().QueryAsyncWithNotifications((_, _, _) =>
+                    var subscription = r.All<BeatmapInfo>().QueryAsyncWithNotifications((_, _) =>
                     {
                         realm.Run(_ =>
                         {
diff --git a/osu.Game.Tests/Database/RealmLiveTests.cs b/osu.Game.Tests/Database/RealmLiveTests.cs
index d853e75db0..cea30acf3f 100644
--- a/osu.Game.Tests/Database/RealmLiveTests.cs
+++ b/osu.Game.Tests/Database/RealmLiveTests.cs
@@ -355,7 +355,7 @@ namespace osu.Game.Tests.Database
                     return null;
                 });
 
-                void gotChange(IRealmCollection<BeatmapInfo> sender, ChangeSet changes, Exception error)
+                void gotChange(IRealmCollection<BeatmapInfo> sender, ChangeSet? changes)
                 {
                     changesTriggered++;
                 }
diff --git a/osu.Game.Tests/Database/RealmSubscriptionRegistrationTests.cs b/osu.Game.Tests/Database/RealmSubscriptionRegistrationTests.cs
index 4ee302bbd0..45842a952a 100644
--- a/osu.Game.Tests/Database/RealmSubscriptionRegistrationTests.cs
+++ b/osu.Game.Tests/Database/RealmSubscriptionRegistrationTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -54,7 +53,7 @@ namespace osu.Game.Tests.Database
                 registration.Dispose();
             });
 
-            void onChanged(IRealmCollection<BeatmapSetInfo> sender, ChangeSet? changes, Exception error)
+            void onChanged(IRealmCollection<BeatmapSetInfo> sender, ChangeSet? changes)
             {
                 lastChanges = changes;
 
@@ -92,7 +91,7 @@ namespace osu.Game.Tests.Database
                 registration.Dispose();
             });
 
-            void onChanged(IRealmCollection<BeatmapSetInfo> sender, ChangeSet? changes, Exception error) => lastChanges = changes;
+            void onChanged(IRealmCollection<BeatmapSetInfo> sender, ChangeSet? changes) => lastChanges = changes;
         }
 
         [Test]
@@ -185,7 +184,7 @@ namespace osu.Game.Tests.Database
                 }
             });
 
-            void onChanged(IRealmCollection<BeatmapSetInfo> sender, ChangeSet? changes, Exception error)
+            void onChanged(IRealmCollection<BeatmapSetInfo> sender, ChangeSet? changes)
             {
                 if (changes == null)
                     resolvedItems = sender;
diff --git a/osu.Game.Tests/Database/RulesetStoreTests.cs b/osu.Game.Tests/Database/RulesetStoreTests.cs
index a5662fa121..8b4c6e2411 100644
--- a/osu.Game.Tests/Database/RulesetStoreTests.cs
+++ b/osu.Game.Tests/Database/RulesetStoreTests.cs
@@ -76,12 +76,12 @@ namespace osu.Game.Tests.Database
                     Available = true,
                 }));
 
-                Assert.That(realm.Run(r => r.Find<RulesetInfo>(rulesetShortName).Available), Is.True);
+                Assert.That(realm.Run(r => r.Find<RulesetInfo>(rulesetShortName)!.Available), Is.True);
 
                 // Availability is updated on construction of a RealmRulesetStore
                 var _ = new RealmRulesetStore(realm, storage);
 
-                Assert.That(realm.Run(r => r.Find<RulesetInfo>(rulesetShortName).Available), Is.False);
+                Assert.That(realm.Run(r => r.Find<RulesetInfo>(rulesetShortName)!.Available), Is.False);
             });
         }
 
@@ -101,18 +101,18 @@ namespace osu.Game.Tests.Database
                     Available = true,
                 }));
 
-                Assert.That(realm.Run(r => r.Find<RulesetInfo>(rulesetShortName).Available), Is.True);
+                Assert.That(realm.Run(r => r.Find<RulesetInfo>(rulesetShortName)!.Available), Is.True);
 
                 // Availability is updated on construction of a RealmRulesetStore
                 var _ = new RealmRulesetStore(realm, storage);
 
-                Assert.That(realm.Run(r => r.Find<RulesetInfo>(rulesetShortName).Available), Is.False);
+                Assert.That(realm.Run(r => r.Find<RulesetInfo>(rulesetShortName)!.Available), Is.False);
 
                 // Simulate the ruleset getting updated
                 LoadTestRuleset.Version = Ruleset.CURRENT_RULESET_API_VERSION;
                 var __ = new RealmRulesetStore(realm, storage);
 
-                Assert.That(realm.Run(r => r.Find<RulesetInfo>(rulesetShortName).Available), Is.True);
+                Assert.That(realm.Run(r => r.Find<RulesetInfo>(rulesetShortName)!.Available), Is.True);
             });
         }
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
index 80c4e4bce9..b0b9d48cbe 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
@@ -131,7 +131,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("results screen score has matching", () => (Player.GetChildScreen() as ResultsScreen)?.Score.Mods.First(), () => Is.EqualTo(playerMods.First()));
 
             AddUntilStep("score in database", () => Realm.Run(r => r.Find<ScoreInfo>(Player.Score.ScoreInfo.ID) != null));
-            AddUntilStep("databased score has correct mods", () => Realm.Run(r => r.Find<ScoreInfo>(Player.Score.ScoreInfo.ID)).Mods.First(), () => Is.EqualTo(playerMods.First()));
+            AddUntilStep("databased score has correct mods", () => Realm.Run(r => r.Find<ScoreInfo>(Player.Score.ScoreInfo.ID))!.Mods.First(), () => Is.EqualTo(playerMods.First()));
         }
 
         [Test]
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
index 2d54a4e566..bf6d8e524f 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
                     var testPresets = createTestPresets();
                     foreach (var preset in testPresets)
-                        preset.Ruleset = realm.Find<RulesetInfo>(preset.Ruleset.ShortName);
+                        preset.Ruleset = realm.Find<RulesetInfo>(preset.Ruleset.ShortName)!;
 
                     realm.Add(testPresets);
                 });
@@ -103,7 +103,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                     new ManiaModNightcore(),
                     new ManiaModHardRock()
                 },
-                Ruleset = r.Find<RulesetInfo>("mania")
+                Ruleset = r.Find<RulesetInfo>("mania")!
             })));
             AddUntilStep("2 panels visible", () => this.ChildrenOfType<ModPresetPanel>().Count() == 2);
 
@@ -115,7 +115,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                     new OsuModHidden(),
                     new OsuModHardRock()
                 },
-                Ruleset = r.Find<RulesetInfo>("osu")
+                Ruleset = r.Find<RulesetInfo>("osu")!
             })));
             AddUntilStep("2 panels visible", () => this.ChildrenOfType<ModPresetPanel>().Count() == 2);
 
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index dcb1f730a2..4cb6899ebc 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                     {
                         Name = "AR0",
                         Description = "Too... many... circles...",
-                        Ruleset = r.Find<RulesetInfo>(OsuRuleset.SHORT_NAME),
+                        Ruleset = r.Find<RulesetInfo>(OsuRuleset.SHORT_NAME)!,
                         Mods = new[]
                         {
                             new OsuModDifficultyAdjust
@@ -73,7 +73,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                     {
                         Name = "Half Time 0.5x",
                         Description = "Very slow",
-                        Ruleset = r.Find<RulesetInfo>(OsuRuleset.SHORT_NAME),
+                        Ruleset = r.Find<RulesetInfo>(OsuRuleset.SHORT_NAME)!,
                         Mods = new[]
                         {
                             new OsuModHalfTime
diff --git a/osu.Game/BackgroundBeatmapProcessor.cs b/osu.Game/BackgroundBeatmapProcessor.cs
index 9fe3a41b03..34c1786682 100644
--- a/osu.Game/BackgroundBeatmapProcessor.cs
+++ b/osu.Game/BackgroundBeatmapProcessor.cs
@@ -102,7 +102,7 @@ namespace osu.Game
                             }
                         }
 
-                        r.Find<RulesetInfo>(ruleset.ShortName).LastAppliedDifficultyVersion = currentVersion;
+                        r.Find<RulesetInfo>(ruleset.ShortName)!.LastAppliedDifficultyVersion = currentVersion;
                     });
 
                     Logger.Log($"Finished resetting {countReset} beatmap sets for {ruleset.Name}");
@@ -184,7 +184,7 @@ namespace osu.Game
                     // ReSharper disable once MethodHasAsyncOverload
                     realmAccess.Write(r =>
                     {
-                        r.Find<ScoreInfo>(id).MaximumStatisticsJson = JsonConvert.SerializeObject(score.MaximumStatistics);
+                        r.Find<ScoreInfo>(id)!.MaximumStatisticsJson = JsonConvert.SerializeObject(score.MaximumStatistics);
                     });
 
                     Logger.Log($"Populated maximum statistics for score {id}");
@@ -237,7 +237,7 @@ namespace osu.Game
                     // ReSharper disable once MethodHasAsyncOverload
                     realmAccess.Write(r =>
                     {
-                        ScoreInfo s = r.Find<ScoreInfo>(id);
+                        ScoreInfo s = r.Find<ScoreInfo>(id)!;
                         s.TotalScore = newTotalScore;
                         s.TotalScoreVersion = LegacyScoreEncoder.LATEST_VERSION;
                     });
diff --git a/osu.Game/Beatmaps/BeatmapImporter.cs b/osu.Game/Beatmaps/BeatmapImporter.cs
index fd766490fc..dba3987524 100644
--- a/osu.Game/Beatmaps/BeatmapImporter.cs
+++ b/osu.Game/Beatmaps/BeatmapImporter.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Beatmaps
 
                 Logger.Log($"Beatmap \"{updated}\" update completed successfully", LoggingTarget.Database);
 
-                original = realm.Find<BeatmapSetInfo>(original.ID);
+                original = realm!.Find<BeatmapSetInfo>(original.ID)!;
 
                 // Generally the import process will do this for us if the OnlineIDs match,
                 // but that isn't a guarantee (ie. if the .osu file doesn't have OnlineIDs populated).
diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 73811b2e62..cf5ed25404 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -208,7 +208,7 @@ namespace osu.Game.Beatmaps
                 using (var transaction = r.BeginWrite())
                 {
                     if (!beatmapInfo.IsManaged)
-                        beatmapInfo = r.Find<BeatmapInfo>(beatmapInfo.ID);
+                        beatmapInfo = r.Find<BeatmapInfo>(beatmapInfo.ID)!;
 
                     beatmapInfo.Hidden = true;
                     transaction.Commit();
@@ -227,7 +227,7 @@ namespace osu.Game.Beatmaps
                 using (var transaction = r.BeginWrite())
                 {
                     if (!beatmapInfo.IsManaged)
-                        beatmapInfo = r.Find<BeatmapInfo>(beatmapInfo.ID);
+                        beatmapInfo = r.Find<BeatmapInfo>(beatmapInfo.ID)!;
 
                     beatmapInfo.Hidden = false;
                     transaction.Commit();
@@ -330,7 +330,7 @@ namespace osu.Game.Beatmaps
             Realm.Write(r =>
             {
                 if (!beatmapInfo.IsManaged)
-                    beatmapInfo = r.Find<BeatmapInfo>(beatmapInfo.ID);
+                    beatmapInfo = r.Find<BeatmapInfo>(beatmapInfo.ID)!;
 
                 Debug.Assert(beatmapInfo.BeatmapSet != null);
                 Debug.Assert(beatmapInfo.File != null);
@@ -460,7 +460,7 @@ namespace osu.Game.Beatmaps
 
                 Realm.Write(r =>
                 {
-                    var liveBeatmapSet = r.Find<BeatmapSetInfo>(setInfo.ID);
+                    var liveBeatmapSet = r.Find<BeatmapSetInfo>(setInfo.ID)!;
 
                     setInfo.CopyChangesToRealm(liveBeatmapSet);
 
diff --git a/osu.Game/Beatmaps/BeatmapUpdater.cs b/osu.Game/Beatmaps/BeatmapUpdater.cs
index 046adb8327..56bfdc5001 100644
--- a/osu.Game/Beatmaps/BeatmapUpdater.cs
+++ b/osu.Game/Beatmaps/BeatmapUpdater.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Beatmaps
         /// </summary>
         /// <param name="beatmapSet">The managed beatmap set to update. A transaction will be opened to apply changes.</param>
         /// <param name="lookupScope">The preferred scope to use for metadata lookup.</param>
-        public void Process(BeatmapSetInfo beatmapSet, MetadataLookupScope lookupScope = MetadataLookupScope.LocalCacheFirst) => beatmapSet.Realm.Write(r =>
+        public void Process(BeatmapSetInfo beatmapSet, MetadataLookupScope lookupScope = MetadataLookupScope.LocalCacheFirst) => beatmapSet.Realm!.Write(_ =>
         {
             // Before we use below, we want to invalidate.
             workingBeatmapCache.Invalidate(beatmapSet);
diff --git a/osu.Game/Collections/CollectionDropdown.cs b/osu.Game/Collections/CollectionDropdown.cs
index e95565a5c8..e435992381 100644
--- a/osu.Game/Collections/CollectionDropdown.cs
+++ b/osu.Game/Collections/CollectionDropdown.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Collections
             Current.BindValueChanged(selectionChanged);
         }
 
-        private void collectionsChanged(IRealmCollection<BeatmapCollection> collections, ChangeSet? changes, Exception error)
+        private void collectionsChanged(IRealmCollection<BeatmapCollection> collections, ChangeSet? changes)
         {
             var selectedItem = SelectedItem?.Value?.Collection;
 
diff --git a/osu.Game/Collections/DrawableCollectionList.cs b/osu.Game/Collections/DrawableCollectionList.cs
index 0fdf196c4a..6fe38a3229 100644
--- a/osu.Game/Collections/DrawableCollectionList.cs
+++ b/osu.Game/Collections/DrawableCollectionList.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Collections
             realmSubscription = realm.RegisterForNotifications(r => r.All<BeatmapCollection>().OrderBy(c => c.Name), collectionsChanged);
         }
 
-        private void collectionsChanged(IRealmCollection<BeatmapCollection> collections, ChangeSet? changes, Exception error)
+        private void collectionsChanged(IRealmCollection<BeatmapCollection> collections, ChangeSet? changes)
         {
             Items.Clear();
             Items.AddRange(collections.AsEnumerable().Select(c => c.ToLive(realm)));
diff --git a/osu.Game/Collections/DrawableCollectionListItem.cs b/osu.Game/Collections/DrawableCollectionListItem.cs
index 0ab0ff520d..4131148f3f 100644
--- a/osu.Game/Collections/DrawableCollectionListItem.cs
+++ b/osu.Game/Collections/DrawableCollectionListItem.cs
@@ -197,7 +197,7 @@ namespace osu.Game.Collections
                 return true;
             }
 
-            private void deleteCollection() => collection.PerformWrite(c => c.Realm.Remove(c));
+            private void deleteCollection() => collection.PerformWrite(c => c.Realm!.Remove(c));
         }
     }
 }
diff --git a/osu.Game/Database/EmptyRealmSet.cs b/osu.Game/Database/EmptyRealmSet.cs
index 7db946d79f..02dfa50fe5 100644
--- a/osu.Game/Database/EmptyRealmSet.cs
+++ b/osu.Game/Database/EmptyRealmSet.cs
@@ -19,8 +19,8 @@ namespace osu.Game.Database
         IEnumerator IEnumerable.GetEnumerator() => emptySet.GetEnumerator();
         public int Count => emptySet.Count;
         public T this[int index] => emptySet[index];
-        public int IndexOf(object item) => emptySet.IndexOf((T)item);
-        public bool Contains(object item) => emptySet.Contains((T)item);
+        public int IndexOf(object? item) => item == null ? -1 : emptySet.IndexOf((T)item);
+        public bool Contains(object? item) => item != null && emptySet.Contains((T)item);
 
         public event NotifyCollectionChangedEventHandler? CollectionChanged
         {
diff --git a/osu.Game/Database/ModelManager.cs b/osu.Game/Database/ModelManager.cs
index 7d1dc5239a..47feb8a8f9 100644
--- a/osu.Game/Database/ModelManager.cs
+++ b/osu.Game/Database/ModelManager.cs
@@ -34,13 +34,13 @@ namespace osu.Game.Database
         }
 
         public void DeleteFile(TModel item, RealmNamedFileUsage file) =>
-            performFileOperation(item, managed => DeleteFile(managed, managed.Files.First(f => f.Filename == file.Filename), managed.Realm));
+            performFileOperation(item, managed => DeleteFile(managed, managed.Files.First(f => f.Filename == file.Filename), managed.Realm!));
 
         public void ReplaceFile(TModel item, RealmNamedFileUsage file, Stream contents) =>
-            performFileOperation(item, managed => ReplaceFile(file, contents, managed.Realm));
+            performFileOperation(item, managed => ReplaceFile(file, contents, managed.Realm!));
 
         public void AddFile(TModel item, Stream contents, string filename) =>
-            performFileOperation(item, managed => AddFile(managed, contents, filename, managed.Realm));
+            performFileOperation(item, managed => AddFile(managed, contents, filename, managed.Realm!));
 
         private void performFileOperation(TModel item, Action<TModel> operation)
         {
@@ -178,13 +178,14 @@ namespace osu.Game.Database
             // (ie. if an async import finished very recently).
             return Realm.Write(realm =>
             {
-                if (!item.IsManaged)
-                    item = realm.Find<TModel>(item.ID);
+                TModel? processableItem = item;
+                if (!processableItem.IsManaged)
+                    processableItem = realm.Find<TModel>(item.ID);
 
-                if (item?.DeletePending != false)
+                if (processableItem?.DeletePending != false)
                     return false;
 
-                item.DeletePending = true;
+                processableItem.DeletePending = true;
                 return true;
             });
         }
@@ -195,13 +196,14 @@ namespace osu.Game.Database
             // (ie. if an async import finished very recently).
             Realm.Write(realm =>
             {
-                if (!item.IsManaged)
-                    item = realm.Find<TModel>(item.ID);
+                TModel? processableItem = item;
+                if (!processableItem.IsManaged)
+                    processableItem = realm.Find<TModel>(item.ID);
 
-                if (item?.DeletePending != true)
+                if (processableItem?.DeletePending != true)
                     return;
 
-                item.DeletePending = false;
+                processableItem.DeletePending = false;
             });
         }
 
diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index 2bc932f307..a6cef82c5f 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -535,7 +535,7 @@ namespace osu.Game.Database
             lock (notificationsResetMap)
             {
                 // Store an action which is used when blocking to ensure consumers don't use results of a stale changeset firing.
-                notificationsResetMap.Add(action, () => callback(new EmptyRealmSet<T>(), null, null));
+                notificationsResetMap.Add(action, () => callback(new EmptyRealmSet<T>(), null));
             }
 
             return RegisterCustomSubscription(action);
@@ -755,10 +755,10 @@ namespace osu.Game.Database
 
                         for (int i = 0; i < itemCount; i++)
                         {
-                            dynamic? oldItem = oldItems.ElementAt(i);
-                            dynamic? newItem = newItems.ElementAt(i);
+                            dynamic oldItem = oldItems.ElementAt(i);
+                            dynamic newItem = newItems.ElementAt(i);
 
-                            long? nullableOnlineID = oldItem?.OnlineID;
+                            long? nullableOnlineID = oldItem.OnlineID;
                             newItem.OnlineID = (int)(nullableOnlineID ?? -1);
                         }
                     }
@@ -795,7 +795,7 @@ namespace osu.Game.Database
 
                     for (int i = 0; i < metadataCount; i++)
                     {
-                        dynamic? oldItem = oldMetadata.ElementAt(i);
+                        dynamic oldItem = oldMetadata.ElementAt(i);
                         var newItem = newMetadata.ElementAt(i);
 
                         string username = oldItem.Author;
@@ -818,7 +818,7 @@ namespace osu.Game.Database
 
                     for (int i = 0; i < newSettings.Count; i++)
                     {
-                        dynamic? oldItem = oldSettings.ElementAt(i);
+                        dynamic oldItem = oldSettings.ElementAt(i);
                         var newItem = newSettings.ElementAt(i);
 
                         long rulesetId = oldItem.RulesetID;
@@ -843,7 +843,7 @@ namespace osu.Game.Database
 
                     for (int i = 0; i < newKeyBindings.Count; i++)
                     {
-                        dynamic? oldItem = oldKeyBindings.ElementAt(i);
+                        dynamic oldItem = oldKeyBindings.ElementAt(i);
                         var newItem = newKeyBindings.ElementAt(i);
 
                         if (oldItem.RulesetID == null)
diff --git a/osu.Game/Database/RealmLive.cs b/osu.Game/Database/RealmLive.cs
index 9c871a3929..d96ccd9dcd 100644
--- a/osu.Game/Database/RealmLive.cs
+++ b/osu.Game/Database/RealmLive.cs
@@ -104,7 +104,7 @@ namespace osu.Game.Database
 
             PerformRead(t =>
             {
-                using (var transaction = t.Realm.BeginWrite())
+                using (var transaction = t.Realm!.BeginWrite())
                 {
                     perform(t);
                     transaction.Commit();
@@ -133,7 +133,7 @@ namespace osu.Game.Database
         {
             Debug.Assert(ThreadSafety.IsUpdateThread);
 
-            if (dataIsFromUpdateThread && !data.Realm.IsClosed)
+            if (dataIsFromUpdateThread && !data.Realm!.IsClosed)
             {
                 RealmLiveStatistics.USAGE_UPDATE_IMMEDIATE.Value++;
                 return;
@@ -154,7 +154,7 @@ namespace osu.Game.Database
                 // To ensure that behaviour matches what we'd expect (the object *is* available), force
                 // a refresh to bring in any off-thread changes immediately.
                 realm.Refresh();
-                found = realm.Find<T>(ID);
+                found = realm.Find<T>(ID)!;
             }
 
             return found;
diff --git a/osu.Game/Database/RealmObjectExtensions.cs b/osu.Game/Database/RealmObjectExtensions.cs
index 5a6c2e3232..77d199cf9c 100644
--- a/osu.Game/Database/RealmObjectExtensions.cs
+++ b/osu.Game/Database/RealmObjectExtensions.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Database
              .ForMember(s => s.BeatmapSet, cc => cc.Ignore())
              .AfterMap((s, d) =>
              {
-                 d.Ruleset = d.Realm.Find<RulesetInfo>(s.Ruleset.ShortName);
+                 d.Ruleset = d.Realm!.Find<RulesetInfo>(s.Ruleset.ShortName)!;
                  copyChangesToRealm(s.Difficulty, d.Difficulty);
                  copyChangesToRealm(s.Metadata, d.Metadata);
              });
@@ -57,7 +57,7 @@ namespace osu.Game.Database
                      // Importantly, search all of realm for the beatmap (not just the set's beatmaps).
                      // It may have gotten detached, and if that's the case let's use this opportunity to fix
                      // things up.
-                     var existingBeatmap = d.Realm.Find<BeatmapInfo>(beatmap.ID);
+                     var existingBeatmap = d.Realm!.Find<BeatmapInfo>(beatmap.ID);
 
                      if (existingBeatmap != null)
                      {
@@ -77,7 +77,7 @@ namespace osu.Game.Database
                          {
                              ID = beatmap.ID,
                              BeatmapSet = d,
-                             Ruleset = d.Realm.Find<RulesetInfo>(beatmap.Ruleset.ShortName)
+                             Ruleset = d.Realm.Find<RulesetInfo>(beatmap.Ruleset.ShortName)!
                          };
 
                          d.Beatmaps.Add(newBeatmap);
@@ -287,7 +287,7 @@ namespace osu.Game.Database
         /// </returns>
         /// <seealso cref="M:Realms.CollectionExtensions.SubscribeForNotifications``1(System.Collections.Generic.IList{``0},Realms.NotificationCallbackDelegate{``0})" />
         /// <seealso cref="M:Realms.CollectionExtensions.SubscribeForNotifications``1(System.Linq.IQueryable{``0},Realms.NotificationCallbackDelegate{``0})" />
-        public static IDisposable? QueryAsyncWithNotifications<T>(this IRealmCollection<T> collection, NotificationCallbackDelegate<T> callback)
+        public static IDisposable QueryAsyncWithNotifications<T>(this IRealmCollection<T> collection, NotificationCallbackDelegate<T> callback)
             where T : RealmObjectBase
         {
             if (!RealmAccess.CurrentThreadSubscriptionsAllowed)
diff --git a/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs b/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs
index fab0be6cf0..be025e3aa2 100644
--- a/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs
+++ b/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Input.Bindings
 
         protected override void LoadComplete()
         {
-            realmSubscription = realm.RegisterForNotifications(queryRealmKeyBindings, (sender, _, _) =>
+            realmSubscription = realm.RegisterForNotifications(queryRealmKeyBindings, (sender, _) =>
             {
                 // The first fire of this is a bit redundant as this is being called in base.LoadComplete,
                 // but this is safest in case the subscription is restored after a context recycle.
diff --git a/osu.Game/Online/BeatmapDownloadTracker.cs b/osu.Game/Online/BeatmapDownloadTracker.cs
index 144c4445a3..3db602c353 100644
--- a/osu.Game/Online/BeatmapDownloadTracker.cs
+++ b/osu.Game/Online/BeatmapDownloadTracker.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Online
             // Used to interact with manager classes that don't support interface types. Will eventually be replaced.
             var beatmapSetInfo = new BeatmapSetInfo { OnlineID = TrackedItem.OnlineID };
 
-            realmSubscription = realm.RegisterForNotifications(r => r.All<BeatmapSetInfo>().Where(s => s.OnlineID == TrackedItem.OnlineID && !s.DeletePending), (items, _, _) =>
+            realmSubscription = realm.RegisterForNotifications(r => r.All<BeatmapSetInfo>().Where(s => s.OnlineID == TrackedItem.OnlineID && !s.DeletePending), (items, _) =>
             {
                 if (items.Any())
                     Schedule(() => UpdateState(DownloadState.LocallyAvailable));
diff --git a/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs
index 331a471ad5..ceb8e53778 100644
--- a/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs
+++ b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs
@@ -107,7 +107,7 @@ namespace osu.Game.Online.Rooms
 
             // handles changes to hash that didn't occur from the import process (ie. a user editing the beatmap in the editor, somehow).
             realmSubscription?.Dispose();
-            realmSubscription = realm.RegisterForNotifications(_ => filteredBeatmaps(), (_, changes, _) =>
+            realmSubscription = realm.RegisterForNotifications(_ => filteredBeatmaps(), (_, changes) =>
             {
                 if (changes == null)
                     return;
diff --git a/osu.Game/Online/ScoreDownloadTracker.cs b/osu.Game/Online/ScoreDownloadTracker.cs
index 4ddcb40368..de42292372 100644
--- a/osu.Game/Online/ScoreDownloadTracker.cs
+++ b/osu.Game/Online/ScoreDownloadTracker.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Online
             realmSubscription = realm.RegisterForNotifications(r => r.All<ScoreInfo>().Where(s =>
                 ((s.OnlineID > 0 && s.OnlineID == TrackedItem.OnlineID)
                  || (!string.IsNullOrEmpty(s.Hash) && s.Hash == TrackedItem.Hash))
-                && !s.DeletePending), (items, _, _) =>
+                && !s.DeletePending), (items, _) =>
             {
                 if (items.Any())
                     Schedule(() => UpdateState(DownloadState.LocallyAvailable));
diff --git a/osu.Game/Overlays/FirstRunSetup/ScreenBeatmaps.cs b/osu.Game/Overlays/FirstRunSetup/ScreenBeatmaps.cs
index 75bc8fd3a8..385695f669 100644
--- a/osu.Game/Overlays/FirstRunSetup/ScreenBeatmaps.cs
+++ b/osu.Game/Overlays/FirstRunSetup/ScreenBeatmaps.cs
@@ -123,7 +123,7 @@ namespace osu.Game.Overlays.FirstRunSetup
             beatmapSubscription?.Dispose();
         }
 
-        private void beatmapsChanged(IRealmCollection<BeatmapSetInfo> sender, ChangeSet? changes, Exception error) => Schedule(() =>
+        private void beatmapsChanged(IRealmCollection<BeatmapSetInfo> sender, ChangeSet? changes) => Schedule(() =>
         {
             currentlyLoadedBeatmaps.Text = FirstRunSetupBeatmapScreenStrings.CurrentlyLoadedBeatmaps(sender.Count);
 
diff --git a/osu.Game/Overlays/Mods/AddPresetPopover.cs b/osu.Game/Overlays/Mods/AddPresetPopover.cs
index d9e350e560..ef855f6166 100644
--- a/osu.Game/Overlays/Mods/AddPresetPopover.cs
+++ b/osu.Game/Overlays/Mods/AddPresetPopover.cs
@@ -102,7 +102,7 @@ namespace osu.Game.Overlays.Mods
                 Name = nameTextBox.Current.Value,
                 Description = descriptionTextBox.Current.Value,
                 Mods = selectedMods.Value.ToArray(),
-                Ruleset = r.Find<RulesetInfo>(ruleset.Value.ShortName)
+                Ruleset = r.Find<RulesetInfo>(ruleset.Value.ShortName)!
             }));
 
             this.HidePopover();
diff --git a/osu.Game/Overlays/Mods/ModPresetColumn.cs b/osu.Game/Overlays/Mods/ModPresetColumn.cs
index bf5e576277..3b12eec195 100644
--- a/osu.Game/Overlays/Mods/ModPresetColumn.cs
+++ b/osu.Game/Overlays/Mods/ModPresetColumn.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Overlays.Mods
         private Task? latestLoadTask;
         internal bool ItemsLoaded => latestLoadTask?.IsCompleted == true;
 
-        private void asyncLoadPanels(IRealmCollection<ModPreset> presets, ChangeSet changes, Exception error)
+        private void asyncLoadPanels(IRealmCollection<ModPreset> presets, ChangeSet? changes)
         {
             cancellationTokenSource?.Cancel();
 
diff --git a/osu.Game/Overlays/Music/PlaylistOverlay.cs b/osu.Game/Overlays/Music/PlaylistOverlay.cs
index 43b9024303..7784643163 100644
--- a/osu.Game/Overlays/Music/PlaylistOverlay.cs
+++ b/osu.Game/Overlays/Music/PlaylistOverlay.cs
@@ -109,7 +109,7 @@ namespace osu.Game.Overlays.Music
             beatmap.BindValueChanged(working => list.SelectedSet.Value = working.NewValue.BeatmapSetInfo.ToLive(realm), true);
         }
 
-        private void beatmapsChanged(IRealmCollection<BeatmapSetInfo> sender, ChangeSet changes, Exception error)
+        private void beatmapsChanged(IRealmCollection<BeatmapSetInfo> sender, ChangeSet changes)
         {
             if (changes == null)
             {
diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 5382eac675..e997e70157 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -92,7 +92,7 @@ namespace osu.Game.Overlays.Settings.Sections
             });
         }
 
-        private void skinsChanged(IRealmCollection<SkinInfo> sender, ChangeSet changes, Exception error)
+        private void skinsChanged(IRealmCollection<SkinInfo> sender, ChangeSet changes)
         {
             // This can only mean that realm is recycling, else we would see the protected skins.
             // Because we are using `Live<>` in this class, we don't need to worry about this scenario too much.
diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index 5ada2a410d..264a23b6d3 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -66,10 +66,10 @@ namespace osu.Game.Scoring
         {
             // Ensure the beatmap is not detached.
             if (!model.BeatmapInfo.IsManaged)
-                model.BeatmapInfo = realm.Find<BeatmapInfo>(model.BeatmapInfo.ID);
+                model.BeatmapInfo = realm.Find<BeatmapInfo>(model.BeatmapInfo.ID)!;
 
             if (!model.Ruleset.IsManaged)
-                model.Ruleset = realm.Find<RulesetInfo>(model.Ruleset.ShortName);
+                model.Ruleset = realm.Find<RulesetInfo>(model.Ruleset.ShortName)!;
 
             // These properties are known to be non-null, but these final checks ensure a null hasn't come from somewhere (or the refetch has failed).
             // Under no circumstance do we want these to be written to realm as null.
diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 3d87a57295..9af9a0ce72 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -223,7 +223,7 @@ namespace osu.Game.Screens.Select
             subscriptionHiddenBeatmaps = realm.RegisterForNotifications(r => r.All<BeatmapInfo>().Where(b => b.Hidden), beatmapsChanged);
         }
 
-        private void deletedBeatmapSetsChanged(IRealmCollection<BeatmapSetInfo> sender, ChangeSet? changes, Exception? error)
+        private void deletedBeatmapSetsChanged(IRealmCollection<BeatmapSetInfo> sender, ChangeSet? changes)
         {
             // If loading test beatmaps, avoid overwriting with realm subscription callbacks.
             if (loadedTestBeatmaps)
@@ -236,7 +236,7 @@ namespace osu.Game.Screens.Select
                 removeBeatmapSet(sender[i].ID);
         }
 
-        private void beatmapSetsChanged(IRealmCollection<BeatmapSetInfo> sender, ChangeSet? changes, Exception? error)
+        private void beatmapSetsChanged(IRealmCollection<BeatmapSetInfo> sender, ChangeSet? changes)
         {
             // If loading test beatmaps, avoid overwriting with realm subscription callbacks.
             if (loadedTestBeatmaps)
@@ -255,7 +255,7 @@ namespace osu.Game.Screens.Select
                 foreach (var id in realmSets)
                 {
                     if (!root.BeatmapSetsByID.ContainsKey(id))
-                        UpdateBeatmapSet(realm.Realm.Find<BeatmapSetInfo>(id).Detach());
+                        UpdateBeatmapSet(realm.Realm.Find<BeatmapSetInfo>(id)!.Detach());
                 }
 
                 foreach (var id in root.BeatmapSetsByID.Keys)
@@ -315,7 +315,7 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        private void beatmapsChanged(IRealmCollection<BeatmapInfo> sender, ChangeSet? changes, Exception? error)
+        private void beatmapsChanged(IRealmCollection<BeatmapInfo> sender, ChangeSet? changes)
         {
             // we only care about actual changes in hidden status.
             if (changes == null)
diff --git a/osu.Game/Screens/Select/Carousel/TopLocalRank.cs b/osu.Game/Screens/Select/Carousel/TopLocalRank.cs
index 7c632b63db..c17de77619 100644
--- a/osu.Game/Screens/Select/Carousel/TopLocalRank.cs
+++ b/osu.Game/Screens/Select/Carousel/TopLocalRank.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Screens.Select.Carousel
                     localScoresChanged);
             }, true);
 
-            void localScoresChanged(IRealmCollection<ScoreInfo> sender, ChangeSet? changes, Exception _)
+            void localScoresChanged(IRealmCollection<ScoreInfo> sender, ChangeSet? changes)
             {
                 // This subscription may fire from changes to linked beatmaps, which we don't care about.
                 // It's currently not possible for a score to be modified after insertion, so we can safely ignore callbacks with only modifications.
diff --git a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
index 4c41ed3622..58c14b15b9 100644
--- a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
@@ -193,7 +193,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                                           + $" AND {nameof(ScoreInfo.DeletePending)} == false"
                     , beatmapInfo.ID, ruleset.Value.ShortName), localScoresChanged);
 
-            void localScoresChanged(IRealmCollection<ScoreInfo> sender, ChangeSet? changes, Exception exception)
+            void localScoresChanged(IRealmCollection<ScoreInfo> sender, ChangeSet? changes)
             {
                 if (cancellationToken.IsCancellationRequested)
                     return;
diff --git a/osu.Game/Screens/Spectate/SpectatorScreen.cs b/osu.Game/Screens/Spectate/SpectatorScreen.cs
index 2b56767bd0..48b5c210b8 100644
--- a/osu.Game/Screens/Spectate/SpectatorScreen.cs
+++ b/osu.Game/Screens/Spectate/SpectatorScreen.cs
@@ -90,7 +90,7 @@ namespace osu.Game.Screens.Spectate
             }));
         }
 
-        private void beatmapsChanged(IRealmCollection<BeatmapSetInfo> items, ChangeSet changes, Exception ___)
+        private void beatmapsChanged(IRealmCollection<BeatmapSetInfo> items, ChangeSet changes)
         {
             if (changes?.InsertedIndices == null) return;
 
diff --git a/osu.Game/Skinning/RealmBackedResourceStore.cs b/osu.Game/Skinning/RealmBackedResourceStore.cs
index cc887a7a61..cce099a268 100644
--- a/osu.Game/Skinning/RealmBackedResourceStore.cs
+++ b/osu.Game/Skinning/RealmBackedResourceStore.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Skinning
             realmSubscription?.Dispose();
         }
 
-        private void skinChanged(IRealmCollection<T> sender, ChangeSet changes, Exception error) => invalidateCache();
+        private void skinChanged(IRealmCollection<T> sender, ChangeSet? changes) => invalidateCache();
 
         protected override IEnumerable<string> GetFilenames(string name)
         {
diff --git a/osu.Game/Skinning/SkinImporter.cs b/osu.Game/Skinning/SkinImporter.cs
index 43760c4a19..f2103a45c4 100644
--- a/osu.Game/Skinning/SkinImporter.cs
+++ b/osu.Game/Skinning/SkinImporter.cs
@@ -198,7 +198,7 @@ namespace osu.Game.Skinning
 
                 using (var streamContent = new MemoryStream(Encoding.UTF8.GetBytes(skinInfoJson)))
                 {
-                    modelManager.AddFile(s, streamContent, skin_info_file, s.Realm);
+                    modelManager.AddFile(s, streamContent, skin_info_file, s.Realm!);
                 }
 
                 // Then serialise each of the drawable component groups into respective files.
@@ -213,9 +213,9 @@ namespace osu.Game.Skinning
                         var oldFile = s.GetFile(filename);
 
                         if (oldFile != null)
-                            modelManager.ReplaceFile(oldFile, streamContent, s.Realm);
+                            modelManager.ReplaceFile(oldFile, streamContent, s.Realm!);
                         else
-                            modelManager.AddFile(s, streamContent, filename, s.Realm);
+                            modelManager.AddFile(s, streamContent, filename, s.Realm!);
                     }
                 }
 
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index b4d8dd513f..41712f428a 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -35,7 +35,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Realm" Version="10.20.0" />
+    <PackageReference Include="Realm" Version="11.1.2" />
     <PackageReference Include="ppy.osu.Framework" Version="2023.625.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.625.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />

From 5af4aa874158157ce99aa7c9a1383c4b020409c1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Jul 2023 14:05:47 +0900
Subject: [PATCH 1218/1604] Avoid strong hits cutting off other strong hits

---
 osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs b/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
index 2797492b0a..7144fd8ca5 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
@@ -79,11 +79,19 @@ namespace osu.Game.Rulesets.Taiko.UI
                     return false;
             }
 
-            if (strong && hitType == HitType.Centre)
-                flushCenterTriggerSources();
+            if (strong)
+            {
+                switch (hitType)
+                {
+                    case HitType.Centre:
+                        flushCenterTriggerSources();
+                        break;
 
-            if (strong && hitType == HitType.Rim)
-                flushRimTriggerSources();
+                    case HitType.Rim:
+                        flushRimTriggerSources();
+                        break;
+                }
+            }
 
             triggerSource.Play(hitType, strong);
 
@@ -124,14 +132,12 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
             leftCentreTrigger.StopAllPlayback();
             rightCentreTrigger.StopAllPlayback();
-            strongCentreTrigger.StopAllPlayback();
         }
 
         private void flushRimTriggerSources()
         {
             leftRimTrigger.StopAllPlayback();
             rightRimTrigger.StopAllPlayback();
-            strongRimTrigger.StopAllPlayback();
         }
 
         public void OnReleased(KeyBindingReleaseEvent<TaikoAction> e)

From af3f9086e51a5f54f914a813f70685640236c4c2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Jul 2023 14:02:20 +0900
Subject: [PATCH 1219/1604] Expose rewinding state of `IGameplayClock`s

The implementation of this requires a bit of a special case
for 0, so makes sense to implement in a central place.
---
 .../Visual/Gameplay/TestSceneClicksPerSecondCalculator.cs | 1 +
 osu.Game/Beatmaps/FramedBeatmapClock.cs                   | 5 +++++
 osu.Game/Rulesets/UI/FrameStabilityContainer.cs           | 5 +++++
 osu.Game/Screens/Play/GameplayClockContainer.cs           | 5 ++---
 osu.Game/Screens/Play/IGameplayClock.cs                   | 8 ++++++++
 5 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecondCalculator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecondCalculator.cs
index bcb5291108..db06329d74 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecondCalculator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecondCalculator.cs
@@ -125,6 +125,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public IEnumerable<double> NonGameplayAdjustments => throw new NotImplementedException();
             public IBindable<bool> IsPaused => throw new NotImplementedException();
+            public bool IsRewinding => false;
         }
     }
 }
diff --git a/osu.Game/Beatmaps/FramedBeatmapClock.cs b/osu.Game/Beatmaps/FramedBeatmapClock.cs
index 080b0ce7ec..399e2fde7f 100644
--- a/osu.Game/Beatmaps/FramedBeatmapClock.cs
+++ b/osu.Game/Beatmaps/FramedBeatmapClock.cs
@@ -64,6 +64,8 @@ namespace osu.Game.Beatmaps
         [Resolved]
         private IBindable<WorkingBeatmap> beatmap { get; set; } = null!;
 
+        public bool IsRewinding { get; private set; }
+
         public bool IsCoupled
         {
             get => decoupledClock.IsCoupled;
@@ -133,6 +135,9 @@ namespace osu.Game.Beatmaps
             }
             else
                 finalClockSource.ProcessFrame();
+
+            if (Clock.ElapsedFrameTime != 0)
+                IsRewinding = Clock.ElapsedFrameTime < 0;
         }
 
         public double TotalAppliedOffset
diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index 4bb145973d..90cffab714 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -171,6 +171,9 @@ namespace osu.Game.Rulesets.UI
             // The manual clock time has changed in the above code. The framed clock now needs to be updated
             // to ensure that the its time is valid for our children before input is processed
             framedClock.ProcessFrame();
+
+            if (framedClock.ElapsedFrameTime != 0)
+                IsRewinding = framedClock.ElapsedFrameTime < 0;
         }
 
         /// <summary>
@@ -247,6 +250,8 @@ namespace osu.Game.Rulesets.UI
 
         public IBindable<bool> IsPaused { get; } = new BindableBool();
 
+        public bool IsRewinding { get; private set; }
+
         public double CurrentTime => framedClock.CurrentTime;
 
         public double Rate => framedClock.Rate;
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index c42f607908..22e6884526 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -19,11 +19,10 @@ namespace osu.Game.Screens.Play
     [Cached(typeof(IGameplayClock))]
     public partial class GameplayClockContainer : Container, IAdjustableClock, IGameplayClock
     {
-        /// <summary>
-        /// Whether gameplay is paused.
-        /// </summary>
         public IBindable<bool> IsPaused => isPaused;
 
+        public bool IsRewinding => GameplayClock.IsRewinding;
+
         /// <summary>
         /// The source clock. Should generally not be used for any timekeeping purposes.
         /// </summary>
diff --git a/osu.Game/Screens/Play/IGameplayClock.cs b/osu.Game/Screens/Play/IGameplayClock.cs
index 83ba5f3474..ad28e343ff 100644
--- a/osu.Game/Screens/Play/IGameplayClock.cs
+++ b/osu.Game/Screens/Play/IGameplayClock.cs
@@ -23,6 +23,14 @@ namespace osu.Game.Screens.Play
         /// </summary>
         IAdjustableAudioComponent AdjustmentsFromMods { get; }
 
+        /// <summary>
+        /// Whether gameplay is paused.
+        /// </summary>
         IBindable<bool> IsPaused { get; }
+
+        /// <summary>
+        /// Whether the clock is currently rewinding.
+        /// </summary>
+        bool IsRewinding { get; }
     }
 }

From de74c9eb8bb8c24c7a0959969fcb0d9986dacb97 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Jul 2023 14:06:40 +0900
Subject: [PATCH 1220/1604] Fix `GameplaySampleTriggerSource` not handling
 rewinds correctly

---
 osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs b/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
index 18d412ab44..fed262868d 100644
--- a/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
+++ b/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
@@ -85,6 +85,14 @@ namespace osu.Game.Rulesets.UI
                 sound.Stop();
         });
 
+        protected override void Update()
+        {
+            base.Update();
+
+            if (gameplayClock?.IsRewinding == true)
+                mostValidObject = null;
+        }
+
         protected HitObject? GetMostValidObject()
         {
             if (mostValidObject == null || isAlreadyHit(mostValidObject))

From f69f6adf670f29d8a299ce3ef01b5609a2960ae4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Jul 2023 16:15:42 +0900
Subject: [PATCH 1221/1604] Remove beatmap info wedge rotation animation

It looks jank and also causes framebuffer overheads.

But mostly because it looks jank.
---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 5dd2486e1c..3605e3d706 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -76,14 +76,12 @@ namespace osu.Game.Screens.Select
         protected override void PopIn()
         {
             this.MoveToX(0, animation_duration, Easing.OutQuint);
-            this.RotateTo(0, animation_duration, Easing.OutQuint);
             this.FadeIn(transition_duration);
         }
 
         protected override void PopOut()
         {
             this.MoveToX(-100, animation_duration, Easing.In);
-            this.RotateTo(10, animation_duration, Easing.In);
             this.FadeOut(transition_duration * 2, Easing.In);
         }
 

From b40532dde167c056bccfde1c26d21ed7e348fdae Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Jul 2023 17:17:16 +0900
Subject: [PATCH 1222/1604] Fix tournament bracket parsing regression

Closes #24136.
Regressed in #24037.
---
 osu.Game.Tournament/TournamentGameBase.cs | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 7d0571dde0..29f0f4f356 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -9,7 +9,6 @@ using System.Linq;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using osu.Framework.Allocation;
-using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Input;
@@ -94,7 +93,7 @@ namespace osu.Game.Tournament
             Task.Run(readBracket);
         }
 
-        private void readBracket()
+        private async Task readBracket()
         {
             try
             {
@@ -102,7 +101,7 @@ namespace osu.Game.Tournament
                 {
                     using (Stream stream = storage.GetStream(BRACKET_FILENAME, FileAccess.Read, FileMode.Open))
                     using (var sr = new StreamReader(stream))
-                        ladder = JsonConvert.DeserializeObject<LadderInfo>(sr.ReadToEnd(), new JsonPointConverter());
+                        ladder = JsonConvert.DeserializeObject<LadderInfo>(await sr.ReadToEndAsync().ConfigureAwait(false), new JsonPointConverter());
                 }
 
                 ladder ??= new LadderInfo();
@@ -166,8 +165,8 @@ namespace osu.Game.Tournament
                 }
 
                 addedInfo |= addPlayers();
-                addedInfo |= addRoundBeatmaps();
-                addedInfo |= addSeedingBeatmaps();
+                addedInfo |= await addRoundBeatmaps().ConfigureAwait(false);
+                addedInfo |= await addSeedingBeatmaps().ConfigureAwait(false);
 
                 if (addedInfo)
                     saveChanges();
@@ -233,7 +232,7 @@ namespace osu.Game.Tournament
         /// <summary>
         /// Add missing beatmap info based on beatmap IDs
         /// </summary>
-        private bool addRoundBeatmaps()
+        private async Task<bool> addRoundBeatmaps()
         {
             var beatmapsRequiringPopulation = ladder.Rounds
                                                     .SelectMany(r => r.Beatmaps)
@@ -246,7 +245,7 @@ namespace osu.Game.Tournament
             {
                 var b = beatmapsRequiringPopulation[i];
 
-                b.Beatmap = new TournamentBeatmap(beatmapCache.GetBeatmapAsync(b.ID).GetResultSafely() ?? new APIBeatmap());
+                b.Beatmap = new TournamentBeatmap(await beatmapCache.GetBeatmapAsync(b.ID).ConfigureAwait(false) ?? new APIBeatmap());
 
                 updateLoadProgressMessage($"Populating round beatmaps ({i} / {beatmapsRequiringPopulation.Count})");
             }
@@ -257,7 +256,7 @@ namespace osu.Game.Tournament
         /// <summary>
         /// Add missing beatmap info based on beatmap IDs
         /// </summary>
-        private bool addSeedingBeatmaps()
+        private async Task<bool> addSeedingBeatmaps()
         {
             var beatmapsRequiringPopulation = ladder.Teams
                                                     .SelectMany(r => r.SeedingResults)
@@ -271,7 +270,7 @@ namespace osu.Game.Tournament
             {
                 var b = beatmapsRequiringPopulation[i];
 
-                b.Beatmap = new TournamentBeatmap(beatmapCache.GetBeatmapAsync(b.ID).GetResultSafely() ?? new APIBeatmap());
+                b.Beatmap = new TournamentBeatmap(await beatmapCache.GetBeatmapAsync(b.ID).ConfigureAwait(false) ?? new APIBeatmap());
 
                 updateLoadProgressMessage($"Populating seeding beatmaps ({i} / {beatmapsRequiringPopulation.Count})");
             }

From c9fd4354024b03fc1009388eb58853bc3f12de48 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Jul 2023 17:58:27 +0900
Subject: [PATCH 1223/1604] Fix potential crash when mashing exit key

---
 osu.Game/Overlays/Dialog/PopupDialog.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Dialog/PopupDialog.cs b/osu.Game/Overlays/Dialog/PopupDialog.cs
index 9969677826..e1e5604e4c 100644
--- a/osu.Game/Overlays/Dialog/PopupDialog.cs
+++ b/osu.Game/Overlays/Dialog/PopupDialog.cs
@@ -225,7 +225,12 @@ namespace osu.Game.Overlays.Dialog
         /// <summary>
         /// Programmatically clicks the first button of the provided type.
         /// </summary>
-        public void PerformAction<T>() where T : PopupDialogButton => Buttons.OfType<T>().First().TriggerClick();
+        public void PerformAction<T>() where T : PopupDialogButton
+        {
+            // Buttons are regularly added in BDL or LoadComplete, so let's schedule to ensure
+            // they are ready to be pressed.
+            Schedule(() => Buttons.OfType<T>().First().TriggerClick());
+        }
 
         protected override bool OnKeyDown(KeyDownEvent e)
         {

From 7a3a14e50def1ee576a92c102b377ae8b86c2cd8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Jul 2023 17:33:47 +0900
Subject: [PATCH 1224/1604] Add sample trigger tests covering rewinding of
 gameplay

---
 .../Gameplay/TestSceneGameplaySampleTriggerSource.cs   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs
index 6701871e8d..8938cff9a3 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs
@@ -107,7 +107,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             base.SetUpSteps();
 
-            AddStep("Add trigger source", () => Player.GameplayClockContainer.Add(sampleTriggerSource = new TestGameplaySampleTriggerSource(Player.DrawableRuleset.Playfield.HitObjectContainer)));
+            AddStep("Add trigger source", () => Player.DrawableRuleset.FrameStableComponents.Add(sampleTriggerSource = new TestGameplaySampleTriggerSource(Player.DrawableRuleset.Playfield.HitObjectContainer)));
         }
 
         [Test]
@@ -153,6 +153,14 @@ namespace osu.Game.Tests.Visual.Gameplay
             waitForAliveObjectIndex(2);
             checkValidObjectIndex(2);
 
+            // test rewinding
+            seekBeforeIndex(1);
+            waitForAliveObjectIndex(1);
+            checkValidObjectIndex(1);
+
+            seekBeforeIndex(1, 400);
+            checkValidObjectIndex(0);
+
             seekBeforeIndex(3);
             waitForAliveObjectIndex(3);
             checkValidObjectIndex(3);

From 2e98ab0a481f24502177011d2b31f29fc4697d75 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Jul 2023 14:02:20 +0900
Subject: [PATCH 1225/1604] Expose rewinding state of `IGameplayClock`s

The implementation of this requires a bit of a special case
for 0, so makes sense to implement in a central place.
---
 .../Visual/Gameplay/TestSceneClicksPerSecondCalculator.cs | 1 +
 osu.Game/Beatmaps/FramedBeatmapClock.cs                   | 5 +++++
 osu.Game/Rulesets/UI/FrameStabilityContainer.cs           | 5 +++++
 osu.Game/Screens/Play/GameplayClockContainer.cs           | 5 ++---
 osu.Game/Screens/Play/IGameplayClock.cs                   | 8 ++++++++
 5 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecondCalculator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecondCalculator.cs
index bcb5291108..db06329d74 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecondCalculator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecondCalculator.cs
@@ -125,6 +125,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public IEnumerable<double> NonGameplayAdjustments => throw new NotImplementedException();
             public IBindable<bool> IsPaused => throw new NotImplementedException();
+            public bool IsRewinding => false;
         }
     }
 }
diff --git a/osu.Game/Beatmaps/FramedBeatmapClock.cs b/osu.Game/Beatmaps/FramedBeatmapClock.cs
index 080b0ce7ec..399e2fde7f 100644
--- a/osu.Game/Beatmaps/FramedBeatmapClock.cs
+++ b/osu.Game/Beatmaps/FramedBeatmapClock.cs
@@ -64,6 +64,8 @@ namespace osu.Game.Beatmaps
         [Resolved]
         private IBindable<WorkingBeatmap> beatmap { get; set; } = null!;
 
+        public bool IsRewinding { get; private set; }
+
         public bool IsCoupled
         {
             get => decoupledClock.IsCoupled;
@@ -133,6 +135,9 @@ namespace osu.Game.Beatmaps
             }
             else
                 finalClockSource.ProcessFrame();
+
+            if (Clock.ElapsedFrameTime != 0)
+                IsRewinding = Clock.ElapsedFrameTime < 0;
         }
 
         public double TotalAppliedOffset
diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index 4bb145973d..90cffab714 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -171,6 +171,9 @@ namespace osu.Game.Rulesets.UI
             // The manual clock time has changed in the above code. The framed clock now needs to be updated
             // to ensure that the its time is valid for our children before input is processed
             framedClock.ProcessFrame();
+
+            if (framedClock.ElapsedFrameTime != 0)
+                IsRewinding = framedClock.ElapsedFrameTime < 0;
         }
 
         /// <summary>
@@ -247,6 +250,8 @@ namespace osu.Game.Rulesets.UI
 
         public IBindable<bool> IsPaused { get; } = new BindableBool();
 
+        public bool IsRewinding { get; private set; }
+
         public double CurrentTime => framedClock.CurrentTime;
 
         public double Rate => framedClock.Rate;
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index c42f607908..22e6884526 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -19,11 +19,10 @@ namespace osu.Game.Screens.Play
     [Cached(typeof(IGameplayClock))]
     public partial class GameplayClockContainer : Container, IAdjustableClock, IGameplayClock
     {
-        /// <summary>
-        /// Whether gameplay is paused.
-        /// </summary>
         public IBindable<bool> IsPaused => isPaused;
 
+        public bool IsRewinding => GameplayClock.IsRewinding;
+
         /// <summary>
         /// The source clock. Should generally not be used for any timekeeping purposes.
         /// </summary>
diff --git a/osu.Game/Screens/Play/IGameplayClock.cs b/osu.Game/Screens/Play/IGameplayClock.cs
index 83ba5f3474..ad28e343ff 100644
--- a/osu.Game/Screens/Play/IGameplayClock.cs
+++ b/osu.Game/Screens/Play/IGameplayClock.cs
@@ -23,6 +23,14 @@ namespace osu.Game.Screens.Play
         /// </summary>
         IAdjustableAudioComponent AdjustmentsFromMods { get; }
 
+        /// <summary>
+        /// Whether gameplay is paused.
+        /// </summary>
         IBindable<bool> IsPaused { get; }
+
+        /// <summary>
+        /// Whether the clock is currently rewinding.
+        /// </summary>
+        bool IsRewinding { get; }
     }
 }

From 753db044b44bfcbec073637ae4273ba7bc84dd68 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Jul 2023 14:06:40 +0900
Subject: [PATCH 1226/1604] Fix `GameplaySampleTriggerSource` not handling
 rewinds correctly

---
 osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs b/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
index c554318357..d6375ad282 100644
--- a/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
+++ b/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
@@ -69,6 +69,14 @@ namespace osu.Game.Rulesets.UI
             hitSound.Play();
         });
 
+        protected override void Update()
+        {
+            base.Update();
+
+            if (gameplayClock?.IsRewinding == true)
+                mostValidObject = null;
+        }
+
         protected HitObject? GetMostValidObject()
         {
             if (mostValidObject == null || isAlreadyHit(mostValidObject))

From 070b3883ce534cf6d9c5a40f8a329ac47e2bff16 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Jul 2023 00:31:32 +0900
Subject: [PATCH 1227/1604] Remove the ability to cancel all "in progress"
 tasks

---
 osu.Game/Localisation/NotificationsStrings.cs |  5 ---
 osu.Game/Overlays/NotificationOverlay.cs      |  4 +--
 .../Notifications/NotificationSection.cs      | 32 +++++++++----------
 3 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/osu.Game/Localisation/NotificationsStrings.cs b/osu.Game/Localisation/NotificationsStrings.cs
index 44e440e8d9..53687f2b28 100644
--- a/osu.Game/Localisation/NotificationsStrings.cs
+++ b/osu.Game/Localisation/NotificationsStrings.cs
@@ -29,11 +29,6 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString ClearAll => new TranslatableString(getKey(@"clear_all"), @"Clear All");
 
-        /// <summary>
-        /// "Cancel All"
-        /// </summary>
-        public static LocalisableString CancelAll => new TranslatableString(getKey(@"cancel_all"), @"Cancel All");
-
         /// <summary>
         /// "Your battery level is low! Charge your device to prevent interruptions during gameplay."
         /// </summary>
diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index 21027b0931..5c0427bf03 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -108,8 +108,8 @@ namespace osu.Game.Overlays
                                     RelativeSizeAxes = Axes.X,
                                     Children = new[]
                                     {
-                                        new NotificationSection(AccountsStrings.NotificationsTitle, new[] { typeof(SimpleNotification) }, NotificationsStrings.ClearAll),
-                                        new NotificationSection(NotificationsStrings.RunningTasks, new[] { typeof(ProgressNotification) }, NotificationsStrings.CancelAll),
+                                        new NotificationSection(AccountsStrings.NotificationsTitle, new[] { typeof(SimpleNotification) }, true),
+                                        new NotificationSection(NotificationsStrings.RunningTasks, new[] { typeof(ProgressNotification) }, false),
                                     }
                                 }
                             }
diff --git a/osu.Game/Overlays/Notifications/NotificationSection.cs b/osu.Game/Overlays/Notifications/NotificationSection.cs
index 4e28ade802..168c6afe27 100644
--- a/osu.Game/Overlays/Notifications/NotificationSection.cs
+++ b/osu.Game/Overlays/Notifications/NotificationSection.cs
@@ -13,6 +13,7 @@ using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Localisation;
 using osuTK;
 
 namespace osu.Game.Overlays.Notifications
@@ -38,16 +39,16 @@ namespace osu.Game.Overlays.Notifications
 
         public IEnumerable<Type> AcceptedNotificationTypes { get; }
 
-        private readonly LocalisableString clearButtonText;
-
         private readonly LocalisableString titleText;
 
-        public NotificationSection(LocalisableString title, IEnumerable<Type> acceptedNotificationTypes, LocalisableString clearButtonText)
+        private readonly bool allowClear;
+
+        public NotificationSection(LocalisableString title, IEnumerable<Type> acceptedNotificationTypes, bool allowClear)
         {
             AcceptedNotificationTypes = acceptedNotificationTypes.ToArray();
 
-            this.clearButtonText = clearButtonText.ToUpper();
             titleText = title;
+            this.allowClear = allowClear;
         }
 
         [BackgroundDependencyLoader]
@@ -71,15 +72,17 @@ namespace osu.Game.Overlays.Notifications
                 {
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
-                    Children = new Drawable[]
+                    Children = new[]
                     {
-                        new ClearAllButton
-                        {
-                            Text = clearButtonText,
-                            Anchor = Anchor.TopRight,
-                            Origin = Anchor.TopRight,
-                            Action = clearAll
-                        },
+                        allowClear
+                            ? new ClearAllButton
+                            {
+                                Text = NotificationsStrings.ClearAll,
+                                Anchor = Anchor.TopRight,
+                                Origin = Anchor.TopRight,
+                                Action = clearAll
+                            }
+                            : Empty(),
                         new FillFlowContainer
                         {
                             Margin = new MarginPadding
@@ -115,10 +118,7 @@ namespace osu.Game.Overlays.Notifications
             });
         }
 
-        private void clearAll()
-        {
-            notifications.Children.ForEach(c => c.Close(true));
-        }
+        private void clearAll() => notifications.Children.ForEach(c => c.Close(true));
 
         protected override void Update()
         {

From fdb572fdea7dd42d5385a2367ef334a79c0a36e8 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Wed, 5 Jul 2023 17:25:16 +0900
Subject: [PATCH 1228/1604] Add more/different notification sounds

---
 osu.Game/Online/Chat/MessageNotifier.cs                         | 2 ++
 osu.Game/Overlays/Notifications/Notification.cs                 | 2 +-
 .../Overlays/Notifications/ProgressCompletionNotification.cs    | 2 ++
 osu.Game/Overlays/Notifications/SimpleErrorNotification.cs      | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Chat/MessageNotifier.cs b/osu.Game/Online/Chat/MessageNotifier.cs
index ae249d1b7f..65aac723da 100644
--- a/osu.Game/Online/Chat/MessageNotifier.cs
+++ b/osu.Game/Online/Chat/MessageNotifier.cs
@@ -171,6 +171,8 @@ namespace osu.Game.Online.Chat
 
         public abstract partial class HighlightMessageNotification : SimpleNotification
         {
+            public override string PopInSampleName => "UI/notification-mention";
+
             protected HighlightMessageNotification(Message message, Channel channel)
             {
                 this.message = message;
diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index 77d3317b1f..e2c6de0635 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Overlays.Notifications
         /// </summary>
         public virtual bool DisplayOnTop => true;
 
-        public virtual string PopInSampleName => "UI/notification-pop-in";
+        public virtual string PopInSampleName => "UI/notification-default";
 
         protected NotificationLight Light;
 
diff --git a/osu.Game/Overlays/Notifications/ProgressCompletionNotification.cs b/osu.Game/Overlays/Notifications/ProgressCompletionNotification.cs
index 46972d4b5e..93286d9d36 100644
--- a/osu.Game/Overlays/Notifications/ProgressCompletionNotification.cs
+++ b/osu.Game/Overlays/Notifications/ProgressCompletionNotification.cs
@@ -10,6 +10,8 @@ namespace osu.Game.Overlays.Notifications
 {
     public partial class ProgressCompletionNotification : SimpleNotification
     {
+        public override string PopInSampleName => "UI/notification-done";
+
         public ProgressCompletionNotification()
         {
             Icon = FontAwesome.Solid.Check;
diff --git a/osu.Game/Overlays/Notifications/SimpleErrorNotification.cs b/osu.Game/Overlays/Notifications/SimpleErrorNotification.cs
index 758eea93d4..81e3b40ffc 100644
--- a/osu.Game/Overlays/Notifications/SimpleErrorNotification.cs
+++ b/osu.Game/Overlays/Notifications/SimpleErrorNotification.cs
@@ -7,7 +7,7 @@ namespace osu.Game.Overlays.Notifications
 {
     public partial class SimpleErrorNotification : SimpleNotification
     {
-        public override string PopInSampleName => "UI/error-notification-pop-in";
+        public override string PopInSampleName => "UI/notification-error";
 
         public SimpleErrorNotification()
         {

From 4ff4c3a12e271219d8f02d4cec539316bdc21480 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Wed, 5 Jul 2023 17:26:20 +0900
Subject: [PATCH 1229/1604] Remove sound from notification closing/hiding

---
 osu.Game/Overlays/NotificationOverlay.cs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index 21027b0931..ceb5bdd1e9 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -229,14 +229,7 @@ namespace osu.Game.Overlays
             mainContent.FadeEdgeEffectTo(0, WaveContainer.DISAPPEAR_DURATION, Easing.In);
         }
 
-        private void notificationClosed() => Schedule(() =>
-        {
-            updateCounts();
-
-            // this debounce is currently shared between popin/popout sounds, which means one could potentially not play when the user is expecting it.
-            // popout is constant across all notification types, and should therefore be handled using playback concurrency instead, but seems broken at the moment.
-            playDebouncedSample("UI/overlay-pop-out");
-        });
+        private void notificationClosed() => Schedule(updateCounts);
 
         private void playDebouncedSample(string sampleName)
         {

From 6e2b7f433b6e26d877c5d25a3db2987c7b88d8b4 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Wed, 5 Jul 2023 17:27:42 +0900
Subject: [PATCH 1230/1604] Add a sound for 'cancelling' `ProgessNotification`

---
 osu.Game/Overlays/Notifications/ProgressNotification.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Notifications/ProgressNotification.cs b/osu.Game/Overlays/Notifications/ProgressNotification.cs
index e6662e2179..f3eba37517 100644
--- a/osu.Game/Overlays/Notifications/ProgressNotification.cs
+++ b/osu.Game/Overlays/Notifications/ProgressNotification.cs
@@ -4,6 +4,8 @@
 using System;
 using System.Threading;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
@@ -122,6 +124,7 @@ namespace osu.Game.Overlays.Notifications
                     cancellationTokenSource.Cancel();
 
                     IconContent.FadeColour(ColourInfo.GradientVertical(Color4.Gray, Color4.Gray.Lighten(0.5f)), colour_fade_duration);
+                    cancelSample?.Play();
                     loadingSpinner.Hide();
 
                     var icon = new SpriteIcon
@@ -190,6 +193,8 @@ namespace osu.Game.Overlays.Notifications
 
         private LoadingSpinner loadingSpinner = null!;
 
+        private Sample? cancelSample;
+
         private readonly TextFlowContainer textDrawable;
 
         public ProgressNotification()
@@ -217,7 +222,7 @@ namespace osu.Game.Overlays.Notifications
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OsuColour colours, AudioManager audioManager)
         {
             colourQueued = colours.YellowDark;
             colourActive = colours.Blue;
@@ -236,6 +241,8 @@ namespace osu.Game.Overlays.Notifications
                     Size = new Vector2(loading_spinner_size),
                 }
             });
+
+            cancelSample = audioManager.Samples.Get(@"UI/notification-cancel");
         }
 
         public override void Close(bool runFlingAnimation)

From d4f5d0c8787088c31753fc054a5e96249c0736ca Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Fri, 7 Jul 2023 01:06:09 +0900
Subject: [PATCH 1231/1604] Revert "Remove sound from notification
 closing/hiding"

This reverts commit 244f3c6098bb27b66f5ff7fb8c76f38f56cfb4cd.
---
 osu.Game/Overlays/NotificationOverlay.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index ceb5bdd1e9..21027b0931 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -229,7 +229,14 @@ namespace osu.Game.Overlays
             mainContent.FadeEdgeEffectTo(0, WaveContainer.DISAPPEAR_DURATION, Easing.In);
         }
 
-        private void notificationClosed() => Schedule(updateCounts);
+        private void notificationClosed() => Schedule(() =>
+        {
+            updateCounts();
+
+            // this debounce is currently shared between popin/popout sounds, which means one could potentially not play when the user is expecting it.
+            // popout is constant across all notification types, and should therefore be handled using playback concurrency instead, but seems broken at the moment.
+            playDebouncedSample("UI/overlay-pop-out");
+        });
 
         private void playDebouncedSample(string sampleName)
         {

From a55ba963a92b39bdbb80a7c79403e2b59cde1462 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Fri, 7 Jul 2023 01:50:15 +0900
Subject: [PATCH 1232/1604] Don't play 'popout' sample when
 `ProgressNotification` completes

---
 osu.Game/Overlays/NotificationOverlay.cs                | 9 ++++++---
 osu.Game/Overlays/Notifications/Notification.cs         | 1 +
 osu.Game/Overlays/Notifications/ProgressNotification.cs | 2 ++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index 21027b0931..d21ad625c1 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -169,7 +169,7 @@ namespace osu.Game.Overlays
 
             Logger.Log($"⚠️ {notification.Text}");
 
-            notification.Closed += notificationClosed;
+            notification.Closed += () => notificationClosed(notification);
 
             if (notification is IHasCompletionTarget hasCompletionTarget)
                 hasCompletionTarget.CompletionTarget = Post;
@@ -229,17 +229,20 @@ namespace osu.Game.Overlays
             mainContent.FadeEdgeEffectTo(0, WaveContainer.DISAPPEAR_DURATION, Easing.In);
         }
 
-        private void notificationClosed() => Schedule(() =>
+        private void notificationClosed(Notification notification) => Schedule(() =>
         {
             updateCounts();
 
             // this debounce is currently shared between popin/popout sounds, which means one could potentially not play when the user is expecting it.
             // popout is constant across all notification types, and should therefore be handled using playback concurrency instead, but seems broken at the moment.
-            playDebouncedSample("UI/overlay-pop-out");
+            playDebouncedSample(notification.PopOutSampleName);
         });
 
         private void playDebouncedSample(string sampleName)
         {
+            if (string.IsNullOrEmpty(sampleName))
+                return;
+
             if (lastSamplePlayback == null || Time.Current - lastSamplePlayback > OsuGameBase.SAMPLE_DEBOUNCE_TIME)
             {
                 audio.Samples.Get(sampleName)?.Play();
diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index e2c6de0635..8cdc373417 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -51,6 +51,7 @@ namespace osu.Game.Overlays.Notifications
         public virtual bool DisplayOnTop => true;
 
         public virtual string PopInSampleName => "UI/notification-default";
+        public virtual string PopOutSampleName => "UI/overlay-pop-out";
 
         protected NotificationLight Light;
 
diff --git a/osu.Game/Overlays/Notifications/ProgressNotification.cs b/osu.Game/Overlays/Notifications/ProgressNotification.cs
index f3eba37517..53ac490297 100644
--- a/osu.Game/Overlays/Notifications/ProgressNotification.cs
+++ b/osu.Game/Overlays/Notifications/ProgressNotification.cs
@@ -29,6 +29,8 @@ namespace osu.Game.Overlays.Notifications
 
         protected override bool AllowFlingDismiss => false;
 
+        public override string PopOutSampleName => State is ProgressNotificationState.Cancelled ? base.PopOutSampleName : "";
+
         /// <summary>
         /// The function to post completion notifications back to.
         /// </summary>

From f3f4bb635680b28c6f47090d2cbc2660992362f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 6 Jul 2023 20:56:24 +0200
Subject: [PATCH 1233/1604] Add one more safety against processing scores with
 missing beatmap

---
 osu.Game/BackgroundBeatmapProcessor.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/BackgroundBeatmapProcessor.cs b/osu.Game/BackgroundBeatmapProcessor.cs
index 9c140bdda9..323e783d8d 100644
--- a/osu.Game/BackgroundBeatmapProcessor.cs
+++ b/osu.Game/BackgroundBeatmapProcessor.cs
@@ -208,7 +208,9 @@ namespace osu.Game
         {
             Logger.Log("Querying for scores that need total score conversion...");
 
-            HashSet<Guid> scoreIds = realmAccess.Run(r => new HashSet<Guid>(r.All<ScoreInfo>().Where(s => s.TotalScoreVersion == 30000002).AsEnumerable().Select(s => s.ID)));
+            HashSet<Guid> scoreIds = realmAccess.Run(r => new HashSet<Guid>(r.All<ScoreInfo>()
+                                                                             .Where(s => s.BeatmapInfo != null && s.TotalScoreVersion == 30000002)
+                                                                             .AsEnumerable().Select(s => s.ID)));
 
             Logger.Log($"Found {scoreIds.Count} scores which require total score conversion.");
 

From 1473abd909691d950171bd18be9dd1d639504f85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 6 Jul 2023 22:01:02 +0200
Subject: [PATCH 1234/1604] Remove outdated xmldoc

---
 osu.Game/Database/RealmObjectExtensions.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Database/RealmObjectExtensions.cs b/osu.Game/Database/RealmObjectExtensions.cs
index 77d199cf9c..72529ed9ff 100644
--- a/osu.Game/Database/RealmObjectExtensions.cs
+++ b/osu.Game/Database/RealmObjectExtensions.cs
@@ -282,8 +282,6 @@ namespace osu.Game.Database
         /// <returns>
         /// A subscription token. It must be kept alive for as long as you want to receive change notifications.
         /// To stop receiving notifications, call <see cref="M:System.IDisposable.Dispose" />.
-        ///
-        /// May be null in the case the provided collection is not managed.
         /// </returns>
         /// <seealso cref="M:Realms.CollectionExtensions.SubscribeForNotifications``1(System.Collections.Generic.IList{``0},Realms.NotificationCallbackDelegate{``0})" />
         /// <seealso cref="M:Realms.CollectionExtensions.SubscribeForNotifications``1(System.Linq.IQueryable{``0},Realms.NotificationCallbackDelegate{``0})" />

From ae2896ba7e9122d0ac3cd428d993430d1e18dcd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 6 Jul 2023 22:08:48 +0200
Subject: [PATCH 1235/1604] Sprinkle some more null-forgiving operators

---
 osu.Game.Tests/Database/TestRealmKeyBindingStore.cs        | 2 +-
 osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs | 2 +-
 osu.Game/Scoring/ScoreManager.cs                           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Database/TestRealmKeyBindingStore.cs b/osu.Game.Tests/Database/TestRealmKeyBindingStore.cs
index f4467867db..e2774cef00 100644
--- a/osu.Game.Tests/Database/TestRealmKeyBindingStore.cs
+++ b/osu.Game.Tests/Database/TestRealmKeyBindingStore.cs
@@ -104,7 +104,7 @@ namespace osu.Game.Tests.Database
 
                 realm.Run(innerRealm =>
                 {
-                    var binding = innerRealm.ResolveReference(tsr);
+                    var binding = innerRealm.ResolveReference(tsr)!;
                     innerRealm.Write(() => binding.KeyCombination = new KeyCombination(InputKey.BackSpace));
                 });
 
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
index b04e514ec2..725925c8cf 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
@@ -440,7 +440,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         }
 
         private void updateStoreFromButton(KeyButton button) =>
-            realm.WriteAsync(r => r.Find<RealmKeyBinding>(button.KeyBinding.ID).KeyCombinationString = button.KeyBinding.KeyCombinationString);
+            realm.WriteAsync(r => r.Find<RealmKeyBinding>(button.KeyBinding.ID)!.KeyCombinationString = button.KeyBinding.KeyCombinationString);
 
         private void updateIsDefaultValue()
         {
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 55bcb9f79d..31b5bd8365 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -141,7 +141,7 @@ namespace osu.Game.Scoring
         {
             Realm.Run(r =>
             {
-                var beatmapScores = r.Find<BeatmapInfo>(beatmap.ID).Scores.ToList();
+                var beatmapScores = r.Find<BeatmapInfo>(beatmap.ID)!.Scores.ToList();
                 Delete(beatmapScores, silent);
             });
         }

From 8978f2ddd8c5cc366481dedde5a1a036abf383e2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Jul 2023 10:09:24 +0900
Subject: [PATCH 1236/1604] Remove all usage of `!something!.something`

aka don't mix NRT forgiving syntax with not syntax
---
 .../SongSelect/TestScenePlaySongSelect.cs     | 20 ++++++++++---------
 osu.Game/Database/RealmLive.cs                |  3 ++-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index af3a6e178c..0bff40f258 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -163,7 +163,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 InputManager.Key(Key.Enter);
             });
 
-            AddUntilStep("wait for not current", () => !songSelect!.IsCurrentScreen());
+            waitForDismissed();
             AddAssert("ensure selection changed", () => selected != Beatmap.Value);
         }
 
@@ -186,7 +186,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 InputManager.Key(Key.Down);
             });
 
-            AddUntilStep("wait for not current", () => !songSelect!.IsCurrentScreen());
+            waitForDismissed();
             AddAssert("ensure selection didn't change", () => selected == Beatmap.Value);
         }
 
@@ -215,7 +215,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 InputManager.Key(Key.Enter);
             });
 
-            AddUntilStep("wait for not current", () => !songSelect!.IsCurrentScreen());
+            waitForDismissed();
             AddAssert("ensure selection changed", () => selected != Beatmap.Value);
         }
 
@@ -244,7 +244,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 InputManager.ReleaseButton(MouseButton.Left);
             });
 
-            AddUntilStep("wait for not current", () => !songSelect!.IsCurrentScreen());
+            waitForDismissed();
             AddAssert("ensure selection didn't change", () => selected == Beatmap.Value);
         }
 
@@ -257,7 +257,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             createSongSelect();
 
             AddStep("push child screen", () => Stack.Push(new TestSceneOsuScreenStack.TestScreen("test child")));
-            AddUntilStep("wait for not current", () => !songSelect!.IsCurrentScreen());
+            waitForDismissed();
 
             AddStep("return", () => songSelect!.MakeCurrent());
             AddUntilStep("wait for current", () => songSelect!.IsCurrentScreen());
@@ -275,7 +275,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             createSongSelect();
 
             AddStep("push child screen", () => Stack.Push(new TestSceneOsuScreenStack.TestScreen("test child")));
-            AddUntilStep("wait for not current", () => !songSelect!.IsCurrentScreen());
+            waitForDismissed();
 
             AddStep("change convert setting", () => config.SetValue(OsuSetting.ShowConvertedBeatmaps, true));
 
@@ -292,7 +292,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             createSongSelect();
 
             AddStep("push child screen", () => Stack.Push(new TestSceneOsuScreenStack.TestScreen("test child")));
-            AddUntilStep("wait for not current", () => !songSelect!.IsCurrentScreen());
+            waitForDismissed();
 
             AddStep("update beatmap", () =>
             {
@@ -1011,7 +1011,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 });
             });
 
-            AddUntilStep("wait for results screen presented", () => !songSelect!.IsCurrentScreen());
+            waitForDismissed();
 
             AddAssert("check beatmap is correct for score", () => Beatmap.Value.BeatmapInfo.MatchesOnlineID(getPresentBeatmap()));
             AddAssert("check ruleset is correct for score", () => Ruleset.Value.OnlineID == 0);
@@ -1040,7 +1040,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 songSelect!.PresentScore(TestResources.CreateTestScoreInfo(getPresentBeatmap()));
             });
 
-            AddUntilStep("wait for results screen presented", () => !songSelect!.IsCurrentScreen());
+            waitForDismissed();
 
             AddAssert("check beatmap is correct for score", () => Beatmap.Value.BeatmapInfo.MatchesOnlineID(getPresentBeatmap()));
             AddAssert("check ruleset is correct for score", () => Ruleset.Value.OnlineID == 0);
@@ -1161,6 +1161,8 @@ namespace osu.Game.Tests.Visual.SongSelect
                 rulesets.Dispose();
         }
 
+        private void waitForDismissed() => AddUntilStep("wait for not current", () => !songSelect.AsNonNull().IsCurrentScreen());
+
         private partial class TestSongSelect : PlaySongSelect
         {
             public Action? StartRequested;
diff --git a/osu.Game/Database/RealmLive.cs b/osu.Game/Database/RealmLive.cs
index d96ccd9dcd..509fabec59 100644
--- a/osu.Game/Database/RealmLive.cs
+++ b/osu.Game/Database/RealmLive.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Diagnostics;
 using osu.Framework.Development;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Statistics;
 using Realms;
 
@@ -133,7 +134,7 @@ namespace osu.Game.Database
         {
             Debug.Assert(ThreadSafety.IsUpdateThread);
 
-            if (dataIsFromUpdateThread && !data.Realm!.IsClosed)
+            if (dataIsFromUpdateThread && !data.Realm.AsNonNull().IsClosed)
             {
                 RealmLiveStatistics.USAGE_UPDATE_IMMEDIATE.Value++;
                 return;

From d93548f4ea9a759faa6286e5814d54259f75d709 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Jul 2023 13:10:49 +0900
Subject: [PATCH 1237/1604] Add back "clear all" button for progress
 notifications but only clear cancelled

---
 osu.Game/Overlays/INotificationOverlay.cs     |  2 +-
 osu.Game/Overlays/NotificationOverlay.cs      |  4 +--
 .../Notifications/NotificationSection.cs      | 29 +++++++++----------
 .../Notifications/ProgressNotification.cs     |  2 ++
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Overlays/INotificationOverlay.cs b/osu.Game/Overlays/INotificationOverlay.cs
index c5ff10c619..7a44fd63ea 100644
--- a/osu.Game/Overlays/INotificationOverlay.cs
+++ b/osu.Game/Overlays/INotificationOverlay.cs
@@ -44,6 +44,6 @@ namespace osu.Game.Overlays
         /// <summary>
         /// All ongoing operations (ie. any <see cref="ProgressNotification"/> not in a completed state).
         /// </summary>
-        public IEnumerable<ProgressNotification> OngoingOperations => AllNotifications.OfType<ProgressNotification>().Where(p => p.State != ProgressNotificationState.Completed && p.State != ProgressNotificationState.Cancelled);
+        public IEnumerable<ProgressNotification> OngoingOperations => AllNotifications.OfType<ProgressNotification>().Where(p => !p.CompletedOrCancelled);
     }
 }
diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index 5c0427bf03..1ea0e6bb2e 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -108,8 +108,8 @@ namespace osu.Game.Overlays
                                     RelativeSizeAxes = Axes.X,
                                     Children = new[]
                                     {
-                                        new NotificationSection(AccountsStrings.NotificationsTitle, new[] { typeof(SimpleNotification) }, true),
-                                        new NotificationSection(NotificationsStrings.RunningTasks, new[] { typeof(ProgressNotification) }, false),
+                                        new NotificationSection(AccountsStrings.NotificationsTitle, new[] { typeof(SimpleNotification) }),
+                                        new NotificationSection(NotificationsStrings.RunningTasks, new[] { typeof(ProgressNotification) }),
                                     }
                                 }
                             }
diff --git a/osu.Game/Overlays/Notifications/NotificationSection.cs b/osu.Game/Overlays/Notifications/NotificationSection.cs
index 168c6afe27..80bc02a594 100644
--- a/osu.Game/Overlays/Notifications/NotificationSection.cs
+++ b/osu.Game/Overlays/Notifications/NotificationSection.cs
@@ -41,14 +41,11 @@ namespace osu.Game.Overlays.Notifications
 
         private readonly LocalisableString titleText;
 
-        private readonly bool allowClear;
-
-        public NotificationSection(LocalisableString title, IEnumerable<Type> acceptedNotificationTypes, bool allowClear)
+        public NotificationSection(LocalisableString title, IEnumerable<Type> acceptedNotificationTypes)
         {
             AcceptedNotificationTypes = acceptedNotificationTypes.ToArray();
 
             titleText = title;
-            this.allowClear = allowClear;
         }
 
         [BackgroundDependencyLoader]
@@ -72,17 +69,15 @@ namespace osu.Game.Overlays.Notifications
                 {
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
-                    Children = new[]
+                    Children = new Drawable[]
                     {
-                        allowClear
-                            ? new ClearAllButton
-                            {
-                                Text = NotificationsStrings.ClearAll,
-                                Anchor = Anchor.TopRight,
-                                Origin = Anchor.TopRight,
-                                Action = clearAll
-                            }
-                            : Empty(),
+                        new ClearAllButton
+                        {
+                            Text = NotificationsStrings.ClearAll,
+                            Anchor = Anchor.TopRight,
+                            Origin = Anchor.TopRight,
+                            Action = clearAll
+                        },
                         new FillFlowContainer
                         {
                             Margin = new MarginPadding
@@ -118,7 +113,11 @@ namespace osu.Game.Overlays.Notifications
             });
         }
 
-        private void clearAll() => notifications.Children.ForEach(c => c.Close(true));
+        private void clearAll() => notifications.Children.ForEach(c =>
+        {
+            if (c is not ProgressNotification p || p.CompletedOrCancelled)
+                c.Close(true);
+        });
 
         protected override void Update()
         {
diff --git a/osu.Game/Overlays/Notifications/ProgressNotification.cs b/osu.Game/Overlays/Notifications/ProgressNotification.cs
index e6662e2179..5df4c61fd7 100644
--- a/osu.Game/Overlays/Notifications/ProgressNotification.cs
+++ b/osu.Game/Overlays/Notifications/ProgressNotification.cs
@@ -25,6 +25,8 @@ namespace osu.Game.Overlays.Notifications
 
         public Func<bool>? CancelRequested { get; set; }
 
+        public bool CompletedOrCancelled => State == ProgressNotificationState.Completed || State == ProgressNotificationState.Cancelled;
+
         protected override bool AllowFlingDismiss => false;
 
         /// <summary>

From f8be6d41f71995e1705d0b9a192e162197f2fb37 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Jul 2023 13:23:45 +0900
Subject: [PATCH 1238/1604] Play basic notification test first

---
 .../TestSceneNotificationOverlay.cs           | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
index 3cd5daf7a1..4d3ae079e3 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
@@ -52,6 +52,32 @@ namespace osu.Game.Tests.Visual.UserInterface
             notificationOverlay.UnreadCount.ValueChanged += count => { displayedCount.Text = $"unread count: {count.NewValue}"; };
         });
 
+        [Test]
+        public void TestBasicFlow()
+        {
+            setState(Visibility.Visible);
+            AddStep(@"simple #1", sendHelloNotification);
+            AddStep(@"simple #2", sendAmazingNotification);
+            AddStep(@"progress #1", sendUploadProgress);
+            AddStep(@"progress #2", sendDownloadProgress);
+
+            checkProgressingCount(2);
+
+            setState(Visibility.Hidden);
+
+            AddRepeatStep(@"add many simple", sendManyNotifications, 3);
+
+            waitForCompletion();
+
+            AddStep(@"progress #3", sendUploadProgress);
+
+            checkProgressingCount(1);
+
+            checkDisplayedCount(33);
+
+            waitForCompletion();
+        }
+
         [Test]
         public void TestForwardWithFlingRight()
         {
@@ -411,32 +437,6 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddUntilStep("wait for update applied", () => applyUpdate);
         }
 
-        [Test]
-        public void TestBasicFlow()
-        {
-            setState(Visibility.Visible);
-            AddStep(@"simple #1", sendHelloNotification);
-            AddStep(@"simple #2", sendAmazingNotification);
-            AddStep(@"progress #1", sendUploadProgress);
-            AddStep(@"progress #2", sendDownloadProgress);
-
-            checkProgressingCount(2);
-
-            setState(Visibility.Hidden);
-
-            AddRepeatStep(@"add many simple", sendManyNotifications, 3);
-
-            waitForCompletion();
-
-            AddStep(@"progress #3", sendUploadProgress);
-
-            checkProgressingCount(1);
-
-            checkDisplayedCount(33);
-
-            waitForCompletion();
-        }
-
         [Test]
         public void TestImportantWhileClosed()
         {

From 04a15502152e90e603237f232cd53218e2dadc62 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Jul 2023 13:32:15 +0900
Subject: [PATCH 1239/1604] Redesign "local input" toggle in manual input tests
 to be more user-friendly

- Only displays when required (there's literally zero case we want to
  return input to the test, as this is automatic on next action)
- No longer hugs the right side of the screen (blocking visibility of
  some tests).
---
 .../Visual/OsuManualInputManagerTestScene.cs  | 55 ++++++++-----------
 1 file changed, 22 insertions(+), 33 deletions(-)

diff --git a/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs b/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
index 16496ff320..d9c8170a33 100644
--- a/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Testing;
 using osu.Framework.Testing.Input;
+using osu.Game.Graphics;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterfaceV2;
@@ -25,9 +26,10 @@ namespace osu.Game.Tests.Visual
 
         protected readonly ManualInputManager InputManager;
 
-        private readonly RoundedButton buttonTest;
         private readonly RoundedButton buttonLocal;
 
+        private readonly Container takeControlOverlay;
+
         /// <summary>
         /// Whether to create a nested container to handle <see cref="GlobalAction"/>s that result from local (manual) test input.
         /// This should be disabled when instantiating an <see cref="OsuGame"/> instance else actions will be lost.
@@ -66,12 +68,12 @@ namespace osu.Game.Tests.Visual
                     UseParentInput = true,
                     Child = mainContent
                 },
-                new Container
+                takeControlOverlay = new Container
                 {
                     AutoSizeAxes = Axes.Both,
-                    Anchor = Anchor.TopRight,
-                    Origin = Anchor.TopRight,
-                    Margin = new MarginPadding(5),
+                    Anchor = Anchor.BottomCentre,
+                    Origin = Anchor.BottomCentre,
+                    Margin = new MarginPadding(40),
                     CornerRadius = 5,
                     Masking = true,
                     Children = new Drawable[]
@@ -80,28 +82,28 @@ namespace osu.Game.Tests.Visual
                         {
                             Colour = Color4.Black,
                             RelativeSizeAxes = Axes.Both,
-                            Alpha = 0.5f,
+                            Alpha = 0.4f,
                         },
                         new FillFlowContainer
                         {
                             AutoSizeAxes = Axes.Both,
                             Direction = FillDirection.Vertical,
-                            Margin = new MarginPadding(5),
-                            Spacing = new Vector2(5),
+                            Margin = new MarginPadding(10),
+                            Spacing = new Vector2(10),
                             Children = new Drawable[]
                             {
                                 new OsuSpriteText
                                 {
                                     Anchor = Anchor.TopCentre,
                                     Origin = Anchor.TopCentre,
-                                    Text = "Input Priority"
+                                    Font = OsuFont.Default.With(weight: FontWeight.Bold),
+                                    Text = "The test is currently overriding local input",
                                 },
                                 new FillFlowContainer
                                 {
                                     AutoSizeAxes = Axes.Both,
                                     Anchor = Anchor.TopCentre,
                                     Origin = Anchor.TopCentre,
-                                    Margin = new MarginPadding(5),
                                     Spacing = new Vector2(5),
                                     Direction = FillDirection.Horizontal,
 
@@ -109,15 +111,9 @@ namespace osu.Game.Tests.Visual
                                     {
                                         buttonLocal = new RoundedButton
                                         {
-                                            Text = "local",
-                                            Size = new Vector2(50, 30),
-                                            Action = returnUserInput
-                                        },
-                                        buttonTest = new RoundedButton
-                                        {
-                                            Text = "test",
-                                            Size = new Vector2(50, 30),
-                                            Action = returnTestInput
+                                            Text = "Take control back",
+                                            Size = new Vector2(180, 30),
+                                            Action = () => InputManager.UseParentInput = true
                                         },
                                     }
                                 },
@@ -128,6 +124,13 @@ namespace osu.Game.Tests.Visual
             });
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            takeControlOverlay.Alpha = InputManager.UseParentInput ? 0 : 1;
+        }
+
         /// <summary>
         /// Wait for a button to become enabled, then click it.
         /// </summary>
@@ -146,19 +149,5 @@ namespace osu.Game.Tests.Visual
                 InputManager.Click(MouseButton.Left);
             });
         }
-
-        protected override void Update()
-        {
-            base.Update();
-
-            buttonTest.Enabled.Value = InputManager.UseParentInput;
-            buttonLocal.Enabled.Value = !InputManager.UseParentInput;
-        }
-
-        private void returnUserInput() =>
-            InputManager.UseParentInput = true;
-
-        private void returnTestInput() =>
-            InputManager.UseParentInput = false;
     }
 }

From d4c252ddf97c7edf9af02ab66d6a1ec78d7a74d3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Jul 2023 14:28:57 +0900
Subject: [PATCH 1240/1604] Revert cancelling logic changes based on review
 feedback

---
 osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs b/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
index 7144fd8ca5..5c9a57724f 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
@@ -132,12 +132,14 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
             leftCentreTrigger.StopAllPlayback();
             rightCentreTrigger.StopAllPlayback();
+            strongCentreTrigger.StopAllPlayback();
         }
 
         private void flushRimTriggerSources()
         {
             leftRimTrigger.StopAllPlayback();
             rightRimTrigger.StopAllPlayback();
+            strongCentreTrigger.StopAllPlayback();
         }
 
         public void OnReleased(KeyBindingReleaseEvent<TaikoAction> e)

From 48f27ff340f3a417af63b4e323c9f9e2f9115e8f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Jul 2023 14:30:31 +0900
Subject: [PATCH 1241/1604] Move trigger source to own file

Having such a large nested class inside a small top level class is VERY
confusing.
---
 .../Skinning/Argon/ArgonDrumSamplePlayer.cs   | 118 ----------------
 .../Argon/ArgonDrumSampleTriggerSource.cs     | 129 ++++++++++++++++++
 2 files changed, 129 insertions(+), 118 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSampleTriggerSource.cs

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs
index 91393d99fe..7ce020f291 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs
@@ -1,11 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Collections.Generic;
-using System.Linq;
 using osu.Framework.Allocation;
 using osu.Game.Audio;
-using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.Taiko.UI;
 using osu.Game.Rulesets.UI;
 using osu.Game.Skinning;
@@ -25,120 +22,5 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
 
         protected override DrumSampleTriggerSource CreateTriggerSource(HitObjectContainer hitObjectContainer, SampleBalance balance) =>
             new ArgonDrumSampleTriggerSource(hitObjectContainer, balance);
-
-        public partial class ArgonDrumSampleTriggerSource : DrumSampleTriggerSource
-        {
-            private readonly HitObjectContainer hitObjectContainer;
-
-            [Resolved]
-            private ISkinSource skinSource { get; set; } = null!;
-
-            /// <summary>
-            /// The minimum time to leave between flourishes that are added to strong rim hits.
-            /// </summary>
-            private const double time_between_flourishes = 2000;
-
-            public ArgonDrumSampleTriggerSource(HitObjectContainer hitObjectContainer, SampleBalance balance)
-                : base(hitObjectContainer, balance)
-            {
-                this.hitObjectContainer = hitObjectContainer;
-            }
-
-            public override void Play(HitType hitType, bool strong)
-            {
-                TaikoHitObject? hitObject = GetMostValidObject() as TaikoHitObject;
-
-                if (hitObject == null)
-                    return;
-
-                var originalSample = hitObject.CreateHitSampleInfo(hitType == HitType.Rim ? HitSampleInfo.HIT_CLAP : HitSampleInfo.HIT_NORMAL);
-
-                // If the sample is provided by a legacy skin, we should not try and do anything special.
-                if (skinSource.FindProvider(s => s.GetSample(originalSample) != null) is LegacySkinTransformer)
-                {
-                    base.Play(hitType, strong);
-                    return;
-                }
-
-                // let the magic begin...
-                var samplesToPlay = new List<ISampleInfo> { new VolumeAwareHitSampleInfo(originalSample, strong) };
-
-                if (strong && hitType == HitType.Rim && canPlayFlourish(hitObject))
-                    samplesToPlay.Add(new VolumeAwareHitSampleInfo(hitObject.CreateHitSampleInfo(HitSampleInfo.HIT_FLOURISH), true));
-
-                PlaySamples(samplesToPlay.ToArray());
-            }
-
-            private bool canPlayFlourish(TaikoHitObject hitObject)
-            {
-                double? lastFlourish = null;
-
-                var hitObjects = hitObjectContainer.AliveObjects
-                                                   .Reverse()
-                                                   .Select(d => d.HitObject)
-                                                   .OfType<Hit>()
-                                                   .Where(h => h.IsStrong && h.Type == HitType.Rim);
-
-                // Add an additional 'flourish' sample to strong rim hits (that are at least `time_between_flourishes` apart).
-                // This is applied to hitobjects in reverse order, as to sound more musically coherent by biasing towards to
-                // end of groups/combos of strong rim hits instead of the start.
-                foreach (var h in hitObjects)
-                {
-                    bool canFlourish = lastFlourish == null || lastFlourish - h.StartTime >= time_between_flourishes;
-
-                    if (canFlourish)
-                        lastFlourish = h.StartTime;
-
-                    if (h == hitObject)
-                        return canFlourish;
-                }
-
-                return false;
-            }
-
-            public class VolumeAwareHitSampleInfo : HitSampleInfo
-            {
-                public const int SAMPLE_VOLUME_THRESHOLD_HARD = 90;
-                public const int SAMPLE_VOLUME_THRESHOLD_MEDIUM = 60;
-
-                public VolumeAwareHitSampleInfo(HitSampleInfo sampleInfo, bool isStrong = false)
-                    : base(sampleInfo.Name, isStrong ? BANK_STRONG : getBank(sampleInfo.Bank, sampleInfo.Name, sampleInfo.Volume), sampleInfo.Suffix, sampleInfo.Volume)
-                {
-                }
-
-                public override IEnumerable<string> LookupNames
-                {
-                    get
-                    {
-                        foreach (string name in base.LookupNames)
-                            yield return name.Insert(name.LastIndexOf('/') + 1, "Argon/taiko-");
-                    }
-                }
-
-                private static string getBank(string originalBank, string sampleName, int volume)
-                {
-                    // So basically we're overwriting mapper's bank intentions here.
-                    // The rationale is that most taiko beatmaps only use a single bank, but regularly adjust volume.
-
-                    switch (sampleName)
-                    {
-                        case HIT_NORMAL:
-                        case HIT_CLAP:
-                        {
-                            if (volume >= SAMPLE_VOLUME_THRESHOLD_HARD)
-                                return BANK_DRUM;
-
-                            if (volume >= SAMPLE_VOLUME_THRESHOLD_MEDIUM)
-                                return BANK_NORMAL;
-
-                            return BANK_SOFT;
-                        }
-
-                        default:
-                            return originalBank;
-                    }
-                }
-            }
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSampleTriggerSource.cs b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSampleTriggerSource.cs
new file mode 100644
index 0000000000..3454b0fd11
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSampleTriggerSource.cs
@@ -0,0 +1,129 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Game.Audio;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.UI;
+using osu.Game.Rulesets.UI;
+using osu.Game.Skinning;
+
+namespace osu.Game.Rulesets.Taiko.Skinning.Argon
+{
+    public partial class ArgonDrumSampleTriggerSource : DrumSampleTriggerSource
+    {
+        private readonly HitObjectContainer hitObjectContainer;
+
+        [Resolved]
+        private ISkinSource skinSource { get; set; } = null!;
+
+        /// <summary>
+        /// The minimum time to leave between flourishes that are added to strong rim hits.
+        /// </summary>
+        private const double time_between_flourishes = 2000;
+
+        public ArgonDrumSampleTriggerSource(HitObjectContainer hitObjectContainer, SampleBalance balance)
+            : base(hitObjectContainer, balance)
+        {
+            this.hitObjectContainer = hitObjectContainer;
+        }
+
+        public override void Play(HitType hitType, bool strong)
+        {
+            TaikoHitObject? hitObject = GetMostValidObject() as TaikoHitObject;
+
+            if (hitObject == null)
+                return;
+
+            var originalSample = hitObject.CreateHitSampleInfo(hitType == HitType.Rim ? HitSampleInfo.HIT_CLAP : HitSampleInfo.HIT_NORMAL);
+
+            // If the sample is provided by a legacy skin, we should not try and do anything special.
+            if (skinSource.FindProvider(s => s.GetSample(originalSample) != null) is LegacySkinTransformer)
+            {
+                base.Play(hitType, strong);
+                return;
+            }
+
+            // let the magic begin...
+            var samplesToPlay = new List<ISampleInfo> { new VolumeAwareHitSampleInfo(originalSample, strong) };
+
+            if (strong && hitType == HitType.Rim && canPlayFlourish(hitObject))
+                samplesToPlay.Add(new VolumeAwareHitSampleInfo(hitObject.CreateHitSampleInfo(HitSampleInfo.HIT_FLOURISH), true));
+
+            PlaySamples(samplesToPlay.ToArray());
+        }
+
+        private bool canPlayFlourish(TaikoHitObject hitObject)
+        {
+            double? lastFlourish = null;
+
+            var hitObjects = hitObjectContainer.AliveObjects
+                                               .Reverse()
+                                               .Select(d => d.HitObject)
+                                               .OfType<Hit>()
+                                               .Where(h => h.IsStrong && h.Type == HitType.Rim);
+
+            // Add an additional 'flourish' sample to strong rim hits (that are at least `time_between_flourishes` apart).
+            // This is applied to hitobjects in reverse order, as to sound more musically coherent by biasing towards to
+            // end of groups/combos of strong rim hits instead of the start.
+            foreach (var h in hitObjects)
+            {
+                bool canFlourish = lastFlourish == null || lastFlourish - h.StartTime >= time_between_flourishes;
+
+                if (canFlourish)
+                    lastFlourish = h.StartTime;
+
+                if (h == hitObject)
+                    return canFlourish;
+            }
+
+            return false;
+        }
+
+        public class VolumeAwareHitSampleInfo : HitSampleInfo
+        {
+            public const int SAMPLE_VOLUME_THRESHOLD_HARD = 90;
+            public const int SAMPLE_VOLUME_THRESHOLD_MEDIUM = 60;
+
+            public VolumeAwareHitSampleInfo(HitSampleInfo sampleInfo, bool isStrong = false)
+                : base(sampleInfo.Name, isStrong ? BANK_STRONG : getBank(sampleInfo.Bank, sampleInfo.Name, sampleInfo.Volume), sampleInfo.Suffix, sampleInfo.Volume)
+            {
+            }
+
+            public override IEnumerable<string> LookupNames
+            {
+                get
+                {
+                    foreach (string name in base.LookupNames)
+                        yield return name.Insert(name.LastIndexOf('/') + 1, "Argon/taiko-");
+                }
+            }
+
+            private static string getBank(string originalBank, string sampleName, int volume)
+            {
+                // So basically we're overwriting mapper's bank intentions here.
+                // The rationale is that most taiko beatmaps only use a single bank, but regularly adjust volume.
+
+                switch (sampleName)
+                {
+                    case HIT_NORMAL:
+                    case HIT_CLAP:
+                    {
+                        if (volume >= SAMPLE_VOLUME_THRESHOLD_HARD)
+                            return BANK_DRUM;
+
+                        if (volume >= SAMPLE_VOLUME_THRESHOLD_MEDIUM)
+                            return BANK_NORMAL;
+
+                        return BANK_SOFT;
+                    }
+
+                    default:
+                        return originalBank;
+                }
+            }
+        }
+    }
+}

From 6bfbcca2fdf0a1b1bf6342b852aad99ec2ce4788 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Jul 2023 14:44:44 +0900
Subject: [PATCH 1242/1604] Move `VolumeAwareHitSampleInfo` to own file

---
 .../Skinning/Argon/ArgonDrumSamplePlayer.cs   |  6 +--
 .../Argon/ArgonDrumSampleTriggerSource.cs     | 44 ----------------
 .../Argon/VolumeAwareHitSampleInfo.cs         | 52 +++++++++++++++++++
 3 files changed, 55 insertions(+), 47 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko/Skinning/Argon/VolumeAwareHitSampleInfo.cs

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs
index 7ce020f291..898753b568 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs
@@ -15,9 +15,9 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
         private void load(IPooledSampleProvider sampleProvider)
         {
             // Warm up pools for non-standard samples.
-            sampleProvider.GetPooledSample(new ArgonDrumSampleTriggerSource.VolumeAwareHitSampleInfo(new HitSampleInfo(HitSampleInfo.HIT_NORMAL), true));
-            sampleProvider.GetPooledSample(new ArgonDrumSampleTriggerSource.VolumeAwareHitSampleInfo(new HitSampleInfo(HitSampleInfo.HIT_CLAP), true));
-            sampleProvider.GetPooledSample(new ArgonDrumSampleTriggerSource.VolumeAwareHitSampleInfo(new HitSampleInfo(HitSampleInfo.HIT_FLOURISH), true));
+            sampleProvider.GetPooledSample(new VolumeAwareHitSampleInfo(new HitSampleInfo(HitSampleInfo.HIT_NORMAL), true));
+            sampleProvider.GetPooledSample(new VolumeAwareHitSampleInfo(new HitSampleInfo(HitSampleInfo.HIT_CLAP), true));
+            sampleProvider.GetPooledSample(new VolumeAwareHitSampleInfo(new HitSampleInfo(HitSampleInfo.HIT_FLOURISH), true));
         }
 
         protected override DrumSampleTriggerSource CreateTriggerSource(HitObjectContainer hitObjectContainer, SampleBalance balance) =>
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSampleTriggerSource.cs b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSampleTriggerSource.cs
index 3454b0fd11..958d4e3aec 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSampleTriggerSource.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSampleTriggerSource.cs
@@ -81,49 +81,5 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
 
             return false;
         }
-
-        public class VolumeAwareHitSampleInfo : HitSampleInfo
-        {
-            public const int SAMPLE_VOLUME_THRESHOLD_HARD = 90;
-            public const int SAMPLE_VOLUME_THRESHOLD_MEDIUM = 60;
-
-            public VolumeAwareHitSampleInfo(HitSampleInfo sampleInfo, bool isStrong = false)
-                : base(sampleInfo.Name, isStrong ? BANK_STRONG : getBank(sampleInfo.Bank, sampleInfo.Name, sampleInfo.Volume), sampleInfo.Suffix, sampleInfo.Volume)
-            {
-            }
-
-            public override IEnumerable<string> LookupNames
-            {
-                get
-                {
-                    foreach (string name in base.LookupNames)
-                        yield return name.Insert(name.LastIndexOf('/') + 1, "Argon/taiko-");
-                }
-            }
-
-            private static string getBank(string originalBank, string sampleName, int volume)
-            {
-                // So basically we're overwriting mapper's bank intentions here.
-                // The rationale is that most taiko beatmaps only use a single bank, but regularly adjust volume.
-
-                switch (sampleName)
-                {
-                    case HIT_NORMAL:
-                    case HIT_CLAP:
-                    {
-                        if (volume >= SAMPLE_VOLUME_THRESHOLD_HARD)
-                            return BANK_DRUM;
-
-                        if (volume >= SAMPLE_VOLUME_THRESHOLD_MEDIUM)
-                            return BANK_NORMAL;
-
-                        return BANK_SOFT;
-                    }
-
-                    default:
-                        return originalBank;
-                }
-            }
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Argon/VolumeAwareHitSampleInfo.cs b/osu.Game.Rulesets.Taiko/Skinning/Argon/VolumeAwareHitSampleInfo.cs
new file mode 100644
index 0000000000..3ca4b5a3c7
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Skinning/Argon/VolumeAwareHitSampleInfo.cs
@@ -0,0 +1,52 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using osu.Game.Audio;
+
+namespace osu.Game.Rulesets.Taiko.Skinning.Argon
+{
+    public class VolumeAwareHitSampleInfo : HitSampleInfo
+    {
+        public const int SAMPLE_VOLUME_THRESHOLD_HARD = 90;
+        public const int SAMPLE_VOLUME_THRESHOLD_MEDIUM = 60;
+
+        public VolumeAwareHitSampleInfo(HitSampleInfo sampleInfo, bool isStrong = false)
+            : base(sampleInfo.Name, isStrong ? BANK_STRONG : getBank(sampleInfo.Bank, sampleInfo.Name, sampleInfo.Volume), sampleInfo.Suffix, sampleInfo.Volume)
+        {
+        }
+
+        public override IEnumerable<string> LookupNames
+        {
+            get
+            {
+                foreach (string name in base.LookupNames)
+                    yield return name.Insert(name.LastIndexOf('/') + 1, "Argon/taiko-");
+            }
+        }
+
+        private static string getBank(string originalBank, string sampleName, int volume)
+        {
+            // So basically we're overwriting mapper's bank intentions here.
+            // The rationale is that most taiko beatmaps only use a single bank, but regularly adjust volume.
+
+            switch (sampleName)
+            {
+                case HIT_NORMAL:
+                case HIT_CLAP:
+                {
+                    if (volume >= SAMPLE_VOLUME_THRESHOLD_HARD)
+                        return BANK_DRUM;
+
+                    if (volume >= SAMPLE_VOLUME_THRESHOLD_MEDIUM)
+                        return BANK_NORMAL;
+
+                    return BANK_SOFT;
+                }
+
+                default:
+                    return originalBank;
+            }
+        }
+    }
+}

From 9bdc80a74934b781216ff924d5ccca79068e467e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Jul 2023 14:46:36 +0900
Subject: [PATCH 1243/1604] Move flourish playback to own trigger source

---
 .../Skinning/Argon/ArgonDrumSamplePlayer.cs   | 18 ++++-
 .../Argon/ArgonDrumSampleTriggerSource.cs     | 39 ----------
 .../Argon/ArgonFlourishTriggerSource.cs       | 76 +++++++++++++++++++
 .../UI/DrumSamplePlayer.cs                    |  5 +-
 4 files changed, 97 insertions(+), 41 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonFlourishTriggerSource.cs

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs
index 898753b568..2ff36ef9bf 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Allocation;
 using osu.Game.Audio;
+using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.Taiko.UI;
 using osu.Game.Rulesets.UI;
 using osu.Game.Skinning;
@@ -11,16 +12,31 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
 {
     internal partial class ArgonDrumSamplePlayer : DrumSamplePlayer
     {
+        private ArgonFlourishTriggerSource argonFlourishTrigger = null!;
+
         [BackgroundDependencyLoader]
-        private void load(IPooledSampleProvider sampleProvider)
+        private void load(Playfield playfield, IPooledSampleProvider sampleProvider)
         {
+            var hitObjectContainer = playfield.HitObjectContainer;
+
             // Warm up pools for non-standard samples.
             sampleProvider.GetPooledSample(new VolumeAwareHitSampleInfo(new HitSampleInfo(HitSampleInfo.HIT_NORMAL), true));
             sampleProvider.GetPooledSample(new VolumeAwareHitSampleInfo(new HitSampleInfo(HitSampleInfo.HIT_CLAP), true));
             sampleProvider.GetPooledSample(new VolumeAwareHitSampleInfo(new HitSampleInfo(HitSampleInfo.HIT_FLOURISH), true));
+
+            // We want to play back flourishes in an isolated source as to not have them cancelled.
+            AddInternal(argonFlourishTrigger = new ArgonFlourishTriggerSource(hitObjectContainer));
         }
 
         protected override DrumSampleTriggerSource CreateTriggerSource(HitObjectContainer hitObjectContainer, SampleBalance balance) =>
             new ArgonDrumSampleTriggerSource(hitObjectContainer, balance);
+
+        protected override void Play(DrumSampleTriggerSource triggerSource, HitType hitType, bool strong)
+        {
+            base.Play(triggerSource, hitType, strong);
+
+            // This won't always play something, but the logic for flourish playback is contained within.
+            argonFlourishTrigger.Play(hitType, strong);
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSampleTriggerSource.cs b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSampleTriggerSource.cs
index 958d4e3aec..fb4c1067e3 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSampleTriggerSource.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSampleTriggerSource.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using System.Linq;
 using osu.Framework.Allocation;
 using osu.Game.Audio;
 using osu.Game.Rulesets.Taiko.Objects;
@@ -14,20 +13,12 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
 {
     public partial class ArgonDrumSampleTriggerSource : DrumSampleTriggerSource
     {
-        private readonly HitObjectContainer hitObjectContainer;
-
         [Resolved]
         private ISkinSource skinSource { get; set; } = null!;
 
-        /// <summary>
-        /// The minimum time to leave between flourishes that are added to strong rim hits.
-        /// </summary>
-        private const double time_between_flourishes = 2000;
-
         public ArgonDrumSampleTriggerSource(HitObjectContainer hitObjectContainer, SampleBalance balance)
             : base(hitObjectContainer, balance)
         {
-            this.hitObjectContainer = hitObjectContainer;
         }
 
         public override void Play(HitType hitType, bool strong)
@@ -49,37 +40,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
             // let the magic begin...
             var samplesToPlay = new List<ISampleInfo> { new VolumeAwareHitSampleInfo(originalSample, strong) };
 
-            if (strong && hitType == HitType.Rim && canPlayFlourish(hitObject))
-                samplesToPlay.Add(new VolumeAwareHitSampleInfo(hitObject.CreateHitSampleInfo(HitSampleInfo.HIT_FLOURISH), true));
-
             PlaySamples(samplesToPlay.ToArray());
         }
-
-        private bool canPlayFlourish(TaikoHitObject hitObject)
-        {
-            double? lastFlourish = null;
-
-            var hitObjects = hitObjectContainer.AliveObjects
-                                               .Reverse()
-                                               .Select(d => d.HitObject)
-                                               .OfType<Hit>()
-                                               .Where(h => h.IsStrong && h.Type == HitType.Rim);
-
-            // Add an additional 'flourish' sample to strong rim hits (that are at least `time_between_flourishes` apart).
-            // This is applied to hitobjects in reverse order, as to sound more musically coherent by biasing towards to
-            // end of groups/combos of strong rim hits instead of the start.
-            foreach (var h in hitObjects)
-            {
-                bool canFlourish = lastFlourish == null || lastFlourish - h.StartTime >= time_between_flourishes;
-
-                if (canFlourish)
-                    lastFlourish = h.StartTime;
-
-                if (h == hitObject)
-                    return canFlourish;
-            }
-
-            return false;
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonFlourishTriggerSource.cs b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonFlourishTriggerSource.cs
new file mode 100644
index 0000000000..661f737843
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonFlourishTriggerSource.cs
@@ -0,0 +1,76 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Game.Audio;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.UI;
+using osu.Game.Rulesets.UI;
+using osu.Game.Skinning;
+
+namespace osu.Game.Rulesets.Taiko.Skinning.Argon
+{
+    internal partial class ArgonFlourishTriggerSource : ArgonDrumSampleTriggerSource
+    {
+        private readonly HitObjectContainer hitObjectContainer;
+
+        [Resolved]
+        private ISkinSource skinSource { get; set; } = null!;
+
+        /// <summary>
+        /// The minimum time to leave between flourishes that are added to strong rim hits.
+        /// </summary>
+        private const double time_between_flourishes = 2000;
+
+        public ArgonFlourishTriggerSource(HitObjectContainer hitObjectContainer)
+            : base(hitObjectContainer, SampleBalance.Centre)
+        {
+            this.hitObjectContainer = hitObjectContainer;
+        }
+
+        public override void Play(HitType hitType, bool strong)
+        {
+            TaikoHitObject? hitObject = GetMostValidObject() as TaikoHitObject;
+
+            if (hitObject == null)
+                return;
+
+            var originalSample = hitObject.CreateHitSampleInfo(hitType == HitType.Rim ? HitSampleInfo.HIT_CLAP : HitSampleInfo.HIT_NORMAL);
+
+            // If the sample is provided by a legacy skin, we should not try and do anything special.
+            if (skinSource.FindProvider(s => s.GetSample(originalSample) != null) is LegacySkinTransformer)
+                return;
+
+            if (strong && hitType == HitType.Rim && canPlayFlourish(hitObject))
+                PlaySamples(new ISampleInfo[] { new VolumeAwareHitSampleInfo(hitObject.CreateHitSampleInfo(HitSampleInfo.HIT_FLOURISH), true) });
+        }
+
+        private bool canPlayFlourish(TaikoHitObject hitObject)
+        {
+            double? lastFlourish = null;
+
+            var hitObjects = hitObjectContainer.AliveObjects
+                                               .Reverse()
+                                               .Select(d => d.HitObject)
+                                               .OfType<Hit>()
+                                               .Where(h => h.IsStrong && h.Type == HitType.Rim);
+
+            // Add an additional 'flourish' sample to strong rim hits (that are at least `time_between_flourishes` apart).
+            // This is applied to hitobjects in reverse order, as to sound more musically coherent by biasing towards to
+            // end of groups/combos of strong rim hits instead of the start.
+            foreach (var h in hitObjects)
+            {
+                bool canFlourish = lastFlourish == null || lastFlourish - h.StartTime >= time_between_flourishes;
+
+                if (canFlourish)
+                    lastFlourish = h.StartTime;
+
+                if (h == hitObject)
+                    return canFlourish;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs b/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
index 5c9a57724f..310a4c1edb 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
@@ -93,7 +93,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                 }
             }
 
-            triggerSource.Play(hitType, strong);
+            Play(triggerSource, hitType, strong);
 
             lastHitTime = Time.Current;
             lastAction = e.Action;
@@ -101,6 +101,9 @@ namespace osu.Game.Rulesets.Taiko.UI
             return false;
         }
 
+        protected virtual void Play(DrumSampleTriggerSource triggerSource, HitType hitType, bool strong) =>
+            triggerSource.Play(hitType, strong);
+
         private bool checkStrongValidity(TaikoAction newAction, TaikoAction? lastAction, double timeBetweenActions)
         {
             if (lastAction == null)

From 755b82a30883d6922f1439bd6cb45383085d1946 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Jul 2023 14:54:49 +0900
Subject: [PATCH 1244/1604] Implement flourish trigger source via base class

---
 .../Skinning/Argon/ArgonFlourishTriggerSource.cs              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonFlourishTriggerSource.cs b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonFlourishTriggerSource.cs
index 661f737843..728977547c 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonFlourishTriggerSource.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonFlourishTriggerSource.cs
@@ -11,7 +11,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.Skinning.Argon
 {
-    internal partial class ArgonFlourishTriggerSource : ArgonDrumSampleTriggerSource
+    internal partial class ArgonFlourishTriggerSource : DrumSampleTriggerSource
     {
         private readonly HitObjectContainer hitObjectContainer;
 
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
         private const double time_between_flourishes = 2000;
 
         public ArgonFlourishTriggerSource(HitObjectContainer hitObjectContainer)
-            : base(hitObjectContainer, SampleBalance.Centre)
+            : base(hitObjectContainer)
         {
             this.hitObjectContainer = hitObjectContainer;
         }

From 8b5d5c9ae2497a9dc24a932b65ec33db875fcdc0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Jul 2023 15:13:25 +0900
Subject: [PATCH 1245/1604] Fix rewinding causing incorrectly stronged
 non-strong hits

---
 osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs b/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
index 310a4c1edb..08bde9a316 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
@@ -109,7 +109,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             if (lastAction == null)
                 return false;
 
-            if (timeBetweenActions > DrawableHit.StrongNestedHit.SECOND_HIT_WINDOW)
+            if (timeBetweenActions < 0 || timeBetweenActions > DrawableHit.StrongNestedHit.SECOND_HIT_WINDOW)
                 return false;
 
             switch (newAction)

From e0fc97bb9302d3bb5d476b5af8936da1b91e13ec Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Jul 2023 15:21:24 +0900
Subject: [PATCH 1246/1604] Replace various local implementations of rewinding
 checks with new property

---
 .../Skinning/Legacy/LegacyCatchComboCounter.cs              | 3 ++-
 .../Objects/Drawables/DrawableHoldNote.cs                   | 3 ++-
 .../Objects/Drawables/DrawableSliderBall.cs                 | 6 ++----
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs    | 3 ++-
 osu.Game/Screens/Play/ComboEffects.cs                       | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatchComboCounter.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatchComboCounter.cs
index 55b24b3ffa..f38b9b430e 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatchComboCounter.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatchComboCounter.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Rulesets.Catch.UI;
+using osu.Game.Screens.Play;
 using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
@@ -59,7 +60,7 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
 
             lastDisplayedCombo = combo;
 
-            if (Time.Elapsed < 0)
+            if ((Clock as IGameplayClock)?.IsRewinding == true)
             {
                 // needs more work to make rewind somehow look good.
                 // basically we want the previous increment to play... or turning off RemoveCompletedTransforms (not feasible from a performance angle).
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index a8563d65c4..d5e212d389 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -16,6 +16,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Screens.Play;
 using osu.Game.Skinning;
 using osuTK;
 
@@ -298,7 +299,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                 return false;
 
             // do not run any of this logic when rewinding, as it inverts order of presses/releases.
-            if (Time.Elapsed < 0)
+            if ((Clock as IGameplayClock)?.IsRewinding == true)
                 return false;
 
             if (CheckHittable?.Invoke(this, Time.Current) == false)
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs
index e1766adc20..d06fb5b4de 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs
@@ -14,6 +14,7 @@ using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Skinning.Default;
+using osu.Game.Screens.Play;
 using osu.Game.Skinning;
 using osuTK;
 
@@ -179,16 +180,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private Vector2? lastPosition;
 
-        private bool rewinding;
-
         public void UpdateProgress(double completionProgress)
         {
             Position = drawableSlider.HitObject.CurvePositionAt(completionProgress);
 
             var diff = lastPosition.HasValue ? lastPosition.Value - Position : Position - drawableSlider.HitObject.CurvePositionAt(completionProgress + 0.01f);
 
-            if (Clock.ElapsedFrameTime != 0)
-                rewinding = Clock.ElapsedFrameTime < 0;
+            bool rewinding = (Clock as IGameplayClock)?.IsRewinding == true;
 
             // Ensure the value is substantially high enough to allow for Atan2 to get a valid angle.
             if (diff.LengthFast < 0.01f)
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index e4d8eb2335..bf649a0a15 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -24,6 +24,7 @@ using osu.Game.Rulesets.Objects.Pooling;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
+using osu.Game.Screens.Play;
 using osu.Game.Skinning;
 using osuTK.Graphics;
 
@@ -688,7 +689,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         protected bool UpdateResult(bool userTriggered)
         {
             // It's possible for input to get into a bad state when rewinding gameplay, so results should not be processed
-            if (Time.Elapsed < 0)
+            if ((Clock as IGameplayClock)?.IsRewinding == true)
                 return false;
 
             if (Judged)
diff --git a/osu.Game/Screens/Play/ComboEffects.cs b/osu.Game/Screens/Play/ComboEffects.cs
index 09c94a8f1d..6f12cfde64 100644
--- a/osu.Game/Screens/Play/ComboEffects.cs
+++ b/osu.Game/Screens/Play/ComboEffects.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Screens.Play
             if (gameplayClock.CurrentTime < firstBreakTime)
                 firstBreakTime = null;
 
-            if (gameplayClock.ElapsedFrameTime < 0)
+            if (gameplayClock.IsRewinding)
                 return;
 
             if (combo.NewValue == 0 && (combo.OldValue > 20 || (alwaysPlayFirst.Value && firstBreakTime == null)))

From 67746e1369bacd864c7b107724416e656119eac4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Jul 2023 15:36:17 +0900
Subject: [PATCH 1247/1604] Move retry sample playback to `PlayerLoader`

---
 osu.Game/Screens/Play/Player.cs       | 4 ----
 osu.Game/Screens/Play/PlayerLoader.cs | 9 ++++++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 2cb7748a15..379c10a4a4 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -112,8 +112,6 @@ namespace osu.Game.Screens.Play
 
         private Ruleset ruleset;
 
-        private SkinnableSound sampleRestart;
-
         public BreakOverlay BreakOverlay;
 
         /// <summary>
@@ -303,7 +301,6 @@ namespace osu.Game.Screens.Play
                             Restart(true);
                         },
                     },
-                    sampleRestart = new SkinnableSound(new SampleInfo(@"Gameplay/restart", @"pause-retry-click"))
                 });
             }
 
@@ -673,7 +670,6 @@ namespace osu.Game.Screens.Play
             // stopping here is to ensure music doesn't become audible after exiting back to PlayerLoader.
             musicController.Stop();
 
-            sampleRestart?.Play();
             RestartRequested?.Invoke(quickRestart);
 
             PerformExit(false);
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 30ae5ee5aa..4b15bac0f3 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -15,6 +15,7 @@ using osu.Framework.Graphics.Transforms;
 using osu.Framework.Input;
 using osu.Framework.Screens;
 using osu.Framework.Threading;
+using osu.Game.Audio;
 using osu.Game.Audio.Effects;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
@@ -25,6 +26,7 @@ using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.Play.PlayerSettings;
+using osu.Game.Skinning;
 using osu.Game.Users;
 using osu.Game.Utils;
 using osuTK;
@@ -76,6 +78,8 @@ namespace osu.Game.Screens.Play
         private AudioFilter lowPassFilter = null!;
         private AudioFilter highPassFilter = null!;
 
+        private SkinnableSound sampleRestart = null!;
+
         [Cached]
         private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
 
@@ -199,7 +203,8 @@ namespace osu.Game.Screens.Play
                 },
                 idleTracker = new IdleTracker(750),
                 lowPassFilter = new AudioFilter(audio.TrackMixer),
-                highPassFilter = new AudioFilter(audio.TrackMixer, BQFType.HighPass)
+                highPassFilter = new AudioFilter(audio.TrackMixer, BQFType.HighPass),
+                sampleRestart = new SkinnableSound(new SampleInfo(@"Gameplay/restart", @"pause-retry-click"))
             };
 
             if (Beatmap.Value.BeatmapInfo.EpilepsyWarning)
@@ -265,6 +270,8 @@ namespace osu.Game.Screens.Play
             playerConsumed = false;
             cancelLoad();
 
+            sampleRestart.Play();
+
             contentIn();
         }
 

From 9732e5733c2685f926e08a3300e246a2b32c59e0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Jul 2023 15:45:21 +0900
Subject: [PATCH 1248/1604] Update resources

---
 osu.Game/osu.Game.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index b4d8dd513f..d30398a475 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -37,7 +37,7 @@
     </PackageReference>
     <PackageReference Include="Realm" Version="10.20.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2023.625.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.625.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.707.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />

From ba0ab7383d051a074fc59fa2416f103093102e17 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Jul 2023 16:28:49 +0900
Subject: [PATCH 1249/1604] Fix broken test nullability

---
 osu.Game.Tests/Database/BeatmapImporterUpdateTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Database/BeatmapImporterUpdateTests.cs b/osu.Game.Tests/Database/BeatmapImporterUpdateTests.cs
index f377d92911..d30b3c089e 100644
--- a/osu.Game.Tests/Database/BeatmapImporterUpdateTests.cs
+++ b/osu.Game.Tests/Database/BeatmapImporterUpdateTests.cs
@@ -383,7 +383,7 @@ namespace osu.Game.Tests.Database
 
                     beatmapInfo.Hash = new_beatmap_hash;
                     beatmapInfo.ResetOnlineInfo();
-                    beatmapInfo.UpdateLocalScores(s.Realm);
+                    beatmapInfo.UpdateLocalScores(s.Realm!);
                 });
 
                 realm.Run(r => r.Refresh());

From 82babbf8faee0876962df4f93f08443c91e6091f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Jul 2023 17:32:22 +0900
Subject: [PATCH 1250/1604] Adjust results screen transition tweens to feel
 better

---
 osu.Game/Screens/Ranking/ResultsScreen.cs              | 8 ++++----
 osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index b9f3b65129..96fed3e6ba 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -305,7 +305,7 @@ namespace osu.Game.Screens.Ranking
                 float origLocation = detachedPanelContainer.ToLocalSpace(screenSpacePos).X;
                 expandedPanel.MoveToX(origLocation)
                              .Then()
-                             .MoveToX(StatisticsPanel.SIDE_PADDING, 150, Easing.OutQuint);
+                             .MoveToX(StatisticsPanel.SIDE_PADDING, 400, Easing.OutElasticQuarter);
 
                 // Hide contracted panels.
                 foreach (var contracted in ScorePanelList.GetScorePanels().Where(p => p.State == PanelState.Contracted))
@@ -313,7 +313,7 @@ namespace osu.Game.Screens.Ranking
                 ScorePanelList.HandleInput = false;
 
                 // Dim background.
-                ApplyToBackground(b => b.FadeColour(OsuColour.Gray(0.1f), 150));
+                ApplyToBackground(b => b.FadeColour(OsuColour.Gray(0.4f), 400, Easing.OutQuint));
 
                 detachedPanel = expandedPanel;
             }
@@ -329,7 +329,7 @@ namespace osu.Game.Screens.Ranking
                 float origLocation = detachedPanel.Parent.ToLocalSpace(screenSpacePos).X;
                 detachedPanel.MoveToX(origLocation)
                              .Then()
-                             .MoveToX(0, 150, Easing.OutQuint);
+                             .MoveToX(0, 250, Easing.OutElasticQuarter);
 
                 // Show contracted panels.
                 foreach (var contracted in ScorePanelList.GetScorePanels().Where(p => p.State == PanelState.Contracted))
@@ -337,7 +337,7 @@ namespace osu.Game.Screens.Ranking
                 ScorePanelList.HandleInput = true;
 
                 // Un-dim background.
-                ApplyToBackground(b => b.FadeColour(OsuColour.Gray(0.5f), 150));
+                ApplyToBackground(b => b.FadeColour(OsuColour.Gray(0.5f), 250, Easing.OutQuint));
 
                 detachedPanel = null;
             }
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
index c36d7726dc..8b059efaf4 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
@@ -223,7 +223,7 @@ namespace osu.Game.Screens.Ranking.Statistics
 
         protected override void PopIn()
         {
-            this.FadeIn(150, Easing.OutQuint);
+            this.FadeIn(350, Easing.OutQuint);
 
             popInSample?.Play();
             wasOpened = true;
@@ -231,7 +231,7 @@ namespace osu.Game.Screens.Ranking.Statistics
 
         protected override void PopOut()
         {
-            this.FadeOut(150, Easing.OutQuint);
+            this.FadeOut(250, Easing.OutQuint);
 
             if (wasOpened)
                 popOutSample?.Play();

From 0e85a33ca2d6ab741566879c336246de01caaa71 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Jul 2023 20:58:04 +0900
Subject: [PATCH 1251/1604] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index fdec4e575b..270a0aa44b 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -11,7 +11,7 @@
     <AndroidManifestMerger>manifestmerger.jar</AndroidManifestMerger>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.625.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.707.0" />
   </ItemGroup>
   <ItemGroup>
     <AndroidManifestOverlay Include="$(MSBuildThisFileDirectory)osu.Android\Properties\AndroidManifestOverlay.xml" />
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 20b1574617..184a77a286 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,7 +36,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="11.1.2" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.625.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.707.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.707.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 86694e268a..51bcc36621 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -16,6 +16,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.625.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.707.0" />
   </ItemGroup>
 </Project>

From 2cd5a4c6c26f5c6f0278a5aec17a6e20bdd28b89 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Jul 2023 22:38:07 +0900
Subject: [PATCH 1252/1604] Add generated code hints in editorconfig /
 dotsettings

---
 .editorconfig       | 3 +++
 osu.sln.DotSettings | 1 +
 2 files changed, 4 insertions(+)

diff --git a/.editorconfig b/.editorconfig
index 67c47000d3..c249e5e9b3 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -9,6 +9,9 @@ indent_style = space
 indent_size = 2
 trim_trailing_whitespace = true
 
+[g_*.cs]
+generated_code = true
+
 [*.cs]
 end_of_line = crlf
 insert_final_newline = true
diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index b54794cd6d..482095db57 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -5,6 +5,7 @@
 	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Ewav/@EntryIndexedValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=2A66DD92_002DADB1_002D4994_002D89E2_002DC94E04ACDA0D_002Fd_003AMigrations/@EntryIndexedValue">ExplicitlyExcluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=D9A367C9_002D4C1A_002D489F_002D9B05_002DA0CEA2B53B58/@EntryIndexedValue">ExplicitlyExcluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/GeneratedCode/GeneratedFileMasks/=g_005F_002A_002Ecs/@EntryIndexedValue">g_*.cs</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/AnalysisEnabled/@EntryValue">SOLUTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeAccessorOwnerBody/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeDefaultValueWhenTypeEvident/@EntryIndexedValue">WARNING</s:String>

From a76cd9b0e6d579e4aa67e796f1d1cb7457f857f2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 8 Jul 2023 00:44:26 +0900
Subject: [PATCH 1253/1604] Update
 osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs

Co-authored-by: Jamie Taylor <me@nekodex.net>
---
 osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs b/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
index 08bde9a316..93d2406c0c 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
@@ -142,7 +142,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
             leftRimTrigger.StopAllPlayback();
             rightRimTrigger.StopAllPlayback();
-            strongCentreTrigger.StopAllPlayback();
+            strongRimTrigger.StopAllPlayback();
         }
 
         public void OnReleased(KeyBindingReleaseEvent<TaikoAction> e)

From 9dae80673474d40902c76f2149afa378d01e7699 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 8 Jul 2023 13:31:21 +0200
Subject: [PATCH 1254/1604] Use `IsRewinding` in a few more places

---
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs                     | 3 ++-
 osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index 1b99270b65..567c288b47 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -10,6 +10,7 @@ using osu.Game.Rulesets.Catch.Objects.Drawables;
 using osu.Game.Rulesets.Catch.Replays;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.UI;
+using osu.Game.Screens.Play;
 using osuTK;
 
 namespace osu.Game.Rulesets.Catch.UI
@@ -96,7 +97,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
             comboDisplay.X = Catcher.X;
 
-            if (Time.Elapsed <= 0)
+            if ((Clock as IGameplayClock)?.IsRewinding == true)
             {
                 // This is probably a wrong value, but currently the true value is not recorded.
                 // Setting `true` will prevent generation of false-positive after-images (with more false-negatives).
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index d5e212d389..c3fec92b92 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -338,7 +338,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                 return;
 
             // do not run any of this logic when rewinding, as it inverts order of presses/releases.
-            if (Time.Elapsed < 0)
+            if ((Clock as IGameplayClock)?.IsRewinding == true)
                 return;
 
             Tail.UpdateResult();

From 3a9b259f8a34100ab4ef796cfa3f99aef925129e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 8 Jul 2023 14:10:05 +0200
Subject: [PATCH 1255/1604] Add back removed `.ToUpper()` case transform

---
 osu.Game/Overlays/Notifications/NotificationSection.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Notifications/NotificationSection.cs b/osu.Game/Overlays/Notifications/NotificationSection.cs
index 80bc02a594..be57d23446 100644
--- a/osu.Game/Overlays/Notifications/NotificationSection.cs
+++ b/osu.Game/Overlays/Notifications/NotificationSection.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Overlays.Notifications
                     {
                         new ClearAllButton
                         {
-                            Text = NotificationsStrings.ClearAll,
+                            Text = NotificationsStrings.ClearAll.ToUpper(),
                             Anchor = Anchor.TopRight,
                             Origin = Anchor.TopRight,
                             Action = clearAll

From cdaf8e4b0ff53937209603f30d8b46b290dac83a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 8 Jul 2023 14:11:58 +0200
Subject: [PATCH 1256/1604] Flip and rename `CompletedOrCancelled` to `Ongoing`

---
 osu.Game/Overlays/INotificationOverlay.cs               | 4 ++--
 osu.Game/Overlays/Notifications/NotificationSection.cs  | 2 +-
 osu.Game/Overlays/Notifications/ProgressNotification.cs | 5 ++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/INotificationOverlay.cs b/osu.Game/Overlays/INotificationOverlay.cs
index 7a44fd63ea..19c646a714 100644
--- a/osu.Game/Overlays/INotificationOverlay.cs
+++ b/osu.Game/Overlays/INotificationOverlay.cs
@@ -42,8 +42,8 @@ namespace osu.Game.Overlays
         IEnumerable<Notification> AllNotifications { get; }
 
         /// <summary>
-        /// All ongoing operations (ie. any <see cref="ProgressNotification"/> not in a completed state).
+        /// All ongoing operations (ie. any <see cref="ProgressNotification"/> not in a completed or cancelled state).
         /// </summary>
-        public IEnumerable<ProgressNotification> OngoingOperations => AllNotifications.OfType<ProgressNotification>().Where(p => !p.CompletedOrCancelled);
+        public IEnumerable<ProgressNotification> OngoingOperations => AllNotifications.OfType<ProgressNotification>().Where(p => p.Ongoing);
     }
 }
diff --git a/osu.Game/Overlays/Notifications/NotificationSection.cs b/osu.Game/Overlays/Notifications/NotificationSection.cs
index be57d23446..10c2900d63 100644
--- a/osu.Game/Overlays/Notifications/NotificationSection.cs
+++ b/osu.Game/Overlays/Notifications/NotificationSection.cs
@@ -115,7 +115,7 @@ namespace osu.Game.Overlays.Notifications
 
         private void clearAll() => notifications.Children.ForEach(c =>
         {
-            if (c is not ProgressNotification p || p.CompletedOrCancelled)
+            if (c is not ProgressNotification p || !p.Ongoing)
                 c.Close(true);
         });
 
diff --git a/osu.Game/Overlays/Notifications/ProgressNotification.cs b/osu.Game/Overlays/Notifications/ProgressNotification.cs
index 5df4c61fd7..466dfab5c5 100644
--- a/osu.Game/Overlays/Notifications/ProgressNotification.cs
+++ b/osu.Game/Overlays/Notifications/ProgressNotification.cs
@@ -25,7 +25,10 @@ namespace osu.Game.Overlays.Notifications
 
         public Func<bool>? CancelRequested { get; set; }
 
-        public bool CompletedOrCancelled => State == ProgressNotificationState.Completed || State == ProgressNotificationState.Cancelled;
+        /// <summary>
+        /// Whether the operation represented by the <see cref="ProgressNotification"/> is still ongoing.
+        /// </summary>
+        public bool Ongoing => State != ProgressNotificationState.Completed && State != ProgressNotificationState.Cancelled;
 
         protected override bool AllowFlingDismiss => false;
 

From 0ecfb7b36fbf6389f433ff2234a92936b24d3eb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 8 Jul 2023 15:03:33 +0200
Subject: [PATCH 1257/1604] Remove unused field

---
 osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs b/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
index d9c8170a33..37260b3b13 100644
--- a/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
@@ -26,8 +26,6 @@ namespace osu.Game.Tests.Visual
 
         protected readonly ManualInputManager InputManager;
 
-        private readonly RoundedButton buttonLocal;
-
         private readonly Container takeControlOverlay;
 
         /// <summary>
@@ -109,7 +107,7 @@ namespace osu.Game.Tests.Visual
 
                                     Children = new Drawable[]
                                     {
-                                        buttonLocal = new RoundedButton
+                                        new RoundedButton
                                         {
                                             Text = "Take control back",
                                             Size = new Vector2(180, 30),

From fee56ac6d2ece7d897a6419d0bfbc9ee65e95c19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 8 Jul 2023 18:29:49 +0200
Subject: [PATCH 1258/1604] Use new `IGameplayClock.IsRewinding` member

---
 osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs b/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
index 93d2406c0c..57067ac666 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs
@@ -9,6 +9,7 @@ using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.Taiko.Objects.Drawables;
 using osu.Game.Rulesets.UI;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Rulesets.Taiko.UI
 {
@@ -44,7 +45,7 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         public bool OnPressed(KeyBindingPressEvent<TaikoAction> e)
         {
-            if (Time.Elapsed < 0)
+            if ((Clock as IGameplayClock)?.IsRewinding == true)
                 return false;
 
             HitType hitType;

From ba0cd7a3f27206e5b815b709da91bf46969e3c90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 8 Jul 2023 19:22:32 +0200
Subject: [PATCH 1259/1604] Fix flourish sample not playing if strong hits are
 hit early

---
 .../Skinning/Argon/ArgonFlourishTriggerSource.cs             | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonFlourishTriggerSource.cs b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonFlourishTriggerSource.cs
index 728977547c..8dfe31b55d 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonFlourishTriggerSource.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonFlourishTriggerSource.cs
@@ -66,7 +66,10 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
                 if (canFlourish)
                     lastFlourish = h.StartTime;
 
-                if (h == hitObject)
+                // hitObject can be either the strong hit itself (if hit late), or its nested strong object (if hit early)
+                // due to `GetMostValidObject()` idiosyncrasies.
+                // whichever it is, if we encounter it during iteration, stop looking.
+                if (h == hitObject || h.NestedHitObjects.Contains(hitObject))
                     return canFlourish;
             }
 

From e9ecad983932086155adb7bb2527ab0f5bf37f3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 8 Jul 2023 23:02:41 +0200
Subject: [PATCH 1260/1604] Add failing test cases covering NaN-timing-point
 sliders

---
 .../OsuBeatmapConversionTest.cs                |  1 +
 .../OsuDifficultyCalculatorTest.cs             |  1 +
 .../nan-slider-expected-conversion.json        |  1 +
 .../Resources/Testing/Beatmaps/nan-slider.osu  | 18 ++++++++++++++++++
 4 files changed, 21 insertions(+)
 create mode 100755 osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/nan-slider-expected-conversion.json
 create mode 100755 osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/nan-slider.osu

diff --git a/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
index 4c11efcc7c..b94e9f38c6 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
@@ -23,6 +23,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         [TestCase("uneven-repeat-slider")]
         [TestCase("old-stacking")]
         [TestCase("multi-segment-slider")]
+        [TestCase("nan-slider")]
         public void Test(string name) => base.Test(name);
 
         protected override IEnumerable<ConvertValue> CreateConvertValue(HitObject hitObject)
diff --git a/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
index cda330afe5..9c6449cfa9 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
@@ -17,6 +17,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         [TestCase(6.7115569159190587d, 206, "diffcalc-test")]
         [TestCase(1.4391311903612753d, 45, "zero-length-sliders")]
+        [TestCase(0.14102693012101306d, 1, "nan-slider")]
         public void Test(double expectedStarRating, int expectedMaxCombo, string name)
             => base.Test(expectedStarRating, expectedMaxCombo, name);
 
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/nan-slider-expected-conversion.json b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/nan-slider-expected-conversion.json
new file mode 100755
index 0000000000..86a4a278f1
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/nan-slider-expected-conversion.json
@@ -0,0 +1 @@
+{"Mappings":[{"StartTime":77497.0,"Objects":[{"StartTime":77497.0,"EndTime":77497.0,"X":298.0,"Y":290.0},{"StartTime":77533.0,"EndTime":77533.0,"X":276.162567,"Y":293.0336}]}]}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/nan-slider.osu b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/nan-slider.osu
new file mode 100755
index 0000000000..fa545a7614
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/nan-slider.osu
@@ -0,0 +1,18 @@
+osu file format v14
+
+[Difficulty]
+HPDrainRate:5.8
+CircleSize:4
+OverallDifficulty:9.6
+ApproachRate:10
+SliderMultiplier:2
+SliderTickRate:1
+
+[TimingPoints]
+77211,-100,4,3,50,70,0,0
+77497,8.40402703648439,4,3,51,70,1,8
+77497,NaN,4,3,51,70,0,8
+77498,285.714285714286,4,3,51,70,1,0
+
+[HitObjects]
+298,290,77497,6,0,B|234:298|192:279|192:279|180:299|180:299|205:311|238:318|238:318|230:347|217:371|217:371|137:370|80:340|80:340|65:259|73:143|102:68|102:68|149:49|199:34|199:34|213:54|213:54|267:38|324:40|324:40|332:18|332:18|385:20|435:27|435:27|480:93|517:204|521:286|521:286|474:329|396:350|396:350|377:329|363:302|363:302|393:287|415:271|415:271|398:254|398:254|362:282|299:290,1,1723.66345596313,10|0,1:0|3:0,3:0:0:0:

From 56a2ba4ac0291ade389d9dbfe5dbb801e70d04d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 8 Jul 2023 23:08:36 +0200
Subject: [PATCH 1261/1604] Fix `GenerateTicks` being lost during osu! beatmap
 conversion process

---
 osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSlider.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSlider.cs b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSlider.cs
index e947690668..790af6cfc1 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSlider.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSlider.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
     /// <summary>
     /// Legacy osu! Slider-type, used for parsing Beatmaps.
     /// </summary>
-    internal sealed class ConvertSlider : Legacy.ConvertSlider, IHasPosition, IHasCombo
+    internal sealed class ConvertSlider : Legacy.ConvertSlider, IHasPosition, IHasCombo, IHasGenerateTicks
     {
         public Vector2 Position { get; set; }
 
@@ -20,5 +20,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
         public bool NewCombo { get; set; }
 
         public int ComboOffset { get; set; }
+
+        public bool GenerateTicks { get; set; } = true;
     }
 }

From ae05df3b8c5d0f44bb1de43c3dbb8087d90adc35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 9 Jul 2023 15:56:51 +0200
Subject: [PATCH 1262/1604] Add `ModScoreV2`

---
 osu.Game/Rulesets/Mods/ModScoreV2.cs | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 osu.Game/Rulesets/Mods/ModScoreV2.cs

diff --git a/osu.Game/Rulesets/Mods/ModScoreV2.cs b/osu.Game/Rulesets/Mods/ModScoreV2.cs
new file mode 100644
index 0000000000..6d56b2d86f
--- /dev/null
+++ b/osu.Game/Rulesets/Mods/ModScoreV2.cs
@@ -0,0 +1,20 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Localisation;
+
+namespace osu.Game.Rulesets.Mods
+{
+    /// <remarks>
+    /// This mod is used strictly to mark osu!stable scores set with the "Score V2" mod active.
+    /// It should not be used in any real capacity going forward.
+    /// </remarks>
+    public class ModScoreV2 : Mod
+    {
+        public override string Name => "Score V2";
+        public override string Acronym => @"SV2";
+        public override ModType Type => ModType.System;
+        public override LocalisableString Description => "Score set on earlier osu! versions with the V2 scoring algorithm active.";
+        public override double ScoreMultiplier => 1;
+    }
+}

From 10ba04512d5963eb1ae6d028d83d65dd644d8ed6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 9 Jul 2023 16:06:05 +0200
Subject: [PATCH 1263/1604] Add `ScoreV2` to `LegacyMods`

---
 osu.Game/Beatmaps/Legacy/LegacyMods.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Beatmaps/Legacy/LegacyMods.cs b/osu.Game/Beatmaps/Legacy/LegacyMods.cs
index 0e517ea3df..747015d90a 100644
--- a/osu.Game/Beatmaps/Legacy/LegacyMods.cs
+++ b/osu.Game/Beatmaps/Legacy/LegacyMods.cs
@@ -38,6 +38,7 @@ namespace osu.Game.Beatmaps.Legacy
         Key1 = 1 << 26,
         Key3 = 1 << 27,
         Key2 = 1 << 28,
+        ScoreV2 = 1 << 29,
         Mirror = 1 << 30,
     }
 }

From 2cd5fd5944e48e9625353e3295ec017e1399ab73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 9 Jul 2023 16:09:25 +0200
Subject: [PATCH 1264/1604] Add failing legacy mod conversion test cases

---
 osu.Game.Rulesets.Catch.Tests/CatchLegacyModConversionTest.cs | 4 +++-
 osu.Game.Rulesets.Mania.Tests/ManiaLegacyModConversionTest.cs | 4 +++-
 osu.Game.Rulesets.Osu.Tests/OsuLegacyModConversionTest.cs     | 4 +++-
 osu.Game.Rulesets.Taiko.Tests/TaikoLegacyModConversionTest.cs | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/CatchLegacyModConversionTest.cs b/osu.Game.Rulesets.Catch.Tests/CatchLegacyModConversionTest.cs
index b74120fa3c..dacfd649ef 100644
--- a/osu.Game.Rulesets.Catch.Tests/CatchLegacyModConversionTest.cs
+++ b/osu.Game.Rulesets.Catch.Tests/CatchLegacyModConversionTest.cs
@@ -5,6 +5,7 @@ using System;
 using NUnit.Framework;
 using osu.Game.Beatmaps.Legacy;
 using osu.Game.Rulesets.Catch.Mods;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Tests.Beatmaps;
 
 namespace osu.Game.Rulesets.Catch.Tests
@@ -24,7 +25,8 @@ namespace osu.Game.Rulesets.Catch.Tests
             new object[] { LegacyMods.HalfTime, new[] { typeof(CatchModHalfTime) } },
             new object[] { LegacyMods.Flashlight, new[] { typeof(CatchModFlashlight) } },
             new object[] { LegacyMods.Autoplay, new[] { typeof(CatchModAutoplay) } },
-            new object[] { LegacyMods.HardRock | LegacyMods.DoubleTime, new[] { typeof(CatchModHardRock), typeof(CatchModDoubleTime) } }
+            new object[] { LegacyMods.HardRock | LegacyMods.DoubleTime, new[] { typeof(CatchModHardRock), typeof(CatchModDoubleTime) } },
+            new object[] { LegacyMods.ScoreV2, new[] { typeof(ModScoreV2) } },
         };
 
         [TestCaseSource(nameof(catch_mod_mapping))]
diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaLegacyModConversionTest.cs b/osu.Game.Rulesets.Mania.Tests/ManiaLegacyModConversionTest.cs
index 3a9639e04d..cb2abc1595 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaLegacyModConversionTest.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaLegacyModConversionTest.cs
@@ -5,6 +5,7 @@ using System;
 using NUnit.Framework;
 using osu.Game.Beatmaps.Legacy;
 using osu.Game.Rulesets.Mania.Mods;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Tests.Beatmaps;
 
 namespace osu.Game.Rulesets.Mania.Tests
@@ -36,7 +37,8 @@ namespace osu.Game.Rulesets.Mania.Tests
             new object[] { LegacyMods.Key3, new[] { typeof(ManiaModKey3) } },
             new object[] { LegacyMods.Key2, new[] { typeof(ManiaModKey2) } },
             new object[] { LegacyMods.Mirror, new[] { typeof(ManiaModMirror) } },
-            new object[] { LegacyMods.HardRock | LegacyMods.DoubleTime, new[] { typeof(ManiaModHardRock), typeof(ManiaModDoubleTime) } }
+            new object[] { LegacyMods.HardRock | LegacyMods.DoubleTime, new[] { typeof(ManiaModHardRock), typeof(ManiaModDoubleTime) } },
+            new object[] { LegacyMods.ScoreV2, new[] { typeof(ModScoreV2) } },
         };
 
         [TestCaseSource(nameof(mania_mod_mapping))]
diff --git a/osu.Game.Rulesets.Osu.Tests/OsuLegacyModConversionTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuLegacyModConversionTest.cs
index 05366e9444..2cf9842c83 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuLegacyModConversionTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuLegacyModConversionTest.cs
@@ -4,6 +4,7 @@
 using System;
 using NUnit.Framework;
 using osu.Game.Beatmaps.Legacy;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Tests.Beatmaps;
 
@@ -28,7 +29,8 @@ namespace osu.Game.Rulesets.Osu.Tests
             new object[] { LegacyMods.SpunOut, new[] { typeof(OsuModSpunOut) } },
             new object[] { LegacyMods.Autopilot, new[] { typeof(OsuModAutopilot) } },
             new object[] { LegacyMods.Target, new[] { typeof(OsuModTargetPractice) } },
-            new object[] { LegacyMods.HardRock | LegacyMods.DoubleTime, new[] { typeof(OsuModHardRock), typeof(OsuModDoubleTime) } }
+            new object[] { LegacyMods.HardRock | LegacyMods.DoubleTime, new[] { typeof(OsuModHardRock), typeof(OsuModDoubleTime) } },
+            new object[] { LegacyMods.ScoreV2, new[] { typeof(ModScoreV2) } },
         };
 
         [TestCaseSource(nameof(osu_mod_mapping))]
diff --git a/osu.Game.Rulesets.Taiko.Tests/TaikoLegacyModConversionTest.cs b/osu.Game.Rulesets.Taiko.Tests/TaikoLegacyModConversionTest.cs
index 541987d63e..5f7a78ddf1 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TaikoLegacyModConversionTest.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TaikoLegacyModConversionTest.cs
@@ -4,6 +4,7 @@
 using System;
 using NUnit.Framework;
 using osu.Game.Beatmaps.Legacy;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Taiko.Mods;
 using osu.Game.Tests.Beatmaps;
 
@@ -25,7 +26,8 @@ namespace osu.Game.Rulesets.Taiko.Tests
             new object[] { LegacyMods.Flashlight, new[] { typeof(TaikoModFlashlight) } },
             new object[] { LegacyMods.Autoplay, new[] { typeof(TaikoModAutoplay) } },
             new object[] { LegacyMods.Random, new[] { typeof(TaikoModRandom) } },
-            new object[] { LegacyMods.HardRock | LegacyMods.DoubleTime, new[] { typeof(TaikoModHardRock), typeof(TaikoModDoubleTime) } }
+            new object[] { LegacyMods.HardRock | LegacyMods.DoubleTime, new[] { typeof(TaikoModHardRock), typeof(TaikoModDoubleTime) } },
+            new object[] { LegacyMods.ScoreV2, new[] { typeof(ModScoreV2) } },
         };
 
         [TestCaseSource(nameof(taiko_mod_mapping))]

From 7be5e0e97832bfc8fdb4c5989839a820861d8a3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 9 Jul 2023 16:15:17 +0200
Subject: [PATCH 1265/1604] Implement back-and-forth conversion of `ModScoreV2`
 and `LegacyMods`

---
 osu.Game.Rulesets.Catch/CatchRuleset.cs | 9 +++++++++
 osu.Game.Rulesets.Mania/ManiaRuleset.cs | 9 +++++++++
 osu.Game.Rulesets.Osu/OsuRuleset.cs     | 4 ++++
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs | 9 +++++++++
 osu.Game/Rulesets/Ruleset.cs            | 4 ++++
 5 files changed, 35 insertions(+)

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index 8f1a1b8ef5..e51e5cc5db 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -91,6 +91,9 @@ namespace osu.Game.Rulesets.Catch
 
             if (mods.HasFlagFast(LegacyMods.Relax))
                 yield return new CatchModRelax();
+
+            if (mods.HasFlagFast(LegacyMods.ScoreV2))
+                yield return new ModScoreV2();
         }
 
         public override IEnumerable<Mod> GetModsFor(ModType type)
@@ -140,6 +143,12 @@ namespace osu.Game.Rulesets.Catch
                         new CatchModNoScope(),
                     };
 
+                case ModType.System:
+                    return new Mod[]
+                    {
+                        new ModScoreV2(),
+                    };
+
                 default:
                     return Array.Empty<Mod>();
             }
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 2e96c89516..bd6ab4086b 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -157,6 +157,9 @@ namespace osu.Game.Rulesets.Mania
 
             if (mods.HasFlagFast(LegacyMods.Mirror))
                 yield return new ManiaModMirror();
+
+            if (mods.HasFlagFast(LegacyMods.ScoreV2))
+                yield return new ModScoreV2();
         }
 
         public override LegacyMods ConvertToLegacyMods(Mod[] mods)
@@ -285,6 +288,12 @@ namespace osu.Game.Rulesets.Mania
                         new ModAdaptiveSpeed()
                     };
 
+                case ModType.System:
+                    return new Mod[]
+                    {
+                        new ModScoreV2(),
+                    };
+
                 default:
                     return Array.Empty<Mod>();
             }
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index b44d999d4f..036d13c5aa 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -113,6 +113,9 @@ namespace osu.Game.Rulesets.Osu
 
             if (mods.HasFlagFast(LegacyMods.TouchDevice))
                 yield return new OsuModTouchDevice();
+
+            if (mods.HasFlagFast(LegacyMods.ScoreV2))
+                yield return new ModScoreV2();
         }
 
         public override LegacyMods ConvertToLegacyMods(Mod[] mods)
@@ -212,6 +215,7 @@ namespace osu.Game.Rulesets.Osu
                     return new Mod[]
                     {
                         new OsuModTouchDevice(),
+                        new ModScoreV2(),
                     };
 
                 default:
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index aa31b1924f..de3fa1750f 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -116,6 +116,9 @@ namespace osu.Game.Rulesets.Taiko
 
             if (mods.HasFlagFast(LegacyMods.Random))
                 yield return new TaikoModRandom();
+
+            if (mods.HasFlagFast(LegacyMods.ScoreV2))
+                yield return new ModScoreV2();
         }
 
         public override LegacyMods ConvertToLegacyMods(Mod[] mods)
@@ -176,6 +179,12 @@ namespace osu.Game.Rulesets.Taiko
                         new ModAdaptiveSpeed()
                     };
 
+                case ModType.System:
+                    return new Mod[]
+                    {
+                        new ModScoreV2(),
+                    };
+
                 default:
                     return Array.Empty<Mod>();
             }
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index 490ec1475c..cd432e050b 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -192,6 +192,10 @@ namespace osu.Game.Rulesets
                     case ModAutoplay:
                         value |= LegacyMods.Autoplay;
                         break;
+
+                    case ModScoreV2:
+                        value |= LegacyMods.ScoreV2;
+                        break;
                 }
             }
 

From 9377622cd4010d7141eecaeebd87663fe50f358b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 9 Jul 2023 16:36:51 +0200
Subject: [PATCH 1266/1604] Add backwards migration to populate ScoreV2 mod for
 already-imported scores

---
 osu.Game/Database/RealmAccess.cs | 67 +++++++++++++++++++++++++++++++-
 1 file changed, 65 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index f9f11c49ff..1af0cf30ba 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -15,17 +15,20 @@ using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Development;
 using osu.Framework.Extensions;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Framework.Statistics;
 using osu.Framework.Threading;
 using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Legacy;
 using osu.Game.Configuration;
 using osu.Game.Extensions;
 using osu.Game.Input.Bindings;
 using osu.Game.IO.Legacy;
 using osu.Game.Models;
+using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
@@ -79,8 +82,9 @@ namespace osu.Game.Database
         /// 29   2023-06-12    Run migration of old lazer scores to be best-effort in the new scoring number space. No actual realm changes.
         /// 30   2023-06-16    Run migration of old lazer scores again. This time with more correct rounding considerations.
         /// 31   2023-06-26    Add Version and LegacyTotalScore to ScoreInfo, set Version to 30000002 and copy TotalScore into LegacyTotalScore for legacy scores.
+        /// 32   2023-07-09    Populate legacy scores with the ScoreV2 mod (and restore TotalScore to the legacy total for such scores) using replay files.
         /// </summary>
-        private const int schema_version = 31;
+        private const int schema_version = 32;
 
         /// <summary>
         /// Lock object which is held during <see cref="BlockAllOperations"/> sections, blocking realm retrieval during blocking periods.
@@ -730,6 +734,8 @@ namespace osu.Game.Database
             Logger.Log($"Running realm migration to version {targetVersion}...");
             Stopwatch stopwatch = new Stopwatch();
 
+            var files = new RealmFileStore(this, storage);
+
             stopwatch.Start();
 
             switch (targetVersion)
@@ -904,7 +910,6 @@ namespace osu.Game.Database
 
                 case 28:
                 {
-                    var files = new RealmFileStore(this, storage);
                     var scores = migration.NewRealm.All<ScoreInfo>();
 
                     foreach (var score in scores)
@@ -986,6 +991,64 @@ namespace osu.Game.Database
 
                     break;
                 }
+
+                case 32:
+                {
+                    foreach (var score in migration.NewRealm.All<ScoreInfo>())
+                    {
+                        if (!score.IsLegacyScore || !score.Ruleset.IsLegacyRuleset())
+                            continue;
+
+                        string? replayFilename = score.Files.FirstOrDefault(f => f.Filename.EndsWith(@".osr", StringComparison.InvariantCultureIgnoreCase))?.File.GetStoragePath();
+                        if (replayFilename == null)
+                            continue;
+
+                        try
+                        {
+                            using (var stream = files.Store.GetStream(replayFilename))
+                            {
+                                if (stream == null)
+                                    continue;
+
+                                // Trimmed down logic from LegacyScoreDecoder to extract the mods bitmask.
+                                using (SerializationReader sr = new SerializationReader(stream))
+                                {
+                                    sr.ReadByte(); // Ruleset.
+                                    sr.ReadInt32(); // Version.
+                                    sr.ReadString(); // Beatmap hash.
+                                    sr.ReadString(); // Username.
+                                    sr.ReadString(); // MD5Hash.
+                                    sr.ReadUInt16(); // Count300.
+                                    sr.ReadUInt16(); // Count100.
+                                    sr.ReadUInt16(); // Count50.
+                                    sr.ReadUInt16(); // CountGeki.
+                                    sr.ReadUInt16(); // CountKatu.
+                                    sr.ReadUInt16(); // CountMiss.
+
+                                    // we should have this in LegacyTotalScore already, but if we're reading through this anyways...
+                                    int totalScore = sr.ReadInt32();
+
+                                    sr.ReadUInt16(); // Max combo.
+                                    sr.ReadBoolean(); // Perfect.
+
+                                    var legacyMods = (LegacyMods)sr.ReadInt32();
+
+                                    if (!legacyMods.HasFlagFast(LegacyMods.ScoreV2) || score.APIMods.Any(mod => mod.Acronym == @"SV2"))
+                                        continue;
+
+                                    score.APIMods = score.APIMods.Append(new APIMod(new ModScoreV2())).ToArray();
+                                    score.LegacyTotalScore = score.TotalScore = totalScore;
+                                }
+                            }
+                        }
+                        catch (Exception e)
+                        {
+                            Logger.Error(e, $"Failed to read replay {replayFilename} during score migration", LoggingTarget.Database);
+                        }
+                    }
+
+                    break;
+                }
             }
 
             Logger.Log($"Migration completed in {stopwatch.ElapsedMilliseconds}ms");

From e12255bbe5e41a6cba7acb28282f74c008769575 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 9 Jul 2023 17:01:28 +0200
Subject: [PATCH 1267/1604] Do not run legacy conversion with ScoreV2 mod
 present

---
 osu.Game/Database/StandardisedScoreMigrationTools.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index 60530c31cb..bc3629c25b 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -9,6 +9,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
@@ -205,6 +206,10 @@ namespace osu.Game.Database
             if (ruleset is not ILegacyRuleset legacyRuleset)
                 return score.TotalScore;
 
+            var mods = score.Mods;
+            if (mods.Any(mod => mod is ModScoreV2))
+                return score.TotalScore;
+
             var playableBeatmap = beatmap.GetPlayableBeatmap(ruleset.RulesetInfo, score.Mods);
 
             if (playableBeatmap.HitObjects.Count == 0)
@@ -212,7 +217,7 @@ namespace osu.Game.Database
 
             ILegacyScoreSimulator sv1Simulator = legacyRuleset.CreateLegacyScoreSimulator();
 
-            sv1Simulator.Simulate(beatmap, playableBeatmap, score.Mods);
+            sv1Simulator.Simulate(beatmap, playableBeatmap, mods);
 
             return ConvertFromLegacyTotalScore(score, new DifficultyAttributes
             {

From 45194b2b4a4ebb26ce3f1fc2e948f4d21495f828 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 9 Jul 2023 18:21:43 +0200
Subject: [PATCH 1268/1604] Fix pressing Ctrl-C in composer not copying
 timestamp to system clipboard

---
 .../Screens/Edit/Compose/ComposeScreen.cs     | 25 +++++++++-------
 osu.Game/Screens/Edit/EditorScreen.cs         | 29 +++++++------------
 2 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
index dc026f7eac..433fb5c8ee 100644
--- a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
+++ b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
@@ -101,26 +101,31 @@ namespace osu.Game.Screens.Edit.Compose
 
         #region Clipboard operations
 
-        protected override void PerformCut()
+        public override void Cut()
         {
-            base.PerformCut();
+            if (!CanCut.Value)
+                return;
 
             Copy();
             EditorBeatmap.RemoveRange(EditorBeatmap.SelectedHitObjects.ToArray());
         }
 
-        protected override void PerformCopy()
+        public override void Copy()
         {
-            base.PerformCopy();
+            // on stable, pressing Ctrl-C would copy the current timestamp to system clipboard
+            // regardless of whether anything was even selected at all.
+            // UX-wise this is generally strange and unexpected, but make it work anyways to preserve muscle memory.
+            // note that this means that `getTimestamp()` must handle no-selection case, too.
+            host.GetClipboard()?.SetText(getTimestamp());
 
-            clipboard.Value = new ClipboardContent(EditorBeatmap).Serialize();
-
-            host.GetClipboard()?.SetText(formatSelectionAsString());
+            if (CanCopy.Value)
+                clipboard.Value = new ClipboardContent(EditorBeatmap).Serialize();
         }
 
-        protected override void PerformPaste()
+        public override void Paste()
         {
-            base.PerformPaste();
+            if (!CanPaste.Value)
+                return;
 
             var objects = clipboard.Value.Deserialize<ClipboardContent>().HitObjects;
 
@@ -147,7 +152,7 @@ namespace osu.Game.Screens.Edit.Compose
             CanPaste.Value = composer.IsLoaded && !string.IsNullOrEmpty(clipboard.Value);
         }
 
-        private string formatSelectionAsString()
+        private string getTimestamp()
         {
             if (composer == null)
                 return string.Empty;
diff --git a/osu.Game/Screens/Edit/EditorScreen.cs b/osu.Game/Screens/Edit/EditorScreen.cs
index b39c0cf5f3..3bc870b898 100644
--- a/osu.Game/Screens/Edit/EditorScreen.cs
+++ b/osu.Game/Screens/Edit/EditorScreen.cs
@@ -44,29 +44,23 @@ namespace osu.Game.Screens.Edit
         /// <summary>
         /// Performs a "cut to clipboard" operation appropriate for the given screen.
         /// </summary>
-        protected virtual void PerformCut()
+        /// <remarks>
+        /// Implementors are responsible for checking <see cref="CanCut"/> themselves.
+        /// </remarks>
+        public virtual void Cut()
         {
         }
 
-        public void Cut()
-        {
-            if (CanCut.Value)
-                PerformCut();
-        }
-
         public BindableBool CanCopy { get; } = new BindableBool();
 
         /// <summary>
         /// Performs a "copy to clipboard" operation appropriate for the given screen.
         /// </summary>
-        protected virtual void PerformCopy()
-        {
-        }
-
+        /// <remarks>
+        /// Implementors are responsible for checking <see cref="CanCopy"/> themselves.
+        /// </remarks>
         public virtual void Copy()
         {
-            if (CanCopy.Value)
-                PerformCopy();
         }
 
         public BindableBool CanPaste { get; } = new BindableBool();
@@ -74,14 +68,11 @@ namespace osu.Game.Screens.Edit
         /// <summary>
         /// Performs a "paste from clipboard" operation appropriate for the given screen.
         /// </summary>
-        protected virtual void PerformPaste()
-        {
-        }
-
+        /// <remarks>
+        /// Implementors are responsible for checking <see cref="CanPaste"/> themselves.
+        /// </remarks>
         public virtual void Paste()
         {
-            if (CanPaste.Value)
-                PerformPaste();
         }
 
         #endregion

From d135b3f6f57a6d3e67ec45b3a250bbf58451ae4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 9 Jul 2023 21:27:33 +0200
Subject: [PATCH 1269/1604] Add message length limit field to API response

---
 osu.Game/Online/Chat/Channel.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Online/Chat/Channel.cs b/osu.Game/Online/Chat/Channel.cs
index 761e8aba8d..3f43560f41 100644
--- a/osu.Game/Online/Chat/Channel.cs
+++ b/osu.Game/Online/Chat/Channel.cs
@@ -86,6 +86,9 @@ namespace osu.Game.Online.Chat
         [JsonProperty(@"last_read_id")]
         public long? LastReadId;
 
+        [JsonProperty(@"message_length_limit")]
+        public int MessageLengthLimit;
+
         /// <summary>
         /// Signals if the current user joined this channel or not. Defaults to false.
         /// Note that this does not guarantee a join has completed. Check Id > 0 for confirmation.

From 2af8c7bc24e3435dba1c7feb08bd1ee923bc9d36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 9 Jul 2023 21:35:24 +0200
Subject: [PATCH 1270/1604] Add failing test case for chat message length limit
 enforcement

---
 .../Visual/Online/TestSceneChatTextBox.cs     | 36 ++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatTextBox.cs b/osu.Game.Tests/Visual/Online/TestSceneChatTextBox.cs
index 1e80acd56b..8c5475223c 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatTextBox.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatTextBox.cs
@@ -3,11 +3,13 @@
 
 #nullable disable
 
+using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.API.Requests.Responses;
@@ -18,7 +20,7 @@ using osu.Game.Overlays.Chat;
 namespace osu.Game.Tests.Visual.Online
 {
     [TestFixture]
-    public partial class TestSceneChatTextBox : OsuTestScene
+    public partial class TestSceneChatTextBox : OsuManualInputManagerTestScene
     {
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Pink);
@@ -30,6 +32,8 @@ namespace osu.Game.Tests.Visual.Online
         private OsuSpriteText searchText;
         private ChatTextBar bar;
 
+        private ChatTextBox textBox => bar.ChildrenOfType<ChatTextBox>().Single();
+
         [SetUp]
         public void SetUp()
         {
@@ -115,6 +119,36 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("Chat Mode Search", () => bar.ShowSearch.Value = true);
         }
 
+        [Test]
+        public void TestLengthLimit()
+        {
+            var firstChannel = new Channel
+            {
+                Name = "#test1",
+                Type = ChannelType.Public,
+                Id = 4567,
+                MessageLengthLimit = 20
+            };
+            var secondChannel = new Channel
+            {
+                Name = "#test2",
+                Type = ChannelType.Public,
+                Id = 5678,
+                MessageLengthLimit = 5
+            };
+
+            AddStep("switch to channel with 20 char length limit", () => currentChannel.Value = firstChannel);
+            AddStep("type a message", () => textBox.Current.Value = "abcdefgh");
+
+            AddStep("switch to channel with 5 char length limit", () => currentChannel.Value = secondChannel);
+            AddAssert("text box empty", () => textBox.Current.Value, () => Is.Empty);
+            AddStep("type too much", () => textBox.Current.Value = "123456");
+            AddAssert("text box has 5 chars", () => textBox.Current.Value, () => Has.Length.EqualTo(5));
+
+            AddStep("switch back to channel with 20 char length limit", () => currentChannel.Value = firstChannel);
+            AddAssert("unsent message preserved without truncation", () => textBox.Current.Value, () => Is.EqualTo("abcdefgh"));
+        }
+
         private static Channel createPublicChannel(string name)
             => new Channel { Name = name, Type = ChannelType.Public, Id = 1234 };
 

From 6453ab6049937e6e47d114ac5baa979771b369f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 9 Jul 2023 21:42:13 +0200
Subject: [PATCH 1271/1604] Set chat text box message length limit based on
 channel

---
 osu.Game/Overlays/Chat/ChatTextBar.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Overlays/Chat/ChatTextBar.cs b/osu.Game/Overlays/Chat/ChatTextBar.cs
index 87e787fcb8..16a8d14b10 100644
--- a/osu.Game/Overlays/Chat/ChatTextBar.cs
+++ b/osu.Game/Overlays/Chat/ChatTextBar.cs
@@ -156,7 +156,11 @@ namespace osu.Game.Overlays.Chat
                     chatTextBox.Current.UnbindFrom(change.OldValue.TextBoxMessage);
 
                 if (newChannel != null)
+                {
+                    // change length limit first before binding to avoid accidentally truncating pending message from new channel.
+                    chatTextBox.LengthLimit = newChannel.MessageLengthLimit;
                     chatTextBox.Current.BindTo(newChannel.TextBoxMessage);
+                }
             }, true);
         }
 

From 91e286560ef53428cc6159e4df6b1c641e503c5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 9 Jul 2023 21:49:50 +0200
Subject: [PATCH 1272/1604] Fix search being broken in channel listing
 "channel"

---
 osu.Game/Online/Chat/Channel.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/Chat/Channel.cs b/osu.Game/Online/Chat/Channel.cs
index 3f43560f41..15ce926039 100644
--- a/osu.Game/Online/Chat/Channel.cs
+++ b/osu.Game/Online/Chat/Channel.cs
@@ -12,6 +12,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Lists;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays.Chat;
+using osu.Game.Overlays.Chat.Listing;
 
 namespace osu.Game.Online.Chat
 {
@@ -86,8 +87,11 @@ namespace osu.Game.Online.Chat
         [JsonProperty(@"last_read_id")]
         public long? LastReadId;
 
+        /// <remarks>
+        /// Purposefully nullable for the sake of <see cref="ChannelListing.ChannelListingChannel"/>.
+        /// </remarks>
         [JsonProperty(@"message_length_limit")]
-        public int MessageLengthLimit;
+        public int? MessageLengthLimit;
 
         /// <summary>
         /// Signals if the current user joined this channel or not. Defaults to false.

From 89b110e3aa318a16bab399df07408576ac9d9aae Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 Jul 2023 21:26:20 +0900
Subject: [PATCH 1273/1604] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 270a0aa44b..759167829c 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -11,7 +11,7 @@
     <AndroidManifestMerger>manifestmerger.jar</AndroidManifestMerger>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.707.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.710.0" />
   </ItemGroup>
   <ItemGroup>
     <AndroidManifestOverlay Include="$(MSBuildThisFileDirectory)osu.Android\Properties\AndroidManifestOverlay.xml" />
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 184a77a286..7968364243 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,7 +36,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="11.1.2" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.707.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.710.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.707.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 51bcc36621..2e691da079 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -16,6 +16,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.707.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.710.0" />
   </ItemGroup>
 </Project>

From 9a2915f423fa03cbc3daf4a603c0db849f8693b7 Mon Sep 17 00:00:00 2001
From: NiceAesth <nice@aesth.dev>
Date: Mon, 10 Jul 2023 17:29:49 +0300
Subject: [PATCH 1274/1604] Add beatmap minimum length checks

---
 osu.Game/Rulesets/Edit/BeatmapVerifier.cs     |  1 +
 .../Rulesets/Edit/Checks/CheckDrainTime.cs    | 38 +++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 osu.Game/Rulesets/Edit/Checks/CheckDrainTime.cs

diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
index dc73e35923..3988f29e13 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
@@ -34,6 +34,7 @@ namespace osu.Game.Rulesets.Edit
             new CheckUnsnappedObjects(),
             new CheckConcurrentObjects(),
             new CheckZeroLengthObjects(),
+            new CheckDrainTime(),
 
             // Timing
             new CheckPreviewTime(),
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckDrainTime.cs b/osu.Game/Rulesets/Edit/Checks/CheckDrainTime.cs
new file mode 100644
index 0000000000..99a74e6479
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/Checks/CheckDrainTime.cs
@@ -0,0 +1,38 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Edit.Checks.Components;
+
+namespace osu.Game.Rulesets.Edit.Checks
+{
+    public class CheckDrainTime : ICheck
+    {
+        private const int min_drain_threshold = 30 * 1000;
+        public CheckMetadata Metadata => new CheckMetadata(CheckCategory.Compose, "Too short drain time");
+
+        public IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
+        {
+            new IssueTemplateTooShort(this)
+        };
+
+        public IEnumerable<Issue> Run(BeatmapVerifierContext context)
+        {
+            double drainTime = context.Beatmap.CalculatePlayableLength();
+
+            if (drainTime < min_drain_threshold)
+                yield return new IssueTemplateTooShort(this).Create((int)(drainTime / 1000));
+        }
+
+        public class IssueTemplateTooShort : IssueTemplate
+        {
+            public IssueTemplateTooShort(ICheck check)
+                : base(check, IssueType.Problem, "Less than 30 seconds of drain time, currently {0}.")
+            {
+            }
+
+            public Issue Create(int drainTimeSeconds) => new Issue(this, drainTimeSeconds);
+        }
+    }
+}

From c972a4195c93690d22427303c8840e411455c616 Mon Sep 17 00:00:00 2001
From: NiceAesth <nice@aesth.dev>
Date: Mon, 10 Jul 2023 17:29:59 +0300
Subject: [PATCH 1275/1604] Add tests

---
 .../Editing/Checks/CheckDrainTimeTest.cs      | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 osu.Game.Tests/Editing/Checks/CheckDrainTimeTest.cs

diff --git a/osu.Game.Tests/Editing/Checks/CheckDrainTimeTest.cs b/osu.Game.Tests/Editing/Checks/CheckDrainTimeTest.cs
new file mode 100644
index 0000000000..ffa3af8fc6
--- /dev/null
+++ b/osu.Game.Tests/Editing/Checks/CheckDrainTimeTest.cs
@@ -0,0 +1,50 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Linq;
+using NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Edit.Checks;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Tests.Beatmaps;
+
+namespace osu.Game.Tests.Editing.Checks
+{
+    public class CheckDrainTimeTest
+    {
+        private CheckDrainTime check = null!;
+
+        private IBeatmap beatmap = null!;
+
+        [SetUp]
+        public void Setup()
+        {
+            check = new CheckDrainTime();
+        }
+
+        [Test]
+        public void TestDrainTimeShort()
+        {
+            setShortDrainTimeBeatmap();
+            var content = new BeatmapVerifierContext(beatmap, new TestWorkingBeatmap(beatmap));
+
+            var issues = check.Run(content).ToList();
+
+            Assert.That(issues, Has.Count.EqualTo(1));
+            Assert.That(issues.Single().Template is CheckDrainTime.IssueTemplateTooShort);
+        }
+
+        private void setShortDrainTimeBeatmap()
+        {
+            beatmap = new Beatmap<HitObject>
+            {
+                HitObjects =
+                {
+                    new HitCircle()
+                }
+            };
+        }
+    }
+}

From 9e4ffc8c12cdce5bb34fee06fafdec76ac41337e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 10 Jul 2023 21:10:01 +0200
Subject: [PATCH 1276/1604] Split helper method for populations from replay

---
 osu.Game/Database/RealmAccess.cs              | 93 ++++++-------------
 .../StandardisedScoreMigrationTools.cs        | 35 +++++++
 2 files changed, 63 insertions(+), 65 deletions(-)

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index 1af0cf30ba..f32b161bb6 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -26,7 +26,6 @@ using osu.Game.Beatmaps.Legacy;
 using osu.Game.Configuration;
 using osu.Game.Extensions;
 using osu.Game.Input.Bindings;
-using osu.Game.IO.Legacy;
 using osu.Game.Models;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
@@ -914,31 +913,13 @@ namespace osu.Game.Database
 
                     foreach (var score in scores)
                     {
-                        string? replayFilename = score.Files.FirstOrDefault(f => f.Filename.EndsWith(@".osr", StringComparison.InvariantCultureIgnoreCase))?.File.GetStoragePath();
-                        if (replayFilename == null)
-                            continue;
-
-                        try
+                        score.PopulateFromReplay(files, sr =>
                         {
-                            using (var stream = files.Store.GetStream(replayFilename))
-                            {
-                                if (stream == null)
-                                    continue;
-
-                                // Trimmed down logic from LegacyScoreDecoder to extract the version from replays.
-                                using (SerializationReader sr = new SerializationReader(stream))
-                                {
-                                    sr.ReadByte(); // Ruleset.
-                                    int version = sr.ReadInt32();
-                                    if (version < LegacyScoreEncoder.FIRST_LAZER_VERSION)
-                                        score.IsLegacyScore = true;
-                                }
-                            }
-                        }
-                        catch (Exception e)
-                        {
-                            Logger.Error(e, $"Failed to read replay {replayFilename} during score migration", LoggingTarget.Database);
-                        }
+                            sr.ReadByte(); // Ruleset.
+                            int version = sr.ReadInt32();
+                            if (version < LegacyScoreEncoder.FIRST_LAZER_VERSION)
+                                score.IsLegacyScore = true;
+                        });
                     }
 
                     break;
@@ -999,52 +980,34 @@ namespace osu.Game.Database
                         if (!score.IsLegacyScore || !score.Ruleset.IsLegacyRuleset())
                             continue;
 
-                        string? replayFilename = score.Files.FirstOrDefault(f => f.Filename.EndsWith(@".osr", StringComparison.InvariantCultureIgnoreCase))?.File.GetStoragePath();
-                        if (replayFilename == null)
-                            continue;
-
-                        try
+                        score.PopulateFromReplay(files, sr =>
                         {
-                            using (var stream = files.Store.GetStream(replayFilename))
-                            {
-                                if (stream == null)
-                                    continue;
+                            sr.ReadByte(); // Ruleset.
+                            sr.ReadInt32(); // Version.
+                            sr.ReadString(); // Beatmap hash.
+                            sr.ReadString(); // Username.
+                            sr.ReadString(); // MD5Hash.
+                            sr.ReadUInt16(); // Count300.
+                            sr.ReadUInt16(); // Count100.
+                            sr.ReadUInt16(); // Count50.
+                            sr.ReadUInt16(); // CountGeki.
+                            sr.ReadUInt16(); // CountKatu.
+                            sr.ReadUInt16(); // CountMiss.
 
-                                // Trimmed down logic from LegacyScoreDecoder to extract the mods bitmask.
-                                using (SerializationReader sr = new SerializationReader(stream))
-                                {
-                                    sr.ReadByte(); // Ruleset.
-                                    sr.ReadInt32(); // Version.
-                                    sr.ReadString(); // Beatmap hash.
-                                    sr.ReadString(); // Username.
-                                    sr.ReadString(); // MD5Hash.
-                                    sr.ReadUInt16(); // Count300.
-                                    sr.ReadUInt16(); // Count100.
-                                    sr.ReadUInt16(); // Count50.
-                                    sr.ReadUInt16(); // CountGeki.
-                                    sr.ReadUInt16(); // CountKatu.
-                                    sr.ReadUInt16(); // CountMiss.
+                            // we should have this in LegacyTotalScore already, but if we're reading through this anyways...
+                            int totalScore = sr.ReadInt32();
 
-                                    // we should have this in LegacyTotalScore already, but if we're reading through this anyways...
-                                    int totalScore = sr.ReadInt32();
+                            sr.ReadUInt16(); // Max combo.
+                            sr.ReadBoolean(); // Perfect.
 
-                                    sr.ReadUInt16(); // Max combo.
-                                    sr.ReadBoolean(); // Perfect.
+                            var legacyMods = (LegacyMods)sr.ReadInt32();
 
-                                    var legacyMods = (LegacyMods)sr.ReadInt32();
+                            if (!legacyMods.HasFlagFast(LegacyMods.ScoreV2) || score.APIMods.Any(mod => mod.Acronym == @"SV2"))
+                                return;
 
-                                    if (!legacyMods.HasFlagFast(LegacyMods.ScoreV2) || score.APIMods.Any(mod => mod.Acronym == @"SV2"))
-                                        continue;
-
-                                    score.APIMods = score.APIMods.Append(new APIMod(new ModScoreV2())).ToArray();
-                                    score.LegacyTotalScore = score.TotalScore = totalScore;
-                                }
-                            }
-                        }
-                        catch (Exception e)
-                        {
-                            Logger.Error(e, $"Failed to read replay {replayFilename} during score migration", LoggingTarget.Database);
-                        }
+                            score.APIMods = score.APIMods.Append(new APIMod(new ModScoreV2())).ToArray();
+                            score.LegacyTotalScore = score.TotalScore = totalScore;
+                        });
                     }
 
                     break;
diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index bc3629c25b..b8afdad294 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -5,7 +5,10 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using osu.Framework.Logging;
 using osu.Game.Beatmaps;
+using osu.Game.Extensions;
+using osu.Game.IO.Legacy;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Judgements;
@@ -287,6 +290,38 @@ namespace osu.Game.Database
             }
         }
 
+        /// <summary>
+        /// Used to populate the <paramref name="score"/> model using data parsed from its corresponding replay file.
+        /// </summary>
+        /// <param name="score">The score to run population from replay for.</param>
+        /// <param name="files">A <see cref="RealmFileStore"/> instance to use for fetching replay.</param>
+        /// <param name="populationFunc">
+        /// Delegate describing the population to execute.
+        /// The delegate's argument is a <see cref="SerializationReader"/> instance which permits to read data from the replay stream.
+        /// </param>
+        public static void PopulateFromReplay(this ScoreInfo score, RealmFileStore files, Action<SerializationReader> populationFunc)
+        {
+            string? replayFilename = score.Files.FirstOrDefault(f => f.Filename.EndsWith(@".osr", StringComparison.InvariantCultureIgnoreCase))?.File.GetStoragePath();
+            if (replayFilename == null)
+                return;
+
+            try
+            {
+                using (var stream = files.Store.GetStream(replayFilename))
+                {
+                    if (stream == null)
+                        return;
+
+                    using (SerializationReader sr = new SerializationReader(stream))
+                        populationFunc.Invoke(sr);
+                }
+            }
+            catch (Exception e)
+            {
+                Logger.Error(e, $"Failed to read replay {replayFilename} during score migration", LoggingTarget.Database);
+            }
+        }
+
         private class FakeHit : HitObject
         {
             private readonly Judgement judgement;

From 06e5ef88c041c6298e3b2d1e8d64c5f28171d2ac Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Tue, 11 Jul 2023 02:30:16 +0200
Subject: [PATCH 1277/1604] legacy export broken

---
 osu.Game/Beatmaps/BeatmapManager.cs          | 53 ++++++++++++++++++++
 osu.Game/Beatmaps/BeatmapSetInfo.cs          | 13 +++++
 osu.Game/Database/ModelManager.cs            |  2 +
 osu.Game/Localisation/EditorStrings.cs       |  5 ++
 osu.Game/Rulesets/Objects/BezierConverter.cs |  7 +++
 osu.Game/Screens/Edit/Editor.cs              |  7 +++
 6 files changed, 87 insertions(+)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 305dc01844..7d8c47ea5a 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -18,12 +18,15 @@ using osu.Framework.Platform;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.Database;
 using osu.Game.Extensions;
+using osu.Game.IO;
 using osu.Game.IO.Archives;
 using osu.Game.Models;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Skinning;
 using osu.Game.Utils;
 
@@ -400,6 +403,56 @@ namespace osu.Game.Beatmaps
 
         public Task Export(BeatmapSetInfo beatmap) => beatmapExporter.ExportAsync(beatmap.ToLive(Realm));
 
+        /// <summary>
+        /// Creates a copy of the <see cref="BeatmapSetInfo"/> and converts all beatmaps to legacy format, then exports it as a legacy package.
+        /// </summary>
+        /// <param name="beatmap"></param>
+        /// <returns></returns>
+        public Task ExportLegacy(BeatmapSetInfo beatmap)
+        {
+            var copy = beatmap.Clone(); // does the detach from realm
+
+            // convert all beatmaps to legacy format
+            foreach (var beatmapInfo in copy.Beatmaps)
+            {
+                // Convert beatmap
+                var file = beatmapInfo.File;
+
+                if (file == null)
+                    continue;
+
+                using var oldStream = new LineBufferedReader(ReadFile(file));
+                var beatmapContent = new LegacyBeatmapDecoder().Decode(oldStream);
+
+                foreach (var controlPoint in beatmapContent.ControlPointInfo.AllControlPoints)
+                    controlPoint.Time = Math.Floor(controlPoint.Time);
+
+                foreach (var hitObject in beatmapContent.HitObjects)
+                {
+                    hitObject.StartTime = Math.Floor(hitObject.StartTime);
+
+                    if (hitObject is IHasPath hasPath && BezierConverter.CountSegments(hasPath.Path.ControlPoints) > 1)
+                    {
+                        var newControlPoints = BezierConverter.ConvertToModernBezier(hasPath.Path.ControlPoints);
+                        hasPath.Path.ControlPoints.Clear();
+                        hasPath.Path.ControlPoints.AddRange(newControlPoints);
+                    }
+                }
+
+                using var newStream = new MemoryStream();
+                using var sw = new StreamWriter(newStream, Encoding.UTF8, 1024, true);
+                new LegacyBeatmapEncoder(beatmapContent, null).Encode(sw);
+                newStream.Seek(0, SeekOrigin.Begin);
+
+                beatmapInfo.MD5Hash = newStream.ComputeMD5Hash();
+                beatmapInfo.Hash = newStream.ComputeSHA2Hash();
+
+                AddFile(copy, newStream, file.Filename);
+            }
+
+            return beatmapExporter.ExportAsync(new RealmLiveUnmanaged<BeatmapSetInfo>(copy));
+        }
+
         private void updateHashAndMarkDirty(BeatmapSetInfo setInfo)
         {
             setInfo.Hash = beatmapImporter.ComputeHash(setInfo);
diff --git a/osu.Game/Beatmaps/BeatmapSetInfo.cs b/osu.Game/Beatmaps/BeatmapSetInfo.cs
index 59e413d935..923c498df8 100644
--- a/osu.Game/Beatmaps/BeatmapSetInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapSetInfo.cs
@@ -90,6 +90,19 @@ namespace osu.Game.Beatmaps
             return ID == other.ID;
         }
 
+        public BeatmapSetInfo Clone()
+        {
+            var clone = (BeatmapSetInfo)this.Detach().MemberwiseClone();
+
+            for (int i = 0; i < clone.Beatmaps.Count; i++)
+                clone.Beatmaps[i] = clone.Beatmaps[i].Clone();
+
+            for (int i = 0; i < clone.Files.Count; i++)
+                clone.Files[i] = new RealmNamedFileUsage(clone.Files[i].File, clone.Files[i].Filename);
+
+            return clone;
+        }
+
         public override string ToString() => Metadata.GetDisplayString();
 
         public bool Equals(IBeatmapSetInfo? other) => other is BeatmapSetInfo b && Equals(b);
diff --git a/osu.Game/Database/ModelManager.cs b/osu.Game/Database/ModelManager.cs
index 7d1dc5239a..8dafe0874c 100644
--- a/osu.Game/Database/ModelManager.cs
+++ b/osu.Game/Database/ModelManager.cs
@@ -33,6 +33,8 @@ namespace osu.Game.Database
             Realm = realm;
         }
 
+        public Stream ReadFile(RealmNamedFileUsage file) => realmFileStore.Storage.GetStream(file.File.GetStoragePath());
+
         public void DeleteFile(TModel item, RealmNamedFileUsage file) =>
             performFileOperation(item, managed => DeleteFile(managed, managed.Files.First(f => f.Filename == file.Filename), managed.Realm));
 
diff --git a/osu.Game/Localisation/EditorStrings.cs b/osu.Game/Localisation/EditorStrings.cs
index 20258b9c35..f1f650cf66 100644
--- a/osu.Game/Localisation/EditorStrings.cs
+++ b/osu.Game/Localisation/EditorStrings.cs
@@ -39,6 +39,11 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString ExportPackage => new TranslatableString(getKey(@"export_package"), @"Export package");
 
+        /// <summary>
+        /// "Export legacy package"
+        /// </summary>
+        public static LocalisableString ExportLegacyPackage => new TranslatableString(getKey(@"export_legacy_package"), @"Export legacy package");
+
         /// <summary>
         /// "Create new difficulty"
         /// </summary>
diff --git a/osu.Game/Rulesets/Objects/BezierConverter.cs b/osu.Game/Rulesets/Objects/BezierConverter.cs
index ebee36a7db..0c878fa1fd 100644
--- a/osu.Game/Rulesets/Objects/BezierConverter.cs
+++ b/osu.Game/Rulesets/Objects/BezierConverter.cs
@@ -39,6 +39,13 @@ namespace osu.Game.Rulesets.Objects
                 new[] { new Vector2d(1, 0), new Vector2d(1, 1.2447058f), new Vector2d(-0.8526471f, 2.118367f), new Vector2d(-2.6211002f, 7.854936e-06f), new Vector2d(-0.8526448f, -2.118357f), new Vector2d(1, -1.2447058f), new Vector2d(1, 0) })
         };
 
+        /// <summary>
+        /// Counts the number of segments in a slider path.
+        /// </summary>
+        /// <param name="controlPoints">The control points of the path.</param>
+        /// <returns>The number of segments in a slider path.</returns>
+        public static int CountSegments(IList<PathControlPoint> controlPoints) => controlPoints.Where((t, i) => t.Type != null && i < controlPoints.Count - 1).Count();
+
         /// <summary>
         /// Converts a slider path to bezier control point positions compatible with the legacy osu! client.
         /// </summary>
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index b8fa7f6579..bc5df37570 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -966,6 +966,7 @@ namespace osu.Game.Screens.Edit
         {
             new EditorMenuItem(WebCommonStrings.ButtonsSave, MenuItemType.Standard, () => Save()),
             new EditorMenuItem(EditorStrings.ExportPackage, MenuItemType.Standard, exportBeatmap) { Action = { Disabled = !RuntimeInfo.IsDesktop } },
+            new EditorMenuItem(EditorStrings.ExportLegacyPackage, MenuItemType.Standard, exportLegacyBeatmap) { Action = { Disabled = !RuntimeInfo.IsDesktop } },
             new EditorMenuItemSpacer(),
             createDifficultyCreationMenu(),
             createDifficultySwitchMenu(),
@@ -981,6 +982,12 @@ namespace osu.Game.Screens.Edit
             beatmapManager.Export(Beatmap.Value.BeatmapSetInfo);
         }
 
+        private void exportLegacyBeatmap()
+        {
+            Save();
+            beatmapManager.ExportLegacy(Beatmap.Value.BeatmapSetInfo);
+        }
+
         /// <summary>
         /// Beatmaps of the currently edited set, grouped by ruleset and ordered by difficulty.
         /// </summary>

From 82364b4f9f8ceb5fdc5512fb763067b84cf3696e Mon Sep 17 00:00:00 2001
From: Zyf <zyfarok@gmail.com>
Date: Tue, 11 Jul 2023 02:46:32 +0200
Subject: [PATCH 1278/1604] Use OsuScoreProcessor in the scoring test scene

---
 osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
index 2b378c8013..c722d67ac9 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
@@ -17,7 +17,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays.Settings;
-using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Osu.Scoring;
 using osu.Game.Rulesets.Osu.Beatmaps;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Osu.Objects;
@@ -125,8 +125,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             graphs.Clear();
             legend.Clear();
 
-            runForProcessor("lazer-standardised", Color4.YellowGreen, new ScoreProcessor(new OsuRuleset()), ScoringMode.Standardised);
-            runForProcessor("lazer-classic", Color4.MediumPurple, new ScoreProcessor(new OsuRuleset()), ScoringMode.Classic);
+            runForProcessor("lazer-standardised", Color4.YellowGreen, new OsuScoreProcessor(), ScoringMode.Standardised);
+            runForProcessor("lazer-classic", Color4.MediumPurple, new OsuScoreProcessor(), ScoringMode.Classic);
 
             runScoreV1();
             runScoreV2();

From ca9c31b492dc097b92c172703bfdaa5a4ce8d4a3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 Jul 2023 17:29:28 +0900
Subject: [PATCH 1279/1604] Add test coverage of slider blueprint end placement
 failing outside playfield

---
 .../Editor/TestSceneSliderPlacementBlueprint.cs   | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index 7542e00a94..1d136fe9cc 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -61,6 +61,21 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             assertControlPointType(0, PathType.Linear);
         }
 
+        [Test]
+        public void TestPlaceWithMouseMovementOutsidePlayfield()
+        {
+            addMovementStep(new Vector2(200));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(1400, 200));
+            addClickStep(MouseButton.Right);
+
+            assertPlaced(true);
+            assertLength(1200);
+            assertControlPointCount(2);
+            assertControlPointType(0, PathType.Linear);
+        }
+
         [Test]
         public void TestPlaceNormalControlPoint()
         {

From a0e6748882caf26d24ec526ec882a47968b7505a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 Jul 2023 17:29:53 +0900
Subject: [PATCH 1280/1604] Fix slider blueprint placement when ending
 placement outside the playfield

As mentioned in https://github.com/ppy/osu/discussions/24161
---
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index 717c026ded..5cb9adfd72 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -171,7 +171,7 @@ namespace osu.Game.Rulesets.Edit
         /// </summary>
         protected void ApplyDefaultsToHitObject() => HitObject.ApplyDefaults(beatmap.ControlPointInfo, beatmap.Difficulty);
 
-        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => Parent?.ReceivePositionalInputAt(screenSpacePos) == true;
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
 
         protected override bool Handle(UIEvent e)
         {

From 2dcd79044289fe31629965ffcbb6fd11e678790e Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Tue, 11 Jul 2023 11:42:31 +0200
Subject: [PATCH 1281/1604] Resolve `Clipboard` via DI

---
 osu.Game/Graphics/ScreenshotManager.cs                |  5 ++++-
 osu.Game/Graphics/UserInterface/ExternalLinkButton.cs | 10 ++++++++--
 osu.Game/Online/Chat/ExternalLinkOpener.cs            |  5 ++++-
 osu.Game/Overlays/Comments/DrawableComment.cs         |  4 ++--
 osu.Game/Screens/Edit/Compose/ComposeScreen.cs        |  4 ++--
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Graphics/ScreenshotManager.cs b/osu.Game/Graphics/ScreenshotManager.cs
index 82f89d6889..26e499ae9a 100644
--- a/osu.Game/Graphics/ScreenshotManager.cs
+++ b/osu.Game/Graphics/ScreenshotManager.cs
@@ -43,6 +43,9 @@ namespace osu.Game.Graphics
         [Resolved]
         private GameHost host { get; set; }
 
+        [Resolved]
+        private Clipboard clipboard { get; set; }
+
         private Storage storage;
 
         [Resolved]
@@ -116,7 +119,7 @@ namespace osu.Game.Graphics
 
                 using (var image = await host.TakeScreenshotAsync().ConfigureAwait(false))
                 {
-                    host.GetClipboard()?.SetImage(image);
+                    clipboard.SetImage(image);
 
                     (string filename, var stream) = getWritableStream();
 
diff --git a/osu.Game/Graphics/UserInterface/ExternalLinkButton.cs b/osu.Game/Graphics/UserInterface/ExternalLinkButton.cs
index 4eccb37613..7ba3d55162 100644
--- a/osu.Game/Graphics/UserInterface/ExternalLinkButton.cs
+++ b/osu.Game/Graphics/UserInterface/ExternalLinkButton.cs
@@ -27,6 +27,9 @@ namespace osu.Game.Graphics.UserInterface
         [Resolved]
         private GameHost host { get; set; } = null!;
 
+        [Resolved]
+        private Clipboard clipboard { get; set; } = null!;
+
         [Resolved]
         private OnScreenDisplay? onScreenDisplay { get; set; }
 
@@ -92,8 +95,11 @@ namespace osu.Game.Graphics.UserInterface
 
         private void copyUrl()
         {
-            host.GetClipboard()?.SetText(Link);
-            onScreenDisplay?.Display(new CopyUrlToast());
+            if (Link != null)
+            {
+                clipboard.SetText(Link);
+                onScreenDisplay?.Display(new CopyUrlToast());
+            }
         }
     }
 }
diff --git a/osu.Game/Online/Chat/ExternalLinkOpener.cs b/osu.Game/Online/Chat/ExternalLinkOpener.cs
index 201212c648..56d24e35bb 100644
--- a/osu.Game/Online/Chat/ExternalLinkOpener.cs
+++ b/osu.Game/Online/Chat/ExternalLinkOpener.cs
@@ -18,6 +18,9 @@ namespace osu.Game.Online.Chat
         [Resolved]
         private GameHost host { get; set; } = null!;
 
+        [Resolved]
+        private Clipboard clipboard { get; set; } = null!;
+
         [Resolved(CanBeNull = true)]
         private IDialogOverlay? dialogOverlay { get; set; }
 
@@ -32,7 +35,7 @@ namespace osu.Game.Online.Chat
         public void OpenUrlExternally(string url, bool bypassWarning = false)
         {
             if (!bypassWarning && externalLinkWarning.Value && dialogOverlay != null)
-                dialogOverlay.Push(new ExternalLinkDialog(url, () => host.OpenUrlExternally(url), () => host.GetClipboard()?.SetText(url)));
+                dialogOverlay.Push(new ExternalLinkDialog(url, () => host.OpenUrlExternally(url), () => clipboard.SetText(url)));
             else
                 host.OpenUrlExternally(url);
         }
diff --git a/osu.Game/Overlays/Comments/DrawableComment.cs b/osu.Game/Overlays/Comments/DrawableComment.cs
index a710406548..ba1c7ca8b2 100644
--- a/osu.Game/Overlays/Comments/DrawableComment.cs
+++ b/osu.Game/Overlays/Comments/DrawableComment.cs
@@ -85,7 +85,7 @@ namespace osu.Game.Overlays.Comments
         private IAPIProvider api { get; set; } = null!;
 
         [Resolved]
-        private GameHost host { get; set; } = null!;
+        private Clipboard clipboard { get; set; } = null!;
 
         [Resolved]
         private OnScreenDisplay? onScreenDisplay { get; set; }
@@ -444,7 +444,7 @@ namespace osu.Game.Overlays.Comments
 
         private void copyUrl()
         {
-            host.GetClipboard()?.SetText($@"{api.APIEndpointUrl}/comments/{Comment.Id}");
+            clipboard.SetText($@"{api.APIEndpointUrl}/comments/{Comment.Id}");
             onScreenDisplay?.Display(new CopyUrlToast());
         }
 
diff --git a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
index 433fb5c8ee..0a58b34da6 100644
--- a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
+++ b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Screens.Edit.Compose
     public partial class ComposeScreen : EditorScreenWithTimeline, IGameplaySettings
     {
         [Resolved]
-        private GameHost host { get; set; }
+        private Clipboard hostClipboard { get; set; } = null!;
 
         [Resolved]
         private EditorClock clock { get; set; }
@@ -116,7 +116,7 @@ namespace osu.Game.Screens.Edit.Compose
             // regardless of whether anything was even selected at all.
             // UX-wise this is generally strange and unexpected, but make it work anyways to preserve muscle memory.
             // note that this means that `getTimestamp()` must handle no-selection case, too.
-            host.GetClipboard()?.SetText(getTimestamp());
+            hostClipboard.SetText(getTimestamp());
 
             if (CanCopy.Value)
                 clipboard.Value = new ClipboardContent(EditorBeatmap).Serialize();

From 1dae1d8f0afa6bb3bae418d5286819bebe4f1612 Mon Sep 17 00:00:00 2001
From: NiceAesth <nice@aesth.dev>
Date: Tue, 11 Jul 2023 13:40:19 +0300
Subject: [PATCH 1282/1604] Account for break time

---
 osu.Game/Rulesets/Edit/Checks/CheckDrainTime.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckDrainTime.cs b/osu.Game/Rulesets/Edit/Checks/CheckDrainTime.cs
index 99a74e6479..21f053f2c2 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckDrainTime.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckDrainTime.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Edit.Checks
 
         public IEnumerable<Issue> Run(BeatmapVerifierContext context)
         {
-            double drainTime = context.Beatmap.CalculatePlayableLength();
+            double drainTime = context.Beatmap.CalculatePlayableLength() - context.Beatmap.TotalBreakTime;
 
             if (drainTime < min_drain_threshold)
                 yield return new IssueTemplateTooShort(this).Create((int)(drainTime / 1000));

From d75887bb3b54b0e024eb5fe47368b79f169c7733 Mon Sep 17 00:00:00 2001
From: NiceAesth <nice@aesth.dev>
Date: Tue, 11 Jul 2023 13:40:27 +0300
Subject: [PATCH 1283/1604] Apply feedback to tests

---
 .../Editing/Checks/CheckDrainTimeTest.cs      | 78 +++++++++++++++----
 1 file changed, 65 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tests/Editing/Checks/CheckDrainTimeTest.cs b/osu.Game.Tests/Editing/Checks/CheckDrainTimeTest.cs
index ffa3af8fc6..9f93ec17d5 100644
--- a/osu.Game.Tests/Editing/Checks/CheckDrainTimeTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckDrainTimeTest.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
@@ -16,8 +17,6 @@ namespace osu.Game.Tests.Editing.Checks
     {
         private CheckDrainTime check = null!;
 
-        private IBeatmap beatmap = null!;
-
         [SetUp]
         public void Setup()
         {
@@ -27,24 +26,77 @@ namespace osu.Game.Tests.Editing.Checks
         [Test]
         public void TestDrainTimeShort()
         {
-            setShortDrainTimeBeatmap();
-            var content = new BeatmapVerifierContext(beatmap, new TestWorkingBeatmap(beatmap));
+            assertShortDrainTime(getShortDrainTimeBeatmap());
+        }
 
-            var issues = check.Run(content).ToList();
+        [Test]
+        public void TestDrainTimeBreak()
+        {
+            assertShortDrainTime(getLongBreakBeatmap());
+        }
+
+        [Test]
+        public void TestDrainTimeCorrect()
+        {
+            assertOk(getCorrectDrainTimeBeatmap());
+        }
+
+        private IBeatmap getShortDrainTimeBeatmap()
+        {
+            return new Beatmap<HitObject>
+            {
+                HitObjects =
+                {
+                    new HitCircle { StartTime = 0 }
+                }
+            };
+        }
+
+        private IBeatmap getLongBreakBeatmap()
+        {
+            return new Beatmap<HitObject>
+            {
+                HitObjects =
+                {
+                    new HitCircle { StartTime = 0 },
+                    new HitCircle { StartTime = 30 }
+                }
+            };
+        }
+
+        private IBeatmap getCorrectDrainTimeBeatmap()
+        {
+            var hitObjects = new List<HitObject>();
+
+            for (int i = 0; i <= 30; ++i)
+            {
+                hitObjects.Add(new HitCircle { StartTime = 1000 * i });
+            }
+
+            return new Beatmap<HitObject>
+            {
+                HitObjects = hitObjects
+            };
+        }
+
+        private void assertShortDrainTime(IBeatmap beatmap)
+        {
+            var issues = check.Run(getContext(beatmap)).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckDrainTime.IssueTemplateTooShort);
         }
 
-        private void setShortDrainTimeBeatmap()
+        private void assertOk(IBeatmap beatmap)
         {
-            beatmap = new Beatmap<HitObject>
-            {
-                HitObjects =
-                {
-                    new HitCircle()
-                }
-            };
+            var issues = check.Run(getContext(beatmap)).ToList();
+
+            Assert.That(issues, Is.Empty);
+        }
+
+        private BeatmapVerifierContext getContext(IBeatmap beatmap)
+        {
+            return new BeatmapVerifierContext(beatmap, new TestWorkingBeatmap(beatmap));
         }
     }
 }

From 2db25722cbf29eb7d93e59df5d3e6b414e4d2dd4 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Tue, 11 Jul 2023 20:18:54 +0200
Subject: [PATCH 1284/1604] It works now

---
 osu.Game/Beatmaps/BeatmapManager.cs | 89 +++++++++++++++++++----------
 osu.Game/Beatmaps/BeatmapSetInfo.cs | 13 -----
 osu.Game/Database/ModelManager.cs   | 10 ++--
 3 files changed, 62 insertions(+), 50 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 7d8c47ea5a..7c21b87a97 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -29,6 +29,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Skinning;
 using osu.Game.Utils;
+using osuTK;
 
 namespace osu.Game.Beatmaps
 {
@@ -406,51 +407,77 @@ namespace osu.Game.Beatmaps
         /// <summary>
         /// Creates a copy of the <see cref="BeatmapSetInfo"/> and converts all beatmaps to legacy format, then exports it as a legacy package.
         /// </summary>
-        /// <param name="beatmap"></param>
+        /// <param name="beatmapSetInfo"></param>
         /// <returns></returns>
-        public Task ExportLegacy(BeatmapSetInfo beatmap)
+        public Task ExportLegacy(BeatmapSetInfo beatmapSetInfo)
         {
-            var copy = beatmap.Clone(); // does the detach from realm
+            // Create a clone of the original beatmap set which we will convert to legacy format and then export
+            var clone = new BeatmapSetInfo(beatmapSetInfo.Beatmaps.Select(b => b.Clone()));
+            clone.Files.AddRange(beatmapSetInfo.Files.Select(f => new RealmNamedFileUsage(f.File, f.Filename)));
 
-            // convert all beatmaps to legacy format
-            foreach (var beatmapInfo in copy.Beatmaps)
+            // convert all beatmaps in the cloned beatmap set to legacy format
+            foreach (var beatmapInfo in clone.Beatmaps)
             {
-                // Convert beatmap
-                var file = beatmapInfo.File;
+                beatmapInfo.BeatmapSet = clone;
+                beatmapInfo.ID = Guid.NewGuid();
 
+                var file = beatmapInfo.File;
                 if (file == null)
                     continue;
 
-                using var oldStream = new LineBufferedReader(ReadFile(file));
-                var beatmapContent = new LegacyBeatmapDecoder().Decode(oldStream);
-
-                foreach (var controlPoint in beatmapContent.ControlPointInfo.AllControlPoints)
-                    controlPoint.Time = Math.Floor(controlPoint.Time);
-
-                foreach (var hitObject in beatmapContent.HitObjects)
+                var beatmapContent = new LegacyBeatmapDecoder().Decode(new LineBufferedReader(RealmFileStore.Storage.GetStream(file.File.GetStoragePath())));
+                var beatmapSkin = new LegacySkin(new SkinInfo(), null!)
                 {
-                    hitObject.StartTime = Math.Floor(hitObject.StartTime);
+                    Configuration = new LegacySkinDecoder().Decode(new LineBufferedReader(RealmFileStore.Storage.GetStream(file.File.GetStoragePath())))
+                };
 
-                    if (hitObject is IHasPath hasPath && BezierConverter.CountSegments(hasPath.Path.ControlPoints) > 1)
-                    {
-                        var newControlPoints = BezierConverter.ConvertToModernBezier(hasPath.Path.ControlPoints);
-                        hasPath.Path.ControlPoints.Clear();
-                        hasPath.Path.ControlPoints.AddRange(newControlPoints);
-                    }
-                }
+                Realm.Realm.Write(realm =>
+                {
+                    using var stream = new MemoryStream();
+                    convertAndEncodeLegacyBeatmap(beatmapContent, beatmapSkin, stream);
 
-                using var newStream = new MemoryStream();
-                using var sw = new StreamWriter(newStream, Encoding.UTF8, 1024, true);
-                new LegacyBeatmapEncoder(beatmapContent, null).Encode(sw);
-                newStream.Seek(0, SeekOrigin.Begin);
+                    beatmapInfo.MD5Hash = stream.ComputeMD5Hash();
+                    beatmapInfo.Hash = stream.ComputeSHA2Hash();
 
-                beatmapInfo.MD5Hash = newStream.ComputeMD5Hash();
-                beatmapInfo.Hash = newStream.ComputeSHA2Hash();
-
-                AddFile(copy, newStream, file.Filename);
+                    file.File = RealmFileStore.Add(stream, realm).Detach();
+                });
             }
 
-            return beatmapExporter.ExportAsync(new RealmLiveUnmanaged<BeatmapSetInfo>(copy));
+            return beatmapExporter.ExportAsync(new RealmLiveUnmanaged<BeatmapSetInfo>(clone));
+        }
+
+        private void convertAndEncodeLegacyBeatmap(IBeatmap beatmapContent, ISkin beatmapSkin, Stream stream)
+        {
+            // Convert beatmap elements to be compatible with legacy format
+            // So we truncate time and position values to integers, and convert paths with multiple segments to bezier curves
+            foreach (var controlPoint in beatmapContent.ControlPointInfo.AllControlPoints)
+                controlPoint.Time = Math.Floor(controlPoint.Time);
+
+            foreach (var hitObject in beatmapContent.HitObjects)
+            {
+                hitObject.StartTime = Math.Floor(hitObject.StartTime);
+
+                if (hitObject is not IHasPath hasPath || BezierConverter.CountSegments(hasPath.Path.ControlPoints) <= 1) continue;
+
+                var newControlPoints = BezierConverter.ConvertToModernBezier(hasPath.Path.ControlPoints);
+
+                // Truncate control points to integer positions
+                foreach (var pathControlPoint in newControlPoints)
+                {
+                    pathControlPoint.Position = new Vector2(
+                        (float)Math.Floor(pathControlPoint.Position.X),
+                        (float)Math.Floor(pathControlPoint.Position.Y));
+                }
+
+                hasPath.Path.ControlPoints.Clear();
+                hasPath.Path.ControlPoints.AddRange(newControlPoints);
+            }
+
+            // Encode to legacy format
+            using (var sw = new StreamWriter(stream, Encoding.UTF8, 1024, true))
+                new LegacyBeatmapEncoder(beatmapContent, beatmapSkin).Encode(sw);
+
+            stream.Seek(0, SeekOrigin.Begin);
         }
 
         private void updateHashAndMarkDirty(BeatmapSetInfo setInfo)
diff --git a/osu.Game/Beatmaps/BeatmapSetInfo.cs b/osu.Game/Beatmaps/BeatmapSetInfo.cs
index 923c498df8..59e413d935 100644
--- a/osu.Game/Beatmaps/BeatmapSetInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapSetInfo.cs
@@ -90,19 +90,6 @@ namespace osu.Game.Beatmaps
             return ID == other.ID;
         }
 
-        public BeatmapSetInfo Clone()
-        {
-            var clone = (BeatmapSetInfo)this.Detach().MemberwiseClone();
-
-            for (int i = 0; i < clone.Beatmaps.Count; i++)
-                clone.Beatmaps[i] = clone.Beatmaps[i].Clone();
-
-            for (int i = 0; i < clone.Files.Count; i++)
-                clone.Files[i] = new RealmNamedFileUsage(clone.Files[i].File, clone.Files[i].Filename);
-
-            return clone;
-        }
-
         public override string ToString() => Metadata.GetDisplayString();
 
         public bool Equals(IBeatmapSetInfo? other) => other is BeatmapSetInfo b && Equals(b);
diff --git a/osu.Game/Database/ModelManager.cs b/osu.Game/Database/ModelManager.cs
index 8dafe0874c..172a2df5a3 100644
--- a/osu.Game/Database/ModelManager.cs
+++ b/osu.Game/Database/ModelManager.cs
@@ -25,16 +25,14 @@ namespace osu.Game.Database
 
         protected RealmAccess Realm { get; }
 
-        private readonly RealmFileStore realmFileStore;
+        protected readonly RealmFileStore RealmFileStore;
 
         public ModelManager(Storage storage, RealmAccess realm)
         {
-            realmFileStore = new RealmFileStore(realm, storage);
+            RealmFileStore = new RealmFileStore(realm, storage);
             Realm = realm;
         }
 
-        public Stream ReadFile(RealmNamedFileUsage file) => realmFileStore.Storage.GetStream(file.File.GetStoragePath());
-
         public void DeleteFile(TModel item, RealmNamedFileUsage file) =>
             performFileOperation(item, managed => DeleteFile(managed, managed.Files.First(f => f.Filename == file.Filename), managed.Realm));
 
@@ -79,7 +77,7 @@ namespace osu.Game.Database
         /// </summary>
         public void ReplaceFile(RealmNamedFileUsage file, Stream contents, Realm realm)
         {
-            file.File = realmFileStore.Add(contents, realm);
+            file.File = RealmFileStore.Add(contents, realm);
         }
 
         /// <summary>
@@ -95,7 +93,7 @@ namespace osu.Game.Database
                 return;
             }
 
-            var file = realmFileStore.Add(contents, realm);
+            var file = RealmFileStore.Add(contents, realm);
             var namedUsage = new RealmNamedFileUsage(file, filename);
 
             item.Files.Add(namedUsage);

From b577b6b6ae9ce8e4b047cfed8ba0820c04546db7 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Tue, 11 Jul 2023 21:04:09 +0200
Subject: [PATCH 1285/1604] Export legacy converted beatmaps as .osz and
 non-converted beatmaps as .osz2

---
 osu.Game/Beatmaps/BeatmapImporter.cs |  4 ++--
 osu.Game/Beatmaps/BeatmapManager.cs  | 13 ++++++++++---
 osu.Game/Database/BeatmapExporter.cs | 18 ++++++++++++++++++
 3 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 osu.Game/Database/BeatmapExporter.cs

diff --git a/osu.Game/Beatmaps/BeatmapImporter.cs b/osu.Game/Beatmaps/BeatmapImporter.cs
index 7d367ef77d..a2d74d089f 100644
--- a/osu.Game/Beatmaps/BeatmapImporter.cs
+++ b/osu.Game/Beatmaps/BeatmapImporter.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Beatmaps
     /// </summary>
     public class BeatmapImporter : RealmArchiveModelImporter<BeatmapSetInfo>
     {
-        public override IEnumerable<string> HandledExtensions => new[] { ".osz" };
+        public override IEnumerable<string> HandledExtensions => new[] { ".osz", ".osz2" };
 
         protected override string[] HashableFileTypes => new[] { ".osu" };
 
@@ -145,7 +145,7 @@ namespace osu.Game.Beatmaps
             }
         }
 
-        protected override bool ShouldDeleteArchive(string path) => Path.GetExtension(path).ToLowerInvariant() == ".osz";
+        protected override bool ShouldDeleteArchive(string path) => HandledExtensions.Contains(Path.GetExtension(path).ToLowerInvariant());
 
         protected override void Populate(BeatmapSetInfo beatmapSet, ArchiveReader? archive, Realm realm, CancellationToken cancellationToken = default)
         {
diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 7c21b87a97..ded26f79cd 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -44,7 +44,9 @@ namespace osu.Game.Beatmaps
 
         private readonly WorkingBeatmapCache workingBeatmapCache;
 
-        private readonly LegacyBeatmapExporter beatmapExporter;
+        private readonly BeatmapExporter beatmapExporter;
+
+        private readonly LegacyBeatmapExporter legacyBeatmapExporter;
 
         public ProcessBeatmapDelegate? ProcessBeatmap { private get; set; }
 
@@ -81,7 +83,12 @@ namespace osu.Game.Beatmaps
 
             workingBeatmapCache = CreateWorkingBeatmapCache(audioManager, gameResources, userResources, defaultBeatmap, host);
 
-            beatmapExporter = new LegacyBeatmapExporter(storage)
+            beatmapExporter = new BeatmapExporter(storage)
+            {
+                PostNotification = obj => PostNotification?.Invoke(obj)
+            };
+
+            legacyBeatmapExporter = new LegacyBeatmapExporter(storage)
             {
                 PostNotification = obj => PostNotification?.Invoke(obj)
             };
@@ -443,7 +450,7 @@ namespace osu.Game.Beatmaps
                 });
             }
 
-            return beatmapExporter.ExportAsync(new RealmLiveUnmanaged<BeatmapSetInfo>(clone));
+            return legacyBeatmapExporter.ExportAsync(new RealmLiveUnmanaged<BeatmapSetInfo>(clone));
         }
 
         private void convertAndEncodeLegacyBeatmap(IBeatmap beatmapContent, ISkin beatmapSkin, Stream stream)
diff --git a/osu.Game/Database/BeatmapExporter.cs b/osu.Game/Database/BeatmapExporter.cs
new file mode 100644
index 0000000000..b3a85dd5d9
--- /dev/null
+++ b/osu.Game/Database/BeatmapExporter.cs
@@ -0,0 +1,18 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Platform;
+using osu.Game.Beatmaps;
+
+namespace osu.Game.Database
+{
+    public class BeatmapExporter : LegacyArchiveExporter<BeatmapSetInfo>
+    {
+        public BeatmapExporter(Storage storage)
+            : base(storage)
+        {
+        }
+
+        protected override string FileExtension => @".osz2";
+    }
+}

From 9a3cb624a8a616b37df9f35280d659c704f6ae18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 11 Jul 2023 23:18:49 +0200
Subject: [PATCH 1286/1604] Rewrite tests to be less aggressively DRY

Four of six helper methods defined in the test were used exactly once;
the remaining two were used two times. Splitting helpers there is just
too much.
---
 .../Editing/Checks/CheckDrainTimeTest.cs      | 69 +++++++------------
 1 file changed, 23 insertions(+), 46 deletions(-)

diff --git a/osu.Game.Tests/Editing/Checks/CheckDrainTimeTest.cs b/osu.Game.Tests/Editing/Checks/CheckDrainTimeTest.cs
index 9f93ec17d5..e5a33d753c 100644
--- a/osu.Game.Tests/Editing/Checks/CheckDrainTimeTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckDrainTimeTest.cs
@@ -26,35 +26,25 @@ namespace osu.Game.Tests.Editing.Checks
         [Test]
         public void TestDrainTimeShort()
         {
-            assertShortDrainTime(getShortDrainTimeBeatmap());
-        }
-
-        [Test]
-        public void TestDrainTimeBreak()
-        {
-            assertShortDrainTime(getLongBreakBeatmap());
-        }
-
-        [Test]
-        public void TestDrainTimeCorrect()
-        {
-            assertOk(getCorrectDrainTimeBeatmap());
-        }
-
-        private IBeatmap getShortDrainTimeBeatmap()
-        {
-            return new Beatmap<HitObject>
+            var beatmap = new Beatmap<HitObject>
             {
                 HitObjects =
                 {
                     new HitCircle { StartTime = 0 }
                 }
             };
+            var context = new BeatmapVerifierContext(beatmap, new TestWorkingBeatmap(beatmap));
+
+            var issues = check.Run(context).ToList();
+
+            Assert.That(issues, Has.Count.EqualTo(1));
+            Assert.That(issues.Single().Template is CheckDrainTime.IssueTemplateTooShort);
         }
 
-        private IBeatmap getLongBreakBeatmap()
+        [Test]
+        public void TestDrainTimeBreak()
         {
-            return new Beatmap<HitObject>
+            var beatmap = new Beatmap<HitObject>
             {
                 HitObjects =
                 {
@@ -62,41 +52,28 @@ namespace osu.Game.Tests.Editing.Checks
                     new HitCircle { StartTime = 30 }
                 }
             };
-        }
+            var context = new BeatmapVerifierContext(beatmap, new TestWorkingBeatmap(beatmap));
 
-        private IBeatmap getCorrectDrainTimeBeatmap()
-        {
-            var hitObjects = new List<HitObject>();
-
-            for (int i = 0; i <= 30; ++i)
-            {
-                hitObjects.Add(new HitCircle { StartTime = 1000 * i });
-            }
-
-            return new Beatmap<HitObject>
-            {
-                HitObjects = hitObjects
-            };
-        }
-
-        private void assertShortDrainTime(IBeatmap beatmap)
-        {
-            var issues = check.Run(getContext(beatmap)).ToList();
+            var issues = check.Run(context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckDrainTime.IssueTemplateTooShort);
         }
 
-        private void assertOk(IBeatmap beatmap)
+        [Test]
+        public void TestDrainTimeCorrect()
         {
-            var issues = check.Run(getContext(beatmap)).ToList();
+            var hitObjects = new List<HitObject>();
+
+            for (int i = 0; i <= 30; ++i)
+                hitObjects.Add(new HitCircle { StartTime = 1000 * i });
+
+            var beatmap = new Beatmap<HitObject> { HitObjects = hitObjects };
+            var context = new BeatmapVerifierContext(beatmap, new TestWorkingBeatmap(beatmap));
+
+            var issues = check.Run(context).ToList();
 
             Assert.That(issues, Is.Empty);
         }
-
-        private BeatmapVerifierContext getContext(IBeatmap beatmap)
-        {
-            return new BeatmapVerifierContext(beatmap, new TestWorkingBeatmap(beatmap));
-        }
     }
 }

From d927cb3f1c3ec6c61e9ab1ee8beced9ecad5938a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 11 Jul 2023 23:21:03 +0200
Subject: [PATCH 1287/1604] Actually cover cases with breaks in tests

---
 osu.Game.Tests/Editing/Checks/CheckDrainTimeTest.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Editing/Checks/CheckDrainTimeTest.cs b/osu.Game.Tests/Editing/Checks/CheckDrainTimeTest.cs
index e5a33d753c..9e20164972 100644
--- a/osu.Game.Tests/Editing/Checks/CheckDrainTimeTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckDrainTimeTest.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Timing;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Checks;
 using osu.Game.Rulesets.Objects;
@@ -49,7 +50,11 @@ namespace osu.Game.Tests.Editing.Checks
                 HitObjects =
                 {
                     new HitCircle { StartTime = 0 },
-                    new HitCircle { StartTime = 30 }
+                    new HitCircle { StartTime = 40_000 }
+                },
+                Breaks = new List<BreakPeriod>
+                {
+                    new BreakPeriod(10_000, 21_000)
                 }
             };
             var context = new BeatmapVerifierContext(beatmap, new TestWorkingBeatmap(beatmap));

From a1da0b58db3ebc7ec425df2ff3ae81fc2d9949b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 11 Jul 2023 23:22:37 +0200
Subject: [PATCH 1288/1604] Improve negative test case without breaks too

---
 osu.Game.Tests/Editing/Checks/CheckDrainTimeTest.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Editing/Checks/CheckDrainTimeTest.cs b/osu.Game.Tests/Editing/Checks/CheckDrainTimeTest.cs
index 9e20164972..f845d3c4c1 100644
--- a/osu.Game.Tests/Editing/Checks/CheckDrainTimeTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckDrainTimeTest.cs
@@ -31,7 +31,8 @@ namespace osu.Game.Tests.Editing.Checks
             {
                 HitObjects =
                 {
-                    new HitCircle { StartTime = 0 }
+                    new HitCircle { StartTime = 0 },
+                    new HitCircle { StartTime = 29_999 }
                 }
             };
             var context = new BeatmapVerifierContext(beatmap, new TestWorkingBeatmap(beatmap));

From 41d39243264fbd1c1d135cf48d430b757c06b0df Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 12 Jul 2023 16:30:26 +0900
Subject: [PATCH 1289/1604] Update localisation analyser packages

---
 .config/dotnet-tools.json | 2 +-
 osu.Game/osu.Game.csproj  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 8c8a3be771..3cecb0d07c 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -21,7 +21,7 @@
       ]
     },
     "ppy.localisationanalyser.tools": {
-      "version": "2022.809.0",
+      "version": "2023.712.0",
       "commands": [
         "localisation"
       ]
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 7968364243..8febabb61b 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -31,7 +31,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
     <PackageReference Include="Microsoft.Toolkit.HighPerformance" Version="7.1.2" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="ppy.LocalisationAnalyser" Version="2022.809.0">
+    <PackageReference Include="ppy.LocalisationAnalyser" Version="2023.712.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

From 87570ed238bb303237d40aa3a51a3af46317e17d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 Jul 2023 17:23:31 +0900
Subject: [PATCH 1290/1604] Fix incorrect slider stacking on very old beatmaps

Closes https://github.com/ppy/osu/issues/24185

The stable code has had a bug in this logic forever. So we'll need to
reimplement the bug.

Basically, sliders have to have `UpdateCalculations` run in order to
have a correct `Position2` and `EndTime`, but this wasn't being called
in the inner loop before use of `EndTime` at
https://github.com/peppy/osu-stable-reference/blob/1531237b63392e82c003c712faa028406073aa8f/osu!/GameplayElements/HitObjectManager.cs#L1813.

To fix this, we use `StartTime` in the inner loop to reproduce the bug.
---
 osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapProcessor.cs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapProcessor.cs b/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapProcessor.cs
index f51f04bf87..c081df3ac6 100644
--- a/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapProcessor.cs
@@ -214,17 +214,24 @@ namespace osu.Game.Rulesets.Osu.Beatmaps
                         ? currSlider.Position + currSlider.Path.PositionAt(1)
                         : currHitObject.Position;
 
+                    // Note the use of `StartTime` in the code below doesn't match stable's use of `EndTime`.
+                    // This is because in the stable implementation, `UpdateCalculations` is not called on the inner-loop hitobject (j)
+                    // and therefore it does not have a correct `EndTime`, but instead the default of `EndTime = StartTime`.
+                    //
+                    // Effects of this can be seen on https://osu.ppy.sh/beatmapsets/243#osu/1146 at sliders around 86647 ms, where
+                    // if we use `EndTime` here it would result in unexpected stacking.
+
                     if (Vector2Extensions.Distance(beatmap.HitObjects[j].Position, currHitObject.Position) < stack_distance)
                     {
                         currHitObject.StackHeight++;
-                        startTime = beatmap.HitObjects[j].GetEndTime();
+                        startTime = beatmap.HitObjects[j].StartTime;
                     }
                     else if (Vector2Extensions.Distance(beatmap.HitObjects[j].Position, position2) < stack_distance)
                     {
                         // Case for sliders - bump notes down and right, rather than up and left.
                         sliderStack++;
                         beatmap.HitObjects[j].StackHeight -= sliderStack;
-                        startTime = beatmap.HitObjects[j].GetEndTime();
+                        startTime = beatmap.HitObjects[j].StartTime;
                     }
                 }
             }

From d12845d7b1ecb007b6d2c9602e1042d192842b12 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 Jul 2023 17:39:54 +0900
Subject: [PATCH 1291/1604] Remove no-longer-necessary
 `ReceivePositionalInputAt` overide in `CatchPlacementBlueprint`

---
 .../Edit/Blueprints/CatchPlacementBlueprint.cs                 | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Edit/Blueprints/CatchPlacementBlueprint.cs b/osu.Game.Rulesets.Catch/Edit/Blueprints/CatchPlacementBlueprint.cs
index d2d605a6fe..1a2990e4ac 100644
--- a/osu.Game.Rulesets.Catch/Edit/Blueprints/CatchPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Catch/Edit/Blueprints/CatchPlacementBlueprint.cs
@@ -6,7 +6,6 @@ using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
-using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Edit.Blueprints
 {
@@ -24,7 +23,5 @@ namespace osu.Game.Rulesets.Catch.Edit.Blueprints
             : base(new THitObject())
         {
         }
-
-        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
     }
 }

From 547f2476694ace63aa44d8f55324e61804030f2d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 Jul 2023 17:41:58 +0900
Subject: [PATCH 1292/1604] Fix test to work regardless of screen sizes

---
 .../Editor/TestSceneSliderPlacementBlueprint.cs                | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index 1d136fe9cc..7d29670daa 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -67,11 +67,10 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             addMovementStep(new Vector2(200));
             addClickStep(MouseButton.Left);
 
-            addMovementStep(new Vector2(1400, 200));
+            AddStep("move mouse out of screen", () => InputManager.MoveMouseTo(InputManager.ScreenSpaceDrawQuad.TopRight + Vector2.One));
             addClickStep(MouseButton.Right);
 
             assertPlaced(true);
-            assertLength(1200);
             assertControlPointCount(2);
             assertControlPointType(0, PathType.Linear);
         }

From b3b6df6e3034051d87bb2dc9ddc3f74bcce5fab2 Mon Sep 17 00:00:00 2001
From: Andrew Hong <andrew.jwn.hong@gmail.com>
Date: Wed, 12 Jul 2023 06:19:48 -0400
Subject: [PATCH 1293/1604] Remove emoji regex

---
 osu.Game/Online/Chat/MessageFormatter.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Online/Chat/MessageFormatter.cs b/osu.Game/Online/Chat/MessageFormatter.cs
index f89939d7cf..792780595f 100644
--- a/osu.Game/Online/Chat/MessageFormatter.cs
+++ b/osu.Game/Online/Chat/MessageFormatter.cs
@@ -283,8 +283,6 @@ namespace osu.Game.Online.Chat
             while (space-- > 0)
                 empty += "\0";
 
-            handleMatches(emoji_regex, empty, "{0}", result, startIndex);
-
             return result;
         }
 

From 4f4c481a678b8fb5e608ca9c7af5ce4372ac80f6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 Jul 2023 19:21:24 +0900
Subject: [PATCH 1294/1604] Fix timing distribution graph sometimes not
 displaying correctly

Weird "basal" height logic just didn't make any sense (was getting stuck at 1 when `DrawHeight` was 0)
---
 .../HitEventTimingDistributionGraph.cs        | 92 ++++++-------------
 1 file changed, 27 insertions(+), 65 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
index 6b1850002d..16da8c64a0 100644
--- a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
+++ b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
@@ -211,7 +211,8 @@ namespace osu.Game.Screens.Ranking.Statistics
             private readonly bool isCentre;
             private readonly float totalValue;
 
-            private float basalHeight;
+            private const float minimum_height = 0.02f;
+
             private float offsetAdjustment;
 
             private Circle[] boxOriginals = null!;
@@ -256,15 +257,17 @@ namespace osu.Game.Screens.Ranking.Statistics
                 else
                 {
                     // A bin with no value draws a grey dot instead.
-                    Circle dot = new Circle
+                    InternalChildren = boxOriginals = new[]
                     {
-                        RelativeSizeAxes = Axes.Both,
-                        Anchor = Anchor.BottomCentre,
-                        Origin = Anchor.BottomCentre,
-                        Colour = isCentre ? Color4.White : Color4.Gray,
-                        Height = 0,
+                        new Circle
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Anchor = Anchor.BottomCentre,
+                            Origin = Anchor.BottomCentre,
+                            Colour = isCentre ? Color4.White : Color4.Gray,
+                            Height = 0,
+                        }
                     };
-                    InternalChildren = boxOriginals = new[] { dot };
                 }
             }
 
@@ -272,31 +275,24 @@ namespace osu.Game.Screens.Ranking.Statistics
             {
                 base.LoadComplete();
 
-                if (!values.Any())
-                    return;
-
-                updateBasalHeight();
-
-                foreach (var boxOriginal in boxOriginals)
-                {
-                    boxOriginal.Y = 0;
-                    boxOriginal.Height = basalHeight;
-                }
-
                 float offsetValue = 0;
 
-                for (int i = 0; i < values.Count; i++)
+                for (int i = 0; i < boxOriginals.Length; i++)
                 {
-                    boxOriginals[i].MoveToY(offsetForValue(offsetValue) * BoundingBox.Height, duration, Easing.OutQuint);
-                    boxOriginals[i].ResizeHeightTo(heightForValue(values[i].Value), duration, Easing.OutQuint);
-                    offsetValue -= values[i].Value;
-                }
-            }
+                    int value = i < values.Count ? values[i].Value : 0;
 
-            protected override void Update()
-            {
-                base.Update();
-                updateBasalHeight();
+                    var box = boxOriginals[i];
+
+                    box.Y = 0;
+                    box.Height = 0;
+
+                    box.MoveToY(offsetForValue(offsetValue) * BoundingBox.Height, duration, Easing.OutQuint);
+                    box.ResizeHeightTo(heightForValue(value), duration, Easing.OutQuint);
+                    offsetValue -= value;
+                }
+
+                if (boxAdjustment != null)
+                    drawAdjustmentBar();
             }
 
             public void UpdateOffset(float adjustment)
@@ -324,43 +320,9 @@ namespace osu.Game.Screens.Ranking.Statistics
                 drawAdjustmentBar();
             }
 
-            private void updateBasalHeight()
-            {
-                float newBasalHeight = DrawHeight > DrawWidth ? DrawWidth / DrawHeight : 1;
+            private float offsetForValue(float value) => (1 - minimum_height) * value / maxValue;
 
-                if (newBasalHeight == basalHeight)
-                    return;
-
-                basalHeight = newBasalHeight;
-                foreach (var dot in boxOriginals)
-                    dot.Height = basalHeight;
-
-                draw();
-            }
-
-            private float offsetForValue(float value) => (1 - basalHeight) * value / maxValue;
-
-            private float heightForValue(float value) => MathF.Max(basalHeight + offsetForValue(value), 0);
-
-            private void draw()
-            {
-                resizeBars();
-
-                if (boxAdjustment != null)
-                    drawAdjustmentBar();
-            }
-
-            private void resizeBars()
-            {
-                float offsetValue = 0;
-
-                for (int i = 0; i < values.Count; i++)
-                {
-                    boxOriginals[i].Y = offsetForValue(offsetValue) * DrawHeight;
-                    boxOriginals[i].Height = heightForValue(values[i].Value);
-                    offsetValue -= values[i].Value;
-                }
-            }
+            private float heightForValue(float value) => minimum_height + offsetForValue(value);
 
             private void drawAdjustmentBar()
             {

From b05ba8c501cd1d43b19bbe057ca939fdca6e4f06 Mon Sep 17 00:00:00 2001
From: Andrew Hong <andrew.jwn.hong@gmail.com>
Date: Wed, 12 Jul 2023 06:32:33 -0400
Subject: [PATCH 1295/1604] Remove unused code

---
 osu.Game/Online/Chat/MessageFormatter.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/osu.Game/Online/Chat/MessageFormatter.cs b/osu.Game/Online/Chat/MessageFormatter.cs
index 792780595f..6ca651bc87 100644
--- a/osu.Game/Online/Chat/MessageFormatter.cs
+++ b/osu.Game/Online/Chat/MessageFormatter.cs
@@ -279,10 +279,6 @@ namespace osu.Game.Online.Chat
             // handle channels
             handleMatches(channel_regex, "{0}", $@"{OsuGameBase.OSU_PROTOCOL}chan/{{0}}", result, startIndex, LinkAction.OpenChannel);
 
-            string empty = "";
-            while (space-- > 0)
-                empty += "\0";
-
             return result;
         }
 

From 465cc759f02c84c6c3ae720d715623ac2b7596d6 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Wed, 12 Jul 2023 14:49:49 +0200
Subject: [PATCH 1296/1604] Add xmldoc to clarify the purpose of
 BeatmapExporter

---
 osu.Game/Database/BeatmapExporter.cs       | 4 ++++
 osu.Game/Database/LegacyBeatmapExporter.cs | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/osu.Game/Database/BeatmapExporter.cs b/osu.Game/Database/BeatmapExporter.cs
index b3a85dd5d9..9377065973 100644
--- a/osu.Game/Database/BeatmapExporter.cs
+++ b/osu.Game/Database/BeatmapExporter.cs
@@ -6,6 +6,10 @@ using osu.Game.Beatmaps;
 
 namespace osu.Game.Database
 {
+    /// <summary>
+    /// Exporter for beatmap archives.
+    /// This is not for legacy purposes and works for lazer only.
+    /// </summary>
     public class BeatmapExporter : LegacyArchiveExporter<BeatmapSetInfo>
     {
         public BeatmapExporter(Storage storage)
diff --git a/osu.Game/Database/LegacyBeatmapExporter.cs b/osu.Game/Database/LegacyBeatmapExporter.cs
index 4ee8c0636e..62096f862a 100644
--- a/osu.Game/Database/LegacyBeatmapExporter.cs
+++ b/osu.Game/Database/LegacyBeatmapExporter.cs
@@ -6,6 +6,9 @@ using osu.Game.Beatmaps;
 
 namespace osu.Game.Database
 {
+    /// <summary>
+    /// Exporter for osu!stable legacy beatmap archives.
+    /// </summary>
     public class LegacyBeatmapExporter : LegacyArchiveExporter<BeatmapSetInfo>
     {
         public LegacyBeatmapExporter(Storage storage)

From 3052c317e10c801e79a45542bcc247ee59379ce5 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Wed, 12 Jul 2023 15:04:06 +0200
Subject: [PATCH 1297/1604] change .osz2 to .olz (osu lazer zip)

---
 osu.Game/Beatmaps/BeatmapImporter.cs | 2 +-
 osu.Game/Database/BeatmapExporter.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapImporter.cs b/osu.Game/Beatmaps/BeatmapImporter.cs
index a2d74d089f..e500f87984 100644
--- a/osu.Game/Beatmaps/BeatmapImporter.cs
+++ b/osu.Game/Beatmaps/BeatmapImporter.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Beatmaps
     /// </summary>
     public class BeatmapImporter : RealmArchiveModelImporter<BeatmapSetInfo>
     {
-        public override IEnumerable<string> HandledExtensions => new[] { ".osz", ".osz2" };
+        public override IEnumerable<string> HandledExtensions => new[] { ".osz", ".olz" };
 
         protected override string[] HashableFileTypes => new[] { ".osu" };
 
diff --git a/osu.Game/Database/BeatmapExporter.cs b/osu.Game/Database/BeatmapExporter.cs
index 9377065973..f37c57dea5 100644
--- a/osu.Game/Database/BeatmapExporter.cs
+++ b/osu.Game/Database/BeatmapExporter.cs
@@ -17,6 +17,6 @@ namespace osu.Game.Database
         {
         }
 
-        protected override string FileExtension => @".osz2";
+        protected override string FileExtension => @".olz";
     }
 }

From 8ca801a2240b6749c35dc98a33f73ba229d080fe Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Wed, 12 Jul 2023 15:18:16 +0200
Subject: [PATCH 1298/1604] dispose the streams

---
 osu.Game/Beatmaps/BeatmapManager.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index ded26f79cd..248e97d6ee 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -432,10 +432,15 @@ namespace osu.Game.Beatmaps
                 if (file == null)
                     continue;
 
-                var beatmapContent = new LegacyBeatmapDecoder().Decode(new LineBufferedReader(RealmFileStore.Storage.GetStream(file.File.GetStoragePath())));
+                using var contentStream = RealmFileStore.Storage.GetStream(file.File.GetStoragePath());
+                using var contentStreamReader = new LineBufferedReader(contentStream);
+                var beatmapContent = new LegacyBeatmapDecoder().Decode(contentStreamReader);
+
+                using var skinStream = RealmFileStore.Storage.GetStream(file.File.GetStoragePath());
+                using var skinStreamReader = new LineBufferedReader(contentStream);
                 var beatmapSkin = new LegacySkin(new SkinInfo(), null!)
                 {
-                    Configuration = new LegacySkinDecoder().Decode(new LineBufferedReader(RealmFileStore.Storage.GetStream(file.File.GetStoragePath())))
+                    Configuration = new LegacySkinDecoder().Decode(skinStreamReader)
                 };
 
                 Realm.Realm.Write(realm =>

From 1d837a8725308a7f6e83ced3713a8796ad464930 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Thu, 13 Jul 2023 00:20:01 +0200
Subject: [PATCH 1299/1604] Move all conversion code to LegacyBeatmapExporter

---
 osu.Game/Beatmaps/BeatmapManager.cs        | 85 +---------------------
 osu.Game/Database/LegacyArchiveExporter.cs |  4 +-
 osu.Game/Database/LegacyBeatmapExporter.cs | 70 ++++++++++++++++++
 osu.Game/Database/ModelManager.cs          |  8 +-
 4 files changed, 78 insertions(+), 89 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 248e97d6ee..ffdff13845 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -18,18 +18,14 @@ using osu.Framework.Platform;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.Database;
 using osu.Game.Extensions;
-using osu.Game.IO;
 using osu.Game.IO.Archives;
 using osu.Game.Models;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Rulesets;
-using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Skinning;
 using osu.Game.Utils;
-using osuTK;
 
 namespace osu.Game.Beatmaps
 {
@@ -411,86 +407,7 @@ namespace osu.Game.Beatmaps
 
         public Task Export(BeatmapSetInfo beatmap) => beatmapExporter.ExportAsync(beatmap.ToLive(Realm));
 
-        /// <summary>
-        /// Creates a copy of the <see cref="BeatmapSetInfo"/> and converts all beatmaps to legacy format, then exports it as a legacy package.
-        /// </summary>
-        /// <param name="beatmapSetInfo"></param>
-        /// <returns></returns>
-        public Task ExportLegacy(BeatmapSetInfo beatmapSetInfo)
-        {
-            // Create a clone of the original beatmap set which we will convert to legacy format and then export
-            var clone = new BeatmapSetInfo(beatmapSetInfo.Beatmaps.Select(b => b.Clone()));
-            clone.Files.AddRange(beatmapSetInfo.Files.Select(f => new RealmNamedFileUsage(f.File, f.Filename)));
-
-            // convert all beatmaps in the cloned beatmap set to legacy format
-            foreach (var beatmapInfo in clone.Beatmaps)
-            {
-                beatmapInfo.BeatmapSet = clone;
-                beatmapInfo.ID = Guid.NewGuid();
-
-                var file = beatmapInfo.File;
-                if (file == null)
-                    continue;
-
-                using var contentStream = RealmFileStore.Storage.GetStream(file.File.GetStoragePath());
-                using var contentStreamReader = new LineBufferedReader(contentStream);
-                var beatmapContent = new LegacyBeatmapDecoder().Decode(contentStreamReader);
-
-                using var skinStream = RealmFileStore.Storage.GetStream(file.File.GetStoragePath());
-                using var skinStreamReader = new LineBufferedReader(contentStream);
-                var beatmapSkin = new LegacySkin(new SkinInfo(), null!)
-                {
-                    Configuration = new LegacySkinDecoder().Decode(skinStreamReader)
-                };
-
-                Realm.Realm.Write(realm =>
-                {
-                    using var stream = new MemoryStream();
-                    convertAndEncodeLegacyBeatmap(beatmapContent, beatmapSkin, stream);
-
-                    beatmapInfo.MD5Hash = stream.ComputeMD5Hash();
-                    beatmapInfo.Hash = stream.ComputeSHA2Hash();
-
-                    file.File = RealmFileStore.Add(stream, realm).Detach();
-                });
-            }
-
-            return legacyBeatmapExporter.ExportAsync(new RealmLiveUnmanaged<BeatmapSetInfo>(clone));
-        }
-
-        private void convertAndEncodeLegacyBeatmap(IBeatmap beatmapContent, ISkin beatmapSkin, Stream stream)
-        {
-            // Convert beatmap elements to be compatible with legacy format
-            // So we truncate time and position values to integers, and convert paths with multiple segments to bezier curves
-            foreach (var controlPoint in beatmapContent.ControlPointInfo.AllControlPoints)
-                controlPoint.Time = Math.Floor(controlPoint.Time);
-
-            foreach (var hitObject in beatmapContent.HitObjects)
-            {
-                hitObject.StartTime = Math.Floor(hitObject.StartTime);
-
-                if (hitObject is not IHasPath hasPath || BezierConverter.CountSegments(hasPath.Path.ControlPoints) <= 1) continue;
-
-                var newControlPoints = BezierConverter.ConvertToModernBezier(hasPath.Path.ControlPoints);
-
-                // Truncate control points to integer positions
-                foreach (var pathControlPoint in newControlPoints)
-                {
-                    pathControlPoint.Position = new Vector2(
-                        (float)Math.Floor(pathControlPoint.Position.X),
-                        (float)Math.Floor(pathControlPoint.Position.Y));
-                }
-
-                hasPath.Path.ControlPoints.Clear();
-                hasPath.Path.ControlPoints.AddRange(newControlPoints);
-            }
-
-            // Encode to legacy format
-            using (var sw = new StreamWriter(stream, Encoding.UTF8, 1024, true))
-                new LegacyBeatmapEncoder(beatmapContent, beatmapSkin).Encode(sw);
-
-            stream.Seek(0, SeekOrigin.Begin);
-        }
+        public Task ExportLegacy(BeatmapSetInfo beatmap) => legacyBeatmapExporter.ExportAsync(beatmap.ToLive(Realm));
 
         private void updateHashAndMarkDirty(BeatmapSetInfo setInfo)
         {
diff --git a/osu.Game/Database/LegacyArchiveExporter.cs b/osu.Game/Database/LegacyArchiveExporter.cs
index 7689ffc13d..9805207591 100644
--- a/osu.Game/Database/LegacyArchiveExporter.cs
+++ b/osu.Game/Database/LegacyArchiveExporter.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Database
                 {
                     cancellationToken.ThrowIfCancellationRequested();
 
-                    using (var stream = UserFileStorage.GetStream(file.File.GetStoragePath()))
+                    using (var stream = GetFileContents(model, file))
                     {
                         if (stream == null)
                         {
@@ -65,5 +65,7 @@ namespace osu.Game.Database
                 }
             }
         }
+
+        protected virtual Stream? GetFileContents(TModel model, INamedFileUsage file) => UserFileStorage.GetStream(file.File.GetStoragePath());
     }
 }
diff --git a/osu.Game/Database/LegacyBeatmapExporter.cs b/osu.Game/Database/LegacyBeatmapExporter.cs
index 62096f862a..42d8a72073 100644
--- a/osu.Game/Database/LegacyBeatmapExporter.cs
+++ b/osu.Game/Database/LegacyBeatmapExporter.cs
@@ -1,13 +1,25 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
+using System.IO;
+using System.Linq;
+using System.Text;
 using osu.Framework.Platform;
 using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Formats;
+using osu.Game.Extensions;
+using osu.Game.IO;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Skinning;
+using osuTK;
 
 namespace osu.Game.Database
 {
     /// <summary>
     /// Exporter for osu!stable legacy beatmap archives.
+    /// Converts all beatmaps in the set to legacy format and exports it as a legacy package.
     /// </summary>
     public class LegacyBeatmapExporter : LegacyArchiveExporter<BeatmapSetInfo>
     {
@@ -16,6 +28,64 @@ namespace osu.Game.Database
         {
         }
 
+        protected override Stream? GetFileContents(BeatmapSetInfo model, INamedFileUsage file)
+        {
+            bool isBeatmap = model.Beatmaps.Any(o => o.Hash == file.File.Hash);
+
+            if (!isBeatmap)
+                return base.GetFileContents(model, file);
+
+            // Read the beatmap contents and skin
+            using var contentStream = UserFileStorage.GetStream(file.File.GetStoragePath());
+
+            if (contentStream == null)
+                return null;
+
+            using var contentStreamReader = new LineBufferedReader(contentStream);
+            var beatmapContent = new LegacyBeatmapDecoder().Decode(contentStreamReader);
+
+            using var skinStream = UserFileStorage.GetStream(file.File.GetStoragePath());
+            using var skinStreamReader = new LineBufferedReader(contentStream);
+            var beatmapSkin = new LegacySkin(new SkinInfo(), null!)
+            {
+                Configuration = new LegacySkinDecoder().Decode(skinStreamReader)
+            };
+
+            // Convert beatmap elements to be compatible with legacy format
+            // So we truncate time and position values to integers, and convert paths with multiple segments to bezier curves
+            foreach (var controlPoint in beatmapContent.ControlPointInfo.AllControlPoints)
+                controlPoint.Time = Math.Floor(controlPoint.Time);
+
+            foreach (var hitObject in beatmapContent.HitObjects)
+            {
+                hitObject.StartTime = Math.Floor(hitObject.StartTime);
+
+                if (hitObject is not IHasPath hasPath || BezierConverter.CountSegments(hasPath.Path.ControlPoints) <= 1) continue;
+
+                var newControlPoints = BezierConverter.ConvertToModernBezier(hasPath.Path.ControlPoints);
+
+                // Truncate control points to integer positions
+                foreach (var pathControlPoint in newControlPoints)
+                {
+                    pathControlPoint.Position = new Vector2(
+                        (float)Math.Floor(pathControlPoint.Position.X),
+                        (float)Math.Floor(pathControlPoint.Position.Y));
+                }
+
+                hasPath.Path.ControlPoints.Clear();
+                hasPath.Path.ControlPoints.AddRange(newControlPoints);
+            }
+
+            // Encode to legacy format
+            var stream = new MemoryStream();
+            using (var sw = new StreamWriter(stream, Encoding.UTF8, 1024, true))
+                new LegacyBeatmapEncoder(beatmapContent, beatmapSkin).Encode(sw);
+
+            stream.Seek(0, SeekOrigin.Begin);
+
+            return stream;
+        }
+
         protected override string FileExtension => @".osz";
     }
 }
diff --git a/osu.Game/Database/ModelManager.cs b/osu.Game/Database/ModelManager.cs
index 172a2df5a3..7d1dc5239a 100644
--- a/osu.Game/Database/ModelManager.cs
+++ b/osu.Game/Database/ModelManager.cs
@@ -25,11 +25,11 @@ namespace osu.Game.Database
 
         protected RealmAccess Realm { get; }
 
-        protected readonly RealmFileStore RealmFileStore;
+        private readonly RealmFileStore realmFileStore;
 
         public ModelManager(Storage storage, RealmAccess realm)
         {
-            RealmFileStore = new RealmFileStore(realm, storage);
+            realmFileStore = new RealmFileStore(realm, storage);
             Realm = realm;
         }
 
@@ -77,7 +77,7 @@ namespace osu.Game.Database
         /// </summary>
         public void ReplaceFile(RealmNamedFileUsage file, Stream contents, Realm realm)
         {
-            file.File = RealmFileStore.Add(contents, realm);
+            file.File = realmFileStore.Add(contents, realm);
         }
 
         /// <summary>
@@ -93,7 +93,7 @@ namespace osu.Game.Database
                 return;
             }
 
-            var file = RealmFileStore.Add(contents, realm);
+            var file = realmFileStore.Add(contents, realm);
             var namedUsage = new RealmNamedFileUsage(file, filename);
 
             item.Files.Add(namedUsage);

From d62cfc16166ff48f07778a67d37fe939e71e80c0 Mon Sep 17 00:00:00 2001
From: Andrew Hong <andrew.jwn.hong@gmail.com>
Date: Wed, 12 Jul 2023 20:24:09 -0400
Subject: [PATCH 1300/1604] Parse emoji to an empty string

---
 osu.Game/Online/Chat/MessageFormatter.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Online/Chat/MessageFormatter.cs b/osu.Game/Online/Chat/MessageFormatter.cs
index 6ca651bc87..3e03cc287b 100644
--- a/osu.Game/Online/Chat/MessageFormatter.cs
+++ b/osu.Game/Online/Chat/MessageFormatter.cs
@@ -256,6 +256,9 @@ namespace osu.Game.Online.Chat
 
         private static MessageFormatterResult format(string toFormat, int startIndex = 0, int space = 3)
         {
+            // see: https://github.com/ppy/osu/pull/24190
+            toFormat = Regex.Replace(toFormat, emoji_regex.ToString(), string.Empty);
+
             var result = new MessageFormatterResult(toFormat);
 
             // handle the [link display] format

From 5a43de1ace9e81e8e838c077f4fc79d5dbb1d229 Mon Sep 17 00:00:00 2001
From: Andrew Hong <andrew.jwn.hong@gmail.com>
Date: Wed, 12 Jul 2023 21:13:10 -0400
Subject: [PATCH 1301/1604] Update test cases

---
 osu.Game.Tests/Chat/MessageFormatterTests.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Chat/MessageFormatterTests.cs b/osu.Game.Tests/Chat/MessageFormatterTests.cs
index 3c35dc311f..fef8054c70 100644
--- a/osu.Game.Tests/Chat/MessageFormatterTests.cs
+++ b/osu.Game.Tests/Chat/MessageFormatterTests.cs
@@ -478,7 +478,7 @@ namespace osu.Game.Tests.Chat
                 Content = "This is a [http://www.simple-test.com simple test] with some [traps] and [[wiki links]]. Don't forget to visit https://osu.ppy.sh (now!)[http://google.com]\uD83D\uDE12"
             });
 
-            Assert.AreEqual("This is a simple test with some [traps] and wiki links. Don't forget to visit https://osu.ppy.sh now!\0\0\0", result.DisplayContent);
+            Assert.AreEqual("This is a simple test with some [traps] and wiki links. Don't forget to visit https://osu.ppy.sh now!", result.DisplayContent);
             Assert.AreEqual(5, result.Links.Count);
 
             Link f = result.Links.Find(l => l.Url == "https://dev.ppy.sh/wiki/wiki links");
@@ -508,6 +508,7 @@ namespace osu.Game.Tests.Chat
         }
 
         [Test]
+        [Ignore("https://github.com/ppy/osu/pull/24190")]
         public void TestEmoji()
         {
             Message result = MessageFormatter.FormatMessage(new Message { Content = "Hello world\uD83D\uDE12<--This is an emoji,There are more:\uD83D\uDE10\uD83D\uDE00,\uD83D\uDE20" });

From 3d256acfef02706afcb51316161314dd46edd19d Mon Sep 17 00:00:00 2001
From: Andrew Hong <andrew.jwn.hong@gmail.com>
Date: Wed, 12 Jul 2023 21:40:49 -0400
Subject: [PATCH 1302/1604] Delete emoji test in TestLinkComplex

---
 osu.Game.Tests/Chat/MessageFormatterTests.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game.Tests/Chat/MessageFormatterTests.cs b/osu.Game.Tests/Chat/MessageFormatterTests.cs
index fef8054c70..5c063a5c6c 100644
--- a/osu.Game.Tests/Chat/MessageFormatterTests.cs
+++ b/osu.Game.Tests/Chat/MessageFormatterTests.cs
@@ -500,11 +500,6 @@ namespace osu.Game.Tests.Chat
             Assert.That(f, Is.Not.Null);
             Assert.AreEqual(78, f.Index);
             Assert.AreEqual(18, f.Length);
-
-            f = result.Links.Find(l => l.Url == "\uD83D\uDE12");
-            Assert.That(f, Is.Not.Null);
-            Assert.AreEqual(101, f.Index);
-            Assert.AreEqual(3, f.Length);
         }
 
         [Test]

From f44e6e510d967792e55b86b7163a9d70addcf499 Mon Sep 17 00:00:00 2001
From: Andrew Hong <andrew.jwn.hong@gmail.com>
Date: Wed, 12 Jul 2023 22:42:12 -0400
Subject: [PATCH 1303/1604] 5 -> 4

---
 osu.Game.Tests/Chat/MessageFormatterTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Chat/MessageFormatterTests.cs b/osu.Game.Tests/Chat/MessageFormatterTests.cs
index 5c063a5c6c..aa45e360e6 100644
--- a/osu.Game.Tests/Chat/MessageFormatterTests.cs
+++ b/osu.Game.Tests/Chat/MessageFormatterTests.cs
@@ -479,7 +479,7 @@ namespace osu.Game.Tests.Chat
             });
 
             Assert.AreEqual("This is a simple test with some [traps] and wiki links. Don't forget to visit https://osu.ppy.sh now!", result.DisplayContent);
-            Assert.AreEqual(5, result.Links.Count);
+            Assert.AreEqual(4, result.Links.Count);
 
             Link f = result.Links.Find(l => l.Url == "https://dev.ppy.sh/wiki/wiki links");
             Assert.That(f, Is.Not.Null);

From 8e294c325842430f56189ef8142a4b288279c07f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Jul 2023 13:22:45 +0900
Subject: [PATCH 1304/1604] Add test coverage of hitting objects immediately
 after a swell

---
 .../Judgements/TestSceneSwellJudgements.cs    | 70 +++++++++++++++++++
 1 file changed, 70 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneSwellJudgements.cs b/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneSwellJudgements.cs
index ccc829f09e..4abad98eab 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneSwellJudgements.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneSwellJudgements.cs
@@ -114,5 +114,75 @@ namespace osu.Game.Rulesets.Taiko.Tests.Judgements
 
             AddAssert("all tick offsets are 0", () => JudgementResults.Where(r => r.HitObject is SwellTick).All(r => r.TimeOffset == 0));
         }
+
+        /// <summary>
+        /// Ensure input is correctly sent to subsequent hits if a swell is fully completed.
+        /// </summary>
+        [Test]
+        public void TestHitSwellThenHitHit()
+        {
+            const double swell_time = 1000;
+            const double hit_time = 1150;
+
+            Swell swell = new Swell
+            {
+                StartTime = swell_time,
+                Duration = 100,
+                RequiredHits = 1
+            };
+
+            Hit hit = new Hit
+            {
+                StartTime = hit_time
+            };
+
+            List<ReplayFrame> frames = new List<ReplayFrame>
+            {
+                new TaikoReplayFrame(0),
+                new TaikoReplayFrame(swell_time, TaikoAction.LeftRim),
+                new TaikoReplayFrame(hit_time, TaikoAction.RightCentre),
+            };
+
+            PerformTest(frames, CreateBeatmap(swell, hit));
+
+            AssertJudgementCount(3);
+
+            AssertResult<SwellTick>(0, HitResult.IgnoreHit);
+            AssertResult<Swell>(0, HitResult.LargeBonus);
+            AssertResult<Hit>(0, HitResult.Great);
+        }
+
+        [Test]
+        public void TestMissSwellThenHitHit()
+        {
+            const double swell_time = 1000;
+            const double hit_time = 1150;
+
+            Swell swell = new Swell
+            {
+                StartTime = swell_time,
+                Duration = 100,
+                RequiredHits = 1
+            };
+
+            Hit hit = new Hit
+            {
+                StartTime = hit_time
+            };
+
+            List<ReplayFrame> frames = new List<ReplayFrame>
+            {
+                new TaikoReplayFrame(0),
+                new TaikoReplayFrame(hit_time, TaikoAction.RightCentre),
+            };
+
+            PerformTest(frames, CreateBeatmap(swell, hit));
+
+            AssertJudgementCount(3);
+
+            AssertResult<SwellTick>(0, HitResult.IgnoreMiss);
+            AssertResult<Swell>(0, HitResult.IgnoreMiss);
+            AssertResult<Hit>(0, HitResult.Great);
+        }
     }
 }

From 259ac6d427b3142a99c0366024adb068b97cb47e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Jul 2023 13:16:58 +0900
Subject: [PATCH 1305/1604] Fix osu!taiko swells eating input after already
 being judged

---
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
index 8441e3a749..3fa6f4b756 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
@@ -276,6 +276,9 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             if (Time.Current < HitObject.StartTime)
                 return false;
 
+            if (AllJudged)
+                return false;
+
             bool isCentre = e.Action == TaikoAction.LeftCentre || e.Action == TaikoAction.RightCentre;
 
             // Ensure alternating centre and rim hits

From fbf14a0f7cbd4c9b354c71affb49d8e0406c8584 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Jul 2023 13:41:35 +0900
Subject: [PATCH 1306/1604] Allow autoplay to fail

Feels more correct.
---
 osu.Game/Rulesets/Mods/ModAutoplay.cs | 4 +---
 osu.Game/Screens/Play/ReplayPlayer.cs | 3 ++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModAutoplay.cs b/osu.Game/Rulesets/Mods/ModAutoplay.cs
index 83afda3a28..ab2c84bada 100644
--- a/osu.Game/Rulesets/Mods/ModAutoplay.cs
+++ b/osu.Game/Rulesets/Mods/ModAutoplay.cs
@@ -11,7 +11,7 @@ using osu.Game.Replays;
 
 namespace osu.Game.Rulesets.Mods
 {
-    public abstract class ModAutoplay : Mod, IApplicableFailOverride, ICreateReplayData
+    public abstract class ModAutoplay : Mod, ICreateReplayData
     {
         public override string Name => "Autoplay";
         public override string Acronym => "AT";
@@ -20,8 +20,6 @@ namespace osu.Game.Rulesets.Mods
         public override LocalisableString Description => "Watch a perfect automated play through the song.";
         public override double ScoreMultiplier => 1;
 
-        public bool PerformFail() => false;
-
         public bool RestartOnFail => false;
 
         public override bool UserPlayable => false;
diff --git a/osu.Game/Screens/Play/ReplayPlayer.cs b/osu.Game/Screens/Play/ReplayPlayer.cs
index 8a4e63d21c..ca71a89b48 100644
--- a/osu.Game/Screens/Play/ReplayPlayer.cs
+++ b/osu.Game/Screens/Play/ReplayPlayer.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Bindables;
 using osu.Framework.Input.Bindings;
@@ -30,7 +31,7 @@ namespace osu.Game.Screens.Play
         // Disallow replays from failing. (see https://github.com/ppy/osu/issues/6108)
         protected override bool CheckModsAllowFailure()
         {
-            if (!replayIsFailedScore)
+            if (!replayIsFailedScore && !GameplayState.Mods.OfType<ModAutoplay>().Any())
                 return false;
 
             return base.CheckModsAllowFailure();

From 1bfe5a18cb94de911bb6ecf445abc8d32fe254ca Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Jul 2023 13:46:50 +0900
Subject: [PATCH 1307/1604] Rename `RestoreDefaultValueButton` to
 `RevertToDefaultButton`

Because I can't find it every time I search.
---
 .../Settings/TestSceneKeyBindingPanel.cs      | 10 +++---
 ...n.cs => TestSceneRevertToDefaultButton.cs} | 10 +++---
 .../Visual/Settings/TestSceneSettingsItem.cs  | 34 +++++++++----------
 .../TestSceneModSelectOverlay.cs              |  2 +-
 ...alueButton.cs => RevertToDefaultButton.cs} |  4 +--
 .../Settings/Sections/Input/KeyBindingRow.cs  |  2 +-
 osu.Game/Overlays/Settings/SettingsItem.cs    |  2 +-
 7 files changed, 32 insertions(+), 32 deletions(-)
 rename osu.Game.Tests/Visual/Settings/{TestSceneRestoreDefaultValueButton.cs => TestSceneRevertToDefaultButton.cs} (82%)
 rename osu.Game/Overlays/{RestoreDefaultValueButton.cs => RevertToDefaultButton.cs} (97%)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
index da48086717..449ca0f258 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
@@ -195,16 +195,16 @@ namespace osu.Game.Tests.Visual.Settings
                 InputManager.ReleaseKey(Key.P);
             });
 
-            AddUntilStep("restore button shown", () => settingsKeyBindingRow.ChildrenOfType<RestoreDefaultValueButton<bool>>().First().Alpha > 0);
+            AddUntilStep("restore button shown", () => settingsKeyBindingRow.ChildrenOfType<RevertToDefaultButton<bool>>().First().Alpha > 0);
 
             AddStep("click reset button for bindings", () =>
             {
-                var resetButton = settingsKeyBindingRow.ChildrenOfType<RestoreDefaultValueButton<bool>>().First();
+                var resetButton = settingsKeyBindingRow.ChildrenOfType<RevertToDefaultButton<bool>>().First();
 
                 resetButton.TriggerClick();
             });
 
-            AddUntilStep("restore button hidden", () => settingsKeyBindingRow.ChildrenOfType<RestoreDefaultValueButton<bool>>().First().Alpha == 0);
+            AddUntilStep("restore button hidden", () => settingsKeyBindingRow.ChildrenOfType<RevertToDefaultButton<bool>>().First().Alpha == 0);
 
             AddAssert("binding cleared",
                 () => settingsKeyBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().ElementAt(0).KeyBinding.KeyCombination.Equals(settingsKeyBindingRow.Defaults.ElementAt(0)));
@@ -225,7 +225,7 @@ namespace osu.Game.Tests.Visual.Settings
                 InputManager.ReleaseKey(Key.P);
             });
 
-            AddUntilStep("restore button shown", () => settingsKeyBindingRow.ChildrenOfType<RestoreDefaultValueButton<bool>>().First().Alpha > 0);
+            AddUntilStep("restore button shown", () => settingsKeyBindingRow.ChildrenOfType<RevertToDefaultButton<bool>>().First().Alpha > 0);
 
             AddStep("click reset button for bindings", () =>
             {
@@ -234,7 +234,7 @@ namespace osu.Game.Tests.Visual.Settings
                 resetButton.TriggerClick();
             });
 
-            AddUntilStep("restore button hidden", () => settingsKeyBindingRow.ChildrenOfType<RestoreDefaultValueButton<bool>>().First().Alpha == 0);
+            AddUntilStep("restore button hidden", () => settingsKeyBindingRow.ChildrenOfType<RevertToDefaultButton<bool>>().First().Alpha == 0);
 
             AddAssert("binding cleared",
                 () => settingsKeyBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().ElementAt(0).KeyBinding.KeyCombination.Equals(settingsKeyBindingRow.Defaults.ElementAt(0)));
diff --git a/osu.Game.Tests/Visual/Settings/TestSceneRestoreDefaultValueButton.cs b/osu.Game.Tests/Visual/Settings/TestSceneRevertToDefaultButton.cs
similarity index 82%
rename from osu.Game.Tests/Visual/Settings/TestSceneRestoreDefaultValueButton.cs
rename to osu.Game.Tests/Visual/Settings/TestSceneRevertToDefaultButton.cs
index 6e52881f5e..609283edfc 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneRestoreDefaultValueButton.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneRevertToDefaultButton.cs
@@ -15,7 +15,7 @@ using osuTK;
 
 namespace osu.Game.Tests.Visual.Settings
 {
-    public partial class TestSceneRestoreDefaultValueButton : OsuTestScene
+    public partial class TestSceneRevertToDefaultButton : OsuTestScene
     {
         [Resolved]
         private OsuColour colours { get; set; }
@@ -31,7 +31,7 @@ namespace osu.Game.Tests.Visual.Settings
         [Test]
         public void TestBasic()
         {
-            RestoreDefaultValueButton<float> restoreDefaultValueButton = null;
+            RevertToDefaultButton<float> revertToDefaultButton = null;
 
             AddStep("create button", () => Child = new Container
             {
@@ -43,7 +43,7 @@ namespace osu.Game.Tests.Visual.Settings
                         RelativeSizeAxes = Axes.Both,
                         Colour = colours.GreySeaFoam
                     },
-                    restoreDefaultValueButton = new RestoreDefaultValueButton<float>
+                    revertToDefaultButton = new RevertToDefaultButton<float>
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
@@ -55,8 +55,8 @@ namespace osu.Game.Tests.Visual.Settings
             AddSliderStep("set scale", 1, 4, 1, scale =>
             {
                 this.scale = scale;
-                if (restoreDefaultValueButton != null)
-                    restoreDefaultValueButton.Scale = new Vector2(scale);
+                if (revertToDefaultButton != null)
+                    revertToDefaultButton.Scale = new Vector2(scale);
             });
             AddToggleStep("toggle default state", state => current.Value = state ? default : 1);
             AddToggleStep("toggle disabled state", state => current.Disabled = state);
diff --git a/osu.Game.Tests/Visual/Settings/TestSceneSettingsItem.cs b/osu.Game.Tests/Visual/Settings/TestSceneSettingsItem.cs
index 384508f375..ec0ad685c5 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneSettingsItem.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneSettingsItem.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Tests.Visual.Settings
         public void TestRestoreDefaultValueButtonVisibility()
         {
             SettingsTextBox textBox = null;
-            RestoreDefaultValueButton<string> restoreDefaultValueButton = null;
+            RevertToDefaultButton<string> revertToDefaultButton = null;
 
             AddStep("create settings item", () =>
             {
@@ -33,22 +33,22 @@ namespace osu.Game.Tests.Visual.Settings
                 };
             });
             AddUntilStep("wait for loaded", () => textBox.IsLoaded);
-            AddStep("retrieve restore default button", () => restoreDefaultValueButton = textBox.ChildrenOfType<RestoreDefaultValueButton<string>>().Single());
+            AddStep("retrieve restore default button", () => revertToDefaultButton = textBox.ChildrenOfType<RevertToDefaultButton<string>>().Single());
 
-            AddAssert("restore button hidden", () => restoreDefaultValueButton.Alpha == 0);
+            AddAssert("restore button hidden", () => revertToDefaultButton.Alpha == 0);
 
             AddStep("change value from default", () => textBox.Current.Value = "non-default");
-            AddUntilStep("restore button shown", () => restoreDefaultValueButton.Alpha > 0);
+            AddUntilStep("restore button shown", () => revertToDefaultButton.Alpha > 0);
 
             AddStep("restore default", () => textBox.Current.SetDefault());
-            AddUntilStep("restore button hidden", () => restoreDefaultValueButton.Alpha == 0);
+            AddUntilStep("restore button hidden", () => revertToDefaultButton.Alpha == 0);
         }
 
         [Test]
         public void TestSetAndClearLabelText()
         {
             SettingsTextBox textBox = null;
-            RestoreDefaultValueButton<string> restoreDefaultValueButton = null;
+            RevertToDefaultButton<string> revertToDefaultButton = null;
             OsuTextBox control = null;
 
             AddStep("create settings item", () =>
@@ -61,25 +61,25 @@ namespace osu.Game.Tests.Visual.Settings
             AddUntilStep("wait for loaded", () => textBox.IsLoaded);
             AddStep("retrieve components", () =>
             {
-                restoreDefaultValueButton = textBox.ChildrenOfType<RestoreDefaultValueButton<string>>().Single();
+                revertToDefaultButton = textBox.ChildrenOfType<RevertToDefaultButton<string>>().Single();
                 control = textBox.ChildrenOfType<OsuTextBox>().Single();
             });
 
-            AddStep("set non-default value", () => restoreDefaultValueButton.Current.Value = "non-default");
-            AddAssert("default value button centre aligned to control size", () => Precision.AlmostEquals(restoreDefaultValueButton.Parent.DrawHeight, control.DrawHeight, 1));
+            AddStep("set non-default value", () => revertToDefaultButton.Current.Value = "non-default");
+            AddAssert("default value button centre aligned to control size", () => Precision.AlmostEquals(revertToDefaultButton.Parent.DrawHeight, control.DrawHeight, 1));
 
             AddStep("set label", () => textBox.LabelText = "label text");
             AddAssert("default value button centre aligned to label size", () =>
             {
                 var label = textBox.ChildrenOfType<OsuSpriteText>().Single(spriteText => spriteText.Text == "label text");
-                return Precision.AlmostEquals(restoreDefaultValueButton.Parent.DrawHeight, label.DrawHeight, 1);
+                return Precision.AlmostEquals(revertToDefaultButton.Parent.DrawHeight, label.DrawHeight, 1);
             });
 
             AddStep("clear label", () => textBox.LabelText = default);
-            AddAssert("default value button centre aligned to control size", () => Precision.AlmostEquals(restoreDefaultValueButton.Parent.DrawHeight, control.DrawHeight, 1));
+            AddAssert("default value button centre aligned to control size", () => Precision.AlmostEquals(revertToDefaultButton.Parent.DrawHeight, control.DrawHeight, 1));
 
             AddStep("set warning text", () => textBox.SetNoticeText("This is some very important warning text! Hopefully it doesn't break the alignment of the default value indicator...", true));
-            AddAssert("default value button centre aligned to control size", () => Precision.AlmostEquals(restoreDefaultValueButton.Parent.DrawHeight, control.DrawHeight, 1));
+            AddAssert("default value button centre aligned to control size", () => Precision.AlmostEquals(revertToDefaultButton.Parent.DrawHeight, control.DrawHeight, 1));
         }
 
         /// <summary>
@@ -92,7 +92,7 @@ namespace osu.Game.Tests.Visual.Settings
         {
             BindableFloat current = null;
             SettingsSlider<float> sliderBar = null;
-            RestoreDefaultValueButton<float> restoreDefaultValueButton = null;
+            RevertToDefaultButton<float> revertToDefaultButton = null;
 
             AddStep("create settings item", () =>
             {
@@ -107,15 +107,15 @@ namespace osu.Game.Tests.Visual.Settings
                 };
             });
             AddUntilStep("wait for loaded", () => sliderBar.IsLoaded);
-            AddStep("retrieve restore default button", () => restoreDefaultValueButton = sliderBar.ChildrenOfType<RestoreDefaultValueButton<float>>().Single());
+            AddStep("retrieve restore default button", () => revertToDefaultButton = sliderBar.ChildrenOfType<RevertToDefaultButton<float>>().Single());
 
-            AddAssert("restore button hidden", () => restoreDefaultValueButton.Alpha == 0);
+            AddAssert("restore button hidden", () => revertToDefaultButton.Alpha == 0);
 
             AddStep("change value to next closest", () => sliderBar.Current.Value += current.Precision * 0.6f);
-            AddUntilStep("restore button shown", () => restoreDefaultValueButton.Alpha > 0);
+            AddUntilStep("restore button shown", () => revertToDefaultButton.Alpha > 0);
 
             AddStep("restore default", () => sliderBar.Current.SetDefault());
-            AddUntilStep("restore button hidden", () => restoreDefaultValueButton.Alpha == 0);
+            AddUntilStep("restore button hidden", () => revertToDefaultButton.Alpha == 0);
         }
 
         [Test]
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 4cb6899ebc..ad79865ad9 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -793,7 +793,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             AddStep("open customisation area", () => modSelectOverlay.CustomisationButton!.TriggerClick());
             AddStep("reset half time speed to default", () => modSelectOverlay.ChildrenOfType<ModSettingsArea>().Single()
-                                                                              .ChildrenOfType<RestoreDefaultValueButton<double>>().Single().TriggerClick());
+                                                                              .ChildrenOfType<RevertToDefaultButton<double>>().Single().TriggerClick());
             AddUntilStep("difficulty multiplier display shows correct value", () => modSelectOverlay.ChildrenOfType<DifficultyMultiplierDisplay>().Single().Current.Value, () => Is.EqualTo(0.7));
         }
 
diff --git a/osu.Game/Overlays/RestoreDefaultValueButton.cs b/osu.Game/Overlays/RevertToDefaultButton.cs
similarity index 97%
rename from osu.Game/Overlays/RestoreDefaultValueButton.cs
rename to osu.Game/Overlays/RevertToDefaultButton.cs
index 97c66fdf02..fcd8b74009 100644
--- a/osu.Game/Overlays/RestoreDefaultValueButton.cs
+++ b/osu.Game/Overlays/RevertToDefaultButton.cs
@@ -22,7 +22,7 @@ using osu.Game.Localisation;
 
 namespace osu.Game.Overlays
 {
-    public partial class RestoreDefaultValueButton<T> : OsuClickableContainer, IHasCurrentValue<T>
+    public partial class RevertToDefaultButton<T> : OsuClickableContainer, IHasCurrentValue<T>
     {
         public override bool IsPresent => base.IsPresent || Scheduler.HasPendingTasks;
 
@@ -58,7 +58,7 @@ namespace osu.Game.Overlays
         private CircularContainer circle = null!;
         private Box background = null!;
 
-        public RestoreDefaultValueButton()
+        public RevertToDefaultButton()
             : base(HoverSampleSet.Button)
         {
         }
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
index 725925c8cf..1e2283b58b 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
@@ -103,7 +103,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 {
                     RelativeSizeAxes = Axes.Y,
                     Width = SettingsPanel.CONTENT_MARGINS,
-                    Child = new RestoreDefaultValueButton<bool>
+                    Child = new RevertToDefaultButton<bool>
                     {
                         Current = isDefault,
                         Action = RestoreDefaults,
diff --git a/osu.Game/Overlays/Settings/SettingsItem.cs b/osu.Game/Overlays/Settings/SettingsItem.cs
index 5f4bb9d57f..9085b6c911 100644
--- a/osu.Game/Overlays/Settings/SettingsItem.cs
+++ b/osu.Game/Overlays/Settings/SettingsItem.cs
@@ -217,7 +217,7 @@ namespace osu.Game.Overlays.Settings
             // intentionally done before LoadComplete to avoid overhead.
             if (ShowsDefaultIndicator)
             {
-                defaultValueIndicatorContainer.Add(new RestoreDefaultValueButton<T>
+                defaultValueIndicatorContainer.Add(new RevertToDefaultButton<T>
                 {
                     Current = controlWithCurrent.Current,
                     Anchor = Anchor.Centre,

From 94201579f6d6307308cb9823a308d9bd9c6db5cc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Jul 2023 14:26:01 +0900
Subject: [PATCH 1308/1604] Update design of "revert to default" button

I keep getting feedback that the old design looked like anything *but* a
button to revert defaults. Including people clicking it expecting
opposite behaviour.

This is intended to be a temporary design until we get the full new UI
components online (where this is moved to the right-hand-side).
---
 .../TestSceneRevertToDefaultButton.cs         | 13 ++-
 osu.Game/Overlays/RevertToDefaultButton.cs    | 85 +++++++++----------
 2 files changed, 44 insertions(+), 54 deletions(-)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneRevertToDefaultButton.cs b/osu.Game.Tests/Visual/Settings/TestSceneRevertToDefaultButton.cs
index 609283edfc..bfef120358 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneRevertToDefaultButton.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneRevertToDefaultButton.cs
@@ -1,15 +1,12 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics;
 using osu.Game.Overlays;
 using osuTK;
 
@@ -17,11 +14,11 @@ namespace osu.Game.Tests.Visual.Settings
 {
     public partial class TestSceneRevertToDefaultButton : OsuTestScene
     {
-        [Resolved]
-        private OsuColour colours { get; set; }
-
         private float scale = 1;
 
+        [Cached]
+        private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
+
         private readonly Bindable<float> current = new Bindable<float>
         {
             Default = default,
@@ -31,7 +28,7 @@ namespace osu.Game.Tests.Visual.Settings
         [Test]
         public void TestBasic()
         {
-            RevertToDefaultButton<float> revertToDefaultButton = null;
+            RevertToDefaultButton<float> revertToDefaultButton = null!;
 
             AddStep("create button", () => Child = new Container
             {
@@ -41,7 +38,7 @@ namespace osu.Game.Tests.Visual.Settings
                     new Box
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Colour = colours.GreySeaFoam
+                        Colour = colourProvider.Background2,
                     },
                     revertToDefaultButton = new RevertToDefaultButton<float>
                     {
diff --git a/osu.Game/Overlays/RevertToDefaultButton.cs b/osu.Game/Overlays/RevertToDefaultButton.cs
index fcd8b74009..48491c5d9c 100644
--- a/osu.Game/Overlays/RevertToDefaultButton.cs
+++ b/osu.Game/Overlays/RevertToDefaultButton.cs
@@ -1,24 +1,20 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Extensions.LocalisationExtensions;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
-using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
-using osuTK;
 using osu.Game.Localisation;
+using osuTK;
 
 namespace osu.Game.Overlays
 {
@@ -31,11 +27,17 @@ namespace osu.Game.Overlays
 
         // this is intentionally not using BindableWithCurrent, as it can use the wrong IsDefault implementation when passed a BindableNumber.
         // using GetBoundCopy() ensures that the received bindable is of the exact same type as the source bindable and uses the proper IsDefault implementation.
-        private Bindable<T> current;
+        private Bindable<T>? current;
+
+        private SpriteIcon icon = null!;
+        private Circle circle = null!;
+
+        [Resolved]
+        private OverlayColourProvider colours { get; set; } = null!;
 
         public Bindable<T> Current
         {
-            get => current;
+            get => current.AsNonNull();
             set
             {
                 current?.UnbindAll();
@@ -50,43 +52,37 @@ namespace osu.Game.Overlays
             }
         }
 
-        [Resolved]
-        private OsuColour colours { get; set; }
-
-        private const float size = 4;
-
-        private CircularContainer circle = null!;
-        private Box background = null!;
-
         public RevertToDefaultButton()
             : base(HoverSampleSet.Button)
         {
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colour)
+        private void load()
         {
             // size intentionally much larger than actual drawn content, so that the button is easier to click.
-            Size = new Vector2(3 * size);
+            Size = new Vector2(14);
 
-            Add(circle = new CircularContainer
+            AddRange(new Drawable[]
             {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Size = new Vector2(size),
-                Masking = true,
-                Child = background = new Box
+                circle = new Circle
                 {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
                     RelativeSizeAxes = Axes.Both,
-                    Colour = colour.Lime1
+                },
+                icon = new SpriteIcon
+                {
+                    Icon = FontAwesome.Solid.Undo,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Size = new Vector2(8),
                 }
             });
 
-            Alpha = 0f;
-
             Action += () =>
             {
-                if (!current.Disabled)
+                if (current?.Disabled == false)
                     current.SetDefault();
             };
         }
@@ -120,28 +116,25 @@ namespace osu.Game.Overlays
             if (current == null)
                 return;
 
-            Enabled.Value = !Current.Disabled;
+            Enabled.Value = !current.Disabled;
 
-            if (!Current.Disabled)
+            this.FadeTo(current.Disabled ? 0.2f : (Current.IsDefault ? 0 : 1), fade_duration, Easing.OutQuint);
+
+            if (IsHovered && Enabled.Value)
             {
-                this.FadeTo(Current.IsDefault ? 0 : 1, fade_duration, Easing.OutQuint);
-                background.FadeColour(IsHovered ? colours.Lime0 : colours.Lime1, fade_duration, Easing.OutQuint);
-                circle.TweenEdgeEffectTo(new EdgeEffectParameters
-                {
-                    Colour = (IsHovered ? colours.Lime1 : colours.Lime3).Opacity(0.4f),
-                    Radius = IsHovered ? 8 : 4,
-                    Type = EdgeEffectType.Glow
-                }, fade_duration, Easing.OutQuint);
+                icon.RotateTo(-40, 500, Easing.OutQuint);
+
+                icon.FadeColour(colours.Light1, 300, Easing.OutQuint);
+                circle.FadeColour(colours.Background2, 300, Easing.OutQuint);
+                this.ScaleTo(1.2f, 300, Easing.OutQuint);
             }
             else
             {
-                background.FadeColour(colours.Lime3, fade_duration, Easing.OutQuint);
-                circle.TweenEdgeEffectTo(new EdgeEffectParameters
-                {
-                    Colour = colours.Lime3.Opacity(0.1f),
-                    Radius = 2,
-                    Type = EdgeEffectType.Glow
-                }, fade_duration, Easing.OutQuint);
+                icon.RotateTo(0, 100, Easing.OutQuint);
+
+                icon.FadeColour(colours.Colour0, 100, Easing.OutQuint);
+                circle.FadeColour(colours.Background3, 100, Easing.OutQuint);
+                this.ScaleTo(1f, 100, Easing.OutQuint);
             }
         }
     }

From e2b5abd4e8e90a0cd6ef169f2fefaad7909a9376 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Jul 2023 14:43:14 +0900
Subject: [PATCH 1309/1604] Split bar drawable creation into own method

---
 .../HitEventTimingDistributionGraph.cs        | 137 +++++++++---------
 1 file changed, 69 insertions(+), 68 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
index 16da8c64a0..7e7c0ccb54 100644
--- a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
+++ b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
@@ -113,94 +113,95 @@ namespace osu.Game.Screens.Ranking.Statistics
                 }
             }
 
-            if (barDrawables != null)
-            {
-                for (int i = 0; i < barDrawables.Length; i++)
-                {
-                    barDrawables[i].UpdateOffset(bins[i].Sum(b => b.Value));
-                }
-            }
+            if (barDrawables == null)
+                createBarDrawables();
             else
             {
-                int maxCount = bins.Max(b => b.Values.Sum());
-                barDrawables = bins.Select((bin, i) => new Bar(bins[i], maxCount, i == timing_distribution_centre_bin_index)).ToArray();
+                for (int i = 0; i < barDrawables.Length; i++)
+                    barDrawables[i].UpdateOffset(bins[i].Sum(b => b.Value));
+            }
+        }
 
-                Container axisFlow;
+        private void createBarDrawables()
+        {
+            int maxCount = bins.Max(b => b.Values.Sum());
+            barDrawables = bins.Select((_, i) => new Bar(bins[i], maxCount, i == timing_distribution_centre_bin_index)).ToArray();
 
-                const float axis_font_size = 12;
+            Container axisFlow;
 
-                InternalChild = new GridContainer
+            const float axis_font_size = 12;
+
+            InternalChild = new GridContainer
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                RelativeSizeAxes = Axes.Both,
+                Width = 0.8f,
+                Content = new[]
                 {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    RelativeSizeAxes = Axes.Both,
-                    Width = 0.8f,
-                    Content = new[]
+                    new Drawable[]
                     {
-                        new Drawable[]
+                        new GridContainer
                         {
-                            new GridContainer
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Content = new[] { barDrawables }
-                            }
-                        },
-                        new Drawable[]
-                        {
-                            axisFlow = new Container
-                            {
-                                RelativeSizeAxes = Axes.X,
-                                Height = axis_font_size,
-                            }
-                        },
+                            RelativeSizeAxes = Axes.Both,
+                            Content = new[] { barDrawables }
+                        }
                     },
-                    RowDimensions = new[]
+                    new Drawable[]
                     {
-                        new Dimension(),
-                        new Dimension(GridSizeMode.AutoSize),
-                    }
-                };
+                        axisFlow = new Container
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            Height = axis_font_size,
+                        }
+                    },
+                },
+                RowDimensions = new[]
+                {
+                    new Dimension(),
+                    new Dimension(GridSizeMode.AutoSize),
+                }
+            };
 
-                // Our axis will contain one centre element + 5 points on each side, each with a value depending on the number of bins * bin size.
-                double maxValue = timing_distribution_bins * binSize;
-                double axisValueStep = maxValue / axis_points;
+            // Our axis will contain one centre element + 5 points on each side, each with a value depending on the number of bins * bin size.
+            double maxValue = timing_distribution_bins * binSize;
+            double axisValueStep = maxValue / axis_points;
+
+            axisFlow.Add(new OsuSpriteText
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Text = "0",
+                Font = OsuFont.GetFont(size: axis_font_size, weight: FontWeight.SemiBold)
+            });
+
+            for (int i = 1; i <= axis_points; i++)
+            {
+                double axisValue = i * axisValueStep;
+                float position = (float)(axisValue / maxValue);
+                float alpha = 1f - position * 0.8f;
 
                 axisFlow.Add(new OsuSpriteText
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Text = "0",
+                    RelativePositionAxes = Axes.X,
+                    X = -position / 2,
+                    Alpha = alpha,
+                    Text = axisValue.ToString("-0"),
                     Font = OsuFont.GetFont(size: axis_font_size, weight: FontWeight.SemiBold)
                 });
 
-                for (int i = 1; i <= axis_points; i++)
+                axisFlow.Add(new OsuSpriteText
                 {
-                    double axisValue = i * axisValueStep;
-                    float position = (float)(axisValue / maxValue);
-                    float alpha = 1f - position * 0.8f;
-
-                    axisFlow.Add(new OsuSpriteText
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        RelativePositionAxes = Axes.X,
-                        X = -position / 2,
-                        Alpha = alpha,
-                        Text = axisValue.ToString("-0"),
-                        Font = OsuFont.GetFont(size: axis_font_size, weight: FontWeight.SemiBold)
-                    });
-
-                    axisFlow.Add(new OsuSpriteText
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        RelativePositionAxes = Axes.X,
-                        X = position / 2,
-                        Alpha = alpha,
-                        Text = axisValue.ToString("+0"),
-                        Font = OsuFont.GetFont(size: axis_font_size, weight: FontWeight.SemiBold)
-                    });
-                }
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativePositionAxes = Axes.X,
+                    X = position / 2,
+                    Alpha = alpha,
+                    Text = axisValue.ToString("+0"),
+                    Font = OsuFont.GetFont(size: axis_font_size, weight: FontWeight.SemiBold)
+                });
             }
         }
 

From 21f26f98da76ee5d89dc7c5c8e32309bd2caf034 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Jul 2023 14:57:01 +0900
Subject: [PATCH 1310/1604] Fix graph breaking when resized vertically

---
 .../HitEventTimingDistributionGraph.cs        | 60 +++++++++++++------
 1 file changed, 43 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
index 7e7c0ccb54..85c2777645 100644
--- a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
+++ b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
@@ -5,9 +5,11 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Layout;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Scoring;
@@ -220,6 +222,8 @@ namespace osu.Game.Screens.Ranking.Statistics
 
             private Circle? boxAdjustment;
 
+            private float? lastDrawHeight;
+
             [Resolved]
             private OsuColour colours { get; set; } = null!;
 
@@ -276,24 +280,18 @@ namespace osu.Game.Screens.Ranking.Statistics
             {
                 base.LoadComplete();
 
-                float offsetValue = 0;
+                Scheduler.AddOnce(updateMetrics, true);
+            }
 
-                for (int i = 0; i < boxOriginals.Length; i++)
+            protected override bool OnInvalidate(Invalidation invalidation, InvalidationSource source)
+            {
+                if (invalidation.HasFlagFast(Invalidation.DrawSize))
                 {
-                    int value = i < values.Count ? values[i].Value : 0;
-
-                    var box = boxOriginals[i];
-
-                    box.Y = 0;
-                    box.Height = 0;
-
-                    box.MoveToY(offsetForValue(offsetValue) * BoundingBox.Height, duration, Easing.OutQuint);
-                    box.ResizeHeightTo(heightForValue(value), duration, Easing.OutQuint);
-                    offsetValue -= value;
+                    if (lastDrawHeight != null && lastDrawHeight != DrawHeight)
+                        Scheduler.AddOnce(updateMetrics, false);
                 }
 
-                if (boxAdjustment != null)
-                    drawAdjustmentBar();
+                return base.OnInvalidate(invalidation, source);
             }
 
             public void UpdateOffset(float adjustment)
@@ -318,12 +316,36 @@ namespace osu.Game.Screens.Ranking.Statistics
                 }
 
                 offsetAdjustment = adjustment;
-                drawAdjustmentBar();
+
+                Scheduler.AddOnce(updateMetrics, true);
             }
 
-            private float offsetForValue(float value) => (1 - minimum_height) * value / maxValue;
+            private void updateMetrics(bool animate = true)
+            {
+                float offsetValue = 0;
 
-            private float heightForValue(float value) => minimum_height + offsetForValue(value);
+                for (int i = 0; i < boxOriginals.Length; i++)
+                {
+                    int value = i < values.Count ? values[i].Value : 0;
+
+                    var box = boxOriginals[i];
+
+                    box.Y = 0;
+                    box.Height = 0;
+
+                    box.MoveToY(offsetForValue(offsetValue) * BoundingBox.Height, duration, Easing.OutQuint);
+                    box.ResizeHeightTo(heightForValue(value), duration, Easing.OutQuint);
+                    offsetValue -= value;
+                }
+
+                if (boxAdjustment != null)
+                    drawAdjustmentBar();
+
+                if (!animate)
+                    FinishTransforms(true);
+
+                lastDrawHeight = DrawHeight;
+            }
 
             private void drawAdjustmentBar()
             {
@@ -332,6 +354,10 @@ namespace osu.Game.Screens.Ranking.Statistics
                 boxAdjustment.ResizeHeightTo(heightForValue(offsetAdjustment), duration, Easing.OutQuint);
                 boxAdjustment.FadeTo(!hasAdjustment ? 0 : 1, duration, Easing.OutQuint);
             }
+
+            private float offsetForValue(float value) => (1 - minimum_height) * value / maxValue;
+
+            private float heightForValue(float value) => minimum_height + offsetForValue(value);
         }
     }
 }

From 1d62a041ccdd8ae10066823080b76861d42ff15d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Jul 2023 15:07:26 +0900
Subject: [PATCH 1311/1604] Fix animation restarting unexpectedly

---
 .../Ranking/Statistics/HitEventTimingDistributionGraph.cs      | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
index 85c2777645..e8d2eefd81 100644
--- a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
+++ b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
@@ -330,9 +330,6 @@ namespace osu.Game.Screens.Ranking.Statistics
 
                     var box = boxOriginals[i];
 
-                    box.Y = 0;
-                    box.Height = 0;
-
                     box.MoveToY(offsetForValue(offsetValue) * BoundingBox.Height, duration, Easing.OutQuint);
                     box.ResizeHeightTo(heightForValue(value), duration, Easing.OutQuint);
                     offsetValue -= value;

From 3d17a03dc696c340ca690716a380f83a500e3013 Mon Sep 17 00:00:00 2001
From: Andrew Hong <andrew.jwn.hong@gmail.com>
Date: Thu, 13 Jul 2023 01:09:35 -0400
Subject: [PATCH 1312/1604] Emojis now represented as "[emoji]"

---
 osu.Game.Tests/Chat/MessageFormatterTests.cs | 7 +++----
 osu.Game/Online/Chat/MessageFormatter.cs     | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Chat/MessageFormatterTests.cs b/osu.Game.Tests/Chat/MessageFormatterTests.cs
index aa45e360e6..529b28318a 100644
--- a/osu.Game.Tests/Chat/MessageFormatterTests.cs
+++ b/osu.Game.Tests/Chat/MessageFormatterTests.cs
@@ -478,7 +478,7 @@ namespace osu.Game.Tests.Chat
                 Content = "This is a [http://www.simple-test.com simple test] with some [traps] and [[wiki links]]. Don't forget to visit https://osu.ppy.sh (now!)[http://google.com]\uD83D\uDE12"
             });
 
-            Assert.AreEqual("This is a simple test with some [traps] and wiki links. Don't forget to visit https://osu.ppy.sh now!", result.DisplayContent);
+            Assert.AreEqual("This is a simple test with some [traps] and wiki links. Don't forget to visit https://osu.ppy.sh now![emoji]", result.DisplayContent);
             Assert.AreEqual(4, result.Links.Count);
 
             Link f = result.Links.Find(l => l.Url == "https://dev.ppy.sh/wiki/wiki links");
@@ -503,11 +503,10 @@ namespace osu.Game.Tests.Chat
         }
 
         [Test]
-        [Ignore("https://github.com/ppy/osu/pull/24190")]
         public void TestEmoji()
         {
-            Message result = MessageFormatter.FormatMessage(new Message { Content = "Hello world\uD83D\uDE12<--This is an emoji,There are more:\uD83D\uDE10\uD83D\uDE00,\uD83D\uDE20" });
-            Assert.AreEqual("Hello world\0\0\0<--This is an emoji,There are more:\0\0\0\0\0\0,\0\0\0", result.DisplayContent);
+            Message result = MessageFormatter.FormatMessage(new Message { Content = "Hello world\uD83D\uDE12<--This is an emoji,There are more emojis among us:\uD83D\uDE10\uD83D\uDE00,\uD83D\uDE20" });
+            Assert.AreEqual("Hello world[emoji]<--This is an emoji,There are more emojis among us:[emoji][emoji],[emoji]", result.DisplayContent);
             Assert.AreEqual(result.Links.Count, 4);
             Assert.AreEqual(result.Links[0].Index, 11);
             Assert.AreEqual(result.Links[1].Index, 49);
diff --git a/osu.Game/Online/Chat/MessageFormatter.cs b/osu.Game/Online/Chat/MessageFormatter.cs
index 3e03cc287b..7a3941038e 100644
--- a/osu.Game/Online/Chat/MessageFormatter.cs
+++ b/osu.Game/Online/Chat/MessageFormatter.cs
@@ -257,7 +257,7 @@ namespace osu.Game.Online.Chat
         private static MessageFormatterResult format(string toFormat, int startIndex = 0, int space = 3)
         {
             // see: https://github.com/ppy/osu/pull/24190
-            toFormat = Regex.Replace(toFormat, emoji_regex.ToString(), string.Empty);
+            toFormat = Regex.Replace(toFormat, emoji_regex.ToString(), "[emoji]");
 
             var result = new MessageFormatterResult(toFormat);
 

From 2f40989a4fb67af56c9e7685794bb5ff42aad2f8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Jul 2023 17:25:08 +0900
Subject: [PATCH 1313/1604] Allow no fail mod during autoplay

---
 osu.Game/Rulesets/Mods/ModAutoplay.cs | 2 +-
 osu.Game/Rulesets/Mods/ModNoFail.cs   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModAutoplay.cs b/osu.Game/Rulesets/Mods/ModAutoplay.cs
index ab2c84bada..a4ffbeacef 100644
--- a/osu.Game/Rulesets/Mods/ModAutoplay.cs
+++ b/osu.Game/Rulesets/Mods/ModAutoplay.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Mods
         public override bool ValidForMultiplayer => false;
         public override bool ValidForMultiplayerAsFreeMod => false;
 
-        public override Type[] IncompatibleMods => new[] { typeof(ModCinema), typeof(ModRelax), typeof(ModFailCondition), typeof(ModNoFail), typeof(ModAdaptiveSpeed) };
+        public override Type[] IncompatibleMods => new[] { typeof(ModCinema), typeof(ModRelax), typeof(ModFailCondition), typeof(ModAdaptiveSpeed) };
 
         public override bool HasImplementation => GetType().GenericTypeArguments.Length == 0;
 
diff --git a/osu.Game/Rulesets/Mods/ModNoFail.cs b/osu.Game/Rulesets/Mods/ModNoFail.cs
index 31bb4338b3..8c61d948a4 100644
--- a/osu.Game/Rulesets/Mods/ModNoFail.cs
+++ b/osu.Game/Rulesets/Mods/ModNoFail.cs
@@ -16,6 +16,6 @@ namespace osu.Game.Rulesets.Mods
         public override ModType Type => ModType.DifficultyReduction;
         public override LocalisableString Description => "You can't fail, no matter what.";
         public override double ScoreMultiplier => 0.5;
-        public override Type[] IncompatibleMods => new[] { typeof(ModRelax), typeof(ModFailCondition), typeof(ModAutoplay) };
+        public override Type[] IncompatibleMods => new[] { typeof(ModRelax), typeof(ModFailCondition) };
     }
 }

From 403a7aa0006d7103100b02344665918526462df9 Mon Sep 17 00:00:00 2001
From: Andrew Hong <andrew.jwn.hong@gmail.com>
Date: Thu, 13 Jul 2023 04:28:35 -0400
Subject: [PATCH 1314/1604] 0 links are expected

---
 osu.Game.Tests/Chat/MessageFormatterTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Chat/MessageFormatterTests.cs b/osu.Game.Tests/Chat/MessageFormatterTests.cs
index 529b28318a..4d18a3d0bb 100644
--- a/osu.Game.Tests/Chat/MessageFormatterTests.cs
+++ b/osu.Game.Tests/Chat/MessageFormatterTests.cs
@@ -507,7 +507,7 @@ namespace osu.Game.Tests.Chat
         {
             Message result = MessageFormatter.FormatMessage(new Message { Content = "Hello world\uD83D\uDE12<--This is an emoji,There are more emojis among us:\uD83D\uDE10\uD83D\uDE00,\uD83D\uDE20" });
             Assert.AreEqual("Hello world[emoji]<--This is an emoji,There are more emojis among us:[emoji][emoji],[emoji]", result.DisplayContent);
-            Assert.AreEqual(result.Links.Count, 4);
+            Assert.AreEqual(result.Links.Count, 0);
             Assert.AreEqual(result.Links[0].Index, 11);
             Assert.AreEqual(result.Links[1].Index, 49);
             Assert.AreEqual(result.Links[2].Index, 52);

From ea6704ca1d528df6b94028aa2f82836e16947afe Mon Sep 17 00:00:00 2001
From: Andrew Hong <andrew.jwn.hong@gmail.com>
Date: Thu, 13 Jul 2023 04:41:53 -0400
Subject: [PATCH 1315/1604] Move parsing

---
 osu.Game/Online/Chat/MessageFormatter.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/Chat/MessageFormatter.cs b/osu.Game/Online/Chat/MessageFormatter.cs
index 7a3941038e..10a005d71a 100644
--- a/osu.Game/Online/Chat/MessageFormatter.cs
+++ b/osu.Game/Online/Chat/MessageFormatter.cs
@@ -256,9 +256,6 @@ namespace osu.Game.Online.Chat
 
         private static MessageFormatterResult format(string toFormat, int startIndex = 0, int space = 3)
         {
-            // see: https://github.com/ppy/osu/pull/24190
-            toFormat = Regex.Replace(toFormat, emoji_regex.ToString(), "[emoji]");
-
             var result = new MessageFormatterResult(toFormat);
 
             // handle the [link display] format
@@ -282,6 +279,9 @@ namespace osu.Game.Online.Chat
             // handle channels
             handleMatches(channel_regex, "{0}", $@"{OsuGameBase.OSU_PROTOCOL}chan/{{0}}", result, startIndex, LinkAction.OpenChannel);
 
+            // see: https://github.com/ppy/osu/pull/24190
+            result.Text = Regex.Replace(result.Text, emoji_regex.ToString(), "[emoji]");
+
             return result;
         }
 

From f5c472c0fe8a2a2bd9f4d9305be46353119dfce0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Jul 2023 17:36:52 +0900
Subject: [PATCH 1316/1604] Don't hide mod select overlay when pressing select
 binding with no search

---
 .../Visual/UserInterface/TestSceneModSelectOverlay.cs     | 2 +-
 osu.Game/Overlays/Mods/ModSelectOverlay.cs                | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 4cb6899ebc..9561a8875c 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -542,7 +542,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             AddStep("clear search", () => modSelectOverlay.SearchTerm = string.Empty);
             AddStep("press enter", () => InputManager.Key(Key.Enter));
-            AddAssert("mod select hidden", () => modSelectOverlay.State.Value == Visibility.Hidden);
+            AddAssert("mod select still visible", () => modSelectOverlay.State.Value == Visibility.Visible);
         }
 
         [Test]
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 9035503723..c09668850a 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -48,7 +48,8 @@ namespace osu.Game.Overlays.Mods
         /// Contrary to <see cref="OsuGameBase.AvailableMods"/> and <see cref="globalAvailableMods"/>, the <see cref="Mod"/> instances
         /// inside the <see cref="ModState"/> objects are owned solely by this <see cref="ModSelectOverlay"/> instance.
         /// </remarks>
-        public Bindable<Dictionary<ModType, IReadOnlyList<ModState>>> AvailableMods { get; } = new Bindable<Dictionary<ModType, IReadOnlyList<ModState>>>(new Dictionary<ModType, IReadOnlyList<ModState>>());
+        public Bindable<Dictionary<ModType, IReadOnlyList<ModState>>> AvailableMods { get; } =
+            new Bindable<Dictionary<ModType, IReadOnlyList<ModState>>>(new Dictionary<ModType, IReadOnlyList<ModState>>());
 
         private Func<Mod, bool> isValidMod = _ => true;
 
@@ -636,12 +637,9 @@ namespace osu.Game.Overlays.Mods
 
                 case GlobalAction.Select:
                 {
-                    // Pressing select should select first filtered mod or completely hide the overlay in one shot if search term is empty.
+                    // Pressing select should select first filtered mod if a search is in progress.
                     if (string.IsNullOrEmpty(SearchTerm))
-                    {
-                        hideOverlay(true);
                         return true;
-                    }
 
                     ModState? firstMod = columnFlow.Columns.OfType<ModColumn>().FirstOrDefault(m => m.IsPresent)?.AvailableMods.FirstOrDefault(x => x.Visible);
 

From db37de45ac12ebb0ceb9dda45e40d2e75f92c81c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Jul 2023 17:49:06 +0900
Subject: [PATCH 1317/1604] Allow saving changes to presets in popover using
 "select" binding

---
 .../UserInterface/TestSceneModPresetColumn.cs |  9 ++----
 .../Graphics/UserInterfaceV2/OsuPopover.cs    |  2 +-
 osu.Game/Overlays/Mods/AddPresetPopover.cs    | 14 ++++++++++
 osu.Game/Overlays/Mods/EditPresetPopover.cs   | 28 ++++++++++++++-----
 4 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
index bf6d8e524f..1779b240cc 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
@@ -9,8 +9,8 @@ using osu.Framework.Allocation;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Testing;
 using osu.Framework.Graphics.Cursor;
+using osu.Framework.Testing;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
@@ -304,11 +304,8 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("preset is not changed", () => panel.Preset.Value.Name == presetName);
             AddUntilStep("popover is unchanged", () => this.ChildrenOfType<OsuPopover>().FirstOrDefault() == popover);
             AddStep("edit preset name", () => popover.ChildrenOfType<LabelledTextBox>().First().Current.Value = "something new");
-            AddStep("attempt preset edit", () =>
-            {
-                InputManager.MoveMouseTo(popover.ChildrenOfType<ShearedButton>().ElementAt(1));
-                InputManager.Click(MouseButton.Left);
-            });
+            AddStep("commit changes to textbox", () => InputManager.Key(Key.Enter));
+            AddStep("attempt preset edit via select binding", () => InputManager.Key(Key.Enter));
             AddUntilStep("popover closed", () => !this.ChildrenOfType<OsuPopover>().Any());
             AddAssert("preset is changed", () => panel.Preset.Value.Name != presetName);
         }
diff --git a/osu.Game/Graphics/UserInterfaceV2/OsuPopover.cs b/osu.Game/Graphics/UserInterfaceV2/OsuPopover.cs
index 00e5b8838c..381193d539 100644
--- a/osu.Game/Graphics/UserInterfaceV2/OsuPopover.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/OsuPopover.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
             return base.OnKeyDown(e);
         }
 
-        public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
+        public virtual bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
         {
             if (e.Repeat)
                 return false;
diff --git a/osu.Game/Overlays/Mods/AddPresetPopover.cs b/osu.Game/Overlays/Mods/AddPresetPopover.cs
index ef855f6166..638592a9b5 100644
--- a/osu.Game/Overlays/Mods/AddPresetPopover.cs
+++ b/osu.Game/Overlays/Mods/AddPresetPopover.cs
@@ -8,10 +8,12 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Input.Events;
 using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Input.Bindings;
 using osu.Game.Localisation;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
@@ -95,6 +97,18 @@ namespace osu.Game.Overlays.Mods
             }, true);
         }
 
+        public override bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
+        {
+            switch (e.Action)
+            {
+                case GlobalAction.Select:
+                    createButton.TriggerClick();
+                    return true;
+            }
+
+            return base.OnPressed(e);
+        }
+
         private void createPreset()
         {
             realm.Write(r => r.Add(new ModPreset
diff --git a/osu.Game/Overlays/Mods/EditPresetPopover.cs b/osu.Game/Overlays/Mods/EditPresetPopover.cs
index 5220f6a391..d755825a95 100644
--- a/osu.Game/Overlays/Mods/EditPresetPopover.cs
+++ b/osu.Game/Overlays/Mods/EditPresetPopover.cs
@@ -8,11 +8,13 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Input.Events;
 using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Input.Bindings;
 using osu.Game.Localisation;
 using osu.Game.Rulesets.Mods;
 using osuTK;
@@ -130,6 +132,25 @@ namespace osu.Game.Overlays.Mods
             }, true);
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            ScheduleAfterChildren(() => GetContainingInputManager().ChangeFocus(nameTextBox));
+        }
+
+        public override bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
+        {
+            switch (e.Action)
+            {
+                case GlobalAction.Select:
+                    saveButton.TriggerClick();
+                    return true;
+            }
+
+            return base.OnPressed(e);
+        }
+
         private void useCurrentMods()
         {
             saveableMods = selectedMods.Value.ToHashSet();
@@ -150,13 +171,6 @@ namespace osu.Game.Overlays.Mods
             return !saveableMods.SetEquals(selectedMods.Value);
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            ScheduleAfterChildren(() => GetContainingInputManager().ChangeFocus(nameTextBox));
-        }
-
         private void save()
         {
             preset.PerformWrite(s =>

From 71351d898247d0329dca7726e0bc3965edb8dffd Mon Sep 17 00:00:00 2001
From: Andrew Hong <andrew.jwn.hong@gmail.com>
Date: Thu, 13 Jul 2023 05:06:23 -0400
Subject: [PATCH 1318/1604] I forgor to remove these

---
 osu.Game.Tests/Chat/MessageFormatterTests.cs | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/osu.Game.Tests/Chat/MessageFormatterTests.cs b/osu.Game.Tests/Chat/MessageFormatterTests.cs
index 4d18a3d0bb..46dc47bf53 100644
--- a/osu.Game.Tests/Chat/MessageFormatterTests.cs
+++ b/osu.Game.Tests/Chat/MessageFormatterTests.cs
@@ -508,14 +508,6 @@ namespace osu.Game.Tests.Chat
             Message result = MessageFormatter.FormatMessage(new Message { Content = "Hello world\uD83D\uDE12<--This is an emoji,There are more emojis among us:\uD83D\uDE10\uD83D\uDE00,\uD83D\uDE20" });
             Assert.AreEqual("Hello world[emoji]<--This is an emoji,There are more emojis among us:[emoji][emoji],[emoji]", result.DisplayContent);
             Assert.AreEqual(result.Links.Count, 0);
-            Assert.AreEqual(result.Links[0].Index, 11);
-            Assert.AreEqual(result.Links[1].Index, 49);
-            Assert.AreEqual(result.Links[2].Index, 52);
-            Assert.AreEqual(result.Links[3].Index, 56);
-            Assert.AreEqual(result.Links[0].Url, "\uD83D\uDE12");
-            Assert.AreEqual(result.Links[1].Url, "\uD83D\uDE10");
-            Assert.AreEqual(result.Links[2].Url, "\uD83D\uDE00");
-            Assert.AreEqual(result.Links[3].Url, "\uD83D\uDE20");
         }
 
         [Test]

From 6529c810fadf3c2c25dec35441ca7f72d2448bb3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Jun 2023 18:17:46 +0900
Subject: [PATCH 1319/1604] Change order and test population in
 `TestSceneStatisticsPanel` to give better visible results

---
 .../Visual/Ranking/TestSceneStatisticsPanel.cs    | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
index 67211a3b72..69c9fcb637 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
@@ -30,19 +30,19 @@ namespace osu.Game.Tests.Visual.Ranking
     public partial class TestSceneStatisticsPanel : OsuTestScene
     {
         [Test]
-        public void TestScoreWithTimeStatistics()
+        public void TestScoreWithPositionStatistics()
         {
             var score = TestResources.CreateTestScoreInfo();
-            score.HitEvents = TestSceneHitEventTimingDistributionGraph.CreateDistributedHitEvents();
+            score.HitEvents = createPositionDistributedHitEvents();
 
             loadPanel(score);
         }
 
         [Test]
-        public void TestScoreWithPositionStatistics()
+        public void TestScoreWithTimeStatistics()
         {
             var score = TestResources.CreateTestScoreInfo();
-            score.HitEvents = createPositionDistributedHitEvents();
+            score.HitEvents = TestSceneHitEventTimingDistributionGraph.CreateDistributedHitEvents();
 
             loadPanel(score);
         }
@@ -89,18 +89,19 @@ namespace osu.Game.Tests.Visual.Ranking
 
         private static List<HitEvent> createPositionDistributedHitEvents()
         {
-            var hitEvents = new List<HitEvent>();
+            var hitEvents = TestSceneHitEventTimingDistributionGraph.CreateDistributedHitEvents();
+
             // Use constant seed for reproducibility
             var random = new Random(0);
 
-            for (int i = 0; i < 500; i++)
+            for (int i = 0; i < hitEvents.Count; i++)
             {
                 double angle = random.NextDouble() * 2 * Math.PI;
                 double radius = random.NextDouble() * 0.5f * OsuHitObject.OBJECT_RADIUS;
 
                 var position = new Vector2((float)(radius * Math.Cos(angle)), (float)(radius * Math.Sin(angle)));
 
-                hitEvents.Add(new HitEvent(0, HitResult.Perfect, new HitCircle(), new HitCircle(), position));
+                hitEvents[i] = hitEvents[i].With(position);
             }
 
             return hitEvents;

From b7ab46d87b538725086ab4d556f4f19d4118ddd5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Jul 2023 01:06:26 +0900
Subject: [PATCH 1320/1604] Add full statistics score to
 `TestSceneResultsScreen`

---
 osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs   | 5 ++++-
 osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
index c5b61c1a90..4eba60de3c 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
@@ -82,7 +82,10 @@ namespace osu.Game.Tests.Visual.Ranking
                     RelativeSizeAxes = Axes.Both
                 };
 
-                stack.Push(screen = createResultsScreen());
+                var score = TestResources.CreateTestScoreInfo();
+                score.HitEvents = TestSceneStatisticsPanel.CreatePositionDistributedHitEvents();
+
+                stack.Push(screen = createResultsScreen(score));
             });
             AddUntilStep("wait for loaded", () => screen.IsLoaded);
             AddAssert("retry overlay not present", () => screen.RetryOverlay == null);
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
index 69c9fcb637..e02782678f 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Tests.Visual.Ranking
         public void TestScoreWithPositionStatistics()
         {
             var score = TestResources.CreateTestScoreInfo();
-            score.HitEvents = createPositionDistributedHitEvents();
+            score.HitEvents = CreatePositionDistributedHitEvents();
 
             loadPanel(score);
         }
@@ -87,7 +87,7 @@ namespace osu.Game.Tests.Visual.Ranking
             };
         });
 
-        private static List<HitEvent> createPositionDistributedHitEvents()
+        public static List<HitEvent> CreatePositionDistributedHitEvents()
         {
             var hitEvents = TestSceneHitEventTimingDistributionGraph.CreateDistributedHitEvents();
 

From aebbffacf247adf4d9e64e3205c5c5c421032685 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Jun 2023 19:06:48 +0900
Subject: [PATCH 1321/1604] Show online stats on `TestSceneStatisticsPanel`

Fix test regression
---
 osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs   | 1 +
 osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
index 4eba60de3c..937bbe1448 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
@@ -83,6 +83,7 @@ namespace osu.Game.Tests.Visual.Ranking
                 };
 
                 var score = TestResources.CreateTestScoreInfo();
+                score.OnlineID = 1234;
                 score.HitEvents = TestSceneStatisticsPanel.CreatePositionDistributedHitEvents();
 
                 stack.Push(screen = createResultsScreen(score));
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
index e02782678f..e0d743b046 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
@@ -13,6 +13,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Online.Solo;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Mods;
@@ -23,6 +24,7 @@ using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Tests.Resources;
+using osu.Game.Users;
 using osuTK;
 
 namespace osu.Game.Tests.Visual.Ranking
@@ -33,6 +35,7 @@ namespace osu.Game.Tests.Visual.Ranking
         public void TestScoreWithPositionStatistics()
         {
             var score = TestResources.CreateTestScoreInfo();
+            score.OnlineID = 1234;
             score.HitEvents = CreatePositionDistributedHitEvents();
 
             loadPanel(score);
@@ -79,11 +82,12 @@ namespace osu.Game.Tests.Visual.Ranking
 
         private void loadPanel(ScoreInfo score) => AddStep("load panel", () =>
         {
-            Child = new StatisticsPanel
+            Child = new SoloStatisticsPanel(score)
             {
                 RelativeSizeAxes = Axes.Both,
                 State = { Value = Visibility.Visible },
-                Score = { Value = score }
+                Score = { Value = score },
+                StatisticsUpdate = { Value = new SoloStatisticsUpdate(score, new UserStatistics(), new UserStatistics()) }
             };
         });
 

From 654a7057fca18ba68bb8590b34b4a06076d014ec Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Jul 2023 01:29:58 +0900
Subject: [PATCH 1322/1604] Add actual statistics changes to better visualise
 layout

---
 .../Ranking/TestSceneStatisticsPanel.cs       | 39 ++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
index e0d743b046..93005271a9 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
@@ -87,7 +87,44 @@ namespace osu.Game.Tests.Visual.Ranking
                 RelativeSizeAxes = Axes.Both,
                 State = { Value = Visibility.Visible },
                 Score = { Value = score },
-                StatisticsUpdate = { Value = new SoloStatisticsUpdate(score, new UserStatistics(), new UserStatistics()) }
+                StatisticsUpdate =
+                {
+                    Value = new SoloStatisticsUpdate(score, new UserStatistics
+                    {
+                        Level = new UserStatistics.LevelInfo
+                        {
+                            Current = 5,
+                            Progress = 20,
+                        },
+                        GlobalRank = 38000,
+                        CountryRank = 12006,
+                        PP = 2134,
+                        RankedScore = 21123849,
+                        Accuracy = 0.985,
+                        PlayCount = 13375,
+                        PlayTime = 354490,
+                        TotalScore = 128749597,
+                        TotalHits = 0,
+                        MaxCombo = 1233,
+                    }, new UserStatistics
+                    {
+                        Level = new UserStatistics.LevelInfo
+                        {
+                            Current = 5,
+                            Progress = 30,
+                        },
+                        GlobalRank = 36000,
+                        CountryRank = 12000,
+                        PP = (decimal)2134.5,
+                        RankedScore = 23897015,
+                        Accuracy = 0.984,
+                        PlayCount = 13376,
+                        PlayTime = 35789,
+                        TotalScore = 132218497,
+                        TotalHits = 0,
+                        MaxCombo = 1233,
+                    })
+                }
             };
         });
 

From 6ef39b87fed8b44b5f9219da12d639ae5e4f422b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Jul 2023 01:24:09 +0900
Subject: [PATCH 1323/1604] Reorder tests for testability

---
 .../Visual/Ranking/TestSceneResultsScreen.cs  | 51 ++++++++++---------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
index 937bbe1448..1c904a936f 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
@@ -69,6 +69,30 @@ namespace osu.Game.Tests.Visual.Ranking
             }));
         }
 
+        [TestCase(1, ScoreRank.X)]
+        [TestCase(0.9999, ScoreRank.S)]
+        [TestCase(0.975, ScoreRank.S)]
+        [TestCase(0.925, ScoreRank.A)]
+        [TestCase(0.85, ScoreRank.B)]
+        [TestCase(0.75, ScoreRank.C)]
+        [TestCase(0.5, ScoreRank.D)]
+        [TestCase(0.2, ScoreRank.D)]
+        public void TestResultsWithPlayer(double accuracy, ScoreRank rank)
+        {
+            TestResultsScreen screen = null;
+
+            var score = TestResources.CreateTestScoreInfo();
+
+            score.OnlineID = 1234;
+            score.HitEvents = TestSceneStatisticsPanel.CreatePositionDistributedHitEvents();
+            score.Accuracy = accuracy;
+            score.Rank = rank;
+
+            loadResultsScreen(() => screen = createResultsScreen(score));
+            AddUntilStep("wait for loaded", () => screen.IsLoaded);
+            AddAssert("retry overlay present", () => screen.RetryOverlay != null);
+        }
+
         [Test]
         public void TestResultsWithoutPlayer()
         {
@@ -83,8 +107,6 @@ namespace osu.Game.Tests.Visual.Ranking
                 };
 
                 var score = TestResources.CreateTestScoreInfo();
-                score.OnlineID = 1234;
-                score.HitEvents = TestSceneStatisticsPanel.CreatePositionDistributedHitEvents();
 
                 stack.Push(screen = createResultsScreen(score));
             });
@@ -92,28 +114,6 @@ namespace osu.Game.Tests.Visual.Ranking
             AddAssert("retry overlay not present", () => screen.RetryOverlay == null);
         }
 
-        [TestCase(0.2, ScoreRank.D)]
-        [TestCase(0.5, ScoreRank.D)]
-        [TestCase(0.75, ScoreRank.C)]
-        [TestCase(0.85, ScoreRank.B)]
-        [TestCase(0.925, ScoreRank.A)]
-        [TestCase(0.975, ScoreRank.S)]
-        [TestCase(0.9999, ScoreRank.S)]
-        [TestCase(1, ScoreRank.X)]
-        public void TestResultsWithPlayer(double accuracy, ScoreRank rank)
-        {
-            TestResultsScreen screen = null;
-
-            var score = TestResources.CreateTestScoreInfo();
-
-            score.Accuracy = accuracy;
-            score.Rank = rank;
-
-            loadResultsScreen(() => screen = createResultsScreen(score));
-            AddUntilStep("wait for loaded", () => screen.IsLoaded);
-            AddAssert("retry overlay present", () => screen.RetryOverlay != null);
-        }
-
         [Test]
         public void TestResultsForUnranked()
         {
@@ -332,13 +332,14 @@ namespace osu.Game.Tests.Visual.Ranking
             }
         }
 
-        private partial class TestResultsScreen : ResultsScreen
+        private partial class TestResultsScreen : SoloResultsScreen
         {
             public HotkeyRetryOverlay RetryOverlay;
 
             public TestResultsScreen(ScoreInfo score)
                 : base(score, true)
             {
+                ShowUserStatistics = true;
             }
 
             protected override void LoadComplete()

From 0173543dcc2f2d639ba8ab74c3976c6a19d0baf0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Jun 2023 18:17:46 +0900
Subject: [PATCH 1324/1604] Change order and test population in
 `TestSceneStatisticsPanel` to give better visible results

---
 .../Visual/Ranking/TestSceneStatisticsPanel.cs    | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
index 67211a3b72..69c9fcb637 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
@@ -30,19 +30,19 @@ namespace osu.Game.Tests.Visual.Ranking
     public partial class TestSceneStatisticsPanel : OsuTestScene
     {
         [Test]
-        public void TestScoreWithTimeStatistics()
+        public void TestScoreWithPositionStatistics()
         {
             var score = TestResources.CreateTestScoreInfo();
-            score.HitEvents = TestSceneHitEventTimingDistributionGraph.CreateDistributedHitEvents();
+            score.HitEvents = createPositionDistributedHitEvents();
 
             loadPanel(score);
         }
 
         [Test]
-        public void TestScoreWithPositionStatistics()
+        public void TestScoreWithTimeStatistics()
         {
             var score = TestResources.CreateTestScoreInfo();
-            score.HitEvents = createPositionDistributedHitEvents();
+            score.HitEvents = TestSceneHitEventTimingDistributionGraph.CreateDistributedHitEvents();
 
             loadPanel(score);
         }
@@ -89,18 +89,19 @@ namespace osu.Game.Tests.Visual.Ranking
 
         private static List<HitEvent> createPositionDistributedHitEvents()
         {
-            var hitEvents = new List<HitEvent>();
+            var hitEvents = TestSceneHitEventTimingDistributionGraph.CreateDistributedHitEvents();
+
             // Use constant seed for reproducibility
             var random = new Random(0);
 
-            for (int i = 0; i < 500; i++)
+            for (int i = 0; i < hitEvents.Count; i++)
             {
                 double angle = random.NextDouble() * 2 * Math.PI;
                 double radius = random.NextDouble() * 0.5f * OsuHitObject.OBJECT_RADIUS;
 
                 var position = new Vector2((float)(radius * Math.Cos(angle)), (float)(radius * Math.Sin(angle)));
 
-                hitEvents.Add(new HitEvent(0, HitResult.Perfect, new HitCircle(), new HitCircle(), position));
+                hitEvents[i] = hitEvents[i].With(position);
             }
 
             return hitEvents;

From 6e9785ec589fe7f586d213b4cb17242dbb6360eb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Jul 2023 01:06:26 +0900
Subject: [PATCH 1325/1604] Add full statistics score to
 `TestSceneResultsScreen`

---
 osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs   | 5 ++++-
 osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
index c5b61c1a90..4eba60de3c 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
@@ -82,7 +82,10 @@ namespace osu.Game.Tests.Visual.Ranking
                     RelativeSizeAxes = Axes.Both
                 };
 
-                stack.Push(screen = createResultsScreen());
+                var score = TestResources.CreateTestScoreInfo();
+                score.HitEvents = TestSceneStatisticsPanel.CreatePositionDistributedHitEvents();
+
+                stack.Push(screen = createResultsScreen(score));
             });
             AddUntilStep("wait for loaded", () => screen.IsLoaded);
             AddAssert("retry overlay not present", () => screen.RetryOverlay == null);
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
index 69c9fcb637..e02782678f 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Tests.Visual.Ranking
         public void TestScoreWithPositionStatistics()
         {
             var score = TestResources.CreateTestScoreInfo();
-            score.HitEvents = createPositionDistributedHitEvents();
+            score.HitEvents = CreatePositionDistributedHitEvents();
 
             loadPanel(score);
         }
@@ -87,7 +87,7 @@ namespace osu.Game.Tests.Visual.Ranking
             };
         });
 
-        private static List<HitEvent> createPositionDistributedHitEvents()
+        public static List<HitEvent> CreatePositionDistributedHitEvents()
         {
             var hitEvents = TestSceneHitEventTimingDistributionGraph.CreateDistributedHitEvents();
 

From b43949300bdee77effee0e6c5bfb5dc8daf012c1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Jun 2023 19:06:48 +0900
Subject: [PATCH 1326/1604] Show online stats on `TestSceneStatisticsPanel`

Fix test regression
---
 osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs   | 1 +
 osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
index 4eba60de3c..937bbe1448 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
@@ -83,6 +83,7 @@ namespace osu.Game.Tests.Visual.Ranking
                 };
 
                 var score = TestResources.CreateTestScoreInfo();
+                score.OnlineID = 1234;
                 score.HitEvents = TestSceneStatisticsPanel.CreatePositionDistributedHitEvents();
 
                 stack.Push(screen = createResultsScreen(score));
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
index e02782678f..e0d743b046 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
@@ -13,6 +13,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Online.Solo;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Mods;
@@ -23,6 +24,7 @@ using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Tests.Resources;
+using osu.Game.Users;
 using osuTK;
 
 namespace osu.Game.Tests.Visual.Ranking
@@ -33,6 +35,7 @@ namespace osu.Game.Tests.Visual.Ranking
         public void TestScoreWithPositionStatistics()
         {
             var score = TestResources.CreateTestScoreInfo();
+            score.OnlineID = 1234;
             score.HitEvents = CreatePositionDistributedHitEvents();
 
             loadPanel(score);
@@ -79,11 +82,12 @@ namespace osu.Game.Tests.Visual.Ranking
 
         private void loadPanel(ScoreInfo score) => AddStep("load panel", () =>
         {
-            Child = new StatisticsPanel
+            Child = new SoloStatisticsPanel(score)
             {
                 RelativeSizeAxes = Axes.Both,
                 State = { Value = Visibility.Visible },
-                Score = { Value = score }
+                Score = { Value = score },
+                StatisticsUpdate = { Value = new SoloStatisticsUpdate(score, new UserStatistics(), new UserStatistics()) }
             };
         });
 

From 48670308a501205d518ba1cb086e64cc4e1dfcdb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Jul 2023 01:29:58 +0900
Subject: [PATCH 1327/1604] Add actual statistics changes to better visualise
 layout

---
 .../Ranking/TestSceneStatisticsPanel.cs       | 39 ++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
index e0d743b046..93005271a9 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
@@ -87,7 +87,44 @@ namespace osu.Game.Tests.Visual.Ranking
                 RelativeSizeAxes = Axes.Both,
                 State = { Value = Visibility.Visible },
                 Score = { Value = score },
-                StatisticsUpdate = { Value = new SoloStatisticsUpdate(score, new UserStatistics(), new UserStatistics()) }
+                StatisticsUpdate =
+                {
+                    Value = new SoloStatisticsUpdate(score, new UserStatistics
+                    {
+                        Level = new UserStatistics.LevelInfo
+                        {
+                            Current = 5,
+                            Progress = 20,
+                        },
+                        GlobalRank = 38000,
+                        CountryRank = 12006,
+                        PP = 2134,
+                        RankedScore = 21123849,
+                        Accuracy = 0.985,
+                        PlayCount = 13375,
+                        PlayTime = 354490,
+                        TotalScore = 128749597,
+                        TotalHits = 0,
+                        MaxCombo = 1233,
+                    }, new UserStatistics
+                    {
+                        Level = new UserStatistics.LevelInfo
+                        {
+                            Current = 5,
+                            Progress = 30,
+                        },
+                        GlobalRank = 36000,
+                        CountryRank = 12000,
+                        PP = (decimal)2134.5,
+                        RankedScore = 23897015,
+                        Accuracy = 0.984,
+                        PlayCount = 13376,
+                        PlayTime = 35789,
+                        TotalScore = 132218497,
+                        TotalHits = 0,
+                        MaxCombo = 1233,
+                    })
+                }
             };
         });
 

From 8c4831e09f6c8acd1cd0919b2990dbcba0bfb45a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Jul 2023 01:24:09 +0900
Subject: [PATCH 1328/1604] Reorder tests for testability

---
 .../Visual/Ranking/TestSceneResultsScreen.cs  | 51 ++++++++++---------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
index 937bbe1448..1c904a936f 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
@@ -69,6 +69,30 @@ namespace osu.Game.Tests.Visual.Ranking
             }));
         }
 
+        [TestCase(1, ScoreRank.X)]
+        [TestCase(0.9999, ScoreRank.S)]
+        [TestCase(0.975, ScoreRank.S)]
+        [TestCase(0.925, ScoreRank.A)]
+        [TestCase(0.85, ScoreRank.B)]
+        [TestCase(0.75, ScoreRank.C)]
+        [TestCase(0.5, ScoreRank.D)]
+        [TestCase(0.2, ScoreRank.D)]
+        public void TestResultsWithPlayer(double accuracy, ScoreRank rank)
+        {
+            TestResultsScreen screen = null;
+
+            var score = TestResources.CreateTestScoreInfo();
+
+            score.OnlineID = 1234;
+            score.HitEvents = TestSceneStatisticsPanel.CreatePositionDistributedHitEvents();
+            score.Accuracy = accuracy;
+            score.Rank = rank;
+
+            loadResultsScreen(() => screen = createResultsScreen(score));
+            AddUntilStep("wait for loaded", () => screen.IsLoaded);
+            AddAssert("retry overlay present", () => screen.RetryOverlay != null);
+        }
+
         [Test]
         public void TestResultsWithoutPlayer()
         {
@@ -83,8 +107,6 @@ namespace osu.Game.Tests.Visual.Ranking
                 };
 
                 var score = TestResources.CreateTestScoreInfo();
-                score.OnlineID = 1234;
-                score.HitEvents = TestSceneStatisticsPanel.CreatePositionDistributedHitEvents();
 
                 stack.Push(screen = createResultsScreen(score));
             });
@@ -92,28 +114,6 @@ namespace osu.Game.Tests.Visual.Ranking
             AddAssert("retry overlay not present", () => screen.RetryOverlay == null);
         }
 
-        [TestCase(0.2, ScoreRank.D)]
-        [TestCase(0.5, ScoreRank.D)]
-        [TestCase(0.75, ScoreRank.C)]
-        [TestCase(0.85, ScoreRank.B)]
-        [TestCase(0.925, ScoreRank.A)]
-        [TestCase(0.975, ScoreRank.S)]
-        [TestCase(0.9999, ScoreRank.S)]
-        [TestCase(1, ScoreRank.X)]
-        public void TestResultsWithPlayer(double accuracy, ScoreRank rank)
-        {
-            TestResultsScreen screen = null;
-
-            var score = TestResources.CreateTestScoreInfo();
-
-            score.Accuracy = accuracy;
-            score.Rank = rank;
-
-            loadResultsScreen(() => screen = createResultsScreen(score));
-            AddUntilStep("wait for loaded", () => screen.IsLoaded);
-            AddAssert("retry overlay present", () => screen.RetryOverlay != null);
-        }
-
         [Test]
         public void TestResultsForUnranked()
         {
@@ -332,13 +332,14 @@ namespace osu.Game.Tests.Visual.Ranking
             }
         }
 
-        private partial class TestResultsScreen : ResultsScreen
+        private partial class TestResultsScreen : SoloResultsScreen
         {
             public HotkeyRetryOverlay RetryOverlay;
 
             public TestResultsScreen(ScoreInfo score)
                 : base(score, true)
             {
+                ShowUserStatistics = true;
             }
 
             protected override void LoadComplete()

From 98bf15182efada7ceb1b9d9fa2b1ca9a6bef02f5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Jun 2023 18:17:57 +0900
Subject: [PATCH 1329/1604] Remove more `GridContainer` nonsense

---
 .../Ranking/Statistics/StatisticContainer.cs  | 29 ++++++-------------
 .../Ranking/Statistics/StatisticsPanel.cs     | 24 ++++-----------
 2 files changed, 15 insertions(+), 38 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs b/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs
index 9191ee6f52..f3308e9931 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs
@@ -26,31 +26,20 @@ namespace osu.Game.Screens.Ranking.Statistics
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
 
-            InternalChild = new GridContainer
+            InternalChild = new FillFlowContainer
             {
                 RelativeSizeAxes = Axes.X,
                 AutoSizeAxes = Axes.Y,
-                Content = new[]
+                Children = new[]
                 {
-                    new[]
+                    createHeader(item),
+                    new Container
                     {
-                        createHeader(item)
-                    },
-                    new Drawable[]
-                    {
-                        new Container
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
-                            Margin = new MarginPadding { Top = 15 },
-                            Child = item.CreateContent()
-                        }
-                    },
-                },
-                RowDimensions = new[]
-                {
-                    new Dimension(GridSizeMode.AutoSize),
-                    new Dimension(GridSizeMode.AutoSize),
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Margin = new MarginPadding { Top = 15 },
+                        Child = item.CreateContent()
+                    }
                 }
             };
         }
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
index 8b059efaf4..40d2d29902 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
@@ -124,7 +124,7 @@ namespace osu.Game.Screens.Ranking.Statistics
                 }
                 else
                 {
-                    FillFlowContainer rows;
+                    FillFlowContainer flow;
                     container = new OsuScrollContainer(Direction.Vertical)
                     {
                         RelativeSizeAxes = Axes.Both,
@@ -133,11 +133,12 @@ namespace osu.Game.Screens.Ranking.Statistics
                         Alpha = 0,
                         Children = new[]
                         {
-                            rows = new FillFlowContainer
+                            flow = new FillFlowContainer
                             {
                                 RelativeSizeAxes = Axes.X,
                                 AutoSizeAxes = Axes.Y,
-                                Spacing = new Vector2(30, 15)
+                                Spacing = new Vector2(30, 15),
+                                Direction = FillDirection.Full,
                             }
                         }
                     };
@@ -146,35 +147,22 @@ namespace osu.Game.Screens.Ranking.Statistics
 
                     foreach (var item in statisticItems)
                     {
-                        var columnContent = new List<Drawable>();
-
                         if (!hitEventsAvailable && item.RequiresHitEvents)
                         {
                             anyRequiredHitEvents = true;
                             continue;
                         }
 
-                        columnContent.Add(new StatisticContainer(item)
+                        flow.Add(new StatisticContainer(item)
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
                         });
-
-                        rows.Add(new GridContainer
-                        {
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.TopCentre,
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
-                            Content = new[] { columnContent.ToArray() },
-                            ColumnDimensions = new[] { new Dimension() },
-                            RowDimensions = new[] { new Dimension(GridSizeMode.AutoSize) }
-                        });
                     }
 
                     if (anyRequiredHitEvents)
                     {
-                        rows.Add(new FillFlowContainer
+                        flow.Add(new FillFlowContainer
                         {
                             RelativeSizeAxes = Axes.X,
                             AutoSizeAxes = Axes.Y,

From 7637a9e60394c79d3e1f1155b896ef75f8793cd9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Jul 2023 18:16:09 +0900
Subject: [PATCH 1330/1604] Adjust metrics of `OverallRanking`

---
 .../Ranking/Statistics/User/OverallRanking.cs |  2 +-
 .../Statistics/User/RankingChangeRow.cs       | 25 +++++++++++++++----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Statistics/User/OverallRanking.cs b/osu.Game/Screens/Ranking/Statistics/User/OverallRanking.cs
index 447f206128..1d39023223 100644
--- a/osu.Game/Screens/Ranking/Statistics/User/OverallRanking.cs
+++ b/osu.Game/Screens/Ranking/Statistics/User/OverallRanking.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Screens.Ranking.Statistics.User
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
                     Direction = FillDirection.Vertical,
-                    Spacing = new Vector2(10),
+                    Spacing = new Vector2(5),
                     Children = new Drawable[]
                     {
                         new GlobalRankChangeRow { StatisticsUpdate = { BindTarget = StatisticsUpdate } },
diff --git a/osu.Game/Screens/Ranking/Statistics/User/RankingChangeRow.cs b/osu.Game/Screens/Ranking/Statistics/User/RankingChangeRow.cs
index 5348b4a522..534e1e58cd 100644
--- a/osu.Game/Screens/Ranking/Statistics/User/RankingChangeRow.cs
+++ b/osu.Game/Screens/Ranking/Statistics/User/RankingChangeRow.cs
@@ -6,6 +6,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
 using osu.Game.Graphics;
@@ -46,7 +47,7 @@ namespace osu.Game.Screens.Ranking.Statistics.User
                 new OsuSpriteText
                 {
                     Text = Label,
-                    Font = OsuFont.Default.With(size: 18)
+                    Font = OsuFont.Default.With(size: 14)
                 },
                 new FillFlowContainer
                 {
@@ -65,17 +66,31 @@ namespace osu.Game.Screens.Ranking.Statistics.User
                             Spacing = new Vector2(5),
                             Children = new Drawable[]
                             {
-                                changeIcon = new SpriteIcon
+                                new Container
                                 {
+                                    Size = new Vector2(14),
                                     Anchor = Anchor.CentreRight,
                                     Origin = Anchor.CentreRight,
-                                    Size = new Vector2(18)
+                                    Children = new Drawable[]
+                                    {
+                                        new Circle
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                            Colour = colours.Gray1
+                                        },
+                                        changeIcon = new SpriteIcon
+                                        {
+                                            Anchor = Anchor.Centre,
+                                            Origin = Anchor.Centre,
+                                            Size = new Vector2(10),
+                                        },
+                                    }
                                 },
                                 currentValueText = new OsuSpriteText
                                 {
                                     Anchor = Anchor.CentreRight,
                                     Origin = Anchor.CentreRight,
-                                    Font = OsuFont.Default.With(size: 18, weight: FontWeight.Bold)
+                                    Font = OsuFont.Default.With(size: 14, weight: FontWeight.Bold)
                                 },
                             }
                         },
@@ -123,7 +138,7 @@ namespace osu.Game.Screens.Ranking.Statistics.User
             }
             else
             {
-                comparisonColour = colours.Orange1;
+                comparisonColour = colours.Gray4;
                 icon = FontAwesome.Solid.Minus;
             }
 

From f223fd7c3bf5bd19b36b8abe613e6fd549576412 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Jul 2023 18:16:15 +0900
Subject: [PATCH 1331/1604] Adjust metrics of `PerformanceBreakdown`

---
 .../Ranking/Statistics/PerformanceBreakdownChart.cs  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Statistics/PerformanceBreakdownChart.cs b/osu.Game/Screens/Ranking/Statistics/PerformanceBreakdownChart.cs
index 10cb77fa91..6979f0ad94 100644
--- a/osu.Game/Screens/Ranking/Statistics/PerformanceBreakdownChart.cs
+++ b/osu.Game/Screens/Ranking/Statistics/PerformanceBreakdownChart.cs
@@ -97,7 +97,7 @@ namespace osu.Game.Screens.Ranking.Statistics
                                     {
                                         Origin = Anchor.CentreLeft,
                                         Anchor = Anchor.CentreLeft,
-                                        Font = OsuFont.GetFont(weight: FontWeight.Regular, size: 18),
+                                        Font = OsuFont.GetFont(weight: FontWeight.Regular, size: 14),
                                         Text = "Achieved PP",
                                         Colour = Color4Extensions.FromHex("#66FFCC")
                                     },
@@ -105,7 +105,7 @@ namespace osu.Game.Screens.Ranking.Statistics
                                     {
                                         Origin = Anchor.CentreRight,
                                         Anchor = Anchor.CentreRight,
-                                        Font = OsuFont.GetFont(weight: FontWeight.SemiBold, size: 18),
+                                        Font = OsuFont.GetFont(weight: FontWeight.SemiBold, size: 14),
                                         Colour = Color4Extensions.FromHex("#66FFCC")
                                     }
                                 },
@@ -115,7 +115,7 @@ namespace osu.Game.Screens.Ranking.Statistics
                                     {
                                         Origin = Anchor.CentreLeft,
                                         Anchor = Anchor.CentreLeft,
-                                        Font = OsuFont.GetFont(weight: FontWeight.Regular, size: 18),
+                                        Font = OsuFont.GetFont(weight: FontWeight.Regular, size: 14),
                                         Text = "Maximum",
                                         Colour = OsuColour.Gray(0.7f)
                                     },
@@ -123,7 +123,7 @@ namespace osu.Game.Screens.Ranking.Statistics
                                     {
                                         Origin = Anchor.CentreLeft,
                                         Anchor = Anchor.CentreLeft,
-                                        Font = OsuFont.GetFont(weight: FontWeight.Regular, size: 18),
+                                        Font = OsuFont.GetFont(weight: FontWeight.Regular, size: 14),
                                         Colour = OsuColour.Gray(0.7f)
                                     }
                                 }
@@ -208,7 +208,7 @@ namespace osu.Game.Screens.Ranking.Statistics
                 {
                     Origin = Anchor.CentreLeft,
                     Anchor = Anchor.CentreLeft,
-                    Font = OsuFont.GetFont(weight: FontWeight.Regular),
+                    Font = OsuFont.GetFont(weight: FontWeight.Regular, size: 14),
                     Text = attribute.DisplayName,
                     Colour = Colour4.White
                 },
@@ -233,7 +233,7 @@ namespace osu.Game.Screens.Ranking.Statistics
                 {
                     Origin = Anchor.CentreRight,
                     Anchor = Anchor.CentreRight,
-                    Font = OsuFont.GetFont(weight: FontWeight.SemiBold),
+                    Font = OsuFont.GetFont(weight: FontWeight.SemiBold, size: 14),
                     Text = percentage.ToLocalisableString("0%"),
                     Colour = Colour4.White
                 }

From 4f089eb5a5d7d471d2d218a68df32c996c58f45a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Jul 2023 18:16:55 +0900
Subject: [PATCH 1332/1604] Adjust metrics of `AccuracyHeatmap`

---
 osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
index 5d2f6a14c7..6564a086fe 100644
--- a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
+++ b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Scoring;
@@ -120,18 +121,22 @@ namespace osu.Game.Rulesets.Osu.Statistics
                                         new OsuSpriteText
                                         {
                                             Text = "Overshoot",
+                                            Font = OsuFont.GetFont(size: 12),
                                             Anchor = Anchor.Centre,
-                                            Origin = Anchor.BottomCentre,
-                                            Padding = new MarginPadding(3),
+                                            Origin = Anchor.BottomLeft,
+                                            Padding = new MarginPadding(2),
+                                            Rotation = -rotation,
                                             RelativePositionAxes = Axes.Both,
                                             Y = -(inner_portion + line_extension) / 2,
                                         },
                                         new OsuSpriteText
                                         {
                                             Text = "Undershoot",
+                                            Font = OsuFont.GetFont(size: 12),
                                             Anchor = Anchor.Centre,
-                                            Origin = Anchor.TopCentre,
-                                            Padding = new MarginPadding(3),
+                                            Origin = Anchor.TopRight,
+                                            Rotation = -rotation,
+                                            Padding = new MarginPadding(2),
                                             RelativePositionAxes = Axes.Both,
                                             Y = (inner_portion + line_extension) / 2,
                                         },

From d54cf639839f847e60fcc56202f322d0f59d0ad6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Jul 2023 18:29:20 +0900
Subject: [PATCH 1333/1604] Centralise font size specification for statistic
 items (and reduce slightly)

---
 .../Statistics/HitEventTimingDistributionGraph.cs    |  8 ++++----
 .../Ranking/Statistics/PerformanceBreakdownChart.cs  | 12 ++++++------
 .../Ranking/Statistics/SimpleStatisticItem.cs        |  4 ++--
 .../Screens/Ranking/Statistics/StatisticContainer.cs |  2 +-
 osu.Game/Screens/Ranking/Statistics/StatisticItem.cs |  5 +++++
 .../Ranking/Statistics/User/RankingChangeRow.cs      |  4 ++--
 6 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
index e8d2eefd81..fb9a78fb54 100644
--- a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
+++ b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
@@ -154,7 +154,7 @@ namespace osu.Game.Screens.Ranking.Statistics
                         axisFlow = new Container
                         {
                             RelativeSizeAxes = Axes.X,
-                            Height = axis_font_size,
+                            Height = StatisticItem.FONT_SIZE,
                         }
                     },
                 },
@@ -174,7 +174,7 @@ namespace osu.Game.Screens.Ranking.Statistics
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 Text = "0",
-                Font = OsuFont.GetFont(size: axis_font_size, weight: FontWeight.SemiBold)
+                Font = OsuFont.GetFont(size: StatisticItem.FONT_SIZE, weight: FontWeight.SemiBold)
             });
 
             for (int i = 1; i <= axis_points; i++)
@@ -191,7 +191,7 @@ namespace osu.Game.Screens.Ranking.Statistics
                     X = -position / 2,
                     Alpha = alpha,
                     Text = axisValue.ToString("-0"),
-                    Font = OsuFont.GetFont(size: axis_font_size, weight: FontWeight.SemiBold)
+                    Font = OsuFont.GetFont(size: StatisticItem.FONT_SIZE, weight: FontWeight.SemiBold)
                 });
 
                 axisFlow.Add(new OsuSpriteText
@@ -202,7 +202,7 @@ namespace osu.Game.Screens.Ranking.Statistics
                     X = position / 2,
                     Alpha = alpha,
                     Text = axisValue.ToString("+0"),
-                    Font = OsuFont.GetFont(size: axis_font_size, weight: FontWeight.SemiBold)
+                    Font = OsuFont.GetFont(size: StatisticItem.FONT_SIZE, weight: FontWeight.SemiBold)
                 });
             }
         }
diff --git a/osu.Game/Screens/Ranking/Statistics/PerformanceBreakdownChart.cs b/osu.Game/Screens/Ranking/Statistics/PerformanceBreakdownChart.cs
index 6979f0ad94..ee0ce6183d 100644
--- a/osu.Game/Screens/Ranking/Statistics/PerformanceBreakdownChart.cs
+++ b/osu.Game/Screens/Ranking/Statistics/PerformanceBreakdownChart.cs
@@ -97,7 +97,7 @@ namespace osu.Game.Screens.Ranking.Statistics
                                     {
                                         Origin = Anchor.CentreLeft,
                                         Anchor = Anchor.CentreLeft,
-                                        Font = OsuFont.GetFont(weight: FontWeight.Regular, size: 14),
+                                        Font = OsuFont.GetFont(weight: FontWeight.Regular, size: StatisticItem.FONT_SIZE),
                                         Text = "Achieved PP",
                                         Colour = Color4Extensions.FromHex("#66FFCC")
                                     },
@@ -105,7 +105,7 @@ namespace osu.Game.Screens.Ranking.Statistics
                                     {
                                         Origin = Anchor.CentreRight,
                                         Anchor = Anchor.CentreRight,
-                                        Font = OsuFont.GetFont(weight: FontWeight.SemiBold, size: 14),
+                                        Font = OsuFont.GetFont(weight: FontWeight.SemiBold, size: StatisticItem.FONT_SIZE),
                                         Colour = Color4Extensions.FromHex("#66FFCC")
                                     }
                                 },
@@ -115,7 +115,7 @@ namespace osu.Game.Screens.Ranking.Statistics
                                     {
                                         Origin = Anchor.CentreLeft,
                                         Anchor = Anchor.CentreLeft,
-                                        Font = OsuFont.GetFont(weight: FontWeight.Regular, size: 14),
+                                        Font = OsuFont.GetFont(weight: FontWeight.Regular, size: StatisticItem.FONT_SIZE),
                                         Text = "Maximum",
                                         Colour = OsuColour.Gray(0.7f)
                                     },
@@ -123,7 +123,7 @@ namespace osu.Game.Screens.Ranking.Statistics
                                     {
                                         Origin = Anchor.CentreLeft,
                                         Anchor = Anchor.CentreLeft,
-                                        Font = OsuFont.GetFont(weight: FontWeight.Regular, size: 14),
+                                        Font = OsuFont.GetFont(weight: FontWeight.Regular, size: StatisticItem.FONT_SIZE),
                                         Colour = OsuColour.Gray(0.7f)
                                     }
                                 }
@@ -208,7 +208,7 @@ namespace osu.Game.Screens.Ranking.Statistics
                 {
                     Origin = Anchor.CentreLeft,
                     Anchor = Anchor.CentreLeft,
-                    Font = OsuFont.GetFont(weight: FontWeight.Regular, size: 14),
+                    Font = OsuFont.GetFont(weight: FontWeight.Regular, size: StatisticItem.FONT_SIZE),
                     Text = attribute.DisplayName,
                     Colour = Colour4.White
                 },
@@ -233,7 +233,7 @@ namespace osu.Game.Screens.Ranking.Statistics
                 {
                     Origin = Anchor.CentreRight,
                     Anchor = Anchor.CentreRight,
-                    Font = OsuFont.GetFont(weight: FontWeight.SemiBold, size: 14),
+                    Font = OsuFont.GetFont(weight: FontWeight.SemiBold, size: StatisticItem.FONT_SIZE),
                     Text = percentage.ToLocalisableString("0%"),
                     Colour = Colour4.White
                 }
diff --git a/osu.Game/Screens/Ranking/Statistics/SimpleStatisticItem.cs b/osu.Game/Screens/Ranking/Statistics/SimpleStatisticItem.cs
index 99f4e1e342..23ccc3d0b7 100644
--- a/osu.Game/Screens/Ranking/Statistics/SimpleStatisticItem.cs
+++ b/osu.Game/Screens/Ranking/Statistics/SimpleStatisticItem.cs
@@ -44,13 +44,13 @@ namespace osu.Game.Screens.Ranking.Statistics
                     Text = Name,
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.CentreLeft,
-                    Font = OsuFont.GetFont(size: 14)
+                    Font = OsuFont.GetFont(size: StatisticItem.FONT_SIZE)
                 },
                 value = new OsuSpriteText
                 {
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.CentreRight,
-                    Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold)
+                    Font = OsuFont.GetFont(size: StatisticItem.FONT_SIZE, weight: FontWeight.Bold)
                 }
             });
         }
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs b/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs
index f3308e9931..c3cc443adb 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Screens.Ranking.Statistics
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.CentreLeft,
                         Text = item.Name,
-                        Font = OsuFont.GetFont(size: 14, weight: FontWeight.SemiBold),
+                        Font = OsuFont.GetFont(size: StatisticItem.FONT_SIZE, weight: FontWeight.SemiBold),
                     }
                 }
             };
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticItem.cs b/osu.Game/Screens/Ranking/Statistics/StatisticItem.cs
index fd7a0ddb4f..cf95886905 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticItem.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticItem.cs
@@ -12,6 +12,11 @@ namespace osu.Game.Screens.Ranking.Statistics
     /// </summary>
     public class StatisticItem
     {
+        /// <summary>
+        /// The recommended font size to use in statistic items to make sure they match others.
+        /// </summary>
+        public const float FONT_SIZE = 13;
+
         /// <summary>
         /// The name of this item.
         /// </summary>
diff --git a/osu.Game/Screens/Ranking/Statistics/User/RankingChangeRow.cs b/osu.Game/Screens/Ranking/Statistics/User/RankingChangeRow.cs
index 534e1e58cd..a58e028baa 100644
--- a/osu.Game/Screens/Ranking/Statistics/User/RankingChangeRow.cs
+++ b/osu.Game/Screens/Ranking/Statistics/User/RankingChangeRow.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Screens.Ranking.Statistics.User
                 new OsuSpriteText
                 {
                     Text = Label,
-                    Font = OsuFont.Default.With(size: 14)
+                    Font = OsuFont.Default.With(size: StatisticItem.FONT_SIZE)
                 },
                 new FillFlowContainer
                 {
@@ -90,7 +90,7 @@ namespace osu.Game.Screens.Ranking.Statistics.User
                                 {
                                     Anchor = Anchor.CentreRight,
                                     Origin = Anchor.CentreRight,
-                                    Font = OsuFont.Default.With(size: 14, weight: FontWeight.Bold)
+                                    Font = OsuFont.Default.With(size: StatisticItem.FONT_SIZE, weight: FontWeight.Bold)
                                 },
                             }
                         },

From 6edaf4f230c4b0ab82f6ca8dbab0e3774cdec1a7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Jun 2023 17:52:08 +0900
Subject: [PATCH 1334/1604] Ensure `PerformanceBreakdown` pieces cannot be null

---
 .../Rulesets/Difficulty/PerformanceBreakdown.cs     | 13 +++++++++++--
 .../Difficulty/PerformanceBreakdownCalculator.cs    |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Difficulty/PerformanceBreakdown.cs b/osu.Game/Rulesets/Difficulty/PerformanceBreakdown.cs
index bd971db476..6e41855ca3 100644
--- a/osu.Game/Rulesets/Difficulty/PerformanceBreakdown.cs
+++ b/osu.Game/Rulesets/Difficulty/PerformanceBreakdown.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Rulesets.Difficulty
 {
     /// <summary>
@@ -19,5 +17,16 @@ namespace osu.Game.Rulesets.Difficulty
         /// Performance of a perfect play for comparison.
         /// </summary>
         public PerformanceAttributes PerfectPerformance { get; set; }
+
+        /// <summary>
+        /// Create a new performance breakdown.
+        /// </summary>
+        /// <param name="performance">Actual gameplay performance.</param>
+        /// <param name="perfectPerformance">Performance of a perfect play for comparison.</param>
+        public PerformanceBreakdown(PerformanceAttributes performance, PerformanceAttributes perfectPerformance)
+        {
+            Performance = performance;
+            PerfectPerformance = perfectPerformance;
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Difficulty/PerformanceBreakdownCalculator.cs b/osu.Game/Rulesets/Difficulty/PerformanceBreakdownCalculator.cs
index 8b59500f43..ad9257d4f3 100644
--- a/osu.Game/Rulesets/Difficulty/PerformanceBreakdownCalculator.cs
+++ b/osu.Game/Rulesets/Difficulty/PerformanceBreakdownCalculator.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Difficulty
                 getPerfectPerformance(score, cancellationToken)
             ).ConfigureAwait(false);
 
-            return new PerformanceBreakdown { Performance = performanceArray[0], PerfectPerformance = performanceArray[1] };
+            return new PerformanceBreakdown(performanceArray[0] ?? new PerformanceAttributes(), performanceArray[1] ?? new PerformanceAttributes());
         }
 
         [ItemCanBeNull]

From 947b40149f3e7581f15d40d6daeccf772bf8ac61 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Jul 2023 18:30:05 +0900
Subject: [PATCH 1335/1604] Adjust metrics of `SimpleStatisticTable`

---
 osu.Game.Rulesets.Mania/ManiaRuleset.cs                     | 2 +-
 osu.Game.Rulesets.Osu/OsuRuleset.cs                         | 2 +-
 osu.Game/Screens/Ranking/Statistics/SimpleStatisticTable.cs | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index bd6ab4086b..620009e182 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -412,7 +412,7 @@ namespace osu.Game.Rulesets.Mania
                 RelativeSizeAxes = Axes.X,
                 Height = 250
             }, true),
-            new StatisticItem(string.Empty, () => new SimpleStatisticTable(3, new SimpleStatisticItem[]
+            new StatisticItem(string.Empty, () => new SimpleStatisticTable(2, new SimpleStatisticItem[]
             {
                 new AverageHitError(score.HitEvents),
                 new UnstableRate(score.HitEvents)
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 036d13c5aa..3b24cc5997 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -319,7 +319,7 @@ namespace osu.Game.Rulesets.Osu
                     RelativeSizeAxes = Axes.X,
                     Height = 250
                 }, true),
-                new StatisticItem(string.Empty, () => new SimpleStatisticTable(3, new SimpleStatisticItem[]
+                new StatisticItem(string.Empty, () => new SimpleStatisticTable(2, new SimpleStatisticItem[]
                 {
                     new AverageHitError(timedHitEvents),
                     new UnstableRate(timedHitEvents)
diff --git a/osu.Game/Screens/Ranking/Statistics/SimpleStatisticTable.cs b/osu.Game/Screens/Ranking/Statistics/SimpleStatisticTable.cs
index d68df4558a..4eb4979724 100644
--- a/osu.Game/Screens/Ranking/Statistics/SimpleStatisticTable.cs
+++ b/osu.Game/Screens/Ranking/Statistics/SimpleStatisticTable.cs
@@ -103,7 +103,6 @@ namespace osu.Game.Screens.Ranking.Statistics
             public Spacer()
             {
                 RelativeSizeAxes = Axes.Both;
-                Padding = new MarginPadding { Vertical = 4 };
 
                 InternalChild = new CircularContainer
                 {

From 0881f4772cb730855cb8ebc5ec8c27327bd8dc60 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Jul 2023 18:31:45 +0900
Subject: [PATCH 1336/1604] Adjust metrics of `HitEventTimingDistributionGraph`

---
 .../Ranking/Statistics/HitEventTimingDistributionGraph.cs    | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
index fb9a78fb54..1260ec2339 100644
--- a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
+++ b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
@@ -131,14 +131,11 @@ namespace osu.Game.Screens.Ranking.Statistics
 
             Container axisFlow;
 
-            const float axis_font_size = 12;
+            Padding = new MarginPadding { Horizontal = 5 };
 
             InternalChild = new GridContainer
             {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
                 RelativeSizeAxes = Axes.Both,
-                Width = 0.8f,
                 Content = new[]
                 {
                     new Drawable[]

From 1a7b00ec152c15f467b05e1995bbfd32c7267403 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Jun 2023 17:52:08 +0900
Subject: [PATCH 1337/1604] Ensure `PerformanceBreakdown` pieces cannot be null

---
 .../Rulesets/Difficulty/PerformanceBreakdown.cs     | 13 +++++++++++--
 .../Difficulty/PerformanceBreakdownCalculator.cs    |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Difficulty/PerformanceBreakdown.cs b/osu.Game/Rulesets/Difficulty/PerformanceBreakdown.cs
index bd971db476..6e41855ca3 100644
--- a/osu.Game/Rulesets/Difficulty/PerformanceBreakdown.cs
+++ b/osu.Game/Rulesets/Difficulty/PerformanceBreakdown.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Rulesets.Difficulty
 {
     /// <summary>
@@ -19,5 +17,16 @@ namespace osu.Game.Rulesets.Difficulty
         /// Performance of a perfect play for comparison.
         /// </summary>
         public PerformanceAttributes PerfectPerformance { get; set; }
+
+        /// <summary>
+        /// Create a new performance breakdown.
+        /// </summary>
+        /// <param name="performance">Actual gameplay performance.</param>
+        /// <param name="perfectPerformance">Performance of a perfect play for comparison.</param>
+        public PerformanceBreakdown(PerformanceAttributes performance, PerformanceAttributes perfectPerformance)
+        {
+            Performance = performance;
+            PerfectPerformance = perfectPerformance;
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Difficulty/PerformanceBreakdownCalculator.cs b/osu.Game/Rulesets/Difficulty/PerformanceBreakdownCalculator.cs
index 8b59500f43..ad9257d4f3 100644
--- a/osu.Game/Rulesets/Difficulty/PerformanceBreakdownCalculator.cs
+++ b/osu.Game/Rulesets/Difficulty/PerformanceBreakdownCalculator.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Difficulty
                 getPerfectPerformance(score, cancellationToken)
             ).ConfigureAwait(false);
 
-            return new PerformanceBreakdown { Performance = performanceArray[0], PerfectPerformance = performanceArray[1] };
+            return new PerformanceBreakdown(performanceArray[0] ?? new PerformanceAttributes(), performanceArray[1] ?? new PerformanceAttributes());
         }
 
         [ItemCanBeNull]

From b333945cde705b12b8de3b32838cf532dc3a9a6a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Jul 2023 01:58:38 +0900
Subject: [PATCH 1338/1604] Change `OverallRanking` to use a two-column layout
 similar to statistics table

---
 .../Statistics/SimpleStatisticTable.cs        |  2 +-
 .../Ranking/Statistics/User/OverallRanking.cs | 49 ++++++++++++++-----
 .../Statistics/User/RankingChangeRow.cs       |  5 +-
 3 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Statistics/SimpleStatisticTable.cs b/osu.Game/Screens/Ranking/Statistics/SimpleStatisticTable.cs
index 4eb4979724..ed31bc8643 100644
--- a/osu.Game/Screens/Ranking/Statistics/SimpleStatisticTable.cs
+++ b/osu.Game/Screens/Ranking/Statistics/SimpleStatisticTable.cs
@@ -98,7 +98,7 @@ namespace osu.Game.Screens.Ranking.Statistics
             Direction = FillDirection.Vertical
         };
 
-        private partial class Spacer : CompositeDrawable
+        public partial class Spacer : CompositeDrawable
         {
             public Spacer()
             {
diff --git a/osu.Game/Screens/Ranking/Statistics/User/OverallRanking.cs b/osu.Game/Screens/Ranking/Statistics/User/OverallRanking.cs
index 1d39023223..d08a654e99 100644
--- a/osu.Game/Screens/Ranking/Statistics/User/OverallRanking.cs
+++ b/osu.Game/Screens/Ranking/Statistics/User/OverallRanking.cs
@@ -7,7 +7,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Solo;
-using osuTK;
 
 namespace osu.Game.Screens.Ranking.Statistics.User
 {
@@ -18,7 +17,7 @@ namespace osu.Game.Screens.Ranking.Statistics.User
         public Bindable<SoloStatisticsUpdate?> StatisticsUpdate { get; } = new Bindable<SoloStatisticsUpdate?>();
 
         private LoadingLayer loadingLayer = null!;
-        private FillFlowContainer content = null!;
+        private GridContainer content = null!;
 
         [BackgroundDependencyLoader]
         private void load()
@@ -33,21 +32,47 @@ namespace osu.Game.Screens.Ranking.Statistics.User
                 {
                     RelativeSizeAxes = Axes.Both,
                 },
-                content = new FillFlowContainer
+                content = new GridContainer
                 {
                     AlwaysPresent = true,
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
-                    Direction = FillDirection.Vertical,
-                    Spacing = new Vector2(5),
-                    Children = new Drawable[]
+                    ColumnDimensions = new[]
                     {
-                        new GlobalRankChangeRow { StatisticsUpdate = { BindTarget = StatisticsUpdate } },
-                        new AccuracyChangeRow { StatisticsUpdate = { BindTarget = StatisticsUpdate } },
-                        new MaximumComboChangeRow { StatisticsUpdate = { BindTarget = StatisticsUpdate } },
-                        new RankedScoreChangeRow { StatisticsUpdate = { BindTarget = StatisticsUpdate } },
-                        new TotalScoreChangeRow { StatisticsUpdate = { BindTarget = StatisticsUpdate } },
-                        new PerformancePointsChangeRow { StatisticsUpdate = { BindTarget = StatisticsUpdate } }
+                        new Dimension(),
+                        new Dimension(GridSizeMode.Absolute, 30),
+                        new Dimension(),
+                    },
+                    RowDimensions = new[]
+                    {
+                        new Dimension(GridSizeMode.AutoSize),
+                        new Dimension(GridSizeMode.Absolute, 10),
+                        new Dimension(GridSizeMode.AutoSize),
+                        new Dimension(GridSizeMode.Absolute, 10),
+                        new Dimension(GridSizeMode.AutoSize),
+                    },
+                    Content = new[]
+                    {
+                        new Drawable[]
+                        {
+                            new GlobalRankChangeRow { StatisticsUpdate = { BindTarget = StatisticsUpdate } },
+                            new SimpleStatisticTable.Spacer(),
+                            new PerformancePointsChangeRow { StatisticsUpdate = { BindTarget = StatisticsUpdate } },
+                        },
+                        new Drawable[] { },
+                        new Drawable[]
+                        {
+                            new MaximumComboChangeRow { StatisticsUpdate = { BindTarget = StatisticsUpdate } },
+                            new SimpleStatisticTable.Spacer(),
+                            new AccuracyChangeRow { StatisticsUpdate = { BindTarget = StatisticsUpdate } },
+                        },
+                        new Drawable[] { },
+                        new Drawable[]
+                        {
+                            new RankedScoreChangeRow { StatisticsUpdate = { BindTarget = StatisticsUpdate } },
+                            new SimpleStatisticTable.Spacer(),
+                            new TotalScoreChangeRow { StatisticsUpdate = { BindTarget = StatisticsUpdate } },
+                        }
                     }
                 }
             };
diff --git a/osu.Game/Screens/Ranking/Statistics/User/RankingChangeRow.cs b/osu.Game/Screens/Ranking/Statistics/User/RankingChangeRow.cs
index a58e028baa..906bf8d5ca 100644
--- a/osu.Game/Screens/Ranking/Statistics/User/RankingChangeRow.cs
+++ b/osu.Game/Screens/Ranking/Statistics/User/RankingChangeRow.cs
@@ -54,7 +54,8 @@ namespace osu.Game.Screens.Ranking.Statistics.User
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
                     Direction = FillDirection.Vertical,
-                    AutoSizeAxes = Axes.Both,
+                    AutoSizeAxes = Axes.X,
+                    Height = StatisticItem.FONT_SIZE * 2,
                     Children = new Drawable[]
                     {
                         new FillFlowContainer
@@ -98,7 +99,7 @@ namespace osu.Game.Screens.Ranking.Statistics.User
                         {
                             Anchor = Anchor.TopRight,
                             Origin = Anchor.TopRight,
-                            Font = OsuFont.Default.With(weight: FontWeight.Bold)
+                            Font = OsuFont.Default.With(size: StatisticItem.FONT_SIZE, weight: FontWeight.Bold)
                         }
                     }
                 }

From 2073810e958b7376d4797de1dc1e5d79213be7d4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Jul 2023 18:48:24 +0900
Subject: [PATCH 1339/1604] Add performance breakdown chart for osu!catch

---
 osu.Game.Rulesets.Catch/CatchRuleset.cs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index e51e5cc5db..bd6b857fe8 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -26,6 +26,8 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Replays.Types;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
+using osu.Game.Scoring;
+using osu.Game.Screens.Ranking.Statistics;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Catch
@@ -218,5 +220,17 @@ namespace osu.Game.Rulesets.Catch
         public override HitObjectComposer CreateHitObjectComposer() => new CatchHitObjectComposer(this);
 
         public override IBeatmapVerifier CreateBeatmapVerifier() => new CatchBeatmapVerifier();
+
+        public override StatisticItem[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap)
+        {
+            return new[]
+            {
+                new StatisticItem("Performance Breakdown", () => new PerformanceBreakdownChart(score, playableBeatmap)
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y
+                }),
+            };
+        }
     }
 }

From 9ad63bae374262f1a1158dcc1975eecda1595e39 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Jul 2023 18:50:52 +0900
Subject: [PATCH 1340/1604] Add missing heading for statistics section in
 results screen

---
 osu.Game.Rulesets.Mania/ManiaRuleset.cs | 2 +-
 osu.Game.Rulesets.Osu/OsuRuleset.cs     | 2 +-
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index bd6ab4086b..e46c85ab29 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -412,7 +412,7 @@ namespace osu.Game.Rulesets.Mania
                 RelativeSizeAxes = Axes.X,
                 Height = 250
             }, true),
-            new StatisticItem(string.Empty, () => new SimpleStatisticTable(3, new SimpleStatisticItem[]
+            new StatisticItem("Statistics", () => new SimpleStatisticTable(3, new SimpleStatisticItem[]
             {
                 new AverageHitError(score.HitEvents),
                 new UnstableRate(score.HitEvents)
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 036d13c5aa..c00bab8ed7 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -319,7 +319,7 @@ namespace osu.Game.Rulesets.Osu
                     RelativeSizeAxes = Axes.X,
                     Height = 250
                 }, true),
-                new StatisticItem(string.Empty, () => new SimpleStatisticTable(3, new SimpleStatisticItem[]
+                new StatisticItem("Statistics", () => new SimpleStatisticTable(3, new SimpleStatisticItem[]
                 {
                     new AverageHitError(timedHitEvents),
                     new UnstableRate(timedHitEvents)
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index de3fa1750f..feb8b0c2c2 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -256,7 +256,7 @@ namespace osu.Game.Rulesets.Taiko
                     RelativeSizeAxes = Axes.X,
                     Height = 250
                 }, true),
-                new StatisticItem(string.Empty, () => new SimpleStatisticTable(3, new SimpleStatisticItem[]
+                new StatisticItem("Statistics", () => new SimpleStatisticTable(3, new SimpleStatisticItem[]
                 {
                     new AverageHitError(timedHitEvents),
                     new UnstableRate(timedHitEvents)

From e34839c8918ef5fbda6fe2b547c4963feceed223 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Jul 2023 18:55:54 +0900
Subject: [PATCH 1341/1604] Rename `StatisticContainer` to
 `StatisticItemContainer` and add a background

---
 ...Container.cs => StatisticItemContainer.cs} | 43 ++++++++++++++-----
 .../Ranking/Statistics/StatisticsPanel.cs     |  2 +-
 2 files changed, 34 insertions(+), 11 deletions(-)
 rename osu.Game/Screens/Ranking/Statistics/{StatisticContainer.cs => StatisticItemContainer.cs} (62%)

diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs b/osu.Game/Screens/Ranking/Statistics/StatisticItemContainer.cs
similarity index 62%
rename from osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs
rename to osu.Game/Screens/Ranking/Statistics/StatisticItemContainer.cs
index c3cc443adb..6e18ae1fe4 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticItemContainer.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Localisation;
@@ -15,31 +16,53 @@ namespace osu.Game.Screens.Ranking.Statistics
     /// <summary>
     /// Wraps a <see cref="StatisticItem"/> to add a header and suitable layout for use in <see cref="ResultsScreen"/>.
     /// </summary>
-    internal partial class StatisticContainer : CompositeDrawable
+    internal partial class StatisticItemContainer : CompositeDrawable
     {
         /// <summary>
-        /// Creates a new <see cref="StatisticContainer"/>.
+        /// Creates a new <see cref="StatisticItemContainer"/>.
         /// </summary>
         /// <param name="item">The <see cref="StatisticItem"/> to display.</param>
-        public StatisticContainer(StatisticItem item)
+        public StatisticItemContainer(StatisticItem item)
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
 
-            InternalChild = new FillFlowContainer
+            Padding = new MarginPadding(5);
+
+            InternalChild = new Container
             {
                 RelativeSizeAxes = Axes.X,
                 AutoSizeAxes = Axes.Y,
-                Children = new[]
+                Masking = true,
+                CornerRadius = 6,
+                Children = new Drawable[]
                 {
-                    createHeader(item),
+                    new Box
+                    {
+                        Colour = ColourInfo.GradientVertical(
+                            OsuColour.Gray(0.25f),
+                            OsuColour.Gray(0.18f)
+                        ),
+                        Alpha = 0.95f,
+                        RelativeSizeAxes = Axes.Both,
+                    },
                     new Container
                     {
                         RelativeSizeAxes = Axes.X,
                         AutoSizeAxes = Axes.Y,
-                        Margin = new MarginPadding { Top = 15 },
-                        Child = item.CreateContent()
-                    }
+                        Padding = new MarginPadding(5),
+                        Children = new[]
+                        {
+                            createHeader(item),
+                            new Container
+                            {
+                                RelativeSizeAxes = Axes.X,
+                                AutoSizeAxes = Axes.Y,
+                                Padding = new MarginPadding(10) { Top = 30 },
+                                Child = item.CreateContent()
+                            }
+                        }
+                    },
                 }
             };
         }
@@ -52,7 +75,7 @@ namespace osu.Game.Screens.Ranking.Statistics
             return new FillFlowContainer
             {
                 RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y,
+                Height = 20,
                 Direction = FillDirection.Horizontal,
                 Spacing = new Vector2(5, 0),
                 Children = new Drawable[]
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
index 40d2d29902..8ab774f76d 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
@@ -153,7 +153,7 @@ namespace osu.Game.Screens.Ranking.Statistics
                             continue;
                         }
 
-                        flow.Add(new StatisticContainer(item)
+                        flow.Add(new StatisticItemContainer(item)
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,

From 2c27b17c85a14a39bc4dbdc0e5297945d6e0e838 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Jul 2023 19:00:03 +0900
Subject: [PATCH 1342/1604] Disable masking on inner scroll container

---
 osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
index 8ab774f76d..9357d1f385 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
@@ -130,6 +130,8 @@ namespace osu.Game.Screens.Ranking.Statistics
                         RelativeSizeAxes = Axes.Both,
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
+                        Masking = false,
+                        ScrollbarOverlapsContent = false,
                         Alpha = 0,
                         Children = new[]
                         {

From cde8d8e7f1fccc221527209216c24a73612e7d71 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Thu, 13 Jul 2023 14:33:21 +0200
Subject: [PATCH 1343/1604] Optimize realm transactions for editor Save action

---
 osu.Game/Beatmaps/BeatmapManager.cs | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 54c243e842..265149e378 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -431,8 +431,9 @@ namespace osu.Game.Beatmaps
             beatmapInfo.Status = BeatmapOnlineStatus.LocallyModified;
             beatmapInfo.ResetOnlineInfo();
 
-            using (var stream = new MemoryStream())
+            Realm.Write(r =>
             {
+                using var stream = new MemoryStream();
                 using (var sw = new StreamWriter(stream, Encoding.UTF8, 1024, true))
                     new LegacyBeatmapEncoder(beatmapContent, beatmapSkin).Encode(sw);
 
@@ -458,23 +459,20 @@ namespace osu.Game.Beatmaps
 
                 updateHashAndMarkDirty(setInfo);
 
-                Realm.Write(r =>
-                {
-                    var liveBeatmapSet = r.Find<BeatmapSetInfo>(setInfo.ID)!;
+                var liveBeatmapSet = r.Find<BeatmapSetInfo>(setInfo.ID)!;
 
-                    setInfo.CopyChangesToRealm(liveBeatmapSet);
+                setInfo.CopyChangesToRealm(liveBeatmapSet);
 
-                    if (transferCollections)
-                        beatmapInfo.TransferCollectionReferences(r, oldMd5Hash);
+                if (transferCollections)
+                    beatmapInfo.TransferCollectionReferences(r, oldMd5Hash);
 
-                    liveBeatmapSet.Beatmaps.Single(b => b.ID == beatmapInfo.ID)
-                                  .UpdateLocalScores(r);
+                liveBeatmapSet.Beatmaps.Single(b => b.ID == beatmapInfo.ID)
+                              .UpdateLocalScores(r);
 
-                    // do not look up metadata.
-                    // this is a locally-modified set now, so looking up metadata is busy work at best and harmful at worst.
-                    ProcessBeatmap?.Invoke(liveBeatmapSet, MetadataLookupScope.None);
-                });
-            }
+                // do not look up metadata.
+                // this is a locally-modified set now, so looking up metadata is busy work at best and harmful at worst.
+                ProcessBeatmap?.Invoke(liveBeatmapSet, MetadataLookupScope.None);
+            });
 
             Debug.Assert(beatmapInfo.BeatmapSet != null);
 

From 20e4e2581a530dc020d0b8c3252ba961110ee04e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Jul 2023 22:12:55 +0900
Subject: [PATCH 1344/1604] Change `IBeatSyncProvider.Clock` to always be
 non-null

---
 .../Visual/UserInterface/TestSceneBeatSyncedContainer.cs   | 5 -----
 osu.Game/Beatmaps/BeatSyncProviderExtensions.cs            | 7 +------
 osu.Game/Beatmaps/IBeatSyncProvider.cs                     | 2 +-
 osu.Game/Graphics/Containers/BeatSyncedContainer.cs        | 5 +----
 osu.Game/Rulesets/Mods/MetronomeBeat.cs                    | 2 +-
 osu.Game/Screens/Edit/Timing/MetronomeDisplay.cs           | 4 ++--
 osu.Game/Screens/Edit/Timing/TapButton.cs                  | 2 +-
 osu.Game/Screens/Menu/LogoVisualisation.cs                 | 3 +--
 .../Storyboards/Drawables/DrawableStoryboardAnimation.cs   | 2 +-
 9 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatSyncedContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatSyncedContainer.cs
index 5d97714ab5..c723610614 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatSyncedContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatSyncedContainer.cs
@@ -5,7 +5,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Audio.Track;
@@ -283,8 +282,6 @@ namespace osu.Game.Tests.Visual.UserInterface
 
                 if (ReferenceEquals(timingPoints[^1], current))
                 {
-                    Debug.Assert(BeatSyncSource.Clock != null);
-
                     return (int)Math.Ceiling((BeatSyncSource.Clock.CurrentTime - current.Time) / current.BeatLength);
                 }
 
@@ -295,8 +292,6 @@ namespace osu.Game.Tests.Visual.UserInterface
             {
                 base.Update();
 
-                Debug.Assert(BeatSyncSource.Clock != null);
-
                 timeUntilNextBeat.Value = TimeUntilNextBeat;
                 timeSinceLastBeat.Value = TimeSinceLastBeat;
                 currentTime.Value = BeatSyncSource.Clock.CurrentTime;
diff --git a/osu.Game/Beatmaps/BeatSyncProviderExtensions.cs b/osu.Game/Beatmaps/BeatSyncProviderExtensions.cs
index 767aa5df73..e2b805bf0d 100644
--- a/osu.Game/Beatmaps/BeatSyncProviderExtensions.cs
+++ b/osu.Game/Beatmaps/BeatSyncProviderExtensions.cs
@@ -5,14 +5,9 @@ namespace osu.Game.Beatmaps
 {
     public static class BeatSyncProviderExtensions
     {
-        /// <summary>
-        /// Check whether beat sync is currently available.
-        /// </summary>
-        public static bool CheckBeatSyncAvailable(this IBeatSyncProvider provider) => provider.Clock != null;
-
         /// <summary>
         /// Whether the beat sync provider is currently in a kiai section. Should make everything more epic.
         /// </summary>
-        public static bool CheckIsKiaiTime(this IBeatSyncProvider provider) => provider.Clock != null && provider.ControlPoints?.EffectPointAt(provider.Clock.CurrentTime).KiaiMode == true;
+        public static bool CheckIsKiaiTime(this IBeatSyncProvider provider) => provider.ControlPoints?.EffectPointAt(provider.Clock.CurrentTime).KiaiMode == true;
     }
 }
diff --git a/osu.Game/Beatmaps/IBeatSyncProvider.cs b/osu.Game/Beatmaps/IBeatSyncProvider.cs
index 9ee19e720d..776552cfa5 100644
--- a/osu.Game/Beatmaps/IBeatSyncProvider.cs
+++ b/osu.Game/Beatmaps/IBeatSyncProvider.cs
@@ -24,6 +24,6 @@ namespace osu.Game.Beatmaps
         /// <summary>
         /// Access a clock currently responsible for providing beat sync. If <c>null</c>, no current provider is available.
         /// </summary>
-        IClock? Clock { get; }
+        IClock Clock { get; }
     }
 }
diff --git a/osu.Game/Graphics/Containers/BeatSyncedContainer.cs b/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
index 42b30f9d18..f911311a09 100644
--- a/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
+++ b/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Diagnostics;
 using osu.Framework.Allocation;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Containers;
@@ -86,14 +85,12 @@ namespace osu.Game.Graphics.Containers
             TimingControlPoint timingPoint;
             EffectControlPoint effectPoint;
 
-            IsBeatSyncedWithTrack = BeatSyncSource.CheckBeatSyncAvailable() && BeatSyncSource.Clock?.IsRunning == true;
+            IsBeatSyncedWithTrack = BeatSyncSource.Clock.IsRunning;
 
             double currentTrackTime;
 
             if (IsBeatSyncedWithTrack)
             {
-                Debug.Assert(BeatSyncSource.Clock != null);
-
                 currentTrackTime = BeatSyncSource.Clock.CurrentTime + EarlyActivationMilliseconds;
 
                 timingPoint = BeatSyncSource.ControlPoints?.TimingPointAt(currentTrackTime) ?? TimingControlPoint.DEFAULT;
diff --git a/osu.Game/Rulesets/Mods/MetronomeBeat.cs b/osu.Game/Rulesets/Mods/MetronomeBeat.cs
index 265970ea46..5615362d1a 100644
--- a/osu.Game/Rulesets/Mods/MetronomeBeat.cs
+++ b/osu.Game/Rulesets/Mods/MetronomeBeat.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Mods
             int timeSignature = timingPoint.TimeSignature.Numerator;
 
             // play metronome from one measure before the first object.
-            if (BeatSyncSource.Clock?.CurrentTime < firstHitTime - timingPoint.BeatLength * timeSignature)
+            if (BeatSyncSource.Clock.CurrentTime < firstHitTime - timingPoint.BeatLength * timeSignature)
                 return;
 
             sample.Frequency.Value = beatIndex % timeSignature == 0 ? 1 : 0.5f;
diff --git a/osu.Game/Screens/Edit/Timing/MetronomeDisplay.cs b/osu.Game/Screens/Edit/Timing/MetronomeDisplay.cs
index f4a39405a1..9f03281d0c 100644
--- a/osu.Game/Screens/Edit/Timing/MetronomeDisplay.cs
+++ b/osu.Game/Screens/Edit/Timing/MetronomeDisplay.cs
@@ -240,7 +240,7 @@ namespace osu.Game.Screens.Edit.Timing
         {
             base.Update();
 
-            if (BeatSyncSource.ControlPoints == null || BeatSyncSource.Clock == null)
+            if (BeatSyncSource.ControlPoints == null)
                 return;
 
             metronomeClock.Rate = IsBeatSyncedWithTrack ? BeatSyncSource.Clock.Rate : 1;
@@ -259,7 +259,7 @@ namespace osu.Game.Screens.Edit.Timing
                 this.TransformBindableTo(interpolatedBpm, (int)Math.Round(timingPoint.BPM), 600, Easing.OutQuint);
             }
 
-            if (BeatSyncSource.Clock?.IsRunning != true && isSwinging)
+            if (!BeatSyncSource.Clock.IsRunning && isSwinging)
             {
                 swing.ClearTransforms(true);
 
diff --git a/osu.Game/Screens/Edit/Timing/TapButton.cs b/osu.Game/Screens/Edit/Timing/TapButton.cs
index f28c6ccf0a..fd60fb1b5b 100644
--- a/osu.Game/Screens/Edit/Timing/TapButton.cs
+++ b/osu.Game/Screens/Edit/Timing/TapButton.cs
@@ -310,7 +310,7 @@ namespace osu.Game.Screens.Edit.Timing
             }
 
             double averageBeatLength = (tapTimings.Last() - tapTimings.Skip(initial_taps_to_ignore).First()) / (tapTimings.Count - initial_taps_to_ignore - 1);
-            double clockRate = beatSyncSource?.Clock?.Rate ?? 1;
+            double clockRate = beatSyncSource?.Clock.Rate ?? 1;
 
             double bpm = Math.Round(60000 / averageBeatLength / clockRate);
 
diff --git a/osu.Game/Screens/Menu/LogoVisualisation.cs b/osu.Game/Screens/Menu/LogoVisualisation.cs
index 5000a97b3d..fa26cfab46 100644
--- a/osu.Game/Screens/Menu/LogoVisualisation.cs
+++ b/osu.Game/Screens/Menu/LogoVisualisation.cs
@@ -102,8 +102,7 @@ namespace osu.Game.Screens.Menu
             for (int i = 0; i < temporalAmplitudes.Length; i++)
                 temporalAmplitudes[i] = 0;
 
-            if (beatSyncProvider.Clock != null)
-                addAmplitudesFromSource(beatSyncProvider);
+            addAmplitudesFromSource(beatSyncProvider);
 
             foreach (var source in amplitudeSources)
                 addAmplitudesFromSource(source);
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
index be77c9a98e..82c01ea6a1 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
@@ -128,7 +128,7 @@ namespace osu.Game.Storyboards.Drawables
             //
             // In the case of storyboard animations, we want to synchronise with game time perfectly
             // so let's get a correct time based on gameplay clock and earliest transform.
-            PlaybackPosition = (beatSyncProvider.Clock?.CurrentTime ?? Clock.CurrentTime) - Animation.EarliestTransformTime;
+            PlaybackPosition = beatSyncProvider.Clock.CurrentTime - Animation.EarliestTransformTime;
         }
 
         private void skinSourceChanged()

From 1698caa078e12a33e808ba5b86c00f3c805e5bb8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Jul 2023 20:31:00 +0900
Subject: [PATCH 1345/1604] Add kiai fountains to main menu

---
 .../Visual/Menus/TestSceneStarFountain.cs     |  52 +++++++++
 osu.Game/Screens/Menu/KiaiMenuFountains.cs    |  67 ++++++++++++
 osu.Game/Screens/Menu/MainMenu.cs             |   1 +
 osu.Game/Screens/Menu/StarFountain.cs         | 102 ++++++++++++++++++
 4 files changed, 222 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Menus/TestSceneStarFountain.cs
 create mode 100644 osu.Game/Screens/Menu/KiaiMenuFountains.cs
 create mode 100644 osu.Game/Screens/Menu/StarFountain.cs

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneStarFountain.cs b/osu.Game.Tests/Visual/Menus/TestSceneStarFountain.cs
new file mode 100644
index 0000000000..b12f3e7946
--- /dev/null
+++ b/osu.Game.Tests/Visual/Menus/TestSceneStarFountain.cs
@@ -0,0 +1,52 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Framework.Testing;
+using osu.Framework.Utils;
+using osu.Game.Screens.Menu;
+
+namespace osu.Game.Tests.Visual.Menus
+{
+    [TestFixture]
+    public partial class TestSceneStarFountain : OsuTestScene
+    {
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep("make fountains", () =>
+            {
+                Children = new[]
+                {
+                    new StarFountain
+                    {
+                        Anchor = Anchor.BottomCentre,
+                        Origin = Anchor.BottomCentre,
+                        X = 200,
+                    },
+                    new StarFountain
+                    {
+                        Anchor = Anchor.BottomCentre,
+                        Origin = Anchor.BottomCentre,
+                        X = -200,
+                    },
+                };
+            });
+        }
+
+        [Test]
+        public void TestPew()
+        {
+            AddRepeatStep("activate fountains sometimes", () =>
+            {
+                foreach (var fountain in Children.OfType<StarFountain>())
+                {
+                    if (RNG.NextSingle() > 0.8f)
+                        fountain.Shoot();
+                }
+            }, 150);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Menu/KiaiMenuFountains.cs b/osu.Game/Screens/Menu/KiaiMenuFountains.cs
new file mode 100644
index 0000000000..a4d58e398a
--- /dev/null
+++ b/osu.Game/Screens/Menu/KiaiMenuFountains.cs
@@ -0,0 +1,67 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Audio.Track;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Graphics.Containers;
+
+namespace osu.Game.Screens.Menu
+{
+    public partial class KiaiMenuFountains : BeatSyncedContainer
+    {
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            RelativeSizeAxes = Axes.Both;
+
+            Children = new[]
+            {
+                new StarFountain
+                {
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.BottomLeft,
+                    X = 250,
+                },
+                new StarFountain
+                {
+                    Anchor = Anchor.BottomRight,
+                    Origin = Anchor.BottomRight,
+                    X = -250,
+                },
+            };
+        }
+
+        private bool isTriggered;
+
+        private double? lastTrigger;
+
+        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
+        {
+            base.OnNewBeat(beatIndex, timingPoint, effectPoint, amplitudes);
+
+            if (effectPoint.KiaiMode && !isTriggered)
+            {
+                bool isNearEffectPoint = Math.Abs(BeatSyncSource.Clock.CurrentTime - effectPoint.Time) < 500;
+                if (isNearEffectPoint)
+                    Shoot();
+            }
+
+            isTriggered = effectPoint.KiaiMode;
+        }
+
+        public void Shoot()
+        {
+            if (lastTrigger != null && Clock.CurrentTime - lastTrigger < 500)
+                return;
+
+            foreach (var fountain in Children.OfType<StarFountain>())
+                fountain.Shoot();
+
+            lastTrigger = Clock.CurrentTime;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index f34a1954a5..baa34d4914 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -136,6 +136,7 @@ namespace osu.Game.Screens.Menu
                     Origin = Anchor.TopRight,
                     Margin = new MarginPadding { Right = 15, Top = 5 }
                 },
+                new KiaiMenuFountains(),
                 holdToExitGameOverlay?.CreateProxy() ?? Empty()
             });
 
diff --git a/osu.Game/Screens/Menu/StarFountain.cs b/osu.Game/Screens/Menu/StarFountain.cs
new file mode 100644
index 0000000000..e8feba4451
--- /dev/null
+++ b/osu.Game/Screens/Menu/StarFountain.cs
@@ -0,0 +1,102 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Pooling;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.Utils;
+using osuTK;
+
+namespace osu.Game.Screens.Menu
+{
+    public partial class StarFountain : CompositeDrawable
+    {
+        private DrawablePool<Star> starPool = null!;
+        private Container starContainer = null!;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChildren = new Drawable[]
+            {
+                starPool = new DrawablePool<Star>(192),
+                starContainer = new Container()
+            };
+        }
+
+        public void Shoot()
+        {
+            int dir = RNG.Next(-1, 2);
+
+            for (int i = 0; i < 192; i++)
+            {
+                double offset = i * 3;
+
+                starContainer.Add(starPool.Get(s =>
+                {
+                    s.Velocity = new Vector2(dir * 0.6f + RNG.NextSingle(-0.25f, 0.25f), -RNG.NextSingle(2.2f, 2.4f));
+                    s.Position = new Vector2(RNG.NextSingle(-5, 5), 50);
+                    s.Hide();
+
+                    using (s.BeginDelayedSequence(offset))
+                    {
+                        s.FadeIn();
+                        s.ScaleTo(1);
+
+                        double duration = RNG.Next(300, 1300);
+
+                        s.FadeOutFromOne(duration, Easing.Out);
+                        s.ScaleTo(RNG.NextSingle(1, 2.8f), duration, Easing.Out);
+
+                        s.Expire();
+                    }
+                }));
+            }
+        }
+
+        private partial class Star : PoolableDrawable
+        {
+            public Vector2 Velocity = Vector2.Zero;
+
+            private float rotation;
+
+            [BackgroundDependencyLoader]
+            private void load(TextureStore textures)
+            {
+                AutoSizeAxes = Axes.Both;
+                Origin = Anchor.Centre;
+
+                InternalChildren = new Drawable[]
+                {
+                    new Sprite
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Blending = BlendingParameters.Additive,
+                        Scale = new Vector2(0.5f),
+                        Texture = textures.Get("Menu/fountain-star")
+                    }
+                };
+
+                rotation = RNG.NextSingle(-2f, 2f);
+            }
+
+            protected override void Update()
+            {
+                const float gravity = 0.004f;
+
+                base.Update();
+
+                float elapsed = (float)Time.Elapsed;
+
+                Position += Velocity * elapsed;
+                Velocity += new Vector2(0, elapsed * gravity);
+
+                Rotation += rotation * elapsed;
+            }
+        }
+    }
+}

From 53fccaa3bd5afeb5413b3cb1537c8808bb386f5a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Jul 2023 22:30:27 +0900
Subject: [PATCH 1346/1604] Use skinnable sprite

---
 osu.Game/Screens/Menu/StarFountain.cs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Menu/StarFountain.cs b/osu.Game/Screens/Menu/StarFountain.cs
index e8feba4451..f891e989bb 100644
--- a/osu.Game/Screens/Menu/StarFountain.cs
+++ b/osu.Game/Screens/Menu/StarFountain.cs
@@ -5,9 +5,8 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Pooling;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Textures;
 using osu.Framework.Utils;
+using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Screens.Menu
@@ -64,20 +63,18 @@ namespace osu.Game.Screens.Menu
             private float rotation;
 
             [BackgroundDependencyLoader]
-            private void load(TextureStore textures)
+            private void load()
             {
                 AutoSizeAxes = Axes.Both;
                 Origin = Anchor.Centre;
 
                 InternalChildren = new Drawable[]
                 {
-                    new Sprite
+                    new SkinnableSprite("star2")
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
                         Blending = BlendingParameters.Additive,
-                        Scale = new Vector2(0.5f),
-                        Texture = textures.Get("Menu/fountain-star")
                     }
                 };
 

From 8f826a3702640fedf73b94127528ebd69e9c469d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Jul 2023 22:57:04 +0900
Subject: [PATCH 1347/1604] Add skinning support for kiai fountain stars

---
 osu.Game/Screens/Menu/StarFountain.cs      |  2 +-
 osu.Game/Skinning/LegacySkinTransformer.cs | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Menu/StarFountain.cs b/osu.Game/Screens/Menu/StarFountain.cs
index f891e989bb..8aedf3199b 100644
--- a/osu.Game/Screens/Menu/StarFountain.cs
+++ b/osu.Game/Screens/Menu/StarFountain.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Screens.Menu
 
                 InternalChildren = new Drawable[]
                 {
-                    new SkinnableSprite("star2")
+                    new SkinnableSprite("Menu/fountain-star")
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
diff --git a/osu.Game/Skinning/LegacySkinTransformer.cs b/osu.Game/Skinning/LegacySkinTransformer.cs
index 367e5bae01..97b0f3a9b5 100644
--- a/osu.Game/Skinning/LegacySkinTransformer.cs
+++ b/osu.Game/Skinning/LegacySkinTransformer.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Audio.Sample;
+using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
 using osu.Game.Rulesets.Objects.Legacy;
 using static osu.Game.Skinning.SkinConfiguration;
@@ -23,6 +24,18 @@ namespace osu.Game.Skinning
         {
         }
 
+        public override Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
+        {
+            switch (componentName)
+            {
+                case "fountain-star":
+                    componentName = "star2";
+                    break;
+            }
+
+            return base.GetTexture(componentName, wrapModeS, wrapModeT);
+        }
+
         public override ISample? GetSample(ISampleInfo sampleInfo)
         {
             if (!(sampleInfo is ConvertHitObjectParser.LegacyHitSampleInfo legacySample))

From 1051982bc59d14f937575812e1efe7d659bf24fb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Jul 2023 23:12:29 +0900
Subject: [PATCH 1348/1604] Tidy up code with constants

---
 osu.Game/Screens/Menu/StarFountain.cs | 45 ++++++++++++++++++---------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Menu/StarFountain.cs b/osu.Game/Screens/Menu/StarFountain.cs
index 8aedf3199b..7fa996e39a 100644
--- a/osu.Game/Screens/Menu/StarFountain.cs
+++ b/osu.Game/Screens/Menu/StarFountain.cs
@@ -28,29 +28,42 @@ namespace osu.Game.Screens.Menu
 
         public void Shoot()
         {
-            int dir = RNG.Next(-1, 2);
+            // left centre or right movement.
+            int direction = RNG.Next(-1, 2);
 
-            for (int i = 0; i < 192; i++)
+            const int total_stars = 192;
+
+            const float x_velocity_from_direction = 0.6f;
+            const float x_velocity_random_variance = 0.25f;
+
+            const float y_velocity_base = -2.0f;
+            const float y_velocity_random_variance = 0.25f;
+
+            const float x_spawn_position_variance = 10;
+            const float y_spawn_position_offset = 50;
+
+            for (int i = 0; i < total_stars; i++)
             {
-                double offset = i * 3;
+                double initialOffset = i * 3;
 
                 starContainer.Add(starPool.Get(s =>
                 {
-                    s.Velocity = new Vector2(dir * 0.6f + RNG.NextSingle(-0.25f, 0.25f), -RNG.NextSingle(2.2f, 2.4f));
-                    s.Position = new Vector2(RNG.NextSingle(-5, 5), 50);
+                    s.Velocity = new Vector2(
+                        direction * x_velocity_from_direction + getRandomVariance(x_velocity_random_variance),
+                        y_velocity_base + getRandomVariance(y_velocity_random_variance));
+
+                    s.Position = new Vector2(getRandomVariance(x_spawn_position_variance), y_spawn_position_offset);
+
                     s.Hide();
 
-                    using (s.BeginDelayedSequence(offset))
+                    using (s.BeginDelayedSequence(initialOffset))
                     {
-                        s.FadeIn();
-                        s.ScaleTo(1);
-
                         double duration = RNG.Next(300, 1300);
 
-                        s.FadeOutFromOne(duration, Easing.Out);
-                        s.ScaleTo(RNG.NextSingle(1, 2.8f), duration, Easing.Out);
-
-                        s.Expire();
+                        s.ScaleTo(1)
+                         .ScaleTo(RNG.NextSingle(1, 2.8f), duration, Easing.Out)
+                         .FadeOutFromOne(duration, Easing.Out)
+                         .Expire();
                     }
                 }));
             }
@@ -78,12 +91,12 @@ namespace osu.Game.Screens.Menu
                     }
                 };
 
-                rotation = RNG.NextSingle(-2f, 2f);
+                rotation = getRandomVariance(2);
             }
 
             protected override void Update()
             {
-                const float gravity = 0.004f;
+                const float gravity = 0.003f;
 
                 base.Update();
 
@@ -95,5 +108,7 @@ namespace osu.Game.Screens.Menu
                 Rotation += rotation * elapsed;
             }
         }
+
+        private static float getRandomVariance(float variance) => RNG.NextSingle(-variance, variance);
     }
 }

From 4b06b6f34ec98b37bdd68e597a8248ac9c36df89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 13 Jul 2023 18:53:32 +0200
Subject: [PATCH 1349/1604] Crudely fix crashes when switching between
 `TestResultsWithPlayer` cases

In the visual test browser, if two `TestResultsWithPlayer` test cases
are ran consecutively, the second would die on `SoloStatisticsWatcher`
seeing duplicated online score IDs. This surfaced after
6ef39b87fed8b44b5f9219da12d639ae5e4f422b, which changed
`TestResultsScreen` to inherit `SoloResultsScreen` rather than
`ResultsScreen`.

This is probably _not_ a very good fix, but I'm trying to be pragmatic
for now. `SoloStatisticsWatcher` should probably not live in
`OsuGameBase`.
---
 .../Visual/Ranking/TestSceneResultsScreen.cs    | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
index 1c904a936f..146482e6fb 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
@@ -69,6 +69,8 @@ namespace osu.Game.Tests.Visual.Ranking
             }));
         }
 
+        private int onlineScoreID = 1;
+
         [TestCase(1, ScoreRank.X)]
         [TestCase(0.9999, ScoreRank.S)]
         [TestCase(0.975, ScoreRank.S)]
@@ -81,14 +83,17 @@ namespace osu.Game.Tests.Visual.Ranking
         {
             TestResultsScreen screen = null;
 
-            var score = TestResources.CreateTestScoreInfo();
+            loadResultsScreen(() =>
+            {
+                var score = TestResources.CreateTestScoreInfo();
 
-            score.OnlineID = 1234;
-            score.HitEvents = TestSceneStatisticsPanel.CreatePositionDistributedHitEvents();
-            score.Accuracy = accuracy;
-            score.Rank = rank;
+                score.OnlineID = onlineScoreID++;
+                score.HitEvents = TestSceneStatisticsPanel.CreatePositionDistributedHitEvents();
+                score.Accuracy = accuracy;
+                score.Rank = rank;
 
-            loadResultsScreen(() => screen = createResultsScreen(score));
+                return screen = createResultsScreen(score);
+            });
             AddUntilStep("wait for loaded", () => screen.IsLoaded);
             AddAssert("retry overlay present", () => screen.RetryOverlay != null);
         }

From 20bde40ce21b41d5a19add9e5a28e472f1460919 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 13 Jul 2023 20:00:25 +0200
Subject: [PATCH 1350/1604] Fix differing anchor specs on statistics panel flow
 items

---
 osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
index 9357d1f385..19bd0c4393 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
@@ -157,8 +157,8 @@ namespace osu.Game.Screens.Ranking.Statistics
 
                         flow.Add(new StatisticItemContainer(item)
                         {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
                         });
                     }
 

From 632077319f3e4763a6654a137c5723f5daba84c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 13 Jul 2023 20:06:53 +0200
Subject: [PATCH 1351/1604] Fix taiko statistics table not using 2-column
 layout

---
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index feb8b0c2c2..584a91bfdc 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -256,7 +256,7 @@ namespace osu.Game.Rulesets.Taiko
                     RelativeSizeAxes = Axes.X,
                     Height = 250
                 }, true),
-                new StatisticItem("Statistics", () => new SimpleStatisticTable(3, new SimpleStatisticItem[]
+                new StatisticItem("Statistics", () => new SimpleStatisticTable(2, new SimpleStatisticItem[]
                 {
                     new AverageHitError(timedHitEvents),
                     new UnstableRate(timedHitEvents)

From 4114fab8ea908ca5cd93d28f1671a7c35deb2f8e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Jul 2023 03:31:36 +0900
Subject: [PATCH 1352/1604] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 759167829c..411a27b0b0 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -11,7 +11,7 @@
     <AndroidManifestMerger>manifestmerger.jar</AndroidManifestMerger>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.710.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.714.0" />
   </ItemGroup>
   <ItemGroup>
     <AndroidManifestOverlay Include="$(MSBuildThisFileDirectory)osu.Android\Properties\AndroidManifestOverlay.xml" />
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 7968364243..f147dfb6c1 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,7 +36,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="11.1.2" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.710.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.714.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.707.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 2e691da079..71978e94fc 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -16,6 +16,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.710.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.714.0" />
   </ItemGroup>
 </Project>

From 4859b8c9947a3b6d9acb39767da6a84939ed0c8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 13 Jul 2023 20:49:34 +0200
Subject: [PATCH 1353/1604] Add some extra text coverage against potential
 emoji-to-link misparses

---
 osu.Game.Tests/Chat/MessageFormatterTests.cs      | 8 ++++++++
 osu.Game.Tests/Visual/Online/TestSceneChatLink.cs | 1 +
 2 files changed, 9 insertions(+)

diff --git a/osu.Game.Tests/Chat/MessageFormatterTests.cs b/osu.Game.Tests/Chat/MessageFormatterTests.cs
index 46dc47bf53..47f4410b07 100644
--- a/osu.Game.Tests/Chat/MessageFormatterTests.cs
+++ b/osu.Game.Tests/Chat/MessageFormatterTests.cs
@@ -510,6 +510,14 @@ namespace osu.Game.Tests.Chat
             Assert.AreEqual(result.Links.Count, 0);
         }
 
+        [Test]
+        public void TestEmojiWithSuccessiveParens()
+        {
+            Message result = MessageFormatter.FormatMessage(new Message { Content = "\uD83D\uDE10(let's hope this doesn't accidentally turn into a link)" });
+            Assert.AreEqual("[emoji](let's hope this doesn't accidentally turn into a link)", result.DisplayContent);
+            Assert.AreEqual(result.Links.Count, 0);
+        }
+
         [Test]
         public void TestAbsoluteExternalLinks()
         {
diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs b/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
index f5cf4c1ff2..ecf9b68297 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
@@ -89,6 +89,7 @@ namespace osu.Game.Tests.Visual.Online
             addMessageWithChecks($"Join my {OsuGameBase.OSU_PROTOCOL}chan/#english.", 1, expectedActions: LinkAction.OpenChannel);
             addMessageWithChecks("Join my #english or #japanese channels.", 2, expectedActions: new[] { LinkAction.OpenChannel, LinkAction.OpenChannel });
             addMessageWithChecks("Join my #english or #nonexistent #hashtag channels.", 1, expectedActions: LinkAction.OpenChannel);
+            addMessageWithChecks("Hello world\uD83D\uDE12(<--This is an emoji). There are more:\uD83D\uDE10\uD83D\uDE00,\uD83D\uDE20");
 
             void addMessageWithChecks(string text, int linkAmount = 0, bool isAction = false, bool isImportant = false, params LinkAction[] expectedActions)
             {

From ae7ed697ec6e49168b1f857cb16f885ce3699906 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 13 Jul 2023 21:22:48 +0200
Subject: [PATCH 1354/1604] Adjust failing test after permitting autoplay and
 no fail combo

---
 .../Visual/Navigation/TestSceneSkinEditorNavigation.cs          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs
index bedb2ceaa1..88904bf85b 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs
@@ -148,7 +148,7 @@ namespace osu.Game.Tests.Visual.Navigation
         {
             advanceToSongSelect();
             openSkinEditor();
-            AddStep("select no fail and spun out", () => Game.SelectedMods.Value = new Mod[] { new OsuModNoFail(), new OsuModSpunOut() });
+            AddStep("select relax and spun out", () => Game.SelectedMods.Value = new Mod[] { new OsuModRelax(), new OsuModSpunOut() });
 
             switchToGameplayScene();
 

From a1e83b20e660f4c677859524a82ddff1d4977429 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 13 Jul 2023 21:23:57 +0200
Subject: [PATCH 1355/1604] Make autoplay compatible with `ModFailCondition`

---
 osu.Game/Rulesets/Mods/ModAutoplay.cs      | 2 +-
 osu.Game/Rulesets/Mods/ModFailCondition.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModAutoplay.cs b/osu.Game/Rulesets/Mods/ModAutoplay.cs
index a4ffbeacef..88b41924ff 100644
--- a/osu.Game/Rulesets/Mods/ModAutoplay.cs
+++ b/osu.Game/Rulesets/Mods/ModAutoplay.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Mods
         public override bool ValidForMultiplayer => false;
         public override bool ValidForMultiplayerAsFreeMod => false;
 
-        public override Type[] IncompatibleMods => new[] { typeof(ModCinema), typeof(ModRelax), typeof(ModFailCondition), typeof(ModAdaptiveSpeed) };
+        public override Type[] IncompatibleMods => new[] { typeof(ModCinema), typeof(ModRelax), typeof(ModAdaptiveSpeed) };
 
         public override bool HasImplementation => GetType().GenericTypeArguments.Length == 0;
 
diff --git a/osu.Game/Rulesets/Mods/ModFailCondition.cs b/osu.Game/Rulesets/Mods/ModFailCondition.cs
index 97789b7f5a..e671c065cf 100644
--- a/osu.Game/Rulesets/Mods/ModFailCondition.cs
+++ b/osu.Game/Rulesets/Mods/ModFailCondition.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Rulesets.Mods
 {
     public abstract class ModFailCondition : Mod, IApplicableToHealthProcessor, IApplicableFailOverride
     {
-        public override Type[] IncompatibleMods => new[] { typeof(ModNoFail), typeof(ModRelax), typeof(ModAutoplay) };
+        public override Type[] IncompatibleMods => new[] { typeof(ModNoFail), typeof(ModRelax) };
 
         [SettingSource("Restart on fail", "Automatically restarts when failed.")]
         public BindableBool Restart { get; } = new BindableBool();

From 674eb1a36b8bb211665616cba1ad233c84e24618 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 13 Jul 2023 21:25:43 +0200
Subject: [PATCH 1356/1604] Remove unused property

---
 osu.Game/Rulesets/Mods/ModAutoplay.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModAutoplay.cs b/osu.Game/Rulesets/Mods/ModAutoplay.cs
index 88b41924ff..a3a4adc53d 100644
--- a/osu.Game/Rulesets/Mods/ModAutoplay.cs
+++ b/osu.Game/Rulesets/Mods/ModAutoplay.cs
@@ -20,8 +20,6 @@ namespace osu.Game.Rulesets.Mods
         public override LocalisableString Description => "Watch a perfect automated play through the song.";
         public override double ScoreMultiplier => 1;
 
-        public bool RestartOnFail => false;
-
         public override bool UserPlayable => false;
         public override bool ValidForMultiplayer => false;
         public override bool ValidForMultiplayerAsFreeMod => false;

From eeb50e27007dcf5076b4a0a99ad0e44d7226b8cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 13 Jul 2023 21:45:06 +0200
Subject: [PATCH 1357/1604] Do not rely on `OverlayColourProvider` presence

---
 osu.Game/Overlays/RevertToDefaultButton.cs | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/RevertToDefaultButton.cs b/osu.Game/Overlays/RevertToDefaultButton.cs
index 48491c5d9c..28433f1669 100644
--- a/osu.Game/Overlays/RevertToDefaultButton.cs
+++ b/osu.Game/Overlays/RevertToDefaultButton.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
+using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Localisation;
@@ -33,7 +34,10 @@ namespace osu.Game.Overlays
         private Circle circle = null!;
 
         [Resolved]
-        private OverlayColourProvider colours { get; set; } = null!;
+        private OsuColour colours { get; set; } = null!;
+
+        [Resolved]
+        private OverlayColourProvider? colourProvider { get; set; }
 
         public Bindable<T> Current
         {
@@ -124,16 +128,16 @@ namespace osu.Game.Overlays
             {
                 icon.RotateTo(-40, 500, Easing.OutQuint);
 
-                icon.FadeColour(colours.Light1, 300, Easing.OutQuint);
-                circle.FadeColour(colours.Background2, 300, Easing.OutQuint);
+                icon.FadeColour(colourProvider?.Light1 ?? colours.YellowLight, 300, Easing.OutQuint);
+                circle.FadeColour(colourProvider?.Background2 ?? colours.Gray6, 300, Easing.OutQuint);
                 this.ScaleTo(1.2f, 300, Easing.OutQuint);
             }
             else
             {
                 icon.RotateTo(0, 100, Easing.OutQuint);
 
-                icon.FadeColour(colours.Colour0, 100, Easing.OutQuint);
-                circle.FadeColour(colours.Background3, 100, Easing.OutQuint);
+                icon.FadeColour(colourProvider?.Colour0 ?? colours.Yellow, 100, Easing.OutQuint);
+                circle.FadeColour(colourProvider?.Background3 ?? colours.Gray3, 100, Easing.OutQuint);
                 this.ScaleTo(1f, 100, Easing.OutQuint);
             }
         }

From 6b9dabbd3c776800f10e0ccad7253fda22edec5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 13 Jul 2023 21:54:28 +0200
Subject: [PATCH 1358/1604] Rewrite test scene to show non-themed and themed
 variants

---
 .../TestSceneRevertToDefaultButton.cs         | 51 ++++++++-----------
 1 file changed, 21 insertions(+), 30 deletions(-)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneRevertToDefaultButton.cs b/osu.Game.Tests/Visual/Settings/TestSceneRevertToDefaultButton.cs
index bfef120358..0e31757396 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneRevertToDefaultButton.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneRevertToDefaultButton.cs
@@ -2,58 +2,49 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
-using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
+using osu.Framework.Testing;
 using osu.Game.Overlays;
+using osu.Game.Tests.Visual.UserInterface;
 using osuTK;
 
 namespace osu.Game.Tests.Visual.Settings
 {
-    public partial class TestSceneRevertToDefaultButton : OsuTestScene
+    public partial class TestSceneRevertToDefaultButton : ThemeComparisonTestScene
     {
         private float scale = 1;
 
-        [Cached]
-        private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
-
         private readonly Bindable<float> current = new Bindable<float>
         {
             Default = default,
             Value = 1,
         };
 
-        [Test]
-        public void TestBasic()
+        protected override Drawable CreateContent() => new Container
         {
-            RevertToDefaultButton<float> revertToDefaultButton = null!;
-
-            AddStep("create button", () => Child = new Container
+            AutoSizeAxes = Axes.Both,
+            Anchor = Anchor.Centre,
+            Origin = Anchor.Centre,
+            Child = new RevertToDefaultButton<float>
             {
-                RelativeSizeAxes = Axes.Both,
-                Children = new Drawable[]
-                {
-                    new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = colourProvider.Background2,
-                    },
-                    revertToDefaultButton = new RevertToDefaultButton<float>
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        Scale = new Vector2(scale),
-                        Current = current,
-                    }
-                }
-            });
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Scale = new Vector2(scale),
+                Current = current,
+            }
+        };
+
+        [Test]
+        public void TestStates()
+        {
+            CreateThemedContent(OverlayColourScheme.Purple);
             AddSliderStep("set scale", 1, 4, 1, scale =>
             {
                 this.scale = scale;
-                if (revertToDefaultButton != null)
-                    revertToDefaultButton.Scale = new Vector2(scale);
+                foreach (var revertToDefaultButton in this.ChildrenOfType<RevertToDefaultButton<float>>())
+                    revertToDefaultButton.Parent!.Scale = new Vector2(scale);
             });
             AddToggleStep("toggle default state", state => current.Value = state ? default : 1);
             AddToggleStep("toggle disabled state", state => current.Disabled = state);

From 3ca767b7a26564e8ed07903a689cb9660585261f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 13 Jul 2023 21:58:55 +0200
Subject: [PATCH 1359/1604] Remove outdated comment

---
 osu.Game/Overlays/RevertToDefaultButton.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Overlays/RevertToDefaultButton.cs b/osu.Game/Overlays/RevertToDefaultButton.cs
index 28433f1669..94d56971e0 100644
--- a/osu.Game/Overlays/RevertToDefaultButton.cs
+++ b/osu.Game/Overlays/RevertToDefaultButton.cs
@@ -64,7 +64,6 @@ namespace osu.Game.Overlays
         [BackgroundDependencyLoader]
         private void load()
         {
-            // size intentionally much larger than actual drawn content, so that the button is easier to click.
             Size = new Vector2(14);
 
             AddRange(new Drawable[]

From 9cc2150b5a37dfb0ecf940f31489dbf20c157384 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 13 Jul 2023 22:00:21 +0200
Subject: [PATCH 1360/1604] Fix mixed `[cC]urrent` usage

---
 osu.Game/Overlays/RevertToDefaultButton.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/RevertToDefaultButton.cs b/osu.Game/Overlays/RevertToDefaultButton.cs
index 94d56971e0..c43d233fc1 100644
--- a/osu.Game/Overlays/RevertToDefaultButton.cs
+++ b/osu.Game/Overlays/RevertToDefaultButton.cs
@@ -121,7 +121,7 @@ namespace osu.Game.Overlays
 
             Enabled.Value = !current.Disabled;
 
-            this.FadeTo(current.Disabled ? 0.2f : (Current.IsDefault ? 0 : 1), fade_duration, Easing.OutQuint);
+            this.FadeTo(current.Disabled ? 0.2f : (current.IsDefault ? 0 : 1), fade_duration, Easing.OutQuint);
 
             if (IsHovered && Enabled.Value)
             {

From e7dbe3c9380b664dc1a67ad8b36eeabd6cd4a131 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 13 Jul 2023 22:28:26 +0200
Subject: [PATCH 1361/1604] Fix broken test

---
 .../Visual/Settings/TestSceneRevertToDefaultButton.cs           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneRevertToDefaultButton.cs b/osu.Game.Tests/Visual/Settings/TestSceneRevertToDefaultButton.cs
index 0e31757396..d081f663ba 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneRevertToDefaultButton.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneRevertToDefaultButton.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Tests.Visual.Settings
         [Test]
         public void TestStates()
         {
-            CreateThemedContent(OverlayColourScheme.Purple);
+            AddStep("create content", () => CreateThemedContent(OverlayColourScheme.Purple));
             AddSliderStep("set scale", 1, 4, 1, scale =>
             {
                 this.scale = scale;

From dd8774a64006792556b357d78756438324a34b37 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Jul 2023 13:21:28 +0900
Subject: [PATCH 1362/1604] Vertically centre the editor osu! playfield

---
 osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index aac5f6ffb1..8d93613156 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -65,8 +65,8 @@ namespace osu.Game.Rulesets.Osu.Edit
             PlayfieldContentContainer.Padding = new MarginPadding
             {
                 Vertical = 10,
-                Left = TOOLBOX_CONTRACTED_SIZE_LEFT + 10,
-                Right = TOOLBOX_CONTRACTED_SIZE_RIGHT + 10,
+                // Intentionally use the left toolbox size for both sides to vertically centre the playfield.
+                Horizontal = TOOLBOX_CONTRACTED_SIZE_LEFT + 10,
             };
 
             LayerBelowRuleset.AddRange(new Drawable[]

From 56acc9e3dde3f161c79f7fafc312d9800e0fc420 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Jul 2023 14:02:48 +0900
Subject: [PATCH 1363/1604] Change `BeatDivisorControl` to retrive bindable
 divisor via DI

---
 .../Visual/Editing/TestSceneBeatDivisorControl.cs      |  9 +++++++--
 .../Visual/Editing/TestSceneTimelineTickDisplay.cs     |  2 +-
 .../Edit/Compose/Components/BeatDivisorControl.cs      |  8 ++------
 osu.Game/Screens/Edit/EditorScreenWithTimeline.cs      | 10 ++--------
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs b/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
index 88b959a2a0..f2b3351533 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
@@ -22,7 +22,6 @@ namespace osu.Game.Tests.Visual.Editing
     public partial class TestSceneBeatDivisorControl : OsuManualInputManagerTestScene
     {
         private BeatDivisorControl beatDivisorControl = null!;
-        private BindableBeatDivisor bindableBeatDivisor = null!;
 
         private SliderBar<int> tickSliderBar => beatDivisorControl.ChildrenOfType<SliderBar<int>>().Single();
         private Triangle tickMarkerHead => tickSliderBar.ChildrenOfType<Triangle>().Single();
@@ -30,13 +29,19 @@ namespace osu.Game.Tests.Visual.Editing
         [Cached]
         private readonly OverlayColourProvider overlayColour = new OverlayColourProvider(OverlayColourScheme.Aquamarine);
 
+        [Cached]
+        private readonly BindableBeatDivisor bindableBeatDivisor = new BindableBeatDivisor(16);
+
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
+            bindableBeatDivisor.ValidDivisors.SetDefault();
+            bindableBeatDivisor.SetDefault();
+
             Child = new PopoverContainer
             {
                 RelativeSizeAxes = Axes.Both,
-                Child = beatDivisorControl = new BeatDivisorControl(bindableBeatDivisor = new BindableBeatDivisor(16))
+                Child = beatDivisorControl = new BeatDivisorControl
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneTimelineTickDisplay.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimelineTickDisplay.cs
index 1376ba23fb..18bd6d840a 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneTimelineTickDisplay.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimelineTickDisplay.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Tests.Visual.Editing
         {
             BeatDivisor.Value = 4;
 
-            Add(new BeatDivisorControl(BeatDivisor)
+            Add(new BeatDivisorControl
             {
                 Anchor = Anchor.TopRight,
                 Origin = Anchor.TopRight,
diff --git a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
index f7159f8670..59b0bd1785 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
@@ -33,12 +33,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
     {
         private int? lastCustomDivisor;
 
-        private readonly BindableBeatDivisor beatDivisor = new BindableBeatDivisor();
-
-        public BeatDivisorControl(BindableBeatDivisor beatDivisor)
-        {
-            this.beatDivisor.BindTo(beatDivisor);
-        }
+        [Resolved]
+        private BindableBeatDivisor beatDivisor { get; set; } = null!;
 
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider)
diff --git a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
index b8cbff047e..0c5f28c2d6 100644
--- a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
+++ b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
@@ -3,7 +3,6 @@
 
 #nullable disable
 
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -19,8 +18,6 @@ namespace osu.Game.Screens.Edit
     {
         private const float padding = 10;
 
-        private readonly BindableBeatDivisor beatDivisor = new BindableBeatDivisor();
-
         private Container timelineContainer;
 
         protected EditorScreenWithTimeline(EditorScreenMode type)
@@ -33,11 +30,8 @@ namespace osu.Game.Screens.Edit
         private LoadingSpinner spinner;
 
         [BackgroundDependencyLoader(true)]
-        private void load(OverlayColourProvider colourProvider, [CanBeNull] BindableBeatDivisor beatDivisor)
+        private void load(OverlayColourProvider colourProvider)
         {
-            if (beatDivisor != null)
-                this.beatDivisor.BindTo(beatDivisor);
-
             Child = new GridContainer
             {
                 RelativeSizeAxes = Axes.Both,
@@ -82,7 +76,7 @@ namespace osu.Game.Screens.Edit
                                                     AutoSizeAxes = Axes.Y,
                                                     Padding = new MarginPadding { Right = 5 },
                                                 },
-                                                new BeatDivisorControl(this.beatDivisor) { RelativeSizeAxes = Axes.Both }
+                                                new BeatDivisorControl { RelativeSizeAxes = Axes.Both }
                                             },
                                         },
                                         RowDimensions = new[]

From ebaf63b7644425dd06f9e1ba00e8159070813ccf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Jul 2023 14:04:12 +0900
Subject: [PATCH 1364/1604] Apply NRT to timeline related classes

---
 .../Edit/Compose/Components/Timeline/TimelineArea.cs |  8 +++-----
 osu.Game/Screens/Edit/EditorScreenWithTimeline.cs    | 12 +++++-------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
index 0b83258f8b..02c773fd4b 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -18,16 +16,16 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
     public partial class TimelineArea : CompositeDrawable
     {
-        public Timeline Timeline;
+        public Timeline Timeline = null!;
 
         private readonly Drawable userContent;
 
-        public TimelineArea(Drawable content = null)
+        public TimelineArea(Drawable? content = null)
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
 
-            userContent = content ?? Drawable.Empty();
+            userContent = content ?? Empty();
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
index 0c5f28c2d6..bd57ea42f0 100644
--- a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
+++ b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -18,17 +16,17 @@ namespace osu.Game.Screens.Edit
     {
         private const float padding = 10;
 
-        private Container timelineContainer;
+        private Container timelineContainer = null!;
+
+        private Container mainContent = null!;
+
+        private LoadingSpinner spinner = null!;
 
         protected EditorScreenWithTimeline(EditorScreenMode type)
             : base(type)
         {
         }
 
-        private Container mainContent;
-
-        private LoadingSpinner spinner;
-
         [BackgroundDependencyLoader(true)]
         private void load(OverlayColourProvider colourProvider)
         {

From 5b2e70426488a295df83f83345326d7181b83568 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Jul 2023 14:19:04 +0900
Subject: [PATCH 1365/1604] Move beat divisor control inside of `TimelineArea`
 and adjust metrics to match design

---
 .../Components/Timeline/TimelineArea.cs       | 44 +++++++++----------
 .../Screens/Edit/EditorScreenWithTimeline.cs  |  5 ++-
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
index 02c773fd4b..3969a002db 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
@@ -48,14 +48,24 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 {
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
+                    RowDimensions = new[]
+                    {
+                        new Dimension(GridSizeMode.AutoSize),
+                    },
+                    ColumnDimensions = new[]
+                    {
+                        new Dimension(GridSizeMode.Absolute, 140),
+                        new Dimension(),
+                        new Dimension(GridSizeMode.Absolute, 30),
+                        new Dimension(GridSizeMode.Absolute, 110),
+                    },
                     Content = new[]
                     {
                         new Drawable[]
                         {
                             new Container
                             {
-                                RelativeSizeAxes = Axes.Y,
-                                AutoSizeAxes = Axes.X,
+                                RelativeSizeAxes = Axes.Both,
                                 Name = @"Toggle controls",
                                 Children = new Drawable[]
                                 {
@@ -92,31 +102,31 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                                     }
                                 }
                             },
+                            Timeline = new Timeline(userContent),
                             new Container
                             {
-                                RelativeSizeAxes = Axes.Y,
-                                AutoSizeAxes = Axes.X,
+                                RelativeSizeAxes = Axes.Both,
                                 Name = @"Zoom controls",
+                                Padding = new MarginPadding { Right = 5 },
                                 Children = new Drawable[]
                                 {
                                     new Box
                                     {
                                         RelativeSizeAxes = Axes.Both,
-                                        Colour = colourProvider.Background3,
+                                        Colour = colourProvider.Background2,
                                     },
                                     new Container<TimelineButton>
                                     {
                                         Anchor = Anchor.CentreLeft,
                                         Origin = Anchor.CentreLeft,
-                                        RelativeSizeAxes = Axes.Y,
-                                        AutoSizeAxes = Axes.X,
+                                        RelativeSizeAxes = Axes.Both,
                                         Masking = true,
                                         Children = new[]
                                         {
                                             new TimelineButton
                                             {
-                                                RelativeSizeAxes = Axes.Y,
-                                                Height = 0.5f,
+                                                RelativeSizeAxes = Axes.Both,
+                                                Size = new Vector2(1, 0.5f),
                                                 Icon = FontAwesome.Solid.SearchPlus,
                                                 Action = () => Timeline.AdjustZoomRelatively(1)
                                             },
@@ -124,8 +134,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                                             {
                                                 Anchor = Anchor.BottomLeft,
                                                 Origin = Anchor.BottomLeft,
-                                                RelativeSizeAxes = Axes.Y,
-                                                Height = 0.5f,
+                                                RelativeSizeAxes = Axes.Both,
+                                                Size = new Vector2(1, 0.5f),
                                                 Icon = FontAwesome.Solid.SearchMinus,
                                                 Action = () => Timeline.AdjustZoomRelatively(-1)
                                             },
@@ -133,19 +143,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                                     }
                                 }
                             },
-                            Timeline = new Timeline(userContent),
+                            new BeatDivisorControl { RelativeSizeAxes = Axes.Both }
                         },
                     },
-                    RowDimensions = new[]
-                    {
-                        new Dimension(GridSizeMode.AutoSize),
-                    },
-                    ColumnDimensions = new[]
-                    {
-                        new Dimension(GridSizeMode.AutoSize),
-                        new Dimension(GridSizeMode.AutoSize),
-                        new Dimension(),
-                    }
                 }
             };
 
diff --git a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
index bd57ea42f0..a2367dd66c 100644
--- a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
+++ b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
@@ -7,7 +7,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays;
-using osu.Game.Screens.Edit.Compose.Components;
 using osu.Game.Screens.Edit.Compose.Components.Timeline;
 
 namespace osu.Game.Screens.Edit
@@ -30,6 +29,9 @@ namespace osu.Game.Screens.Edit
         [BackgroundDependencyLoader(true)]
         private void load(OverlayColourProvider colourProvider)
         {
+            // Grid with only two rows.
+            // First is the timeline area, which should be allowed to expand as required.
+            // Second is the main editor content, including the playfield and side toolbars (but not the bottom).
             Child = new GridContainer
             {
                 RelativeSizeAxes = Axes.Both,
@@ -74,7 +76,6 @@ namespace osu.Game.Screens.Edit
                                                     AutoSizeAxes = Axes.Y,
                                                     Padding = new MarginPadding { Right = 5 },
                                                 },
-                                                new BeatDivisorControl { RelativeSizeAxes = Axes.Both }
                                             },
                                         },
                                         RowDimensions = new[]

From 1dc293ed619adc285ac5554b4ea6a65e04049f77 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Jul 2023 14:24:53 +0900
Subject: [PATCH 1366/1604] Allow specifying a custom width for nubs in
 `OsuCheckbox`es

---
 osu.Game/Graphics/UserInterface/Nub.cs              | 6 +++---
 osu.Game/Graphics/UserInterface/OsuCheckbox.cs      | 8 ++++----
 osu.Game/Graphics/UserInterface/RoundedSliderBar.cs | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/Nub.cs b/osu.Game/Graphics/UserInterface/Nub.cs
index 28a2eb40c3..4b953718bc 100644
--- a/osu.Game/Graphics/UserInterface/Nub.cs
+++ b/osu.Game/Graphics/UserInterface/Nub.cs
@@ -20,16 +20,16 @@ namespace osu.Game.Graphics.UserInterface
     {
         public const float HEIGHT = 15;
 
-        public const float EXPANDED_SIZE = 50;
+        public const float DEFAULT_EXPANDED_SIZE = 50;
 
         private const float border_width = 3;
 
         private readonly Box fill;
         private readonly Container main;
 
-        public Nub()
+        public Nub(float expandedSize = DEFAULT_EXPANDED_SIZE)
         {
-            Size = new Vector2(EXPANDED_SIZE, HEIGHT);
+            Size = new Vector2(expandedSize, HEIGHT);
 
             InternalChildren = new[]
             {
diff --git a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
index 160105af1a..b7b405a7e8 100644
--- a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Graphics.UserInterface
         private Sample sampleChecked;
         private Sample sampleUnchecked;
 
-        public OsuCheckbox(bool nubOnRight = true)
+        public OsuCheckbox(bool nubOnRight = true, float nubSize = Nub.DEFAULT_EXPANDED_SIZE)
         {
             AutoSizeAxes = Axes.Y;
             RelativeSizeAxes = Axes.X;
@@ -61,7 +61,7 @@ namespace osu.Game.Graphics.UserInterface
                     AutoSizeAxes = Axes.Y,
                     RelativeSizeAxes = Axes.X,
                 },
-                Nub = new Nub(),
+                Nub = new Nub(nubSize),
                 new HoverSounds()
             };
 
@@ -70,14 +70,14 @@ namespace osu.Game.Graphics.UserInterface
                 Nub.Anchor = Anchor.CentreRight;
                 Nub.Origin = Anchor.CentreRight;
                 Nub.Margin = new MarginPadding { Right = nub_padding };
-                LabelTextFlowContainer.Padding = new MarginPadding { Right = Nub.EXPANDED_SIZE + nub_padding * 2 };
+                LabelTextFlowContainer.Padding = new MarginPadding { Right = Nub.DEFAULT_EXPANDED_SIZE + nub_padding * 2 };
             }
             else
             {
                 Nub.Anchor = Anchor.CentreLeft;
                 Nub.Origin = Anchor.CentreLeft;
                 Nub.Margin = new MarginPadding { Left = nub_padding };
-                LabelTextFlowContainer.Padding = new MarginPadding { Left = Nub.EXPANDED_SIZE + nub_padding * 2 };
+                LabelTextFlowContainer.Padding = new MarginPadding { Left = Nub.DEFAULT_EXPANDED_SIZE + nub_padding * 2 };
             }
 
             Nub.Current.BindTo(Current);
diff --git a/osu.Game/Graphics/UserInterface/RoundedSliderBar.cs b/osu.Game/Graphics/UserInterface/RoundedSliderBar.cs
index a666b83c05..56af23ff10 100644
--- a/osu.Game/Graphics/UserInterface/RoundedSliderBar.cs
+++ b/osu.Game/Graphics/UserInterface/RoundedSliderBar.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Graphics.UserInterface
         public RoundedSliderBar()
         {
             Height = Nub.HEIGHT;
-            RangePadding = Nub.EXPANDED_SIZE / 2;
+            RangePadding = Nub.DEFAULT_EXPANDED_SIZE / 2;
             Children = new Drawable[]
             {
                 new Container

From 01750dd0914e13b6ce4ee1dda8c878639b7d9972 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Jul 2023 14:24:40 +0900
Subject: [PATCH 1367/1604] Update metrics of checkboxes and backgrounds to
 match design better

---
 .../Components/Timeline/TimelineArea.cs       | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
index 3969a002db..70322bd3e0 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
@@ -39,11 +39,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             InternalChildren = new Drawable[]
             {
-                new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = colourProvider.Background5
-                },
                 new GridContainer
                 {
                     RelativeSizeAxes = Axes.X,
@@ -76,24 +71,23 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                                     },
                                     new FillFlowContainer
                                     {
-                                        AutoSizeAxes = Axes.Y,
-                                        Width = 160,
+                                        RelativeSizeAxes = Axes.Both,
                                         Padding = new MarginPadding(10),
                                         Direction = FillDirection.Vertical,
                                         Spacing = new Vector2(0, 4),
                                         Children = new[]
                                         {
-                                            waveformCheckbox = new OsuCheckbox
+                                            waveformCheckbox = new OsuCheckbox(nubSize: 30f)
                                             {
                                                 LabelText = EditorStrings.TimelineWaveform,
                                                 Current = { Value = true },
                                             },
-                                            ticksCheckbox = new OsuCheckbox
+                                            ticksCheckbox = new OsuCheckbox(nubSize: 30f)
                                             {
                                                 LabelText = EditorStrings.TimelineTicks,
                                                 Current = { Value = true },
                                             },
-                                            controlPointsCheckbox = new OsuCheckbox
+                                            controlPointsCheckbox = new OsuCheckbox(nubSize: 30f)
                                             {
                                                 LabelText = BeatmapsetsStrings.ShowStatsBpm,
                                                 Current = { Value = true },
@@ -102,7 +96,21 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                                     }
                                 }
                             },
-                            Timeline = new Timeline(userContent),
+                            new Container
+                            {
+                                RelativeSizeAxes = Axes.X,
+                                AutoSizeAxes = Axes.Y,
+                                Children = new Drawable[]
+                                {
+                                    new Box
+                                    {
+                                        RelativeSizeAxes = Axes.Both,
+                                        Depth = float.MaxValue,
+                                        Colour = colourProvider.Background5
+                                    },
+                                    Timeline = new Timeline(userContent),
+                                }
+                            },
                             new Container
                             {
                                 RelativeSizeAxes = Axes.Both,

From 6b222cfafdedf6bb7299e189f30b533aa83b659f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Jul 2023 14:29:13 +0900
Subject: [PATCH 1368/1604] Fix slight misalignment so timeline is now
 completely centered

---
 osu.Game/Screens/Edit/EditorScreenWithTimeline.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
index a2367dd66c..104d9dd58f 100644
--- a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
+++ b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Screens.Edit
 {
     public abstract partial class EditorScreenWithTimeline : EditorScreen
     {
-        private const float padding = 10;
+        private const float padding = 15;
 
         private Container timelineContainer = null!;
 
@@ -74,7 +74,6 @@ namespace osu.Game.Screens.Edit
                                                 {
                                                     RelativeSizeAxes = Axes.X,
                                                     AutoSizeAxes = Axes.Y,
-                                                    Padding = new MarginPadding { Right = 5 },
                                                 },
                                             },
                                         },

From 00e9746174b842bcec7cb6ea2c08bd2e55932580 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Jul 2023 15:17:24 +0900
Subject: [PATCH 1369/1604] Implement longer design for timing point piece

---
 .../Timeline/TimelineControlPointGroup.cs     |  2 +-
 .../Components/Timeline/TopPointPiece.cs      | 64 ++++++++++++++-----
 2 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.cs
index fc3ef92bf5..c1b6069523 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             RelativeSizeAxes = Axes.Y;
             AutoSizeAxes = Axes.X;
 
-            Origin = Anchor.TopCentre;
+            Origin = Anchor.TopLeft;
 
             X = (float)group.Time;
         }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TopPointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TopPointPiece.cs
index 69fb001a66..243cdc6ddd 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TopPointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TopPointPiece.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -10,24 +8,25 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
     public partial class TopPointPiece : CompositeDrawable
     {
-        private readonly ControlPoint point;
+        protected readonly ControlPoint Point;
 
-        protected OsuSpriteText Label { get; private set; }
+        protected OsuSpriteText Label { get; private set; } = null!;
+
+        private const float width = 80;
 
         public TopPointPiece(ControlPoint point)
         {
-            this.point = point;
-            AutoSizeAxes = Axes.X;
+            Point = point;
+            Width = width;
             Height = 16;
-            Margin = new MarginPadding(4);
-
-            Masking = true;
-            CornerRadius = Height / 2;
+            Margin = new MarginPadding { Vertical = 4 };
 
             Origin = Anchor.TopCentre;
             Anchor = Anchor.TopCentre;
@@ -36,17 +35,52 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
+            const float corner_radius = 4;
+            const float arrow_extension = 3;
+            const float triangle_portion = 15;
+
             InternalChildren = new Drawable[]
             {
-                new Box
+                // This is a triangle, trust me.
+                // Doing it this way looks okay. Doing it using Triangle primitive is basically impossible.
+                new Container
                 {
-                    Colour = point.GetRepresentingColour(colours),
-                    RelativeSizeAxes = Axes.Both,
+                    Colour = Point.GetRepresentingColour(colours),
+                    X = -corner_radius,
+                    Size = new Vector2(triangle_portion * arrow_extension, Height),
+                    Anchor = Anchor.CentreRight,
+                    Origin = Anchor.CentreRight,
+                    Masking = true,
+                    CornerRadius = Height,
+                    CornerExponent = 1.4f,
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            Colour = Color4.White,
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                    }
+                },
+                new Container
+                {
+                    RelativeSizeAxes = Axes.Y,
+                    Width = width - triangle_portion,
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Colour = Point.GetRepresentingColour(colours),
+                    Masking = true,
+                    CornerRadius = corner_radius,
+                    Child = new Box
+                    {
+                        Colour = Color4.White,
+                        RelativeSizeAxes = Axes.Both,
+                    },
                 },
                 Label = new OsuSpriteText
                 {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
                     Padding = new MarginPadding(3),
                     Font = OsuFont.Default.With(size: 14, weight: FontWeight.SemiBold),
                     Colour = colours.B5,

From 57abb15724e537bee9a97ffdbd810b632b675671 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Jul 2023 15:58:53 +0900
Subject: [PATCH 1370/1604] Update design of timeline centre marker and adjust
 surrounding paddings

---
 .../Components/Timeline/CentreMarker.cs       | 20 +++++++------------
 .../Components/Timeline/TimelineArea.cs       | 20 +++++++++++++------
 .../Screens/Edit/EditorScreenWithTimeline.cs  |  4 ++--
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/CentreMarker.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/CentreMarker.cs
index aee3cffbfd..74786cc0c9 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/CentreMarker.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/CentreMarker.cs
@@ -12,17 +12,17 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
     public partial class CentreMarker : CompositeDrawable
     {
-        private const float triangle_width = 15;
-        private const float triangle_height = 10;
-        private const float bar_width = 2;
+        private const float triangle_width = 8;
+
+        private const float bar_width = 1.6f;
 
         public CentreMarker()
         {
             RelativeSizeAxes = Axes.Y;
             Size = new Vector2(triangle_width, 1);
 
-            Anchor = Anchor.Centre;
-            Origin = Anchor.Centre;
+            Anchor = Anchor.TopCentre;
+            Origin = Anchor.TopCentre;
 
             InternalChildren = new Drawable[]
             {
@@ -37,22 +37,16 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 {
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.BottomCentre,
-                    Size = new Vector2(triangle_width, triangle_height),
+                    Size = new Vector2(triangle_width, triangle_width * 0.8f),
                     Scale = new Vector2(1, -1)
                 },
-                new Triangle
-                {
-                    Anchor = Anchor.BottomCentre,
-                    Origin = Anchor.BottomCentre,
-                    Size = new Vector2(triangle_width, triangle_height),
-                }
             };
         }
 
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            Colour = colours.RedDark;
+            Colour = colours.Red1;
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
index 70322bd3e0..fb7ce8e423 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
@@ -6,6 +6,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Localisation;
 using osu.Game.Overlays;
@@ -29,10 +30,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         }
 
         [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
+        private void load(OverlayColourProvider colourProvider, OsuColour colours)
         {
-            Masking = true;
-
             OsuCheckbox waveformCheckbox;
             OsuCheckbox controlPointsCheckbox;
             OsuCheckbox ticksCheckbox;
@@ -51,7 +50,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                     {
                         new Dimension(GridSizeMode.Absolute, 140),
                         new Dimension(),
-                        new Dimension(GridSizeMode.Absolute, 30),
+                        new Dimension(GridSizeMode.Absolute, 35),
                         new Dimension(GridSizeMode.Absolute, 110),
                     },
                     Content = new[]
@@ -102,6 +101,16 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                                 AutoSizeAxes = Axes.Y,
                                 Children = new Drawable[]
                                 {
+                                    // the out-of-bounds portion of the centre marker.
+                                    new Box
+                                    {
+                                        Width = 24,
+                                        Height = EditorScreenWithTimeline.PADDING,
+                                        Depth = float.MaxValue,
+                                        Colour = colours.Red1,
+                                        Anchor = Anchor.TopCentre,
+                                        Origin = Anchor.BottomCentre,
+                                    },
                                     new Box
                                     {
                                         RelativeSizeAxes = Axes.Both,
@@ -115,7 +124,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                             {
                                 RelativeSizeAxes = Axes.Both,
                                 Name = @"Zoom controls",
-                                Padding = new MarginPadding { Right = 5 },
+                                Padding = new MarginPadding { Right = 10 },
                                 Children = new Drawable[]
                                 {
                                     new Box
@@ -128,7 +137,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                                         Anchor = Anchor.CentreLeft,
                                         Origin = Anchor.CentreLeft,
                                         RelativeSizeAxes = Axes.Both,
-                                        Masking = true,
                                         Children = new[]
                                         {
                                             new TimelineButton
diff --git a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
index 104d9dd58f..ea2790b50a 100644
--- a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
+++ b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Screens.Edit
 {
     public abstract partial class EditorScreenWithTimeline : EditorScreen
     {
-        private const float padding = 15;
+        public const float PADDING = 10;
 
         private Container timelineContainer = null!;
 
@@ -61,7 +61,7 @@ namespace osu.Game.Screens.Edit
                                     Name = "Timeline content",
                                     RelativeSizeAxes = Axes.X,
                                     AutoSizeAxes = Axes.Y,
-                                    Padding = new MarginPadding { Horizontal = padding, Top = padding },
+                                    Padding = new MarginPadding { Horizontal = PADDING, Top = PADDING },
                                     Child = new GridContainer
                                     {
                                         RelativeSizeAxes = Axes.X,

From e6b8cd0c06abce3e02806c570b4316a484c2d817 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Jul 2023 16:55:12 +0900
Subject: [PATCH 1371/1604] Add editor header

---
 .../Edit/Components/Menus/EditorMenuBar.cs    | 44 ++++++++++++++++++-
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs b/osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs
index a911b4e1d8..fa4e52d6a6 100644
--- a/osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs
+++ b/osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs
@@ -3,6 +3,9 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics;
@@ -14,19 +17,56 @@ namespace osu.Game.Screens.Edit.Components.Menus
 {
     public partial class EditorMenuBar : OsuMenu
     {
+        private const float heading_area = 114;
+
         public EditorMenuBar()
             : base(Direction.Horizontal, true)
         {
             RelativeSizeAxes = Axes.X;
 
             MaskingContainer.CornerRadius = 0;
-            ItemsContainer.Padding = new MarginPadding { Left = 100 };
+            ItemsContainer.Padding = new MarginPadding { Left = heading_area };
         }
 
         [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
+        private void load(OverlayColourProvider colourProvider, TextureStore textures)
         {
             BackgroundColour = colourProvider.Background3;
+
+            TextFlowContainer text;
+
+            AddRangeInternal(new[]
+            {
+                new Container
+                {
+                    RelativeSizeAxes = Axes.Y,
+                    Width = heading_area,
+                    Padding = new MarginPadding(8),
+                    Children = new Drawable[]
+                    {
+                        new Sprite
+                        {
+                            Size = new Vector2(26),
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                            Texture = textures.Get("Icons/Hexacons/editor"),
+                        },
+                        text = new TextFlowContainer
+                        {
+                            Anchor = Anchor.CentreRight,
+                            Origin = Anchor.CentreRight,
+                            AutoSizeAxes = Axes.Both,
+                        }
+                    }
+                },
+            });
+
+            text.AddText("osu!", t => t.Font = OsuFont.TorusAlternate);
+            text.AddText("editor", t =>
+            {
+                t.Font = OsuFont.TorusAlternate;
+                t.Colour = colourProvider.Highlight1;
+            });
         }
 
         protected override Framework.Graphics.UserInterface.Menu CreateSubMenu() => new SubMenu();

From fe70f2492538533148fd3ee28a2749901736bf43 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Jul 2023 17:00:42 +0900
Subject: [PATCH 1372/1604] Update design of summary timeline current time
 marker

---
 .../Timelines/Summary/Parts/MarkerPart.cs     | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs
index d42c02e03d..ff707407dd 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs
@@ -73,6 +73,8 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
         {
             public MarkerVisualisation()
             {
+                const float box_height = 4;
+
                 Anchor = Anchor.CentreLeft;
                 Origin = Anchor.Centre;
                 RelativePositionAxes = Axes.X;
@@ -80,32 +82,46 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
                 AutoSizeAxes = Axes.X;
                 InternalChildren = new Drawable[]
                 {
+                    new Box
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                        Size = new Vector2(14, box_height),
+                    },
                     new Triangle
                     {
                         Anchor = Anchor.TopCentre,
                         Origin = Anchor.BottomCentre,
                         Scale = new Vector2(1, -1),
                         Size = new Vector2(10, 5),
+                        Y = box_height,
                     },
                     new Triangle
                     {
                         Anchor = Anchor.BottomCentre,
                         Origin = Anchor.BottomCentre,
-                        Size = new Vector2(10, 5)
+                        Size = new Vector2(10, 5),
+                        Y = -box_height,
+                    },
+                    new Box
+                    {
+                        Anchor = Anchor.BottomCentre,
+                        Origin = Anchor.BottomCentre,
+                        Size = new Vector2(14, box_height),
                     },
                     new Box
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
                         RelativeSizeAxes = Axes.Y,
-                        Width = 2,
+                        Width = 1.4f,
                         EdgeSmoothness = new Vector2(1, 0)
                     }
                 };
             }
 
             [BackgroundDependencyLoader]
-            private void load(OsuColour colours) => Colour = colours.Red;
+            private void load(OsuColour colours) => Colour = colours.Red1;
         }
     }
 }

From 85c780ae5be25c3b89ea414a2b03d688cefdd452 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Jul 2023 19:19:14 +0900
Subject: [PATCH 1373/1604] Allow the osu! logo to be proxied locally into
 scenes

---
 osu.Game/OsuGame.cs               |  4 +--
 osu.Game/Screens/Menu/MainMenu.cs |  7 ++++++
 osu.Game/Screens/Menu/OsuLogo.cs  | 41 +++++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 5b654e0c16..1a40bb8e3d 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -950,9 +950,9 @@ namespace osu.Game
             if (!args?.Any(a => a == @"--no-version-overlay") ?? true)
                 loadComponentSingleFile(versionManager = new VersionManager { Depth = int.MinValue }, ScreenContainer.Add);
 
-            loadComponentSingleFile(osuLogo, logo =>
+            loadComponentSingleFile(osuLogo, _ =>
             {
-                logoContainer.Add(logo);
+                osuLogo.SetupDefaultContainer(logoContainer);
 
                 // Loader has to be created after the logo has finished loading as Loader performs logo transformations on entering.
                 ScreenStack.Push(CreateLoader().With(l => l.RelativeSizeAxes = Axes.Both));
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index baa34d4914..510c9a5373 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -8,6 +8,7 @@ using System.Diagnostics;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Logging;
@@ -85,6 +86,7 @@ namespace osu.Game.Screens.Menu
 
         private ParallaxContainer buttonsContainer;
         private SongTicker songTicker;
+        private Container logoTarget;
 
         [BackgroundDependencyLoader(true)]
         private void load(BeatmapListingOverlay beatmapListing, SettingsOverlay settings, OsuConfigManager config, SessionStatics statics)
@@ -129,6 +131,7 @@ namespace osu.Game.Screens.Menu
                         }
                     }
                 },
+                logoTarget = new Container { RelativeSizeAxes = Axes.Both, },
                 sideFlashes = new MenuSideFlashes(),
                 songTicker = new SongTicker
                 {
@@ -208,6 +211,8 @@ namespace osu.Game.Screens.Menu
             logo.FadeColour(Color4.White, 100, Easing.OutQuint);
             logo.FadeIn(100, Easing.OutQuint);
 
+            logo.ProxyToContainer(logoTarget);
+
             if (resuming)
             {
                 Buttons.State = ButtonSystemState.TopLevel;
@@ -245,6 +250,8 @@ namespace osu.Game.Screens.Menu
             var seq = logo.FadeOut(300, Easing.InSine)
                           .ScaleTo(0.2f, 300, Easing.InSine);
 
+            logo.ReturnProxy();
+
             seq.OnComplete(_ => Buttons.SetOsuLogo(null));
             seq.OnAbort(_ => Buttons.SetOsuLogo(null));
         }
diff --git a/osu.Game/Screens/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs
index 277b8bf888..8867ecfb2a 100644
--- a/osu.Game/Screens/Menu/OsuLogo.cs
+++ b/osu.Game/Screens/Menu/OsuLogo.cs
@@ -435,5 +435,46 @@ namespace osu.Game.Screens.Menu
             logoBounceContainer.MoveTo(Vector2.Zero, 800, Easing.OutElastic);
             base.OnDragEnd(e);
         }
+
+        private Container defaultProxyTarget;
+        private Container currentProxyTarget;
+        private Drawable proxy;
+
+        public Drawable ProxyToContainer(Container c)
+        {
+            if (currentProxyTarget != null)
+                throw new InvalidOperationException("Previous proxy usage was not returned");
+
+            if (defaultProxyTarget == null)
+                throw new InvalidOperationException($"{nameof(SetupDefaultContainer)} must be called first");
+
+            currentProxyTarget = c;
+
+            defaultProxyTarget.Remove(proxy, false);
+            currentProxyTarget.Add(proxy);
+            return proxy;
+        }
+
+        public void ReturnProxy()
+        {
+            if (currentProxyTarget == null)
+                throw new InvalidOperationException("No usage to return");
+
+            if (defaultProxyTarget == null)
+                throw new InvalidOperationException($"{nameof(SetupDefaultContainer)} must be called first");
+
+            currentProxyTarget.Remove(proxy, false);
+            currentProxyTarget = null;
+
+            defaultProxyTarget.Add(proxy);
+        }
+
+        public void SetupDefaultContainer(Container container)
+        {
+            defaultProxyTarget = container;
+
+            defaultProxyTarget.Add(this);
+            defaultProxyTarget.Add(proxy = CreateProxy());
+        }
     }
 }

From d4fb0bef95cd9ede8cb8da9df98dfc07c7791833 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Jul 2023 19:29:36 +0900
Subject: [PATCH 1374/1604] Fix osu!mania scores failing to convert to new
 standardised score due to cast failure

Regressed in https://github.com/ppy/osu/pull/23917.
Closes #24217.
---
 .../Scoring/ManiaScoreProcessor.cs              | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
index a0f6ac572d..16e10006e3 100644
--- a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
+++ b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Mania.Scoring
         }
 
         protected override IEnumerable<HitObject> EnumerateHitObjects(IBeatmap beatmap)
-            => base.EnumerateHitObjects(beatmap).OrderBy(ho => (ManiaHitObject)ho, JudgementOrderComparer.DEFAULT);
+            => base.EnumerateHitObjects(beatmap).OrderBy(ho => ho, JudgementOrderComparer.DEFAULT);
 
         protected override double ComputeTotalScore(double comboProgress, double accuracyProgress, double bonusPortion)
         {
@@ -34,11 +34,11 @@ namespace osu.Game.Rulesets.Mania.Scoring
         protected override double GetComboScoreChange(JudgementResult result)
             => Judgement.ToNumericResult(result.Type) * Math.Min(Math.Max(0.5, Math.Log(result.ComboAfterJudgement, combo_base)), Math.Log(400, combo_base));
 
-        private class JudgementOrderComparer : IComparer<ManiaHitObject>
+        private class JudgementOrderComparer : IComparer<HitObject>
         {
             public static readonly JudgementOrderComparer DEFAULT = new JudgementOrderComparer();
 
-            public int Compare(ManiaHitObject? x, ManiaHitObject? y)
+            public int Compare(HitObject? x, HitObject? y)
             {
                 if (ReferenceEquals(x, y)) return 0;
                 if (ReferenceEquals(x, null)) return -1;
@@ -48,11 +48,14 @@ namespace osu.Game.Rulesets.Mania.Scoring
                 if (result != 0)
                     return result;
 
-                // due to the way input is handled in mania, notes take precedence over ticks in judging order.
-                if (x is Note && y is not Note) return -1;
-                if (x is not Note && y is Note) return 1;
+                var xNote = x as Note;
+                var yNote = y as Note;
 
-                return x.Column.CompareTo(y.Column);
+                // due to the way input is handled in mania, notes take precedence over ticks in judging order.
+                if (xNote != null && yNote == null) return -1;
+                if (xNote == null && yNote != null) return 1;
+
+                return xNote!.Column.CompareTo(yNote!.Column);
             }
         }
     }

From 480259b8d2b4cfc2f2e06e13eaab6ea1f2162dd1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Jul 2023 20:02:25 +0900
Subject: [PATCH 1375/1604] Ensure migration is never run on scores with
 new-enough `TotalScoreVersion`s

---
 osu.Game/Database/StandardisedScoreMigrationTools.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index b8afdad294..11a5e252a3 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -26,6 +26,9 @@ namespace osu.Game.Database
             if (score.IsLegacyScore)
                 return false;
 
+            if (score.TotalScoreVersion > 30000002)
+                return false;
+
             // Recalculate the old-style standardised score to see if this was an old lazer score.
             bool oldScoreMatchesExpectations = GetOldStandardised(score) == score.TotalScore;
             // Some older scores don't have correct statistics populated, so let's give them benefit of doubt.

From 1868826d692f9d0c0fc13a9184758a1c3518a85f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 15 Jul 2023 01:12:10 +0900
Subject: [PATCH 1376/1604] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 411a27b0b0..49b9de678d 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -11,7 +11,7 @@
     <AndroidManifestMerger>manifestmerger.jar</AndroidManifestMerger>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.714.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.715.0" />
   </ItemGroup>
   <ItemGroup>
     <AndroidManifestOverlay Include="$(MSBuildThisFileDirectory)osu.Android\Properties\AndroidManifestOverlay.xml" />
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 0ccf851138..f56133e64c 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,7 +36,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="11.1.2" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.714.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.715.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.707.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 71978e94fc..12f84c66c2 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -16,6 +16,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.714.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.715.0" />
   </ItemGroup>
 </Project>

From e58488d04a64acb9a08cee6253da5973d2c2c9bd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 15 Jul 2023 11:19:34 +0900
Subject: [PATCH 1377/1604] Fix incorrect comparer implementation

---
 .../Scoring/ManiaScoreProcessor.cs                    | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
index 16e10006e3..c53f3c3e07 100644
--- a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
+++ b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
@@ -48,14 +48,13 @@ namespace osu.Game.Rulesets.Mania.Scoring
                 if (result != 0)
                     return result;
 
-                var xNote = x as Note;
-                var yNote = y as Note;
-
                 // due to the way input is handled in mania, notes take precedence over ticks in judging order.
-                if (xNote != null && yNote == null) return -1;
-                if (xNote == null && yNote != null) return 1;
+                if (x is Note && y is not Note) return -1;
+                if (x is not Note && y is Note) return 1;
 
-                return xNote!.Column.CompareTo(yNote!.Column);
+                return x is ManiaHitObject maniaX && y is ManiaHitObject maniaY
+                    ? maniaX.Column.CompareTo(maniaY.Column)
+                    : 0;
             }
         }
     }

From eb81eac635401bde3c923f03a1a7238c9b03caf3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 15 Jul 2023 12:19:18 +0900
Subject: [PATCH 1378/1604] Flag decoded scores more correctly

---
 osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
index c6461840aa..8c00110909 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
@@ -49,6 +49,13 @@ namespace osu.Game.Scoring.Legacy
 
                 scoreInfo.IsLegacyScore = version < LegacyScoreEncoder.FIRST_LAZER_VERSION;
 
+                // TotalScoreVersion gets initialised to LATEST_VERSION.
+                // In the case where the incoming score has either an osu!stable or old lazer version, we need
+                // to mark it with the correct version increment to trigger reprocessing to new standardised scoring.
+                //
+                // See StandardisedScoreMigrationTools.ShouldMigrateToNewStandardised().
+                scoreInfo.TotalScoreVersion = version < 30000002 ? 30000001 : LegacyScoreEncoder.LATEST_VERSION;
+
                 string beatmapHash = sr.ReadString();
 
                 workingBeatmap = GetBeatmap(beatmapHash);

From 7f957d3fbef45d745d9ebc545eefa6050fa3b84f Mon Sep 17 00:00:00 2001
From: chayleaf <chayleaf-git@pavluk.org>
Date: Sat, 15 Jul 2023 20:24:40 +0700
Subject: [PATCH 1379/1604] Fix some taiko maps not finishing in some
 conditions

I don't know how to reproduce this issue in a test, so no tests for now.
Nonetheless, this fixes the issue for me at least on one map:
https://osu.ppy.sh/beatmapsets/1899665#taiko/3915653

This workaround is similar to #16475 (the test from that commit got
eventually removed for some reason).
---
 .../Objects/Drawables/DrawableStrongNestedHit.cs          | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs
index 9b410d1871..eb31708e20 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs
@@ -16,5 +16,13 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             : base(nestedHit)
         {
         }
+
+        public override void OnKilled()
+        {
+            base.OnKilled();
+
+            if (!Judged)
+                ApplyResult(r => r.Type = r.Judgement.MinResult);
+        }
     }
 }

From 309c8522227d63d647847ad0cf90ccf1f5ffd6eb Mon Sep 17 00:00:00 2001
From: Aki <75532970+AkiSakurai@users.noreply.github.com>
Date: Sat, 15 Jul 2023 22:12:48 +0800
Subject: [PATCH 1380/1604] Compute the top local rank directly without an
 expensive detach call

---
 osu.Game/Scoring/ScoreInfoExtensions.cs          | 8 ++++++++
 osu.Game/Screens/Select/Carousel/TopLocalRank.cs | 3 +--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Scoring/ScoreInfoExtensions.cs b/osu.Game/Scoring/ScoreInfoExtensions.cs
index 6e57a9fd0b..63cc077cde 100644
--- a/osu.Game/Scoring/ScoreInfoExtensions.cs
+++ b/osu.Game/Scoring/ScoreInfoExtensions.cs
@@ -32,5 +32,13 @@ namespace osu.Game.Scoring
         /// <param name="score">The <see cref="ScoreInfo"/> to compute the maximum achievable combo for.</param>
         /// <returns>The maximum achievable combo.</returns>
         public static int GetMaximumAchievableCombo(this ScoreInfo score) => score.MaximumStatistics.Where(kvp => kvp.Key.AffectsCombo()).Sum(kvp => kvp.Value);
+
+        /// <summary>
+        /// Retrieves the <see cref="ScoreInfo"/> with the maximum total score.
+        /// </summary>
+        /// <param name="scores">An array of <see cref="ScoreInfo"/>s to retrieve the scoreInfo with maximum total score.</param>
+        /// <returns>The <see cref="ScoreInfo"/> instance with the maximum total score.</returns>
+        public static ScoreInfo? MaxByTopScore(this IEnumerable<ScoreInfo> scores)
+            => scores.MaxBy(info => (info.TotalScore, -info.OnlineID, -info.Date.UtcDateTime.Ticks));
     }
 }
diff --git a/osu.Game/Screens/Select/Carousel/TopLocalRank.cs b/osu.Game/Screens/Select/Carousel/TopLocalRank.cs
index c17de77619..fe2d79b080 100644
--- a/osu.Game/Screens/Select/Carousel/TopLocalRank.cs
+++ b/osu.Game/Screens/Select/Carousel/TopLocalRank.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -75,7 +74,7 @@ namespace osu.Game.Screens.Select.Carousel
                 if (changes?.HasCollectionChanges() == false)
                     return;
 
-                ScoreInfo? topScore = sender.Detach().OrderByTotalScore().FirstOrDefault();
+                ScoreInfo? topScore = sender.MaxByTopScore();
 
                 updateable.Rank = topScore?.Rank;
                 updateable.Alpha = topScore != null ? 1 : 0;

From 3e91d308254d63125e47a3a92f6d52bc9c2d551e Mon Sep 17 00:00:00 2001
From: chayleaf <chayleaf-git@pavluk.org>
Date: Sat, 15 Jul 2023 22:33:16 +0700
Subject: [PATCH 1381/1604] move StrongNestedHit OnKilled to
 DrawableStrongNestedHit

---
 .../Objects/Drawables/DrawableDrumRoll.cs                 | 8 --------
 .../Objects/Drawables/DrawableDrumRollTick.cs             | 8 --------
 .../Objects/Drawables/DrawableStrongNestedHit.cs          | 3 ++-
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index 005d2ab1ac..2bf0c04adf 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -195,14 +195,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
                 ApplyResult(r => r.Type = ParentHitObject.IsHit ? r.Judgement.MaxResult : r.Judgement.MinResult);
             }
 
-            public override void OnKilled()
-            {
-                base.OnKilled();
-
-                if (Time.Current > ParentHitObject.HitObject.GetEndTime() && !Judged)
-                    ApplyResult(r => r.Type = r.Judgement.MinResult);
-            }
-
             public override bool OnPressed(KeyBindingPressEvent<TaikoAction> e) => false;
         }
     }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
index abecd19545..c900165d34 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
@@ -108,14 +108,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
                 ApplyResult(r => r.Type = ParentHitObject.IsHit ? r.Judgement.MaxResult : r.Judgement.MinResult);
             }
 
-            public override void OnKilled()
-            {
-                base.OnKilled();
-
-                if (Time.Current > ParentHitObject.HitObject.GetEndTime() && !Judged)
-                    ApplyResult(r => r.Type = r.Judgement.MinResult);
-            }
-
             public override bool OnPressed(KeyBindingPressEvent<TaikoAction> e) => false;
         }
     }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs
index eb31708e20..4d430987b9 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Taiko.Judgements;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
@@ -21,7 +22,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         {
             base.OnKilled();
 
-            if (!Judged)
+            if (!Judged && Time.Current > ParentHitObject?.HitObject.GetEndTime())
                 ApplyResult(r => r.Type = r.Judgement.MinResult);
         }
     }

From 542916f8570eb757870ab3d612edff9612c1bfee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 15 Jul 2023 18:15:42 +0200
Subject: [PATCH 1382/1604] Bring back test coverage for fail case from #16475

It was inadvertently dropped during refactoring in
b185194d07f0ff1e6ebe7eafb796a85491fab118.
---
 .../Judgements/TestSceneDrumRollJudgements.cs | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneDrumRollJudgements.cs b/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneDrumRollJudgements.cs
index 21f2b8f1be..2f9f5e0a37 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneDrumRollJudgements.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneDrumRollJudgements.cs
@@ -75,6 +75,25 @@ namespace osu.Game.Rulesets.Taiko.Tests.Judgements
             AssertResult<DrumRoll>(0, HitResult.IgnoreHit);
         }
 
+        [Test]
+        public void TestHitNoneStrongDrumRoll()
+        {
+            PerformTest(new List<ReplayFrame>
+            {
+                new TaikoReplayFrame(0),
+            }, CreateBeatmap(createDrumRoll(true)));
+
+            AssertJudgementCount(12);
+
+            for (int i = 0; i < 5; ++i)
+            {
+                AssertResult<DrumRollTick>(i, HitResult.IgnoreMiss);
+                AssertResult<DrumRollTick.StrongNestedHit>(i, HitResult.IgnoreMiss);
+            }
+
+            AssertResult<DrumRoll>(0, HitResult.IgnoreHit);
+        }
+
         [Test]
         public void TestHitAllStrongDrumRollWithOneKey()
         {

From 24d63a4d96c99dc0ff55e50929a3f7b96166e5eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 15 Jul 2023 18:17:45 +0200
Subject: [PATCH 1383/1604] Add test coverage for failing hit judgement with HD
 active

---
 .../Judgements/JudgementTest.cs               |  5 +++-
 .../Judgements/TestSceneHitJudgements.cs      | 28 +++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Judgements/JudgementTest.cs b/osu.Game.Rulesets.Taiko.Tests/Judgements/JudgementTest.cs
index eb2d96ec51..f3e37736b2 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Judgements/JudgementTest.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Judgements/JudgementTest.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
@@ -10,6 +11,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Objects;
@@ -36,11 +38,12 @@ namespace osu.Game.Rulesets.Taiko.Tests.Judgements
                 () => Is.EqualTo(expectedResult));
         }
 
-        protected void PerformTest(List<ReplayFrame> frames, Beatmap<TaikoHitObject>? beatmap = null)
+        protected void PerformTest(List<ReplayFrame> frames, Beatmap<TaikoHitObject>? beatmap = null, Mod[]? mods = null)
         {
             AddStep("load player", () =>
             {
                 Beatmap.Value = CreateWorkingBeatmap(beatmap);
+                SelectedMods.Value = mods ?? Array.Empty<Mod>();
 
                 var p = new ScoreAccessibleReplayPlayer(new Score { Replay = new Replay { Frames = frames } });
 
diff --git a/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneHitJudgements.cs b/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneHitJudgements.cs
index 3bf94eb62e..b9e767e625 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneHitJudgements.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneHitJudgements.cs
@@ -6,8 +6,10 @@ using NUnit.Framework;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Taiko.Mods;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.Taiko.Replays;
+using osu.Game.Rulesets.Taiko.Scoring;
 
 namespace osu.Game.Rulesets.Taiko.Tests.Judgements
 {
@@ -157,5 +159,31 @@ namespace osu.Game.Rulesets.Taiko.Tests.Judgements
             AssertJudgementCount(1);
             AssertResult<Hit>(0, HitResult.Ok);
         }
+
+        [Test]
+        public void TestStrongHitWithHidden()
+        {
+            const double hit_time = 1000;
+
+            var beatmap = CreateBeatmap(new Hit
+            {
+                Type = HitType.Centre,
+                StartTime = hit_time,
+                IsStrong = true
+            });
+
+            var hitWindows = new TaikoHitWindows();
+            hitWindows.SetDifficulty(beatmap.Difficulty.OverallDifficulty);
+
+            PerformTest(new List<ReplayFrame>
+            {
+                new TaikoReplayFrame(0),
+                new TaikoReplayFrame(hit_time + hitWindows.WindowFor(HitResult.Ok) - 1, TaikoAction.LeftCentre),
+            }, beatmap, new[] { new TaikoModHidden() });
+
+            AssertJudgementCount(2);
+            AssertResult<Hit>(0, HitResult.Ok);
+            AssertResult<Hit.StrongNestedHit>(0, HitResult.IgnoreMiss);
+        }
     }
 }

From 9e960894c2b03029a0d40d20a7c0cf9ef451ce5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 15 Jul 2023 18:22:04 +0200
Subject: [PATCH 1384/1604] Add inline commentary about `OnKilled()` override

---
 .../Objects/Drawables/DrawableStrongNestedHit.cs              | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs
index 4d430987b9..724d59edcd 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs
@@ -22,6 +22,10 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         {
             base.OnKilled();
 
+            // usually, the strong nested hit isn't judged itself, it is judged by its parent object.
+            // however, in rare cases (see: drum rolls, hits with hidden active),
+            // it can happen that the hit window of the nested strong hit extends past the lifetime of the parent object.
+            // this is a safety to prevent such cases from causing the nested hit to never be judged and as such prevent gameplay from completing.
             if (!Judged && Time.Current > ParentHitObject?.HitObject.GetEndTime())
                 ApplyResult(r => r.Type = r.Judgement.MinResult);
         }

From 955aa70e46835d6200a4fabb5ba18d5bda1b5787 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 15 Jul 2023 18:43:31 +0200
Subject: [PATCH 1385/1604] Add failing test case for hitting nested hit past
 parent end time

---
 .../Judgements/TestSceneHitJudgements.cs      | 30 ++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneHitJudgements.cs b/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneHitJudgements.cs
index b9e767e625..5e9d4bcf14 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneHitJudgements.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneHitJudgements.cs
@@ -8,6 +8,7 @@ using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Mods;
 using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.Objects.Drawables;
 using osu.Game.Rulesets.Taiko.Replays;
 using osu.Game.Rulesets.Taiko.Scoring;
 
@@ -161,7 +162,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Judgements
         }
 
         [Test]
-        public void TestStrongHitWithHidden()
+        public void TestStrongHitOneKeyWithHidden()
         {
             const double hit_time = 1000;
 
@@ -185,5 +186,32 @@ namespace osu.Game.Rulesets.Taiko.Tests.Judgements
             AssertResult<Hit>(0, HitResult.Ok);
             AssertResult<Hit.StrongNestedHit>(0, HitResult.IgnoreMiss);
         }
+
+        [Test]
+        public void TestStrongHitTwoKeysWithHidden()
+        {
+            const double hit_time = 1000;
+
+            var beatmap = CreateBeatmap(new Hit
+            {
+                Type = HitType.Centre,
+                StartTime = hit_time,
+                IsStrong = true
+            });
+
+            var hitWindows = new TaikoHitWindows();
+            hitWindows.SetDifficulty(beatmap.Difficulty.OverallDifficulty);
+
+            PerformTest(new List<ReplayFrame>
+            {
+                new TaikoReplayFrame(0),
+                new TaikoReplayFrame(hit_time + hitWindows.WindowFor(HitResult.Ok) - 1, TaikoAction.LeftCentre),
+                new TaikoReplayFrame(hit_time + hitWindows.WindowFor(HitResult.Ok) + DrawableHit.StrongNestedHit.SECOND_HIT_WINDOW - 2, TaikoAction.LeftCentre, TaikoAction.RightCentre),
+            }, beatmap, new[] { new TaikoModHidden() });
+
+            AssertJudgementCount(2);
+            AssertResult<Hit>(0, HitResult.Ok);
+            AssertResult<Hit.StrongNestedHit>(0, HitResult.LargeBonus);
+        }
     }
 }

From 041e81889209c0a568a42b38227b2cedf9c2d3e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 15 Jul 2023 18:44:47 +0200
Subject: [PATCH 1386/1604] Fix nested hits not being hittable if cut off by
 parent object ending

---
 osu.Game.Rulesets.Taiko/Mods/TaikoModHidden.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModHidden.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModHidden.cs
index 4708ef9bf0..2c3b4a8d18 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModHidden.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModHidden.cs
@@ -62,6 +62,8 @@ namespace osu.Game.Rulesets.Taiko.Mods
                         hitObject.LifetimeEnd = state == ArmedState.Idle || !hitObject.AllJudged
                             ? hitObject.HitObject.GetEndTime() + hitObject.HitObject.HitWindows.WindowFor(HitResult.Miss)
                             : hitObject.HitStateUpdateTime;
+                        // extend the lifetime end of the object in order to allow its nested strong hit (if any) to be judged.
+                        hitObject.LifetimeEnd += DrawableHit.StrongNestedHit.SECOND_HIT_WINDOW;
                     }
 
                     break;

From cb354685ca323f4e429e60617077ed5a5175ee3d Mon Sep 17 00:00:00 2001
From: Aki <75532970+AkiSakurai@users.noreply.github.com>
Date: Sun, 16 Jul 2023 10:21:32 +0800
Subject: [PATCH 1387/1604] simplify code

---
 osu.Game/Scoring/ScoreInfoExtensions.cs          | 8 --------
 osu.Game/Screens/Select/Carousel/TopLocalRank.cs | 4 ++--
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Scoring/ScoreInfoExtensions.cs b/osu.Game/Scoring/ScoreInfoExtensions.cs
index 63cc077cde..6e57a9fd0b 100644
--- a/osu.Game/Scoring/ScoreInfoExtensions.cs
+++ b/osu.Game/Scoring/ScoreInfoExtensions.cs
@@ -32,13 +32,5 @@ namespace osu.Game.Scoring
         /// <param name="score">The <see cref="ScoreInfo"/> to compute the maximum achievable combo for.</param>
         /// <returns>The maximum achievable combo.</returns>
         public static int GetMaximumAchievableCombo(this ScoreInfo score) => score.MaximumStatistics.Where(kvp => kvp.Key.AffectsCombo()).Sum(kvp => kvp.Value);
-
-        /// <summary>
-        /// Retrieves the <see cref="ScoreInfo"/> with the maximum total score.
-        /// </summary>
-        /// <param name="scores">An array of <see cref="ScoreInfo"/>s to retrieve the scoreInfo with maximum total score.</param>
-        /// <returns>The <see cref="ScoreInfo"/> instance with the maximum total score.</returns>
-        public static ScoreInfo? MaxByTopScore(this IEnumerable<ScoreInfo> scores)
-            => scores.MaxBy(info => (info.TotalScore, -info.OnlineID, -info.Date.UtcDateTime.Ticks));
     }
 }
diff --git a/osu.Game/Screens/Select/Carousel/TopLocalRank.cs b/osu.Game/Screens/Select/Carousel/TopLocalRank.cs
index fe2d79b080..da9661f702 100644
--- a/osu.Game/Screens/Select/Carousel/TopLocalRank.cs
+++ b/osu.Game/Screens/Select/Carousel/TopLocalRank.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -74,8 +75,7 @@ namespace osu.Game.Screens.Select.Carousel
                 if (changes?.HasCollectionChanges() == false)
                     return;
 
-                ScoreInfo? topScore = sender.MaxByTopScore();
-
+                ScoreInfo? topScore = sender.MaxBy(info => (info.TotalScore, -info.Date.UtcDateTime.Ticks));
                 updateable.Rank = topScore?.Rank;
                 updateable.Alpha = topScore != null ? 1 : 0;
             }

From 416ee0d99cb0ddb344ec6183fb15278f45295b2b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 16 Jul 2023 12:48:58 +0900
Subject: [PATCH 1388/1604] Fix covariant array spec in new test

---
 .../Judgements/TestSceneHitJudgements.cs                     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneHitJudgements.cs b/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneHitJudgements.cs
index 5e9d4bcf14..32966905c9 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneHitJudgements.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneHitJudgements.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using NUnit.Framework;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Mods;
@@ -180,7 +181,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Judgements
             {
                 new TaikoReplayFrame(0),
                 new TaikoReplayFrame(hit_time + hitWindows.WindowFor(HitResult.Ok) - 1, TaikoAction.LeftCentre),
-            }, beatmap, new[] { new TaikoModHidden() });
+            }, beatmap, new Mod[] { new TaikoModHidden() });
 
             AssertJudgementCount(2);
             AssertResult<Hit>(0, HitResult.Ok);
@@ -207,7 +208,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Judgements
                 new TaikoReplayFrame(0),
                 new TaikoReplayFrame(hit_time + hitWindows.WindowFor(HitResult.Ok) - 1, TaikoAction.LeftCentre),
                 new TaikoReplayFrame(hit_time + hitWindows.WindowFor(HitResult.Ok) + DrawableHit.StrongNestedHit.SECOND_HIT_WINDOW - 2, TaikoAction.LeftCentre, TaikoAction.RightCentre),
-            }, beatmap, new[] { new TaikoModHidden() });
+            }, beatmap, new Mod[] { new TaikoModHidden() });
 
             AssertJudgementCount(2);
             AssertResult<Hit>(0, HitResult.Ok);

From ce12afde70e437fe1e03ebee24d70258a1dd3063 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sat, 15 Jul 2023 23:38:06 -0700
Subject: [PATCH 1389/1604] Remove android manifest overlay

---
 osu.Android.props                                 |  4 ----
 osu.Android/Properties/AndroidManifestOverlay.xml | 15 ---------------
 2 files changed, 19 deletions(-)
 delete mode 100644 osu.Android/Properties/AndroidManifestOverlay.xml

diff --git a/osu.Android.props b/osu.Android.props
index 49b9de678d..f5d986a458 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -8,14 +8,10 @@
     <!-- NullabilityInfoContextSupport is disabled by default for Android -->
     <NullabilityInfoContextSupport>true</NullabilityInfoContextSupport>
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
-    <AndroidManifestMerger>manifestmerger.jar</AndroidManifestMerger>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Framework.Android" Version="2023.715.0" />
   </ItemGroup>
-  <ItemGroup>
-    <AndroidManifestOverlay Include="$(MSBuildThisFileDirectory)osu.Android\Properties\AndroidManifestOverlay.xml" />
-  </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.
          Since Realm objects are not declared directly in Android projects, simply disable Fody. -->
diff --git a/osu.Android/Properties/AndroidManifestOverlay.xml b/osu.Android/Properties/AndroidManifestOverlay.xml
deleted file mode 100644
index 815f935383..0000000000
--- a/osu.Android/Properties/AndroidManifestOverlay.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <queries>
-        <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <category android:name="android.intent.category.BROWSABLE" />
-            <data android:scheme="https" />
-        </intent>
-        <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <category android:name="android.intent.category.BROWSABLE" />
-            <data android:scheme="mailto" />
-        </intent>
-    </queries>
-</manifest>
\ No newline at end of file

From 72bf43e297896f6ad4cd76644dc232269a435e07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 16 Jul 2023 16:28:44 +0200
Subject: [PATCH 1390/1604] Add failing test covering exit dialog crash

---
 .../Navigation/TestSceneScreenNavigation.cs   | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index c3b668f591..8e335b2345 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -722,6 +722,33 @@ namespace osu.Game.Tests.Visual.Navigation
             AddUntilStep("Wait for game exit", () => Game.ScreenStack.CurrentScreen == null);
         }
 
+        [Test]
+        public void TestForceExitWithOperationInProgress()
+        {
+            AddStep("set hold delay to 0", () => Game.LocalConfig.SetValue(OsuSetting.UIHoldActivationDelay, 0.0));
+            AddUntilStep("wait for dialog overlay", () => Game.ChildrenOfType<DialogOverlay>().SingleOrDefault() != null);
+
+            ProgressNotification progressNotification = null!;
+
+            AddStep("start ongoing operation", () =>
+            {
+                progressNotification = new ProgressNotification
+                {
+                    Text = "Something is still running",
+                    Progress = 0.5f,
+                    State = ProgressNotificationState.Active,
+                };
+                Game.Notifications.Post(progressNotification);
+            });
+
+            AddStep("attempt exit", () =>
+            {
+                for (int i = 0; i < 2; ++i)
+                    Game.ScreenStack.CurrentScreen.Exit();
+            });
+            AddUntilStep("stopped at exit confirm", () => Game.ChildrenOfType<DialogOverlay>().Single().CurrentDialog is ConfirmExitDialog);
+        }
+
         [Test]
         public void TestExitGameFromSongSelect()
         {

From d25a03984beba1ba009f4120920ced2820e3e122 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 16 Jul 2023 16:29:27 +0200
Subject: [PATCH 1391/1604] Fix `PerformAction<T>()` potentially crashing when
 no matching button is found

---
 osu.Game/Overlays/Dialog/PopupDialog.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Dialog/PopupDialog.cs b/osu.Game/Overlays/Dialog/PopupDialog.cs
index e1e5604e4c..d7316305cc 100644
--- a/osu.Game/Overlays/Dialog/PopupDialog.cs
+++ b/osu.Game/Overlays/Dialog/PopupDialog.cs
@@ -229,7 +229,7 @@ namespace osu.Game.Overlays.Dialog
         {
             // Buttons are regularly added in BDL or LoadComplete, so let's schedule to ensure
             // they are ready to be pressed.
-            Schedule(() => Buttons.OfType<T>().First().TriggerClick());
+            Schedule(() => Buttons.OfType<T>().FirstOrDefault()?.TriggerClick());
         }
 
         protected override bool OnKeyDown(KeyDownEvent e)

From a42992d3fdc4a8ea4762a9f546282aea66e5eb42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 16 Jul 2023 17:10:26 +0200
Subject: [PATCH 1392/1604] Remove unused local variable

---
 .../Visual/Navigation/TestSceneScreenNavigation.cs         | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index 8e335b2345..3acc2f0384 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -728,17 +728,14 @@ namespace osu.Game.Tests.Visual.Navigation
             AddStep("set hold delay to 0", () => Game.LocalConfig.SetValue(OsuSetting.UIHoldActivationDelay, 0.0));
             AddUntilStep("wait for dialog overlay", () => Game.ChildrenOfType<DialogOverlay>().SingleOrDefault() != null);
 
-            ProgressNotification progressNotification = null!;
-
             AddStep("start ongoing operation", () =>
             {
-                progressNotification = new ProgressNotification
+                Game.Notifications.Post(new ProgressNotification
                 {
                     Text = "Something is still running",
                     Progress = 0.5f,
                     State = ProgressNotificationState.Active,
-                };
-                Game.Notifications.Post(progressNotification);
+                });
             });
 
             AddStep("attempt exit", () =>

From e25cd03e4bc2d831086edfcf863fef34a9a101c1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 Jul 2023 00:55:25 +0900
Subject: [PATCH 1393/1604] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 49b9de678d..7200f45277 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -11,7 +11,7 @@
     <AndroidManifestMerger>manifestmerger.jar</AndroidManifestMerger>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.715.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.716.0" />
   </ItemGroup>
   <ItemGroup>
     <AndroidManifestOverlay Include="$(MSBuildThisFileDirectory)osu.Android\Properties\AndroidManifestOverlay.xml" />
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index f56133e64c..16c8160fb6 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,7 +36,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="11.1.2" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.715.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.716.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.707.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 12f84c66c2..01ab409fe4 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -16,6 +16,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.715.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.716.0" />
   </ItemGroup>
 </Project>

From a6b1559e1f414a608be1f315bf8527877c219e3c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 Jul 2023 02:24:51 +0900
Subject: [PATCH 1394/1604] Update `DiscordRichPresence` to pull in performance
 fix

See https://github.com/Lachee/discord-rpc-csharp/pull/237
---
 osu.Desktop/osu.Desktop.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index 16d6a81d40..25f4cff00e 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="Clowd.Squirrel" Version="2.9.42" />
     <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
     <PackageReference Include="System.IO.Packaging" Version="7.0.0" />
-    <PackageReference Include="DiscordRichPresence" Version="1.1.3.18" />
+    <PackageReference Include="DiscordRichPresence" Version="1.1.4.20" />
   </ItemGroup>
   <ItemGroup Label="Resources">
     <EmbeddedResource Include="lazer.ico" />

From cd02a8a9ca599b26304f3ef7b39796bbf2c8a68b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 16 Jul 2023 19:43:37 +0200
Subject: [PATCH 1395/1604] Fix `PopupDialog` potentially accumulating
 schedules during load

---
 osu.Game/Overlays/Dialog/PopupDialog.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Dialog/PopupDialog.cs b/osu.Game/Overlays/Dialog/PopupDialog.cs
index d7316305cc..2e9087fdbd 100644
--- a/osu.Game/Overlays/Dialog/PopupDialog.cs
+++ b/osu.Game/Overlays/Dialog/PopupDialog.cs
@@ -229,7 +229,7 @@ namespace osu.Game.Overlays.Dialog
         {
             // Buttons are regularly added in BDL or LoadComplete, so let's schedule to ensure
             // they are ready to be pressed.
-            Schedule(() => Buttons.OfType<T>().FirstOrDefault()?.TriggerClick());
+            Scheduler.AddOnce(() => Buttons.OfType<T>().FirstOrDefault()?.TriggerClick());
         }
 
         protected override bool OnKeyDown(KeyDownEvent e)

From 7fbd47e9eec893409211a4a1f49e9819f0ded742 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 16 Jul 2023 19:56:22 +0200
Subject: [PATCH 1396/1604] Fix `MultiplayerMatchSubScreen` erroneously pushing
 exit dialog on API failure

If `IAPIProvider.State` changes from `Online` at any point when being on
an `OnlinePlayScreen`, it will be forcefully exited from. However,
`MultiplayerMatchSubScreen` had local logic that suppressed the exit in
order to show a confirmation dialog.

The problem is, that in the suppression logic,
`MultiplayerMatchSubScreen` was checking
`MultiplayerClient.IsConnected`, which is a SignalR flag, and was not
checking `IAPIAccess.State`, which is maintained separately. Due to
differing timeouts and failure thresholds, it is not impossible to have
`MultiplayerClient.IsConnected == true` but `IAPIAccess.State !=
APIState.Online`.

In such a case, the match subscreen would wrongly consider itself to be
still online and due to that, push useless confirmation dialogs, while
being in the process of being forcefully exited. This then caused the
dialog to cause a crash, as it was calling `.Exit()` on the screen which
would already have been exited by that point, by the force-exit flow.
---
 .../Multiplayer/MultiplayerMatchSubScreen.cs           | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index ecf38a956d..01f04b44c9 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -17,6 +17,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Online;
+using osu.Game.Online.API;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
@@ -49,6 +50,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         [Resolved]
         private MultiplayerClient client { get; set; }
 
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
         [Resolved(canBeNull: true)]
         private OsuGame game { get; set; }
 
@@ -251,10 +255,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         public override bool OnExiting(ScreenExitEvent e)
         {
             // the room may not be left immediately after a disconnection due to async flow,
-            // so checking the IsConnected status is also required.
-            if (client.Room == null || !client.IsConnected.Value)
+            // so checking the MultiplayerClient / IAPIAccess statuses is also required.
+            if (client.Room == null || !client.IsConnected.Value || api.State.Value != APIState.Online)
             {
-                // room has not been created yet; exit immediately.
+                // room has not been created yet or we're offline; exit immediately.
                 return base.OnExiting(e);
             }
 

From 6200e207d292357656ceb4ad29bca093bcad9da1 Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Sun, 16 Jul 2023 15:21:15 -0400
Subject: [PATCH 1397/1604] use fa_download for updates instead of fa_upload

---
 osu.Game/Updater/NoActionUpdateManager.cs | 4 ++--
 osu.Game/Updater/SimpleUpdateManager.cs   | 4 ++--
 osu.Game/Updater/UpdateManager.cs         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Updater/NoActionUpdateManager.cs b/osu.Game/Updater/NoActionUpdateManager.cs
index 97d3275757..f776cd67be 100644
--- a/osu.Game/Updater/NoActionUpdateManager.cs
+++ b/osu.Game/Updater/NoActionUpdateManager.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -47,7 +47,7 @@ namespace osu.Game.Updater
                     {
                         Text = $"A newer release of osu! has been found ({version} → {latestTagName}).\n\n"
                                + "Check with your package manager / provider to bring osu! up-to-date!",
-                        Icon = FontAwesome.Solid.Upload,
+                        Icon = FontAwesome.Solid.Download,
                     });
 
                     return true;
diff --git a/osu.Game/Updater/SimpleUpdateManager.cs b/osu.Game/Updater/SimpleUpdateManager.cs
index 1ecb73a154..bc1b0919b8 100644
--- a/osu.Game/Updater/SimpleUpdateManager.cs
+++ b/osu.Game/Updater/SimpleUpdateManager.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -54,7 +54,7 @@ namespace osu.Game.Updater
                     {
                         Text = $"A newer release of osu! has been found ({version} → {latestTagName}).\n\n"
                                + "Click here to download the new version, which can be installed over the top of your existing installation",
-                        Icon = FontAwesome.Solid.Upload,
+                        Icon = FontAwesome.Solid.Download,
                         Activated = () =>
                         {
                             host.OpenUrlExternally(getBestUrl(latest));
diff --git a/osu.Game/Updater/UpdateManager.cs b/osu.Game/Updater/UpdateManager.cs
index 47c2a169ed..190748137a 100644
--- a/osu.Game/Updater/UpdateManager.cs
+++ b/osu.Game/Updater/UpdateManager.cs
@@ -134,7 +134,7 @@ namespace osu.Game.Updater
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
-                        Icon = FontAwesome.Solid.Upload,
+                        Icon = FontAwesome.Solid.Download,
                         Size = new Vector2(34),
                         Colour = OsuColour.Gray(0.2f),
                         Depth = float.MaxValue,

From 3888471148e0db66654e7ce4b34886671abe2828 Mon Sep 17 00:00:00 2001
From: NiceAesth <nice@aesth.dev>
Date: Sun, 16 Jul 2023 23:03:21 +0300
Subject: [PATCH 1398/1604] Add break length and bounds checks

---
 .../Editing/Checks/CheckBreaksTest.cs         | 10 +++
 osu.Game/Rulesets/Edit/BeatmapVerifier.cs     |  3 +
 osu.Game/Rulesets/Edit/Checks/CheckBreaks.cs  | 84 +++++++++++++++++++
 3 files changed, 97 insertions(+)
 create mode 100644 osu.Game.Tests/Editing/Checks/CheckBreaksTest.cs
 create mode 100644 osu.Game/Rulesets/Edit/Checks/CheckBreaks.cs

diff --git a/osu.Game.Tests/Editing/Checks/CheckBreaksTest.cs b/osu.Game.Tests/Editing/Checks/CheckBreaksTest.cs
new file mode 100644
index 0000000000..664f72c5f8
--- /dev/null
+++ b/osu.Game.Tests/Editing/Checks/CheckBreaksTest.cs
@@ -0,0 +1,10 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+namespace osu.Game.Tests.Editing.Checks
+{
+    public class CheckBreaksTest
+    {
+        
+    }
+}
diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
index 3988f29e13..4bcf74db45 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
@@ -38,6 +38,9 @@ namespace osu.Game.Rulesets.Edit
 
             // Timing
             new CheckPreviewTime(),
+
+            // Events
+            new CheckBreaks()
         };
 
         public IEnumerable<Issue> Run(BeatmapVerifierContext context)
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBreaks.cs b/osu.Game/Rulesets/Edit/Checks/CheckBreaks.cs
new file mode 100644
index 0000000000..12dc5554f4
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBreaks.cs
@@ -0,0 +1,84 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using osu.Game.Beatmaps.Timing;
+using osu.Game.Rulesets.Edit.Checks.Components;
+using osu.Game.Rulesets.Objects;
+
+namespace osu.Game.Rulesets.Edit.Checks
+{
+    public class CheckBreaks : ICheck
+    {
+        // Breaks may be off by 1 ms.
+        private const int leniency_threshold = 1;
+        private const double min_start_threshold = 200;
+
+        // Break end time depends on the upcoming object's pre-empt time.
+        // As things stand, "pre-empt time" is only defined for osu! standard
+        // This is a generic value representing AR=10
+        // Relevant: https://github.com/ppy/osu/issues/14330#issuecomment-1002158551
+        private const double min_end_threshold = 450;
+        public CheckMetadata Metadata => new CheckMetadata(CheckCategory.Events, "Breaks not achievable using the editor");
+
+        public IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
+        {
+            new IssueTemplateEarlyStart(this),
+            new IssueTemplateLateEnd(this),
+            new IssueTemplateTooShort(this)
+        };
+
+        public IEnumerable<Issue> Run(BeatmapVerifierContext context)
+        {
+            foreach (var breakPeriod in context.Beatmap.Breaks)
+            {
+                if (breakPeriod.Duration < BreakPeriod.MIN_BREAK_DURATION)
+                    yield return new IssueTemplateTooShort(this).Create(breakPeriod.StartTime);
+            }
+
+            foreach (var hitObject in context.Beatmap.HitObjects)
+            {
+                foreach (var breakPeriod in context.Beatmap.Breaks)
+                {
+                    double diffStart = breakPeriod.StartTime - hitObject.GetEndTime();
+                    double diffEnd = hitObject.StartTime - breakPeriod.EndTime;
+
+                    if (diffStart < min_start_threshold - leniency_threshold && diffStart > 0)
+                        yield return new IssueTemplateEarlyStart(this).Create(breakPeriod.StartTime, min_start_threshold - diffStart);
+                    else if (diffEnd < min_end_threshold - leniency_threshold && diffEnd > 0)
+                        yield return new IssueTemplateLateEnd(this).Create(breakPeriod.StartTime, min_end_threshold - diffEnd);
+                }
+            }
+        }
+
+        public class IssueTemplateEarlyStart : IssueTemplate
+        {
+            public IssueTemplateEarlyStart(ICheck check)
+                : base(check, IssueType.Problem, "Break starts {0} ms early.")
+            {
+            }
+
+            public Issue Create(double startTime, double diff) => new Issue(startTime, this, (int)diff);
+        }
+
+        public class IssueTemplateLateEnd : IssueTemplate
+        {
+            public IssueTemplateLateEnd(ICheck check)
+                : base(check, IssueType.Problem, "Break ends {0} ms late.")
+            {
+            }
+
+            public Issue Create(double startTime, double diff) => new Issue(startTime, this, (int)diff);
+        }
+
+        public class IssueTemplateTooShort : IssueTemplate
+        {
+            public IssueTemplateTooShort(ICheck check)
+                : base(check, IssueType.Warning, "Break is non-functional due to being less than 650ms.")
+            {
+            }
+
+            public Issue Create(double startTime) => new Issue(startTime, this);
+        }
+    }
+}

From b3974b34e7cd519d6576b0f01c8788976789f35c Mon Sep 17 00:00:00 2001
From: NiceAesth <nice@aesth.dev>
Date: Sun, 16 Jul 2023 23:03:30 +0300
Subject: [PATCH 1399/1604] Test break checks

---
 .../Editing/Checks/CheckBreaksTest.cs         | 105 +++++++++++++++++-
 1 file changed, 104 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Editing/Checks/CheckBreaksTest.cs b/osu.Game.Tests/Editing/Checks/CheckBreaksTest.cs
index 664f72c5f8..39e414827a 100644
--- a/osu.Game.Tests/Editing/Checks/CheckBreaksTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckBreaksTest.cs
@@ -1,10 +1,113 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Timing;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Edit.Checks;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Tests.Beatmaps;
+
 namespace osu.Game.Tests.Editing.Checks
 {
     public class CheckBreaksTest
     {
-        
+        private CheckBreaks check = null!;
+
+        [SetUp]
+        public void Setup()
+        {
+            check = new CheckBreaks();
+        }
+
+        [Test]
+        public void TestBreakTooShort()
+        {
+            var beatmap = new Beatmap<HitObject>
+            {
+                Breaks = new List<BreakPeriod>
+                {
+                    new BreakPeriod(0, 649)
+                }
+            };
+            var context = new BeatmapVerifierContext(beatmap, new TestWorkingBeatmap(beatmap));
+
+            var issues = check.Run(context).ToList();
+
+            Assert.That(issues, Has.Count.EqualTo(1));
+            Assert.That(issues.Single().Template is CheckBreaks.IssueTemplateTooShort);
+        }
+
+        [Test]
+        public void TestBreakStartsEarly()
+        {
+            var beatmap = new Beatmap<HitObject>
+            {
+                HitObjects =
+                {
+                    new HitCircle { StartTime = 0 },
+                    new HitCircle { StartTime = 1_200 }
+                },
+                Breaks = new List<BreakPeriod>
+                {
+                    new BreakPeriod(100, 751)
+                }
+            };
+            var context = new BeatmapVerifierContext(beatmap, new TestWorkingBeatmap(beatmap));
+
+            var issues = check.Run(context).ToList();
+
+            Assert.That(issues, Has.Count.EqualTo(1));
+            Assert.That(issues.Single().Template is CheckBreaks.IssueTemplateEarlyStart);
+        }
+
+        [Test]
+        public void TestBreakEndsLate()
+        {
+            var beatmap = new Beatmap<HitObject>
+            {
+                HitObjects =
+                {
+                    new HitCircle { StartTime = 0 },
+                    new HitCircle { StartTime = 1_298 }
+                },
+                Breaks = new List<BreakPeriod>
+                {
+                    new BreakPeriod(200, 850)
+                }
+            };
+            var context = new BeatmapVerifierContext(beatmap, new TestWorkingBeatmap(beatmap));
+
+            var issues = check.Run(context).ToList();
+
+            Assert.That(issues, Has.Count.EqualTo(1));
+            Assert.That(issues.Single().Template is CheckBreaks.IssueTemplateLateEnd);
+        }
+
+        [Test]
+        public void TestBreaksCorrect()
+        {
+            var beatmap = new Beatmap<HitObject>
+            {
+                HitObjects =
+                {
+                    new HitCircle { StartTime = 0 },
+                    new HitCircle { StartTime = 1_300 }
+                },
+                Breaks = new List<BreakPeriod>
+                {
+                    new BreakPeriod(200, 850)
+                }
+            };
+            var context = new BeatmapVerifierContext(beatmap, new TestWorkingBeatmap(beatmap));
+
+            var issues = check.Run(context).ToList();
+
+            Assert.That(issues, Is.Empty);
+        }
     }
 }

From 17aac0694eec257217bb8f546806d9021cb97147 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 17 Jul 2023 19:19:03 +0200
Subject: [PATCH 1400/1604] Re-enable connection retrying on discord connector

---
 osu.Desktop/DiscordRichPresence.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Desktop/DiscordRichPresence.cs b/osu.Desktop/DiscordRichPresence.cs
index b1e11d7a60..caf0a1d9fd 100644
--- a/osu.Desktop/DiscordRichPresence.cs
+++ b/osu.Desktop/DiscordRichPresence.cs
@@ -54,9 +54,6 @@ namespace osu.Desktop
 
             client.OnReady += onReady;
 
-            // safety measure for now, until we performance test / improve backoff for failed connections.
-            client.OnConnectionFailed += (_, _) => client.Deinitialize();
-
             client.OnError += (_, e) => Logger.Log($"An error occurred with Discord RPC Client: {e.Code} {e.Message}", LoggingTarget.Network);
 
             config.BindWith(OsuSetting.DiscordRichPresence, privacyMode);

From ff529d9df7d66dc3191c6f75b3691df451c7aeb9 Mon Sep 17 00:00:00 2001
From: NiceAesth <nice@aesth.dev>
Date: Mon, 17 Jul 2023 20:48:53 +0300
Subject: [PATCH 1401/1604] Rename variables, fix check message formatting

---
 osu.Game/Rulesets/Edit/Checks/CheckBreaks.cs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBreaks.cs b/osu.Game/Rulesets/Edit/Checks/CheckBreaks.cs
index 12dc5554f4..54dfb557fe 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBreaks.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBreaks.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Edit.Checks
     {
         // Breaks may be off by 1 ms.
         private const int leniency_threshold = 1;
-        private const double min_start_threshold = 200;
+        private const double minimum_gap_before_break = 200;
 
         // Break end time depends on the upcoming object's pre-empt time.
         // As things stand, "pre-empt time" is only defined for osu! standard
@@ -40,13 +40,13 @@ namespace osu.Game.Rulesets.Edit.Checks
             {
                 foreach (var breakPeriod in context.Beatmap.Breaks)
                 {
-                    double diffStart = breakPeriod.StartTime - hitObject.GetEndTime();
-                    double diffEnd = hitObject.StartTime - breakPeriod.EndTime;
+                    double gapBeforeBreak = breakPeriod.StartTime - hitObject.GetEndTime();
+                    double gapAfterBreak = hitObject.StartTime - breakPeriod.EndTime;
 
-                    if (diffStart < min_start_threshold - leniency_threshold && diffStart > 0)
-                        yield return new IssueTemplateEarlyStart(this).Create(breakPeriod.StartTime, min_start_threshold - diffStart);
-                    else if (diffEnd < min_end_threshold - leniency_threshold && diffEnd > 0)
-                        yield return new IssueTemplateLateEnd(this).Create(breakPeriod.StartTime, min_end_threshold - diffEnd);
+                    if (gapBeforeBreak < minimum_gap_before_break - leniency_threshold && gapBeforeBreak > 0)
+                        yield return new IssueTemplateEarlyStart(this).Create(breakPeriod.StartTime, minimum_gap_before_break - gapBeforeBreak);
+                    else if (gapAfterBreak < min_end_threshold - leniency_threshold && gapAfterBreak > 0)
+                        yield return new IssueTemplateLateEnd(this).Create(breakPeriod.StartTime, min_end_threshold - gapAfterBreak);
                 }
             }
         }
@@ -74,11 +74,11 @@ namespace osu.Game.Rulesets.Edit.Checks
         public class IssueTemplateTooShort : IssueTemplate
         {
             public IssueTemplateTooShort(ICheck check)
-                : base(check, IssueType.Warning, "Break is non-functional due to being less than 650ms.")
+                : base(check, IssueType.Warning, "Break is non-functional due to being less than {0} ms.")
             {
             }
 
-            public Issue Create(double startTime) => new Issue(startTime, this);
+            public Issue Create(double startTime) => new Issue(startTime, this, BreakPeriod.MIN_BREAK_DURATION);
         }
     }
 }

From e6e66c6aefa197732de8b0d425cc736870332147 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 18 Jul 2023 13:08:23 +0900
Subject: [PATCH 1402/1604] Remove mention of clock being nullable in
 `IBeatSyncProvider`

Co-authored-by: Susko3 <Susko3@protonmail.com>
---
 osu.Game/Beatmaps/IBeatSyncProvider.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/IBeatSyncProvider.cs b/osu.Game/Beatmaps/IBeatSyncProvider.cs
index 776552cfa5..61fcf7f8e2 100644
--- a/osu.Game/Beatmaps/IBeatSyncProvider.cs
+++ b/osu.Game/Beatmaps/IBeatSyncProvider.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Beatmaps
         ControlPointInfo? ControlPoints { get; }
 
         /// <summary>
-        /// Access a clock currently responsible for providing beat sync. If <c>null</c>, no current provider is available.
+        /// Access a clock currently responsible for providing beat sync.
         /// </summary>
         IClock Clock { get; }
     }

From 49bb0b190a6531a8f65bccec747747ae31858f27 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 18 Jul 2023 16:14:54 +0900
Subject: [PATCH 1403/1604] Split out star constant to reuse in pool definition

---
 osu.Game/Screens/Menu/StarFountain.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Menu/StarFountain.cs b/osu.Game/Screens/Menu/StarFountain.cs
index 7fa996e39a..3cfa529d40 100644
--- a/osu.Game/Screens/Menu/StarFountain.cs
+++ b/osu.Game/Screens/Menu/StarFountain.cs
@@ -13,6 +13,8 @@ namespace osu.Game.Screens.Menu
 {
     public partial class StarFountain : CompositeDrawable
     {
+        private const int stars_per_shoot = 192;
+
         private DrawablePool<Star> starPool = null!;
         private Container starContainer = null!;
 
@@ -21,7 +23,7 @@ namespace osu.Game.Screens.Menu
         {
             InternalChildren = new Drawable[]
             {
-                starPool = new DrawablePool<Star>(192),
+                starPool = new DrawablePool<Star>(stars_per_shoot),
                 starContainer = new Container()
             };
         }
@@ -31,8 +33,6 @@ namespace osu.Game.Screens.Menu
             // left centre or right movement.
             int direction = RNG.Next(-1, 2);
 
-            const int total_stars = 192;
-
             const float x_velocity_from_direction = 0.6f;
             const float x_velocity_random_variance = 0.25f;
 
@@ -42,7 +42,7 @@ namespace osu.Game.Screens.Menu
             const float x_spawn_position_variance = 10;
             const float y_spawn_position_offset = 50;
 
-            for (int i = 0; i < total_stars; i++)
+            for (int i = 0; i < stars_per_shoot; i++)
             {
                 double initialOffset = i * 3;
 

From f4acc86df8ad3ea0d36b78bc2a7603322f954a36 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 18 Jul 2023 16:26:37 +0900
Subject: [PATCH 1404/1604] Adjust metrics to closer match expectations

---
 osu.Game/Screens/Menu/StarFountain.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Menu/StarFountain.cs b/osu.Game/Screens/Menu/StarFountain.cs
index 3cfa529d40..3b4fdd7abf 100644
--- a/osu.Game/Screens/Menu/StarFountain.cs
+++ b/osu.Game/Screens/Menu/StarFountain.cs
@@ -33,30 +33,30 @@ namespace osu.Game.Screens.Menu
             // left centre or right movement.
             int direction = RNG.Next(-1, 2);
 
-            const float x_velocity_from_direction = 0.6f;
-            const float x_velocity_random_variance = 0.25f;
+            const float x_velocity_from_direction = 0.8f;
+            const float x_velocity_random_variance = 0.15f;
 
             const float y_velocity_base = -2.0f;
-            const float y_velocity_random_variance = 0.25f;
+            const float y_velocity_random_variance = 0.15f;
 
             const float x_spawn_position_variance = 10;
             const float y_spawn_position_offset = 50;
 
             for (int i = 0; i < stars_per_shoot; i++)
             {
-                double initialOffset = i * 3;
+                double capturedIndex = i;
 
                 starContainer.Add(starPool.Get(s =>
                 {
                     s.Velocity = new Vector2(
-                        direction * x_velocity_from_direction + getRandomVariance(x_velocity_random_variance),
+                        direction * x_velocity_from_direction * (1 - 2 * ((float)capturedIndex / stars_per_shoot)) + getRandomVariance(x_velocity_random_variance),
                         y_velocity_base + getRandomVariance(y_velocity_random_variance));
 
                     s.Position = new Vector2(getRandomVariance(x_spawn_position_variance), y_spawn_position_offset);
 
                     s.Hide();
 
-                    using (s.BeginDelayedSequence(initialOffset))
+                    using (s.BeginDelayedSequence(capturedIndex * 3))
                     {
                         double duration = RNG.Next(300, 1300);
 

From c02684d985e426b8dab1bf175204026cff2845e3 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Tue, 18 Jul 2023 12:18:43 +0200
Subject: [PATCH 1405/1604] truncate hit object end time

---
 osu.Game/Database/LegacyBeatmapExporter.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Database/LegacyBeatmapExporter.cs b/osu.Game/Database/LegacyBeatmapExporter.cs
index 42d8a72073..3b2282c234 100644
--- a/osu.Game/Database/LegacyBeatmapExporter.cs
+++ b/osu.Game/Database/LegacyBeatmapExporter.cs
@@ -60,6 +60,9 @@ namespace osu.Game.Database
             {
                 hitObject.StartTime = Math.Floor(hitObject.StartTime);
 
+                if (hitObject is IHasDuration hasDuration && hitObject is not IHasPath)
+                    hasDuration.Duration = Math.Floor(hasDuration.Duration);
+
                 if (hitObject is not IHasPath hasPath || BezierConverter.CountSegments(hasPath.Path.ControlPoints) <= 1) continue;
 
                 var newControlPoints = BezierConverter.ConvertToModernBezier(hasPath.Path.ControlPoints);

From bcdf5310390021d2b5b4996c6d88293846a12004 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Tue, 18 Jul 2023 12:28:35 +0200
Subject: [PATCH 1406/1604] truncate end time before start time

---
 osu.Game/Database/LegacyBeatmapExporter.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Database/LegacyBeatmapExporter.cs b/osu.Game/Database/LegacyBeatmapExporter.cs
index 3b2282c234..983d25a25a 100644
--- a/osu.Game/Database/LegacyBeatmapExporter.cs
+++ b/osu.Game/Database/LegacyBeatmapExporter.cs
@@ -58,10 +58,11 @@ namespace osu.Game.Database
 
             foreach (var hitObject in beatmapContent.HitObjects)
             {
-                hitObject.StartTime = Math.Floor(hitObject.StartTime);
-
+                // Truncate end time before truncating start time because end time is dependent on start time
                 if (hitObject is IHasDuration hasDuration && hitObject is not IHasPath)
-                    hasDuration.Duration = Math.Floor(hasDuration.Duration);
+                    hasDuration.Duration = Math.Floor(hasDuration.EndTime) - Math.Floor(hitObject.StartTime);
+
+                hitObject.StartTime = Math.Floor(hitObject.StartTime);
 
                 if (hitObject is not IHasPath hasPath || BezierConverter.CountSegments(hasPath.Path.ControlPoints) <= 1) continue;
 

From 395dd23966d0ae3fb15b13b8e0b8c6628e1a310b Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Tue, 18 Jul 2023 12:37:37 +0200
Subject: [PATCH 1407/1604] Put 'Export package' and 'Export legacy package' in
 one nested menu

---
 osu.Game/Localisation/EditorStrings.cs |  9 +++++++--
 osu.Game/Screens/Edit/Editor.cs        | 14 ++++++++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Localisation/EditorStrings.cs b/osu.Game/Localisation/EditorStrings.cs
index 70392d5c83..07b4dddc05 100644
--- a/osu.Game/Localisation/EditorStrings.cs
+++ b/osu.Game/Localisation/EditorStrings.cs
@@ -40,9 +40,14 @@ namespace osu.Game.Localisation
         public static LocalisableString ExportPackage => new TranslatableString(getKey(@"export_package"), @"Export package");
 
         /// <summary>
-        /// "Export legacy package"
+        /// "Legacy format (.osz)"
         /// </summary>
-        public static LocalisableString ExportLegacyPackage => new TranslatableString(getKey(@"export_legacy_package"), @"Export legacy package");
+        public static LocalisableString ExportLegacyFormat => new TranslatableString(getKey(@"export_legacy_format"), @"Legacy format (.osz)");
+
+        /// <summary>
+        /// "New format (.olz)"
+        /// </summary>
+        public static LocalisableString ExportNewFormat => new TranslatableString(getKey(@"export_new_format"), @"New format (.olz)");
 
         /// <summary>
         /// "Create new difficulty"
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index a48c57f991..16cd7768fa 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -998,8 +998,7 @@ namespace osu.Game.Screens.Edit
         private List<MenuItem> createFileMenuItems() => new List<MenuItem>
         {
             new EditorMenuItem(WebCommonStrings.ButtonsSave, MenuItemType.Standard, () => Save()),
-            new EditorMenuItem(EditorStrings.ExportPackage, MenuItemType.Standard, exportBeatmap) { Action = { Disabled = !RuntimeInfo.IsDesktop } },
-            new EditorMenuItem(EditorStrings.ExportLegacyPackage, MenuItemType.Standard, exportLegacyBeatmap) { Action = { Disabled = !RuntimeInfo.IsDesktop } },
+            createExportPackageMenu(),
             new EditorMenuItemSpacer(),
             createDifficultyCreationMenu(),
             createDifficultySwitchMenu(),
@@ -1009,6 +1008,17 @@ namespace osu.Game.Screens.Edit
             new EditorMenuItem(CommonStrings.Exit, MenuItemType.Standard, this.Exit)
         };
 
+        private EditorMenuItem createExportPackageMenu()
+        {
+            var exportItems = new List<MenuItem>
+            {
+                new EditorMenuItem(EditorStrings.ExportNewFormat, MenuItemType.Standard, exportBeatmap) { Action = { Disabled = !RuntimeInfo.IsDesktop } },
+                new EditorMenuItem(EditorStrings.ExportLegacyFormat, MenuItemType.Standard, exportLegacyBeatmap) { Action = { Disabled = !RuntimeInfo.IsDesktop } },
+            };
+
+            return new EditorMenuItem(EditorStrings.ExportPackage) { Items = exportItems };
+        }
+
         private void exportBeatmap()
         {
             Save();

From 63dd8bd991835344cbbf3e0c88b8f4b749ea1029 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Tue, 18 Jul 2023 12:40:48 +0200
Subject: [PATCH 1408/1604] use base.GetFileContents to get file stream

---
 osu.Game/Database/LegacyBeatmapExporter.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Database/LegacyBeatmapExporter.cs b/osu.Game/Database/LegacyBeatmapExporter.cs
index 983d25a25a..b90ea73244 100644
--- a/osu.Game/Database/LegacyBeatmapExporter.cs
+++ b/osu.Game/Database/LegacyBeatmapExporter.cs
@@ -8,7 +8,6 @@ using System.Text;
 using osu.Framework.Platform;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Formats;
-using osu.Game.Extensions;
 using osu.Game.IO;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
@@ -36,7 +35,7 @@ namespace osu.Game.Database
                 return base.GetFileContents(model, file);
 
             // Read the beatmap contents and skin
-            using var contentStream = UserFileStorage.GetStream(file.File.GetStoragePath());
+            using var contentStream = base.GetFileContents(model, file);
 
             if (contentStream == null)
                 return null;
@@ -44,7 +43,7 @@ namespace osu.Game.Database
             using var contentStreamReader = new LineBufferedReader(contentStream);
             var beatmapContent = new LegacyBeatmapDecoder().Decode(contentStreamReader);
 
-            using var skinStream = UserFileStorage.GetStream(file.File.GetStoragePath());
+            using var skinStream = base.GetFileContents(model, file);
             using var skinStreamReader = new LineBufferedReader(contentStream);
             var beatmapSkin = new LegacySkin(new SkinInfo(), null!)
             {

From ccbb30cdda8370ad626b30a56d1d9c7f169d03ec Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 18 Jul 2023 19:52:45 +0900
Subject: [PATCH 1409/1604] Fix `ParticleSpewer` not correctly accounting for
 lower frame rates (and spawning less particles)

---
 osu.Game/Graphics/ParticleSpewer.cs | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Graphics/ParticleSpewer.cs b/osu.Game/Graphics/ParticleSpewer.cs
index 8519cf0c59..02053e1be7 100644
--- a/osu.Game/Graphics/ParticleSpewer.cs
+++ b/osu.Game/Graphics/ParticleSpewer.cs
@@ -20,9 +20,9 @@ namespace osu.Game.Graphics
     {
         private readonly FallingParticle[] particles;
         private int currentIndex;
-        private double lastParticleAdded;
+        private double? lastParticleAdded;
 
-        private readonly double cooldown;
+        private readonly double timeBetweenSpawns;
         private readonly double maxDuration;
 
         /// <summary>
@@ -44,7 +44,7 @@ namespace osu.Game.Graphics
 
             particles = new FallingParticle[perSecond * (int)Math.Ceiling(maxDuration / 1000)];
 
-            cooldown = 1000f / perSecond;
+            timeBetweenSpawns = 1000f / perSecond;
             this.maxDuration = maxDuration;
         }
 
@@ -52,18 +52,27 @@ namespace osu.Game.Graphics
         {
             base.Update();
 
-            if (Active.Value && CanSpawnParticles && Math.Abs(Time.Current - lastParticleAdded) > cooldown)
+            Invalidate(Invalidation.DrawNode);
+
+            if (!Active.Value || !CanSpawnParticles)
             {
+                lastParticleAdded = null;
+                return;
+            }
+
+            while (lastParticleAdded == null || Math.Abs(Time.Current - lastParticleAdded.Value) > timeBetweenSpawns)
+            {
+                lastParticleAdded ??= Time.Current;
+
                 var newParticle = CreateParticle();
-                newParticle.StartTime = (float)Time.Current;
+                newParticle.StartTime = (float)lastParticleAdded;
 
                 particles[currentIndex] = newParticle;
 
                 currentIndex = (currentIndex + 1) % particles.Length;
-                lastParticleAdded = Time.Current;
-            }
 
-            Invalidate(Invalidation.DrawNode);
+                lastParticleAdded += timeBetweenSpawns;
+            }
         }
 
         /// <summary>

From ba237a0e3aad8e37b4a75f2a0d79afdf51005e58 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 18 Jul 2023 19:52:58 +0900
Subject: [PATCH 1410/1604] Convert `StarFountain` to use `ParticleSpewer`

More efficient
---
 osu.Game/Screens/Menu/StarFountain.cs | 129 +++++++++++---------------
 1 file changed, 54 insertions(+), 75 deletions(-)

diff --git a/osu.Game/Screens/Menu/StarFountain.cs b/osu.Game/Screens/Menu/StarFountain.cs
index 3b4fdd7abf..debf0007eb 100644
--- a/osu.Game/Screens/Menu/StarFountain.cs
+++ b/osu.Game/Screens/Menu/StarFountain.cs
@@ -2,113 +2,92 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Pooling;
+using osu.Framework.Graphics.Textures;
 using osu.Framework.Utils;
+using osu.Game.Graphics;
 using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Screens.Menu
 {
-    public partial class StarFountain : CompositeDrawable
+    public partial class StarFountain : SkinReloadableDrawable
     {
-        private const int stars_per_shoot = 192;
+        private StarFountainSpewer spewer = null!;
 
-        private DrawablePool<Star> starPool = null!;
-        private Container starContainer = null!;
+        [Resolved]
+        private TextureStore textures { get; set; } = null!;
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            InternalChildren = new Drawable[]
-            {
-                starPool = new DrawablePool<Star>(stars_per_shoot),
-                starContainer = new Container()
-            };
+            InternalChild = spewer = new StarFountainSpewer();
         }
 
-        public void Shoot()
+        public void Shoot() => spewer.Shoot();
+
+        protected override void SkinChanged(ISkinSource skin)
         {
-            // left centre or right movement.
-            int direction = RNG.Next(-1, 2);
+            base.SkinChanged(skin);
+            spewer.Texture = skin.GetTexture("Menu/fountain-star") ?? textures.Get("Menu/fountain-star");
+        }
 
-            const float x_velocity_from_direction = 0.8f;
-            const float x_velocity_random_variance = 0.15f;
+        public partial class StarFountainSpewer : ParticleSpewer
+        {
+            private const int particle_duration_min = 300;
+            private const int particle_duration_max = 1000;
 
-            const float y_velocity_base = -2.0f;
-            const float y_velocity_random_variance = 0.15f;
+            private double? lastShootTime;
+            private int lastShootDirection;
 
-            const float x_spawn_position_variance = 10;
-            const float y_spawn_position_offset = 50;
+            protected override float ParticleGravity => 800;
 
-            for (int i = 0; i < stars_per_shoot; i++)
+            private const double shoot_duration = 800;
+
+            protected override bool CanSpawnParticles => lastShootTime != null && Time.Current - lastShootTime < shoot_duration;
+
+            [Resolved]
+            private ISkinSource skin { get; set; } = null!;
+
+            public StarFountainSpewer()
+                : base(null, 240, particle_duration_max)
             {
-                double capturedIndex = i;
-
-                starContainer.Add(starPool.Get(s =>
-                {
-                    s.Velocity = new Vector2(
-                        direction * x_velocity_from_direction * (1 - 2 * ((float)capturedIndex / stars_per_shoot)) + getRandomVariance(x_velocity_random_variance),
-                        y_velocity_base + getRandomVariance(y_velocity_random_variance));
-
-                    s.Position = new Vector2(getRandomVariance(x_spawn_position_variance), y_spawn_position_offset);
-
-                    s.Hide();
-
-                    using (s.BeginDelayedSequence(capturedIndex * 3))
-                    {
-                        double duration = RNG.Next(300, 1300);
-
-                        s.ScaleTo(1)
-                         .ScaleTo(RNG.NextSingle(1, 2.8f), duration, Easing.Out)
-                         .FadeOutFromOne(duration, Easing.Out)
-                         .Expire();
-                    }
-                }));
             }
-        }
-
-        private partial class Star : PoolableDrawable
-        {
-            public Vector2 Velocity = Vector2.Zero;
-
-            private float rotation;
 
             [BackgroundDependencyLoader]
-            private void load()
+            private void load(TextureStore textures)
             {
-                AutoSizeAxes = Axes.Both;
-                Origin = Anchor.Centre;
+                Texture = skin.GetTexture("Menu/fountain-star") ?? textures.Get("Menu/fountain-star");
+                Active.Value = true;
+            }
 
-                InternalChildren = new Drawable[]
+            protected override FallingParticle CreateParticle()
+            {
+                return new FallingParticle
                 {
-                    new SkinnableSprite("Menu/fountain-star")
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        Blending = BlendingParameters.Additive,
-                    }
+                    StartPosition = new Vector2(0, 50),
+                    Duration = RNG.NextSingle(particle_duration_min, particle_duration_max),
+                    StartAngle = getRandomVariance(4),
+                    EndAngle = getRandomVariance(2),
+                    EndScale = 1.4f + getRandomVariance(0.4f),
+                    Velocity = new Vector2(getCurrentAngle(), -1200 + getRandomVariance(100)),
                 };
-
-                rotation = getRandomVariance(2);
             }
 
-            protected override void Update()
+            private float getCurrentAngle()
             {
-                const float gravity = 0.003f;
+                const float x_velocity_from_direction = 500;
+                const float x_velocity_random_variance = 60;
 
-                base.Update();
-
-                float elapsed = (float)Time.Elapsed;
-
-                Position += Velocity * elapsed;
-                Velocity += new Vector2(0, elapsed * gravity);
-
-                Rotation += rotation * elapsed;
+                return lastShootDirection * x_velocity_from_direction * (float)(1 - 2 * (Clock.CurrentTime - lastShootTime!.Value) / shoot_duration) + getRandomVariance(x_velocity_random_variance);
             }
-        }
 
-        private static float getRandomVariance(float variance) => RNG.NextSingle(-variance, variance);
+            public void Shoot()
+            {
+                lastShootTime = Clock.CurrentTime;
+                lastShootDirection = RNG.Next(-1, 2);
+            }
+
+            private static float getRandomVariance(float variance) => RNG.NextSingle(-variance, variance);
+        }
     }
 }

From e7a9175aeae253a515c8a8ab0d40985853de28ec Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Tue, 18 Jul 2023 13:08:05 +0200
Subject: [PATCH 1411/1604] fix skin using wrong stream

---
 osu.Game/Database/LegacyBeatmapExporter.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Database/LegacyBeatmapExporter.cs b/osu.Game/Database/LegacyBeatmapExporter.cs
index b90ea73244..e054652efa 100644
--- a/osu.Game/Database/LegacyBeatmapExporter.cs
+++ b/osu.Game/Database/LegacyBeatmapExporter.cs
@@ -44,7 +44,11 @@ namespace osu.Game.Database
             var beatmapContent = new LegacyBeatmapDecoder().Decode(contentStreamReader);
 
             using var skinStream = base.GetFileContents(model, file);
-            using var skinStreamReader = new LineBufferedReader(contentStream);
+
+            if (skinStream == null)
+                return null;
+
+            using var skinStreamReader = new LineBufferedReader(skinStream);
             var beatmapSkin = new LegacySkin(new SkinInfo(), null!)
             {
                 Configuration = new LegacySkinDecoder().Decode(skinStreamReader)

From 2e3d1fe950d292e6764715c892aa9ad0759d94b2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Jul 2023 13:38:04 +0900
Subject: [PATCH 1412/1604] Fix regression in time jumping behaviour

---
 .../Gameplay/TestSceneParticleSpewer.cs       |  6 +--
 osu.Game/Graphics/ParticleSpewer.cs           | 47 ++++++++++++++-----
 2 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneParticleSpewer.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneParticleSpewer.cs
index c73d57dc2b..8fb34883bb 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneParticleSpewer.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneParticleSpewer.cs
@@ -69,13 +69,13 @@ namespace osu.Game.Tests.Visual.Gameplay
                 spewer.Clock = new FramedClock(testClock);
             });
             AddStep("start spewer", () => spewer.Active.Value = true);
-            AddAssert("spawned first particle", () => spewer.TotalCreatedParticles == 1);
+            AddAssert("spawned first particle", () => spewer.TotalCreatedParticles, () => Is.EqualTo(1));
 
             AddStep("move clock forward", () => testClock.CurrentTime = TestParticleSpewer.MAX_DURATION * 3);
-            AddAssert("spawned second particle", () => spewer.TotalCreatedParticles == 2);
+            AddAssert("spawned second particle", () => spewer.TotalCreatedParticles, () => Is.EqualTo(2));
 
             AddStep("move clock backwards", () => testClock.CurrentTime = TestParticleSpewer.MAX_DURATION * -1);
-            AddAssert("spawned third particle", () => spewer.TotalCreatedParticles == 3);
+            AddAssert("spawned third particle", () => spewer.TotalCreatedParticles, () => Is.EqualTo(3));
         }
 
         private TestParticleSpewer createSpewer() =>
diff --git a/osu.Game/Graphics/ParticleSpewer.cs b/osu.Game/Graphics/ParticleSpewer.cs
index 02053e1be7..c761ec0b7e 100644
--- a/osu.Game/Graphics/ParticleSpewer.cs
+++ b/osu.Game/Graphics/ParticleSpewer.cs
@@ -4,6 +4,7 @@
 #nullable disable
 
 using System;
+using System.Diagnostics;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
@@ -60,19 +61,43 @@ namespace osu.Game.Graphics
                 return;
             }
 
-            while (lastParticleAdded == null || Math.Abs(Time.Current - lastParticleAdded.Value) > timeBetweenSpawns)
+            // Always want to spawn the first particle in an activation immediately.
+            if (lastParticleAdded == null)
             {
-                lastParticleAdded ??= Time.Current;
-
-                var newParticle = CreateParticle();
-                newParticle.StartTime = (float)lastParticleAdded;
-
-                particles[currentIndex] = newParticle;
-
-                currentIndex = (currentIndex + 1) % particles.Length;
-
-                lastParticleAdded += timeBetweenSpawns;
+                lastParticleAdded = Time.Current;
+                spawnParticle();
             }
+
+            double timeElapsed = Math.Abs(Time.Current - lastParticleAdded.Value);
+
+            // Avoid spawning too many particles if a long amount of time has passed.
+            if (timeElapsed > maxDuration)
+            {
+                lastParticleAdded = Time.Current;
+                spawnParticle();
+                return;
+            }
+
+            Debug.Assert(lastParticleAdded != null);
+
+            for (int i = 0; i < timeElapsed / timeBetweenSpawns; i++)
+            {
+                lastParticleAdded += timeBetweenSpawns;
+                spawnParticle();
+            }
+        }
+
+        private void spawnParticle()
+        {
+            Debug.Assert(lastParticleAdded != null);
+
+            var newParticle = CreateParticle();
+
+            newParticle.StartTime = (float)lastParticleAdded.Value;
+
+            particles[currentIndex] = newParticle;
+
+            currentIndex = (currentIndex + 1) % particles.Length;
         }
 
         /// <summary>

From 7fa95f7512f8b7737c1d569dcb2158b73939c89c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Jul 2023 13:52:43 +0900
Subject: [PATCH 1413/1604] Fix `#region`

---
 osu.Game/Graphics/ParticleSpewer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/ParticleSpewer.cs b/osu.Game/Graphics/ParticleSpewer.cs
index c761ec0b7e..9cf3fb1882 100644
--- a/osu.Game/Graphics/ParticleSpewer.cs
+++ b/osu.Game/Graphics/ParticleSpewer.cs
@@ -107,7 +107,7 @@ namespace osu.Game.Graphics
 
         protected override DrawNode CreateDrawNode() => new ParticleSpewerDrawNode(this);
 
-        # region DrawNode
+        #region DrawNode
 
         private class ParticleSpewerDrawNode : SpriteDrawNode
         {

From 5e2a0bd73302f2f6be74bb9792d0e067f1c092ac Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Jul 2023 14:10:27 +0900
Subject: [PATCH 1414/1604] Fix spawning edge case when elapsed became
 unexpectedly negative

---
 osu.Game/Graphics/ParticleSpewer.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/ParticleSpewer.cs b/osu.Game/Graphics/ParticleSpewer.cs
index 9cf3fb1882..37a4fe77bd 100644
--- a/osu.Game/Graphics/ParticleSpewer.cs
+++ b/osu.Game/Graphics/ParticleSpewer.cs
@@ -66,12 +66,13 @@ namespace osu.Game.Graphics
             {
                 lastParticleAdded = Time.Current;
                 spawnParticle();
+                return;
             }
 
-            double timeElapsed = Math.Abs(Time.Current - lastParticleAdded.Value);
+            double timeElapsed = Time.Current - lastParticleAdded.Value;
 
             // Avoid spawning too many particles if a long amount of time has passed.
-            if (timeElapsed > maxDuration)
+            if (Math.Abs(timeElapsed) > maxDuration)
             {
                 lastParticleAdded = Time.Current;
                 spawnParticle();

From b9a66ad7b346aa26d49a875a522deb8932b8dca9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Jul 2023 14:58:45 +0900
Subject: [PATCH 1415/1604] Add test coverage of incorrect selection behaviour

---
 .../Editor/TestSceneOsuComposerSelection.cs   | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuComposerSelection.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuComposerSelection.cs
index 8641663ce8..623cefff6b 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuComposerSelection.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuComposerSelection.cs
@@ -25,6 +25,35 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
     {
         protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new TestBeatmap(ruleset, false);
 
+        [Test]
+        public void TestSelectAfterFadedOut()
+        {
+            var slider = new Slider
+            {
+                StartTime = 0,
+                Position = new Vector2(100, 100),
+                Path = new SliderPath
+                {
+                    ControlPoints =
+                    {
+                        new PathControlPoint(),
+                        new PathControlPoint(new Vector2(100))
+                    }
+                }
+            };
+            AddStep("add slider", () => EditorBeatmap.Add(slider));
+
+            moveMouseToObject(() => slider);
+
+            AddStep("seek after end", () => EditorClock.Seek(750));
+            AddStep("left click", () => InputManager.Click(MouseButton.Left));
+            AddAssert("slider not selected", () => EditorBeatmap.SelectedHitObjects.Count == 0);
+
+            AddStep("seek to visible", () => EditorClock.Seek(650));
+            AddStep("left click", () => InputManager.Click(MouseButton.Left));
+            AddUntilStep("slider selected", () => EditorBeatmap.SelectedHitObjects.Single() == slider);
+        }
+
         [Test]
         public void TestContextMenuShownCorrectlyForSelectedSlider()
         {

From 4a6a5b174a3255b8479edb2ab4683fd779040925 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Jul 2023 14:52:31 +0900
Subject: [PATCH 1416/1604] Fix editor blueprints being selectable for too long
 when hit markers are enabled

Addresses https://github.com/ppy/osu/discussions/24163.
---
 .../Edit/Blueprints/OsuSelectionBlueprint.cs          | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/OsuSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/OsuSelectionBlueprint.cs
index bdd19f9106..178b809d8b 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/OsuSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/OsuSelectionBlueprint.cs
@@ -22,7 +22,16 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints
         protected override bool AlwaysShowWhenSelected => true;
 
         protected override bool ShouldBeAlive => base.ShouldBeAlive
-                                                 || (DrawableObject is not DrawableSpinner && ShowHitMarkers.Value && editorClock.CurrentTime >= Item.StartTime && editorClock.CurrentTime - Item.GetEndTime() < HitCircleOverlapMarker.FADE_OUT_EXTENSION);
+                                                 || (DrawableObject is not DrawableSpinner && ShowHitMarkers.Value && editorClock.CurrentTime >= Item.StartTime
+                                                     && editorClock.CurrentTime - Item.GetEndTime() < HitCircleOverlapMarker.FADE_OUT_EXTENSION);
+
+        public override bool HandlePositionalInput =>
+            // Bypass fade out extension from hit markers for input handling purposes.
+            // This is to match stable, where even when the afterimage hit markers are still visible, objects are not selectable.
+            //
+            // Note that we are intentionally overriding HandlePositionalInput here and not ReceivePositionalInputAt
+            // as individual blueprint implementations override that.
+            base.ShouldBeAlive;
 
         protected OsuSelectionBlueprint(T hitObject)
             : base(hitObject)

From 871056790b4bfb56fb5d5fad4e3e224673b53987 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Jul 2023 15:01:20 +0900
Subject: [PATCH 1417/1604] Mark editor tile as non-localisable

---
 osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs b/osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs
index fa4e52d6a6..e958849bb0 100644
--- a/osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs
+++ b/osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs
@@ -61,8 +61,8 @@ namespace osu.Game.Screens.Edit.Components.Menus
                 },
             });
 
-            text.AddText("osu!", t => t.Font = OsuFont.TorusAlternate);
-            text.AddText("editor", t =>
+            text.AddText(@"osu!", t => t.Font = OsuFont.TorusAlternate);
+            text.AddText(@"editor", t =>
             {
                 t.Font = OsuFont.TorusAlternate;
                 t.Colour = colourProvider.Highlight1;

From 55a41b0887ff6e7d78502f40dc61204eda4c0306 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Jul 2023 15:13:20 +0900
Subject: [PATCH 1418/1604] Fix overlap between header text and menu items

---
 osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs b/osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs
index e958849bb0..b9385ff0c3 100644
--- a/osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs
+++ b/osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs
@@ -25,7 +25,10 @@ namespace osu.Game.Screens.Edit.Components.Menus
             RelativeSizeAxes = Axes.X;
 
             MaskingContainer.CornerRadius = 0;
-            ItemsContainer.Padding = new MarginPadding { Left = heading_area };
+            ItemsContainer.Padding = new MarginPadding();
+
+            ContentContainer.Margin = new MarginPadding { Left = heading_area };
+            ContentContainer.Masking = true;
         }
 
         [BackgroundDependencyLoader]

From 4e4dcc9846cdb1c9c052b021d3d90681ce877bff Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Jul 2023 16:32:04 +0900
Subject: [PATCH 1419/1604] Add test coverage of selection preferring closest
 objects

---
 .../Editing/TestSceneComposerSelection.cs     | 75 ++++++++++++++++++-
 1 file changed, 72 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneComposerSelection.cs b/osu.Game.Tests/Visual/Editing/TestSceneComposerSelection.cs
index d6934a3770..be5dd59206 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneComposerSelection.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneComposerSelection.cs
@@ -6,21 +6,21 @@
 using System;
 using System.Linq;
 using NUnit.Framework;
-using osu.Framework.Testing;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu;
-using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components;
+using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.UI;
-using osu.Game.Tests.Beatmaps;
 using osu.Game.Screens.Edit.Compose.Components;
+using osu.Game.Tests.Beatmaps;
 using osuTK;
 using osuTK.Input;
 
@@ -217,6 +217,75 @@ namespace osu.Game.Tests.Visual.Editing
             AddAssert("2 hitobjects selected", () => EditorBeatmap.SelectedHitObjects.Count == 2 && !EditorBeatmap.SelectedHitObjects.Contains(addedObjects[1]));
         }
 
+        [Test]
+        public void TestNearestSelection()
+        {
+            var firstObject = new HitCircle { Position = new Vector2(256, 192), StartTime = 0 };
+            var secondObject = new HitCircle { Position = new Vector2(256, 192), StartTime = 600 };
+
+            AddStep("add hitobjects", () => EditorBeatmap.AddRange(new[] { firstObject, secondObject }));
+
+            moveMouseToObject(() => firstObject);
+
+            AddStep("seek near first", () => EditorClock.Seek(100));
+            AddStep("left click", () => InputManager.Click(MouseButton.Left));
+            AddAssert("first selected", () => EditorBeatmap.SelectedHitObjects.Single(), () => Is.EqualTo(firstObject));
+
+            AddStep("deselect", () => EditorBeatmap.SelectedHitObjects.Clear());
+
+            AddStep("seek near second", () => EditorClock.Seek(500));
+            AddStep("left click", () => InputManager.Click(MouseButton.Left));
+            AddAssert("second selected", () => EditorBeatmap.SelectedHitObjects.Single(), () => Is.EqualTo(secondObject));
+
+            AddStep("deselect", () => EditorBeatmap.SelectedHitObjects.Clear());
+
+            AddStep("seek halfway", () => EditorClock.Seek(300));
+            AddStep("left click", () => InputManager.Click(MouseButton.Left));
+            AddAssert("first selected", () => EditorBeatmap.SelectedHitObjects.Single(), () => Is.EqualTo(firstObject));
+        }
+
+        [Test]
+        public void TestNearestSelectionWithEndTime()
+        {
+            var firstObject = new Slider
+            {
+                Position = new Vector2(256, 192),
+                StartTime = 0,
+                Path = new SliderPath(new[]
+                {
+                    new PathControlPoint(),
+                    new PathControlPoint(new Vector2(50, 0)),
+                })
+            };
+
+            var secondObject = new HitCircle
+            {
+                Position = new Vector2(256, 192),
+                StartTime = 600
+            };
+
+            AddStep("add hitobjects", () => EditorBeatmap.AddRange(new HitObject[] { firstObject, secondObject }));
+
+            moveMouseToObject(() => firstObject);
+
+            AddStep("seek near first", () => EditorClock.Seek(100));
+            AddStep("left click", () => InputManager.Click(MouseButton.Left));
+            AddAssert("first selected", () => EditorBeatmap.SelectedHitObjects.Single(), () => Is.EqualTo(firstObject));
+
+            AddStep("deselect", () => EditorBeatmap.SelectedHitObjects.Clear());
+
+            AddStep("seek near second", () => EditorClock.Seek(500));
+            AddStep("left click", () => InputManager.Click(MouseButton.Left));
+            AddAssert("second selected", () => EditorBeatmap.SelectedHitObjects.Single(), () => Is.EqualTo(secondObject));
+
+            AddStep("deselect", () => EditorBeatmap.SelectedHitObjects.Clear());
+
+            AddStep("seek roughly halfway", () => EditorClock.Seek(350));
+            AddStep("left click", () => InputManager.Click(MouseButton.Left));
+            // Slider gets priority due to end time.
+            AddAssert("first selected", () => EditorBeatmap.SelectedHitObjects.Single(), () => Is.EqualTo(firstObject));
+        }
+
         [TestCase(false)]
         [TestCase(true)]
         public void TestMultiSelectFromDrag(bool alreadySelectedBeforeDrag)

From 5ade093c5a70f32971ed26422c7c53f29b6529bd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Jul 2023 15:55:38 +0900
Subject: [PATCH 1420/1604] Change editor to always perform selection of
 closest object

---
 .../Compose/Components/BlueprintContainer.cs  | 27 ++++++++++++++-----
 .../Components/EditorBlueprintContainer.cs    |  5 ++++
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 56a6b18433..5fdd2634c4 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -381,6 +381,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </summary>
         private bool selectedBlueprintAlreadySelectedOnMouseDown;
 
+        protected virtual IEnumerable<SelectionBlueprint<T>> ApplySelectionOrder(IEnumerable<SelectionBlueprint<T>> blueprints) => blueprints.Reverse();
+
         /// <summary>
         /// Attempts to select any hovered blueprints.
         /// </summary>
@@ -390,15 +392,28 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             // Iterate from the top of the input stack (blueprints closest to the front of the screen first).
             // Priority is given to already-selected blueprints.
-            foreach (SelectionBlueprint<T> blueprint in SelectionBlueprints.AliveChildren.Reverse().OrderByDescending(b => b.IsSelected))
+            foreach (SelectionBlueprint<T> blueprint in SelectionBlueprints.AliveChildren.Where(b => b.IsSelected))
             {
-                if (!blueprint.IsHovered) continue;
+                if (runForBlueprint(blueprint))
+                    return true;
+            }
 
-                selectedBlueprintAlreadySelectedOnMouseDown = blueprint.State == SelectionState.Selected;
-                return clickSelectionHandled = SelectionHandler.MouseDownSelectionRequested(blueprint, e);
+            foreach (SelectionBlueprint<T> blueprint in ApplySelectionOrder(SelectionBlueprints.AliveChildren))
+            {
+                if (runForBlueprint(blueprint))
+                    return true;
             }
 
             return false;
+
+            bool runForBlueprint(SelectionBlueprint<T> blueprint)
+            {
+                if (!blueprint.IsHovered) return false;
+
+                selectedBlueprintAlreadySelectedOnMouseDown = blueprint.State == SelectionState.Selected;
+                clickSelectionHandled = SelectionHandler.MouseDownSelectionRequested(blueprint, e);
+                return true;
+            }
         }
 
         /// <summary>
@@ -432,13 +447,13 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
                 // The depth of blueprints is constantly changing (see above where selected blueprints are brought to the front).
                 // For this logic, we want a stable sort order so we can correctly cycle, thus using the blueprintMap instead.
-                IEnumerable<SelectionBlueprint<T>> cyclingSelectionBlueprints = blueprintMap.Values;
+                IEnumerable<SelectionBlueprint<T>> cyclingSelectionBlueprints = ApplySelectionOrder(blueprintMap.Values);
 
                 // If there's already a selection, let's start from the blueprint after the selection.
                 cyclingSelectionBlueprints = cyclingSelectionBlueprints.SkipWhile(b => !b.IsSelected).Skip(1);
 
                 // Add the blueprints from before the selection to the end of the enumerable to allow for cyclic selection.
-                cyclingSelectionBlueprints = cyclingSelectionBlueprints.Concat(blueprintMap.Values.TakeWhile(b => !b.IsSelected));
+                cyclingSelectionBlueprints = cyclingSelectionBlueprints.Concat(ApplySelectionOrder(blueprintMap.Values).TakeWhile(b => !b.IsSelected));
 
                 foreach (SelectionBlueprint<T> blueprint in cyclingSelectionBlueprints)
                 {
diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
index 65797a968d..ad0e8b124b 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
@@ -129,6 +130,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
             return true;
         }
 
+        protected override IEnumerable<SelectionBlueprint<HitObject>> ApplySelectionOrder(IEnumerable<SelectionBlueprint<HitObject>> blueprints) =>
+            base.ApplySelectionOrder(blueprints)
+                .OrderBy(b => Math.Min(Math.Abs(EditorClock.CurrentTime - b.Item.GetEndTime()), Math.Abs(EditorClock.CurrentTime - b.Item.StartTime)));
+
         protected override Container<SelectionBlueprint<HitObject>> CreateSelectionBlueprintContainer() => new HitObjectOrderedSelectionContainer { RelativeSizeAxes = Axes.Both };
 
         protected override SelectionHandler<HitObject> CreateSelectionHandler() => new EditorSelectionHandler();

From 9d46d00294cda3ea10fca9507d008975efcc91d2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Jul 2023 16:17:42 +0900
Subject: [PATCH 1421/1604] Update skin editor cyclic test to match
 expectations better

---
 .../Visual/Gameplay/TestSceneSkinEditor.cs    | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
index 7b37b6624d..4e5db5d46e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
@@ -138,24 +138,28 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestCyclicSelection()
         {
-            SkinBlueprint[] blueprints = null!;
+            List<SkinBlueprint> blueprints = new List<SkinBlueprint>();
 
-            AddStep("Add big black boxes", () =>
+            AddStep("clear list", () => blueprints.Clear());
+
+            for (int i = 0; i < 3; i++)
             {
-                InputManager.MoveMouseTo(skinEditor.ChildrenOfType<BigBlackBox>().First());
-                InputManager.Click(MouseButton.Left);
-                InputManager.Click(MouseButton.Left);
-                InputManager.Click(MouseButton.Left);
-            });
+                AddStep("Add big black box", () =>
+                {
+                    InputManager.MoveMouseTo(skinEditor.ChildrenOfType<BigBlackBox>().First());
+                    InputManager.Click(MouseButton.Left);
+                });
+
+                AddStep("store box", () =>
+                {
+                    // Add blueprints one-by-one so we have a stable order for testing reverse cyclic selection against.
+                    blueprints.Add(skinEditor.ChildrenOfType<SkinBlueprint>().Single(s => s.IsSelected));
+                });
+            }
 
             AddAssert("Three black boxes added", () => targetContainer.Components.OfType<BigBlackBox>().Count(), () => Is.EqualTo(3));
 
-            AddStep("Store black box blueprints", () =>
-            {
-                blueprints = skinEditor.ChildrenOfType<SkinBlueprint>().Where(b => b.Item is BigBlackBox).ToArray();
-            });
-
-            AddAssert("Selection is black box 1", () => skinEditor.SelectedComponents.Single(), () => Is.EqualTo(blueprints[0].Item));
+            AddAssert("Selection is last", () => skinEditor.SelectedComponents.Single(), () => Is.EqualTo(blueprints[2].Item));
 
             AddStep("move cursor to black box", () =>
             {
@@ -164,13 +168,13 @@ namespace osu.Game.Tests.Visual.Gameplay
             });
 
             AddStep("click on black box stack", () => InputManager.Click(MouseButton.Left));
-            AddAssert("Selection is black box 2", () => skinEditor.SelectedComponents.Single(), () => Is.EqualTo(blueprints[1].Item));
+            AddAssert("Selection is second last", () => skinEditor.SelectedComponents.Single(), () => Is.EqualTo(blueprints[1].Item));
 
             AddStep("click on black box stack", () => InputManager.Click(MouseButton.Left));
-            AddAssert("Selection is black box 3", () => skinEditor.SelectedComponents.Single(), () => Is.EqualTo(blueprints[2].Item));
+            AddAssert("Selection is last", () => skinEditor.SelectedComponents.Single(), () => Is.EqualTo(blueprints[0].Item));
 
             AddStep("click on black box stack", () => InputManager.Click(MouseButton.Left));
-            AddAssert("Selection is black box 1", () => skinEditor.SelectedComponents.Single(), () => Is.EqualTo(blueprints[0].Item));
+            AddAssert("Selection is first", () => skinEditor.SelectedComponents.Single(), () => Is.EqualTo(blueprints[2].Item));
 
             AddStep("select all boxes", () =>
             {

From 5ec9cd84b25631ba0bc8ed2c0efcadc331a60afe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Jul 2023 17:13:19 +0900
Subject: [PATCH 1422/1604] Change offset calibration control to adjust for all
 difficulties of the current beatmap set

---
 .../Play/PlayerSettings/BeatmapOffsetControl.cs | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs b/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
index b542707185..840077eb7f 100644
--- a/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
@@ -162,17 +162,20 @@ namespace osu.Game.Screens.Play.PlayerSettings
 
                 realmWriteTask = realm.WriteAsync(r =>
                 {
-                    var settings = r.Find<BeatmapInfo>(beatmap.Value.BeatmapInfo.ID)?.UserSettings;
+                    var setInfo = r.Find<BeatmapSetInfo>(beatmap.Value.BeatmapSetInfo.ID);
 
-                    if (settings == null) // only the case for tests.
+                    if (setInfo == null) // only the case for tests.
                         return;
 
-                    double val = Current.Value;
+                    // Apply to all difficulties in a beatmap set for now (they generally always share timing).
+                    foreach (var b in setInfo.Beatmaps)
+                    {
+                        BeatmapUserSettings settings = b.UserSettings;
+                        double val = Current.Value;
 
-                    if (settings.Offset == val)
-                        return;
-
-                    settings.Offset = val;
+                        if (settings.Offset != val)
+                            settings.Offset = val;
+                    }
                 });
             }
         }

From d33b174243ef6fe98b3c9ac64cfb6f4ccc91d91c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Jul 2023 17:21:17 +0900
Subject: [PATCH 1423/1604] Add test coverage of beatmap editor cyclic
 selection

---
 .../Editing/TestSceneComposerSelection.cs     | 79 +++++++++++++++++++
 1 file changed, 79 insertions(+)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneComposerSelection.cs b/osu.Game.Tests/Visual/Editing/TestSceneComposerSelection.cs
index be5dd59206..d7fb13390f 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneComposerSelection.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneComposerSelection.cs
@@ -286,6 +286,85 @@ namespace osu.Game.Tests.Visual.Editing
             AddAssert("first selected", () => EditorBeatmap.SelectedHitObjects.Single(), () => Is.EqualTo(firstObject));
         }
 
+        [Test]
+        public void TestCyclicSelection()
+        {
+            var firstObject = new HitCircle { Position = new Vector2(256, 192), StartTime = 0 };
+            var secondObject = new HitCircle { Position = new Vector2(256, 192), StartTime = 300 };
+            var thirdObject = new HitCircle { Position = new Vector2(256, 192), StartTime = 600 };
+
+            AddStep("add hitobjects", () => EditorBeatmap.AddRange(new[] { firstObject, secondObject, thirdObject }));
+
+            moveMouseToObject(() => firstObject);
+
+            AddStep("left click", () => InputManager.Click(MouseButton.Left));
+            AddAssert("first selected", () => EditorBeatmap.SelectedHitObjects.Single(), () => Is.EqualTo(firstObject));
+
+            AddStep("left click", () => InputManager.Click(MouseButton.Left));
+            AddAssert("second selected", () => EditorBeatmap.SelectedHitObjects.Single(), () => Is.EqualTo(secondObject));
+
+            AddStep("left click", () => InputManager.Click(MouseButton.Left));
+            AddAssert("third selected", () => EditorBeatmap.SelectedHitObjects.Single(), () => Is.EqualTo(thirdObject));
+
+            // cycle around
+            AddStep("left click", () => InputManager.Click(MouseButton.Left));
+            AddAssert("first selected", () => EditorBeatmap.SelectedHitObjects.Single(), () => Is.EqualTo(firstObject));
+        }
+
+        [Test]
+        public void TestCyclicSelectionOutwards()
+        {
+            var firstObject = new HitCircle { Position = new Vector2(256, 192), StartTime = 0 };
+            var secondObject = new HitCircle { Position = new Vector2(256, 192), StartTime = 300 };
+            var thirdObject = new HitCircle { Position = new Vector2(256, 192), StartTime = 600 };
+
+            AddStep("add hitobjects", () => EditorBeatmap.AddRange(new[] { firstObject, secondObject, thirdObject }));
+
+            moveMouseToObject(() => firstObject);
+
+            AddStep("seek near first", () => EditorClock.Seek(320));
+
+            AddStep("left click", () => InputManager.Click(MouseButton.Left));
+            AddAssert("second selected", () => EditorBeatmap.SelectedHitObjects.Single(), () => Is.EqualTo(secondObject));
+
+            AddStep("left click", () => InputManager.Click(MouseButton.Left));
+            AddAssert("third selected", () => EditorBeatmap.SelectedHitObjects.Single(), () => Is.EqualTo(thirdObject));
+
+            AddStep("left click", () => InputManager.Click(MouseButton.Left));
+            AddAssert("first selected", () => EditorBeatmap.SelectedHitObjects.Single(), () => Is.EqualTo(firstObject));
+
+            // cycle around
+            AddStep("left click", () => InputManager.Click(MouseButton.Left));
+            AddAssert("second selected", () => EditorBeatmap.SelectedHitObjects.Single(), () => Is.EqualTo(secondObject));
+        }
+
+        [Test]
+        public void TestCyclicSelectionBackwards()
+        {
+            var firstObject = new HitCircle { Position = new Vector2(256, 192), StartTime = 0 };
+            var secondObject = new HitCircle { Position = new Vector2(256, 192), StartTime = 300 };
+            var thirdObject = new HitCircle { Position = new Vector2(256, 192), StartTime = 600 };
+
+            AddStep("add hitobjects", () => EditorBeatmap.AddRange(new[] { firstObject, secondObject, thirdObject }));
+
+            moveMouseToObject(() => firstObject);
+
+            AddStep("seek near first", () => EditorClock.Seek(600));
+
+            AddStep("left click", () => InputManager.Click(MouseButton.Left));
+            AddAssert("third selected", () => EditorBeatmap.SelectedHitObjects.Single(), () => Is.EqualTo(thirdObject));
+
+            AddStep("left click", () => InputManager.Click(MouseButton.Left));
+            AddAssert("second selected", () => EditorBeatmap.SelectedHitObjects.Single(), () => Is.EqualTo(secondObject));
+
+            AddStep("left click", () => InputManager.Click(MouseButton.Left));
+            AddAssert("first selected", () => EditorBeatmap.SelectedHitObjects.Single(), () => Is.EqualTo(firstObject));
+
+            // cycle around
+            AddStep("left click", () => InputManager.Click(MouseButton.Left));
+            AddAssert("third selected", () => EditorBeatmap.SelectedHitObjects.Single(), () => Is.EqualTo(thirdObject));
+        }
+
         [TestCase(false)]
         [TestCase(true)]
         public void TestMultiSelectFromDrag(bool alreadySelectedBeforeDrag)

From cf3949c9e21b3fe4f085a8a43d56b60ecdde5ae6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Jul 2023 15:35:40 +0900
Subject: [PATCH 1424/1604] Fix double-click handling when cyclic selection is
 enabled

Removes the limitations of cyclic selection as a result.
---
 .../SkinEditor/SkinBlueprintContainer.cs      |  2 --
 .../Compose/Components/BlueprintContainer.cs  | 20 +++++++++----------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinBlueprintContainer.cs b/osu.Game/Overlays/SkinEditor/SkinBlueprintContainer.cs
index db27e20010..3f8d9f80d4 100644
--- a/osu.Game/Overlays/SkinEditor/SkinBlueprintContainer.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinBlueprintContainer.cs
@@ -25,8 +25,6 @@ namespace osu.Game.Overlays.SkinEditor
         [Resolved]
         private SkinEditor editor { get; set; } = null!;
 
-        protected override bool AllowCyclicSelection => true;
-
         public SkinBlueprintContainer(ISerialisableDrawableContainer targetContainer)
         {
             this.targetContainer = targetContainer;
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 5fdd2634c4..c8df999d37 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -46,15 +46,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected readonly BindableList<T> SelectedItems = new BindableList<T>();
 
-        /// <summary>
-        /// Whether to allow cyclic selection on clicking multiple times.
-        /// </summary>
-        /// <remarks>
-        /// Disabled by default as it does not work well with editors that support double-clicking or other advanced interactions.
-        /// Can probably be made to work with more thought.
-        /// </remarks>
-        protected virtual bool AllowCyclicSelection => false;
-
         protected BlueprintContainer()
         {
             RelativeSizeAxes = Axes.Both;
@@ -167,6 +158,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (ClickedBlueprint == null || SelectionHandler.SelectedBlueprints.FirstOrDefault(b => b.IsHovered) != ClickedBlueprint)
                 return false;
 
+            doubleClickHandled = true;
             return true;
         }
 
@@ -177,6 +169,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             {
                 endClickSelection(e);
                 clickSelectionHandled = false;
+                doubleClickHandled = false;
                 isDraggingBlueprint = false;
                 wasDragStarted = false;
             });
@@ -376,6 +369,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </summary>
         private bool clickSelectionHandled;
 
+        /// <summary>
+        /// Whether a blueprint was double-clicked since last mouse down.
+        /// </summary>
+        private bool doubleClickHandled;
+
         /// <summary>
         /// Whether the selected blueprint(s) were already selected on mouse down. Generally used to perform selection cycling on mouse up in such a case.
         /// </summary>
@@ -424,7 +422,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         private bool endClickSelection(MouseButtonEvent e)
         {
             // If already handled a selection or drag, we don't want to perform a mouse up / click action.
-            if (clickSelectionHandled || isDraggingBlueprint) return true;
+            if (clickSelectionHandled || doubleClickHandled || isDraggingBlueprint) return true;
 
             if (e.Button != MouseButton.Left) return false;
 
@@ -440,7 +438,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 return false;
             }
 
-            if (!wasDragStarted && selectedBlueprintAlreadySelectedOnMouseDown && SelectedItems.Count == 1 && AllowCyclicSelection)
+            if (!wasDragStarted && selectedBlueprintAlreadySelectedOnMouseDown && SelectedItems.Count == 1)
             {
                 // If a click occurred and was handled by the currently selected blueprint but didn't result in a drag,
                 // cycle between other blueprints which are also under the cursor.

From 94c5b8ed32a322d58b04b894eb65449b81bb9bf8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Jul 2023 17:22:25 +0900
Subject: [PATCH 1425/1604] Apply NRT to `TestSceneComposerSelection`

---
 .../Visual/Editing/TestSceneComposerSelection.cs     | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneComposerSelection.cs b/osu.Game.Tests/Visual/Editing/TestSceneComposerSelection.cs
index d7fb13390f..51e75939fe 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneComposerSelection.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneComposerSelection.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Linq;
 using NUnit.Framework;
@@ -82,7 +80,7 @@ namespace osu.Game.Tests.Visual.Editing
         [Test]
         public void TestNudgeSelection()
         {
-            HitCircle[] addedObjects = null;
+            HitCircle[] addedObjects = null!;
 
             AddStep("add hitobjects", () => EditorBeatmap.AddRange(addedObjects = new[]
             {
@@ -104,7 +102,7 @@ namespace osu.Game.Tests.Visual.Editing
         [Test]
         public void TestRotateHotkeys()
         {
-            HitCircle[] addedObjects = null;
+            HitCircle[] addedObjects = null!;
 
             AddStep("add hitobjects", () => EditorBeatmap.AddRange(addedObjects = new[]
             {
@@ -136,7 +134,7 @@ namespace osu.Game.Tests.Visual.Editing
         [Test]
         public void TestGlobalFlipHotkeys()
         {
-            HitCircle addedObject = null;
+            HitCircle addedObject = null!;
 
             AddStep("add hitobjects", () => EditorBeatmap.Add(addedObject = new HitCircle { StartTime = 100 }));
 
@@ -369,7 +367,7 @@ namespace osu.Game.Tests.Visual.Editing
         [TestCase(true)]
         public void TestMultiSelectFromDrag(bool alreadySelectedBeforeDrag)
         {
-            HitCircle[] addedObjects = null;
+            HitCircle[] addedObjects = null!;
 
             AddStep("add hitobjects", () => EditorBeatmap.AddRange(addedObjects = new[]
             {
@@ -468,7 +466,7 @@ namespace osu.Game.Tests.Visual.Editing
         [Test]
         public void TestQuickDeleteRemovesSliderControlPoint()
         {
-            Slider slider = null;
+            Slider slider = null!;
 
             PathControlPoint[] points =
             {

From e283845b7144d1e16039841af85f3441a3be2a26 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Jul 2023 17:45:07 +0900
Subject: [PATCH 1426/1604] Adjust legacy skin elements to better align with
 skinning expectations

---
 osu.Game/Skinning/LegacyAccuracyCounter.cs | 4 ++--
 osu.Game/Skinning/LegacyScoreCounter.cs    | 2 +-
 osu.Game/Skinning/LegacySkin.cs            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Skinning/LegacyAccuracyCounter.cs b/osu.Game/Skinning/LegacyAccuracyCounter.cs
index c99cdba91c..326257c25f 100644
--- a/osu.Game/Skinning/LegacyAccuracyCounter.cs
+++ b/osu.Game/Skinning/LegacyAccuracyCounter.cs
@@ -17,8 +17,8 @@ namespace osu.Game.Skinning
             Anchor = Anchor.TopRight;
             Origin = Anchor.TopRight;
 
-            Scale = new Vector2(0.6f);
-            Margin = new MarginPadding(10);
+            Scale = new Vector2(0.6f * 0.96f);
+            Margin = new MarginPadding { Vertical = 9, Horizontal = 17 };
         }
 
         protected sealed override OsuSpriteText CreateSpriteText() => new LegacySpriteText(LegacyFont.Score)
diff --git a/osu.Game/Skinning/LegacyScoreCounter.cs b/osu.Game/Skinning/LegacyScoreCounter.cs
index d8ee6b21de..d238369be1 100644
--- a/osu.Game/Skinning/LegacyScoreCounter.cs
+++ b/osu.Game/Skinning/LegacyScoreCounter.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Skinning
             Origin = Anchor.TopRight;
 
             Scale = new Vector2(0.96f);
-            Margin = new MarginPadding(10);
+            Margin = new MarginPadding { Horizontal = 10 };
         }
 
         protected sealed override OsuSpriteText CreateSpriteText() => new LegacySpriteText(LegacyFont.Score)
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 79f13686e8..00c18bef3d 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -368,7 +368,7 @@ namespace osu.Game.Skinning
                                 {
                                     songProgress.Anchor = Anchor.TopRight;
                                     songProgress.Origin = Anchor.CentreRight;
-                                    songProgress.X = -accuracy.ScreenSpaceDeltaToParentSpace(accuracy.ScreenSpaceDrawQuad.Size).X - 10;
+                                    songProgress.X = -accuracy.ScreenSpaceDeltaToParentSpace(accuracy.ScreenSpaceDrawQuad.Size).X - 20;
                                     songProgress.Y = container.ToLocalSpace(accuracy.ScreenSpaceDrawQuad.TopLeft).Y + (accuracy.ScreenSpaceDeltaToParentSpace(accuracy.ScreenSpaceDrawQuad.Size).Y / 2);
                                 }
 

From 61ff3d08d45f2667215c46d1412cd9d3f02e3d5a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Jul 2023 17:48:19 +0900
Subject: [PATCH 1427/1604] Change depth of `LegacySongProgress` to allow
 "skinning" via health bar background

---
 osu.Game/Skinning/LegacySkin.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 00c18bef3d..b72a757e6c 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -397,8 +397,8 @@ namespace osu.Game.Skinning
                                     new LegacyComboCounter(),
                                     new LegacyScoreCounter(),
                                     new LegacyAccuracyCounter(),
-                                    new LegacyHealthDisplay(),
                                     new LegacySongProgress(),
+                                    new LegacyHealthDisplay(),
                                     new BarHitErrorMeter(),
                                     new DefaultKeyCounterDisplay()
                                 }

From eb149942e59b9995cfe31d0287289eb4842a0742 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Jul 2023 19:08:32 +0900
Subject: [PATCH 1428/1604] Add ability to toggle all free mods quickly at
 multiplayer song select

---
 .../TestSceneMultiplayerMatchSongSelect.cs    |   8 ++
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    |   4 +
 .../OnlinePlay/FooterButtonFreeMods.cs        | 106 ++++++++++++++----
 .../OnlinePlay/OnlinePlaySongSelect.cs        |   9 +-
 4 files changed, 104 insertions(+), 23 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
index 947b7e5be6..8dc41cd707 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
@@ -67,6 +67,14 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddUntilStep("wait for present", () => songSelect.IsCurrentScreen() && songSelect.BeatmapSetsLoaded);
         }
 
+        [Test]
+        public void TestSelectFreeMods()
+        {
+            AddStep("set some freemods", () => songSelect.FreeMods.Value = new OsuRuleset().GetModsFor(ModType.Fun).ToArray());
+            AddStep("set all freemods", () => songSelect.FreeMods.Value = new OsuRuleset().CreateAllMods().ToArray());
+            AddStep("set no freemods", () => songSelect.FreeMods.Value = Array.Empty<Mod>());
+        }
+
         [Test]
         public void TestBeatmapConfirmed()
         {
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index c09668850a..ba3f01a688 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -111,6 +111,10 @@ namespace osu.Game.Overlays.Mods
 
         private readonly Bindable<Dictionary<ModType, IReadOnlyList<Mod>>> globalAvailableMods = new Bindable<Dictionary<ModType, IReadOnlyList<Mod>>>();
 
+        public IEnumerable<Mod> AllAvailableAndValidMods => allAvailableMods
+                                                            .Select(s => s.Mod)
+                                                            .Where(m => isValidMod(m));
+
         private IEnumerable<ModState> allAvailableMods => AvailableMods.Value.SelectMany(pair => pair.Value);
 
         private readonly BindableBool customisationVisible = new BindableBool();
diff --git a/osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs b/osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs
index 920aff13a8..56a69be741 100644
--- a/osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs
+++ b/osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs
@@ -1,15 +1,21 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Select;
 using osuTK;
 
@@ -17,28 +23,60 @@ namespace osu.Game.Screens.OnlinePlay
 {
     public partial class FooterButtonFreeMods : FooterButton, IHasCurrentValue<IReadOnlyList<Mod>>
     {
-        public Bindable<IReadOnlyList<Mod>> Current
+        public Bindable<IReadOnlyList<Mod>> Current { get; set; } = new BindableWithCurrent<IReadOnlyList<Mod>>();
+
+        private OsuSpriteText count = null!;
+
+        private Circle circle = null!;
+
+        private readonly FreeModSelectOverlay freeModSelectOverlay;
+
+        public FooterButtonFreeMods(FreeModSelectOverlay freeModSelectOverlay)
         {
-            get => modDisplay.Current;
-            set => modDisplay.Current = value;
+            this.freeModSelectOverlay = freeModSelectOverlay;
         }
 
-        private readonly ModDisplay modDisplay;
-
-        public FooterButtonFreeMods()
-        {
-            ButtonContentContainer.Add(modDisplay = new ModDisplay
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Scale = new Vector2(0.8f),
-                ExpansionMode = ExpansionMode.AlwaysContracted,
-            });
-        }
+        [Resolved]
+        private OsuColour colours { get; set; } = null!;
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load()
         {
+            ButtonContentContainer.AddRange(new[]
+            {
+                new Container
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    AutoSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        circle = new Circle
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Colour = colours.YellowDark,
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                        count = new OsuSpriteText
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Padding = new MarginPadding(5),
+                            UseFullGlyphHeight = false,
+                        }
+                    }
+                },
+                new IconButton
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Scale = new Vector2(0.8f),
+                    Icon = FontAwesome.Solid.Bars,
+                    Action = () => freeModSelectOverlay.ToggleVisibility()
+                }
+            });
+
             SelectedColour = colours.Yellow;
             DeselectedColour = SelectedColour.Opacity(0.5f);
             Text = @"freemods";
@@ -49,14 +87,42 @@ namespace osu.Game.Screens.OnlinePlay
             base.LoadComplete();
 
             Current.BindValueChanged(_ => updateModDisplay(), true);
+
+            // Overwrite any external behaviour as we delegate the main toggle action to a sub-button.
+            Action = toggleAllFreeMods;
+        }
+
+        /// <summary>
+        /// Immediately toggle all free mods on/off.
+        /// </summary>
+        private void toggleAllFreeMods()
+        {
+            var availableMods = freeModSelectOverlay.AllAvailableAndValidMods.ToArray();
+
+            Current.Value = Current.Value.Count == availableMods.Length
+                ? Array.Empty<Mod>()
+                : availableMods;
         }
 
         private void updateModDisplay()
         {
-            if (Current.Value?.Count > 0)
-                modDisplay.FadeIn();
+            int current = Current.Value.Count;
+
+            if (current == freeModSelectOverlay.AllAvailableAndValidMods.Count())
+            {
+                count.Text = "all";
+                circle.FadeColour(colours.Yellow, 200, Easing.OutQuint);
+            }
+            else if (current > 0)
+            {
+                count.Text = $"{current} mods";
+                circle.FadeColour(colours.YellowDark, 200, Easing.OutQuint);
+            }
             else
-                modDisplay.FadeOut();
+            {
+                count.Text = "off";
+                circle.FadeColour(colours.Gray4, 200, Easing.OutQuint);
+            }
         }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
index e0ae437d49..622ffddba6 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
@@ -175,9 +175,12 @@ namespace osu.Game.Screens.OnlinePlay
 
         protected override IEnumerable<(FooterButton, OverlayContainer?)> CreateFooterButtons()
         {
-            var buttons = base.CreateFooterButtons().ToList();
-            buttons.Insert(buttons.FindIndex(b => b.Item1 is FooterButtonMods) + 1, (new FooterButtonFreeMods { Current = FreeMods }, freeModSelectOverlay));
-            return buttons;
+            var baseButtons = base.CreateFooterButtons().ToList();
+            var freeModsButton = new FooterButtonFreeMods(freeModSelectOverlay) { Current = FreeMods };
+
+            baseButtons.Insert(baseButtons.FindIndex(b => b.Item1 is FooterButtonMods) + 1, (freeModsButton, freeModSelectOverlay));
+
+            return baseButtons;
         }
 
         /// <summary>

From 310067b4c358c5fa5210b5990e6fd76dbefe14cd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Jul 2023 19:11:19 +0900
Subject: [PATCH 1429/1604] Update resources

---
 osu.Game/osu.Game.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 8febabb61b..4ea788a808 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -37,7 +37,7 @@
     </PackageReference>
     <PackageReference Include="Realm" Version="11.1.2" />
     <PackageReference Include="ppy.osu.Framework" Version="2023.710.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.707.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.719.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />

From 18aace177a7fdcd9a6756229326b102f669c7d53 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Jul 2023 19:36:51 +0900
Subject: [PATCH 1430/1604] Fix deadlock when logging out while at the create
 match screen

Closes https://github.com/ppy/osu/issues/24275.
---
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs |  9 +++++++++
 .../Multiplayer/MultiplayerMatchSubScreen.cs       | 14 ++++----------
 osu.Game/Screens/OnlinePlay/OnlinePlaySubScreen.cs |  6 ++----
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 6b68024393..6e126a928a 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -23,6 +23,7 @@ using osu.Framework.Screens;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Input.Bindings;
+using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
@@ -76,6 +77,9 @@ namespace osu.Game.Screens.OnlinePlay.Match
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
+        [Resolved]
+        private IAPIProvider api { get; set; } = null!;
+
         [Resolved(canBeNull: true)]
         protected OnlinePlayScreen ParentScreen { get; private set; }
 
@@ -284,6 +288,8 @@ namespace osu.Game.Screens.OnlinePlay.Match
         [Resolved(canBeNull: true)]
         private IDialogOverlay dialogOverlay { get; set; }
 
+        protected virtual bool IsConnected => api.State.Value == APIState.Online;
+
         public override bool OnBackButton()
         {
             if (Room.RoomID.Value == null)
@@ -356,6 +362,9 @@ namespace osu.Game.Screens.OnlinePlay.Match
             if (ExitConfirmed)
                 return true;
 
+            if (!IsConnected)
+                return true;
+
             if (dialogOverlay == null || Room.RoomID.Value != null || Room.Playlist.Count == 0)
                 return true;
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 01f04b44c9..f5746ca96c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -17,7 +17,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Online;
-using osu.Game.Online.API;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
@@ -50,9 +49,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         [Resolved]
         private MultiplayerClient client { get; set; }
 
-        [Resolved]
-        private IAPIProvider api { get; set; }
-
         [Resolved(canBeNull: true)]
         private OsuGame game { get; set; }
 
@@ -79,6 +75,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 handleRoomLost();
         }
 
+        protected override bool IsConnected => base.IsConnected && client.IsConnected.Value;
+
         protected override Drawable CreateMainContent() => new Container
         {
             RelativeSizeAxes = Axes.Both,
@@ -254,13 +252,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         public override bool OnExiting(ScreenExitEvent e)
         {
-            // the room may not be left immediately after a disconnection due to async flow,
-            // so checking the MultiplayerClient / IAPIAccess statuses is also required.
-            if (client.Room == null || !client.IsConnected.Value || api.State.Value != APIState.Online)
-            {
-                // room has not been created yet or we're offline; exit immediately.
+            // room has not been created yet or we're offline; exit immediately.
+            if (client.Room == null || !IsConnected)
                 return base.OnExiting(e);
-            }
 
             if (!exitConfirmed && dialogOverlay != null)
             {
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlaySubScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlaySubScreen.cs
index c7b32131cf..b527bf98a2 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlaySubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlaySubScreen.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Screens;
@@ -15,8 +13,8 @@ namespace osu.Game.Screens.OnlinePlay
 
         public virtual string ShortTitle => Title;
 
-        [Resolved(CanBeNull = true)]
-        protected IRoomManager RoomManager { get; private set; }
+        [Resolved]
+        protected IRoomManager? RoomManager { get; private set; }
 
         protected OnlinePlaySubScreen()
         {

From e47722565ae2c53ee38f156a027aa197e54e3c7c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Jul 2023 19:39:10 +0900
Subject: [PATCH 1431/1604] Clarify guard condition in `RoomSubScreen`

---
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 6e126a928a..75b673cf1b 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -365,7 +365,9 @@ namespace osu.Game.Screens.OnlinePlay.Match
             if (!IsConnected)
                 return true;
 
-            if (dialogOverlay == null || Room.RoomID.Value != null || Room.Playlist.Count == 0)
+            bool hasUnsavedChanges = Room.RoomID.Value == null && Room.Playlist.Count > 0;
+
+            if (dialogOverlay == null || !hasUnsavedChanges)
                 return true;
 
             // if the dialog is already displayed, block exiting until the user explicitly makes a decision.

From 764029bde1eda3976982238bf9d1cba6ebe56fa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 19 Jul 2023 19:23:08 +0200
Subject: [PATCH 1432/1604] Fix nullability inspection

---
 .../OnlinePlay/Multiplayer/MultiplayerLoungeSubScreen.cs        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerLoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerLoungeSubScreen.cs
index dd4f35cdd4..4478179726 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerLoungeSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerLoungeSubScreen.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             // To work around this, temporarily remove the room and trigger an immediate listing poll.
             if (e.Last is MultiplayerMatchSubScreen match)
             {
-                RoomManager.RemoveRoom(match.Room);
+                RoomManager?.RemoveRoom(match.Room);
                 ListingPollingComponent.PollImmediately();
             }
         }

From fa29c25097a178ad04a08c5c8ab26a3c918e847e Mon Sep 17 00:00:00 2001
From: NiceAesth <nice@aesth.dev>
Date: Thu, 20 Jul 2023 00:32:35 +0300
Subject: [PATCH 1433/1604] Change check to use binary search

---
 osu.Game/Rulesets/Edit/Checks/CheckBreaks.cs | 57 ++++++++++++++++----
 1 file changed, 48 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBreaks.cs b/osu.Game/Rulesets/Edit/Checks/CheckBreaks.cs
index 54dfb557fe..44d2c18dad 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBreaks.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBreaks.cs
@@ -34,23 +34,62 @@ namespace osu.Game.Rulesets.Edit.Checks
             {
                 if (breakPeriod.Duration < BreakPeriod.MIN_BREAK_DURATION)
                     yield return new IssueTemplateTooShort(this).Create(breakPeriod.StartTime);
-            }
 
-            foreach (var hitObject in context.Beatmap.HitObjects)
-            {
-                foreach (var breakPeriod in context.Beatmap.Breaks)
+                var previousObject = getPreviousObject(breakPeriod.StartTime, context.Beatmap.HitObjects);
+                var nextObject = getNextObject(breakPeriod.EndTime, context.Beatmap.HitObjects);
+
+                if (previousObject != null)
                 {
-                    double gapBeforeBreak = breakPeriod.StartTime - hitObject.GetEndTime();
-                    double gapAfterBreak = hitObject.StartTime - breakPeriod.EndTime;
-
-                    if (gapBeforeBreak < minimum_gap_before_break - leniency_threshold && gapBeforeBreak > 0)
+                    double gapBeforeBreak = breakPeriod.StartTime - previousObject.GetEndTime();
+                    if (gapBeforeBreak < minimum_gap_before_break - leniency_threshold)
                         yield return new IssueTemplateEarlyStart(this).Create(breakPeriod.StartTime, minimum_gap_before_break - gapBeforeBreak);
-                    else if (gapAfterBreak < min_end_threshold - leniency_threshold && gapAfterBreak > 0)
+                }
+
+                if (nextObject != null)
+                {
+                    double gapAfterBreak = nextObject.StartTime - breakPeriod.EndTime;
+                    if (gapAfterBreak < min_end_threshold - leniency_threshold)
                         yield return new IssueTemplateLateEnd(this).Create(breakPeriod.StartTime, min_end_threshold - gapAfterBreak);
                 }
             }
         }
 
+        private HitObject? getPreviousObject(double time, IReadOnlyList<HitObject> hitObjects)
+        {
+            int left = 0;
+            int right = hitObjects.Count - 1;
+
+            while (left <= right)
+            {
+                int mid = left + (right - left) / 2;
+
+                if (hitObjects[mid].GetEndTime() < time)
+                    left = mid + 1;
+                else
+                    right = mid - 1;
+            }
+
+            return right >= 0 ? hitObjects[right] : null;
+        }
+
+        private HitObject? getNextObject(double time, IReadOnlyList<HitObject> hitObjects)
+        {
+            int left = 0;
+            int right = hitObjects.Count - 1;
+
+            while (left <= right)
+            {
+                int mid = left + (right - left) / 2;
+
+                if (hitObjects[mid].StartTime <= time)
+                    left = mid + 1;
+                else
+                    right = mid - 1;
+            }
+
+            return left < hitObjects.Count ? hitObjects[left] : null;
+        }
+
         public class IssueTemplateEarlyStart : IssueTemplate
         {
             public IssueTemplateEarlyStart(ICheck check)

From ce78bb549f2e5d9c09bf91402f55a7d26555f191 Mon Sep 17 00:00:00 2001
From: NiceAesth <nice@aesth.dev>
Date: Thu, 20 Jul 2023 00:32:54 +0300
Subject: [PATCH 1434/1604] Add test for multiple too early objects in break

---
 .../Editing/Checks/CheckBreaksTest.cs         | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/osu.Game.Tests/Editing/Checks/CheckBreaksTest.cs b/osu.Game.Tests/Editing/Checks/CheckBreaksTest.cs
index 39e414827a..aaa536f9b9 100644
--- a/osu.Game.Tests/Editing/Checks/CheckBreaksTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckBreaksTest.cs
@@ -88,6 +88,30 @@ namespace osu.Game.Tests.Editing.Checks
             Assert.That(issues.Single().Template is CheckBreaks.IssueTemplateLateEnd);
         }
 
+        [Test]
+        public void TestBreakMultipleObjectsEarly()
+        {
+            var beatmap = new Beatmap<HitObject>
+            {
+                HitObjects =
+                {
+                    new HitCircle { StartTime = 0 },
+                    new HitCircle { StartTime = 1_297 },
+                    new HitCircle { StartTime = 1_298 }
+                },
+                Breaks = new List<BreakPeriod>
+                {
+                    new BreakPeriod(200, 850)
+                }
+            };
+            var context = new BeatmapVerifierContext(beatmap, new TestWorkingBeatmap(beatmap));
+
+            var issues = check.Run(context).ToList();
+
+            Assert.That(issues, Has.Count.EqualTo(1));
+            Assert.That(issues.Single().Template is CheckBreaks.IssueTemplateLateEnd);
+        }
+
         [Test]
         public void TestBreaksCorrect()
         {

From 18c5fc689f4dc799ab433eb041ca9c09482668ac Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 Jul 2023 12:58:13 +0900
Subject: [PATCH 1435/1604] Don't expose such specific information from
 `ModSelectOverlay`

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs         | 14 +++++---------
 .../Screens/OnlinePlay/FooterButtonFreeMods.cs     |  8 ++++++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index ba3f01a688..7ec108e3ec 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -111,11 +111,7 @@ namespace osu.Game.Overlays.Mods
 
         private readonly Bindable<Dictionary<ModType, IReadOnlyList<Mod>>> globalAvailableMods = new Bindable<Dictionary<ModType, IReadOnlyList<Mod>>>();
 
-        public IEnumerable<Mod> AllAvailableAndValidMods => allAvailableMods
-                                                            .Select(s => s.Mod)
-                                                            .Where(m => isValidMod(m));
-
-        private IEnumerable<ModState> allAvailableMods => AvailableMods.Value.SelectMany(pair => pair.Value);
+        public IEnumerable<ModState> AllAvailableMods => AvailableMods.Value.SelectMany(pair => pair.Value);
 
         private readonly BindableBool customisationVisible = new BindableBool();
 
@@ -386,7 +382,7 @@ namespace osu.Game.Overlays.Mods
 
         private void filterMods()
         {
-            foreach (var modState in allAvailableMods)
+            foreach (var modState in AllAvailableMods)
                 modState.ValidForSelection.Value = modState.Mod.HasImplementation && IsValidMod.Invoke(modState.Mod);
         }
 
@@ -411,7 +407,7 @@ namespace osu.Game.Overlays.Mods
             bool anyCustomisableModActive = false;
             bool anyModPendingConfiguration = false;
 
-            foreach (var modState in allAvailableMods)
+            foreach (var modState in AllAvailableMods)
             {
                 anyCustomisableModActive |= modState.Active.Value && modState.Mod.GetSettingsSourceProperties().Any();
                 anyModPendingConfiguration |= modState.PendingConfiguration;
@@ -468,7 +464,7 @@ namespace osu.Game.Overlays.Mods
 
             var newSelection = new List<Mod>();
 
-            foreach (var modState in allAvailableMods)
+            foreach (var modState in AllAvailableMods)
             {
                 var matchingSelectedMod = SelectedMods.Value.SingleOrDefault(selected => selected.GetType() == modState.Mod.GetType());
 
@@ -495,7 +491,7 @@ namespace osu.Game.Overlays.Mods
             if (externalSelectionUpdateInProgress)
                 return;
 
-            var candidateSelection = allAvailableMods.Where(modState => modState.Active.Value)
+            var candidateSelection = AllAvailableMods.Where(modState => modState.Active.Value)
                                                      .Select(modState => modState.Mod)
                                                      .ToArray();
 
diff --git a/osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs b/osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs
index 56a69be741..294c80677d 100644
--- a/osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs
+++ b/osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs
@@ -97,7 +97,7 @@ namespace osu.Game.Screens.OnlinePlay
         /// </summary>
         private void toggleAllFreeMods()
         {
-            var availableMods = freeModSelectOverlay.AllAvailableAndValidMods.ToArray();
+            var availableMods = allAvailableAndValidMods.ToArray();
 
             Current.Value = Current.Value.Count == availableMods.Length
                 ? Array.Empty<Mod>()
@@ -108,7 +108,7 @@ namespace osu.Game.Screens.OnlinePlay
         {
             int current = Current.Value.Count;
 
-            if (current == freeModSelectOverlay.AllAvailableAndValidMods.Count())
+            if (current == allAvailableAndValidMods.Count())
             {
                 count.Text = "all";
                 circle.FadeColour(colours.Yellow, 200, Easing.OutQuint);
@@ -124,5 +124,9 @@ namespace osu.Game.Screens.OnlinePlay
                 circle.FadeColour(colours.Gray4, 200, Easing.OutQuint);
             }
         }
+
+        private IEnumerable<Mod> allAvailableAndValidMods => freeModSelectOverlay.AllAvailableMods
+                                                                                 .Where(state => state.ValidForSelection.Value)
+                                                                                 .Select(state => state.Mod);
     }
 }

From c93d6a4008639b68a9f6508d6b5e46f9e800df9d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 Jul 2023 13:04:21 +0900
Subject: [PATCH 1436/1604] Invert text colour when freemods is enabled for
 better contrast

---
 osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs b/osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs
index 294c80677d..3825cf18b9 100644
--- a/osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs
+++ b/osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs
@@ -111,16 +111,19 @@ namespace osu.Game.Screens.OnlinePlay
             if (current == allAvailableAndValidMods.Count())
             {
                 count.Text = "all";
+                count.FadeColour(colours.Gray2, 200, Easing.OutQuint);
                 circle.FadeColour(colours.Yellow, 200, Easing.OutQuint);
             }
             else if (current > 0)
             {
                 count.Text = $"{current} mods";
+                count.FadeColour(colours.Gray2, 200, Easing.OutQuint);
                 circle.FadeColour(colours.YellowDark, 200, Easing.OutQuint);
             }
             else
             {
                 count.Text = "off";
+                count.FadeColour(colours.GrayF, 200, Easing.OutQuint);
                 circle.FadeColour(colours.Gray4, 200, Easing.OutQuint);
             }
         }

From d9d055361aa956e5233d38c689aa9077033d104a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 Jul 2023 17:49:23 +0900
Subject: [PATCH 1437/1604] More realm analytic disables

---
 .gitignore               | 1 -
 osu.Game/FodyWeavers.xml | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/FodyWeavers.xml

diff --git a/.gitignore b/.gitignore
index 0c7a18b437..525b3418cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -339,6 +339,5 @@ inspectcode
 
 # Fody (pulled in by Realm) - schema file
 FodyWeavers.xsd
-**/FodyWeavers.xml
 
 .idea/.idea.osu.Desktop/.idea/misc.xml
\ No newline at end of file
diff --git a/osu.Game/FodyWeavers.xml b/osu.Game/FodyWeavers.xml
new file mode 100644
index 0000000000..7ff486f40c
--- /dev/null
+++ b/osu.Game/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <Realm DisableAnalytics="true" />
+</Weavers>

From f791f21dcb3bc22c439838f2f7bee5d84310b757 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 Jul 2023 20:05:35 +0900
Subject: [PATCH 1438/1604] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 059c5f26e7..ed97f609cc 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.716.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.720.0" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 16c8160fb6..eed5cfb69d 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,7 +36,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="11.1.2" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.716.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.720.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.707.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 01ab409fe4..272e17a288 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -16,6 +16,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.716.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.720.0" />
   </ItemGroup>
 </Project>

From 71a643d6400f0c1d47c53632d690ee5311c04bb9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 Jul 2023 18:33:39 +0900
Subject: [PATCH 1439/1604] Update inspection rules in line with source
 generation change

---
 osu.sln.DotSettings | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index 482095db57..ef39c12768 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -140,6 +140,8 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ParameterHidesMember/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ParameterOnlyUsedForPreconditionCheck_002EGlobal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ParameterOnlyUsedForPreconditionCheck_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PartialMethodWithSinglePart/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PartialTypeWithSinglePart/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PatternAlwaysOfType/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PossibleInterfaceMemberAmbiguity/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PossibleMultipleEnumeration/@EntryIndexedValue">HINT</s:String>

From 733ce4c38272d747c749a985247c8db83f8c6f36 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 20 Jul 2023 22:30:48 +0900
Subject: [PATCH 1440/1604] Fix incorrect dependency caching

These are tested framework-side to throw exceptions, but the
test is ignored for the source generated version because it quietly
allows this scenario.

The source gen project should eventually have an analyser for these
unsupported cases, or we could consider relaxing this particular case.
---
 osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs      | 7 ++++++-
 .../Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs    | 7 ++++++-
 .../Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs        | 7 ++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index 74249007e4..aa89342926 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         private HUDOverlay hudOverlay = null!;
 
         [Cached(typeof(ScoreProcessor))]
-        private ScoreProcessor scoreProcessor => gameplayState.ScoreProcessor;
+        private ScoreProcessor scoreProcessor { get; set; }
 
         [Cached(typeof(HealthProcessor))]
         private HealthProcessor healthProcessor = new DrainingHealthProcessor(0);
@@ -47,6 +47,11 @@ namespace osu.Game.Tests.Visual.Gameplay
         private Drawable hideTarget => hudOverlay.ChildrenOfType<SkinComponentsContainer>().First();
         private Drawable keyCounterFlow => hudOverlay.ChildrenOfType<KeyCounterDisplay>().First().ChildrenOfType<FillFlowContainer<KeyCounter>>().Single();
 
+        public TestSceneHUDOverlay()
+        {
+            scoreProcessor = gameplayState.ScoreProcessor;
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
index 89eb291ab0..81ce088b9d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Tests.Visual.Gameplay
     public partial class TestSceneSkinEditorMultipleSkins : SkinnableTestScene
     {
         [Cached(typeof(ScoreProcessor))]
-        private ScoreProcessor scoreProcessor => gameplayState.ScoreProcessor;
+        private ScoreProcessor scoreProcessor { get; set; }
 
         [Cached(typeof(HealthProcessor))]
         private HealthProcessor healthProcessor = new DrainingHealthProcessor(0);
@@ -37,6 +37,11 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached]
         public readonly EditorClipboard Clipboard = new EditorClipboard();
 
+        public TestSceneSkinEditorMultipleSkins()
+        {
+            scoreProcessor = gameplayState.ScoreProcessor;
+        }
+
         [SetUpSteps]
         public void SetUpSteps()
         {
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
index 162e279403..a8580ebf77 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         private HUDOverlay hudOverlay;
 
         [Cached(typeof(ScoreProcessor))]
-        private ScoreProcessor scoreProcessor => gameplayState.ScoreProcessor;
+        private ScoreProcessor scoreProcessor { get; set; }
 
         [Cached(typeof(HealthProcessor))]
         private HealthProcessor healthProcessor = new DrainingHealthProcessor(0);
@@ -47,6 +47,11 @@ namespace osu.Game.Tests.Visual.Gameplay
         private Drawable hideTarget => hudOverlay.ChildrenOfType<SkinComponentsContainer>().First();
         private Drawable keyCounterFlow => hudOverlay.ChildrenOfType<KeyCounterDisplay>().First().ChildrenOfType<FillFlowContainer<KeyCounter>>().Single();
 
+        public TestSceneSkinnableHUDOverlay()
+        {
+            scoreProcessor = gameplayState.ScoreProcessor;
+        }
+
         [Test]
         public void TestComboCounterIncrementing()
         {

From 970ea50269f8b248b69aa458a4baa0aa41e7e45b Mon Sep 17 00:00:00 2001
From: chayleaf <chayleaf-git@pavluk.org>
Date: Thu, 20 Jul 2023 20:53:27 +0700
Subject: [PATCH 1441/1604] fix alive hitobjects blocking hits in taiko with hd

---
 .../Mods/TestSceneTaikoModHidden.cs           | 55 +++++++++++++++++--
 .../Mods/TaikoModHidden.cs                    |  6 ++
 2 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModHidden.cs b/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModHidden.cs
index edc53429b1..6e6be26e43 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModHidden.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModHidden.cs
@@ -1,24 +1,71 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Taiko.Mods;
+using osu.Game.Rulesets.Taiko.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Tests.Mods
 {
     public partial class TestSceneTaikoModHidden : TaikoModTestScene
     {
+        private Func<bool> checkAllMaxResultJudgements(int count) => ()
+            => Player.ScoreProcessor.JudgedHits >= count
+               && Player.Results.All(result => result.Type == result.Judgement.MaxResult);
+
         [Test]
         public void TestDefaultBeatmapTest() => CreateModTest(new ModTestData
         {
             Mod = new TaikoModHidden(),
             Autoplay = true,
-            PassCondition = checkSomeAutoplayHits
+            PassCondition = checkAllMaxResultJudgements(4),
         });
 
-        private bool checkSomeAutoplayHits()
-            => Player.ScoreProcessor.JudgedHits >= 4
-               && Player.Results.All(result => result.Type == result.Judgement.MaxResult);
+        [Test]
+        public void TestHitTwoNotesWithinShortPeriod()
+        {
+            const double hit_time = 1;
+
+            var beatmap = new Beatmap<TaikoHitObject>
+            {
+                HitObjects = new List<TaikoHitObject>
+                {
+                    new Hit
+                    {
+                        Type = HitType.Rim,
+                        StartTime = hit_time,
+                    },
+                    new Hit
+                    {
+                        Type = HitType.Centre,
+                        StartTime = hit_time * 2,
+                    },
+                },
+                BeatmapInfo =
+                {
+                    Difficulty = new BeatmapDifficulty
+                    {
+                        SliderTickRate = 4,
+                        OverallDifficulty = 0,
+                    },
+                    Ruleset = new TaikoRuleset().RulesetInfo
+                },
+            };
+
+            beatmap.ControlPointInfo.Add(0, new EffectControlPoint { ScrollSpeed = 0.1f });
+
+            CreateModTest(new ModTestData
+            {
+                Mod = new TaikoModHidden(),
+                Autoplay = true,
+                PassCondition = checkAllMaxResultJudgements(2),
+                Beatmap = beatmap,
+            });
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModHidden.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModHidden.cs
index 2c3b4a8d18..ad17955f75 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModHidden.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModHidden.cs
@@ -57,6 +57,12 @@ namespace osu.Game.Rulesets.Taiko.Mods
                     {
                         hitObject.FadeOut(duration);
 
+                        // Keep updating the object even after it stopped being visible.
+                        // This is required because of the custom logic in DrawableHit's Update method.
+                        // Specifically, pressHandledThisFrame wasn't reset, which caused further hits
+                        // within the object's lifetime to be rejected.
+                        hitObject.AlwaysPresent = true;
+
                         // DrawableHitObject sets LifetimeEnd to LatestTransformEndTime if it isn't manually changed.
                         // in order for the object to not be killed before its actual end time (as the latest transform ends earlier), set lifetime end explicitly.
                         hitObject.LifetimeEnd = state == ArmedState.Idle || !hitObject.AllJudged

From 511948ba56c4e75d9428cec4d2a7277d8835073f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 20 Jul 2023 19:13:37 +0200
Subject: [PATCH 1442/1604] Add xmldoc to `ApplySelectionOrder()`

---
 .../Screens/Edit/Compose/Components/BlueprintContainer.cs     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 5fdd2634c4..4a2d36b677 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -381,6 +381,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </summary>
         private bool selectedBlueprintAlreadySelectedOnMouseDown;
 
+        /// <summary>
+        /// Sorts the supplied <paramref name="blueprints"/> by the order of preference when making a selection.
+        /// Blueprints at the start of the list will be prioritised over later items if the selection requested is ambiguous due to spatial overlap.
+        /// </summary>
         protected virtual IEnumerable<SelectionBlueprint<T>> ApplySelectionOrder(IEnumerable<SelectionBlueprint<T>> blueprints) => blueprints.Reverse();
 
         /// <summary>

From a16d7e6cc5b70251b0df7beac54dbd6b077eb950 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 Jul 2023 18:34:08 +0900
Subject: [PATCH 1443/1604] Add more padding around editor screen content

---
 .../Screens/Editors/TournamentEditorScreen.cs  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
index 0fb6c1367b..8d221b1818 100644
--- a/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Linq;
@@ -27,17 +25,18 @@ namespace osu.Game.Tournament.Screens.Editors
     {
         protected abstract BindableList<TModel> Storage { get; }
 
-        private FillFlowContainer<TDrawable> flow;
+        private FillFlowContainer<TDrawable> flow = null!;
 
-        [Resolved(canBeNull: true)]
-        private TournamentSceneManager sceneManager { get; set; }
+        [Resolved]
+        private TournamentSceneManager? sceneManager { get; set; }
 
-        protected ControlPanel ControlPanel;
+        protected ControlPanel ControlPanel = null!;
 
-        private readonly TournamentScreen parentScreen;
-        private BackButton backButton;
+        private readonly TournamentScreen? parentScreen;
 
-        protected TournamentEditorScreen(TournamentScreen parentScreen = null)
+        private BackButton backButton = null!;
+
+        protected TournamentEditorScreen(TournamentScreen? parentScreen = null)
         {
             this.parentScreen = parentScreen;
         }
@@ -63,6 +62,7 @@ namespace osu.Game.Tournament.Screens.Editors
                         RelativeSizeAxes = Axes.X,
                         AutoSizeAxes = Axes.Y,
                         Spacing = new Vector2(20),
+                        Padding = new MarginPadding(20),
                     },
                 },
                 ControlPanel = new ControlPanel

From 0284fa1fc187ae9e5bc47d066258eec941170f61 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 Jul 2023 19:02:36 +0900
Subject: [PATCH 1444/1604] Tidy up `TeamEditorScreen`

---
 .../Screens/Editors/TeamEditorScreen.cs       | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
index 93fbfba0e3..6684ccd24b 100644
--- a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
@@ -15,6 +15,10 @@ using osu.Game.Online.API;
 using osu.Game.Overlays.Settings;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
+using osu.Game.Tournament.Screens.Drawings.Components;
+using osu.Game.Tournament.Screens.Gameplay.Components;
+using osu.Game.Tournament.Screens.Ladder.Components;
+using osu.Game.Tournament.Screens.TeamIntro;
 using osu.Game.Users;
 using osuTK;
 
@@ -59,8 +63,6 @@ namespace osu.Game.Tournament.Screens.Editors
         {
             public TournamentTeam Model { get; }
 
-            private readonly Container drawableContainer;
-
             [Resolved]
             private TournamentSceneManager? sceneManager { get; set; }
 
@@ -74,6 +76,9 @@ namespace osu.Game.Tournament.Screens.Editors
                 Masking = true;
                 CornerRadius = 10;
 
+                RelativeSizeAxes = Axes.X;
+                AutoSizeAxes = Axes.Y;
+
                 PlayerEditor playerEditor = new PlayerEditor(Model)
                 {
                     Width = 0.95f
@@ -86,10 +91,9 @@ namespace osu.Game.Tournament.Screens.Editors
                         Colour = OsuColour.Gray(0.1f),
                         RelativeSizeAxes = Axes.Both,
                     },
-                    drawableContainer = new Container
+                    new GroupTeam(team)
                     {
-                        Size = new Vector2(100, 50),
-                        Margin = new MarginPadding(10),
+                        Margin = new MarginPadding(32),
                         Anchor = Anchor.TopRight,
                         Origin = Anchor.TopRight,
                     },
@@ -134,14 +138,14 @@ namespace osu.Game.Tournament.Screens.Editors
                             },
                             new SettingsButton
                             {
-                                Width = 0.11f,
+                                Width = 0.2f,
                                 Margin = new MarginPadding(10),
                                 Text = "Add player",
                                 Action = () => playerEditor.CreateNew()
                             },
                             new DangerousSettingsButton
                             {
-                                Width = 0.11f,
+                                Width = 0.2f,
                                 Text = "Delete Team",
                                 Margin = new MarginPadding(10),
                                 Action = () =>
@@ -164,16 +168,6 @@ namespace osu.Game.Tournament.Screens.Editors
                         }
                     },
                 };
-
-                RelativeSizeAxes = Axes.X;
-                AutoSizeAxes = Axes.Y;
-
-                Model.FlagName.BindValueChanged(updateDrawable, true);
-            }
-
-            private void updateDrawable(ValueChangedEvent<string> flag)
-            {
-                drawableContainer.Child = new DrawableTeamFlag(Model);
             }
 
             public partial class PlayerEditor : CompositeDrawable
@@ -216,7 +210,7 @@ namespace osu.Game.Tournament.Screens.Editors
 
                     private readonly Bindable<int?> playerId = new Bindable<int?>();
 
-                    private readonly Container drawableContainer;
+                    private readonly Container userPanelContainer;
 
                     public PlayerRow(TournamentTeam team, TournamentUser user)
                     {
@@ -228,7 +222,7 @@ namespace osu.Game.Tournament.Screens.Editors
                         AutoSizeAxes = Axes.Y;
 
                         Masking = true;
-                        CornerRadius = 5;
+                        CornerRadius = 10;
 
                         InternalChildren = new Drawable[]
                         {
@@ -240,10 +234,11 @@ namespace osu.Game.Tournament.Screens.Editors
                             new FillFlowContainer
                             {
                                 Margin = new MarginPadding(5),
-                                Padding = new MarginPadding { Right = 160 },
+                                Padding = new MarginPadding { Right = 60 },
                                 Spacing = new Vector2(5),
                                 Direction = FillDirection.Horizontal,
-                                AutoSizeAxes = Axes.Both,
+                                RelativeSizeAxes = Axes.X,
+                                AutoSizeAxes = Axes.Y,
                                 Children = new Drawable[]
                                 {
                                     new SettingsNumberBox
@@ -253,9 +248,10 @@ namespace osu.Game.Tournament.Screens.Editors
                                         Width = 200,
                                         Current = playerId,
                                     },
-                                    drawableContainer = new Container
+                                    userPanelContainer = new Container
                                     {
-                                        Size = new Vector2(100, 70),
+                                        Width = 500,
+                                        RelativeSizeAxes = Axes.Y,
                                     },
                                 }
                             },
@@ -298,7 +294,11 @@ namespace osu.Game.Tournament.Screens.Editors
 
                     private void updatePanel() => Scheduler.AddOnce(() =>
                     {
-                        drawableContainer.Child = new UserGridPanel(user.ToAPIUser()) { Width = 300 };
+                        userPanelContainer.Child = new UserListPanel(user.ToAPIUser())
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                        };
                     });
                 }
             }

From b712b195399485038a950f79deda980088e4dc9e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 Jul 2023 19:08:09 +0900
Subject: [PATCH 1445/1604] Update all tournament buttons to use new design

---
 .../Screens/Editors/TeamEditorScreen.cs               |  4 ----
 .../Screens/Editors/TournamentEditorScreen.cs         |  6 +++---
 osu.Game.Tournament/TournamentSceneManager.cs         |  3 +--
 osu.Game.Tournament/TourneyButton.cs                  | 11 +++++++----
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
index 6684ccd24b..a8afcece37 100644
--- a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
@@ -13,12 +13,8 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Online.API;
 using osu.Game.Overlays.Settings;
-using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
 using osu.Game.Tournament.Screens.Drawings.Components;
-using osu.Game.Tournament.Screens.Gameplay.Components;
-using osu.Game.Tournament.Screens.Ladder.Components;
-using osu.Game.Tournament.Screens.TeamIntro;
 using osu.Game.Users;
 using osuTK;
 
diff --git a/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
index 8d221b1818..8a90777300 100644
--- a/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
@@ -13,7 +13,6 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
-using osu.Game.Overlays.Settings;
 using osu.Game.Tournament.Components;
 using osuTK;
 
@@ -42,7 +41,7 @@ namespace osu.Game.Tournament.Screens.Editors
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(OsuColour colours)
         {
             AddRangeInternal(new Drawable[]
             {
@@ -75,9 +74,10 @@ namespace osu.Game.Tournament.Screens.Editors
                             Text = "Add new",
                             Action = () => Storage.Add(new TModel())
                         },
-                        new DangerousSettingsButton
+                        new TourneyButton
                         {
                             RelativeSizeAxes = Axes.X,
+                            BackgroundColour = colours.Pink3,
                             Text = "Clear all",
                             Action = Storage.Clear
                         },
diff --git a/osu.Game.Tournament/TournamentSceneManager.cs b/osu.Game.Tournament/TournamentSceneManager.cs
index abfe69b97b..216743e4a2 100644
--- a/osu.Game.Tournament/TournamentSceneManager.cs
+++ b/osu.Game.Tournament/TournamentSceneManager.cs
@@ -252,14 +252,13 @@ namespace osu.Game.Tournament
 
                 if (shortcutKey != null)
                 {
-                    Add(new Container
+                    Add(new CircularContainer
                     {
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.CentreLeft,
                         Size = new Vector2(24),
                         Margin = new MarginPadding(5),
                         Masking = true,
-                        CornerRadius = 4,
                         Alpha = 0.5f,
                         Blending = BlendingParameters.Additive,
                         Children = new Drawable[]
diff --git a/osu.Game.Tournament/TourneyButton.cs b/osu.Game.Tournament/TourneyButton.cs
index 67426c1d58..b874c5c37c 100644
--- a/osu.Game.Tournament/TourneyButton.cs
+++ b/osu.Game.Tournament/TourneyButton.cs
@@ -1,18 +1,21 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays.Settings;
 
 namespace osu.Game.Tournament
 {
-    public partial class TourneyButton : OsuButton
+    public partial class TourneyButton : SettingsButton
     {
         public new Box Background => base.Background;
 
-        public TourneyButton()
-            : base(null)
+        [BackgroundDependencyLoader]
+        private void load()
         {
+            Padding = new MarginPadding();
         }
     }
 }

From 427045fdaf6aee48a40229ffc814b1c3785e4897 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 Jul 2023 19:28:43 +0900
Subject: [PATCH 1446/1604] Further layout improvements to `TeamEditorScreen`

---
 .../Screens/Editors/TeamEditorScreen.cs       | 70 ++++++++++---------
 1 file changed, 36 insertions(+), 34 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
index a8afcece37..161ba71f7a 100644
--- a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
@@ -11,7 +11,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
-using osu.Game.Online.API;
 using osu.Game.Overlays.Settings;
 using osu.Game.Tournament.Models;
 using osu.Game.Tournament.Screens.Drawings.Components;
@@ -75,10 +74,7 @@ namespace osu.Game.Tournament.Screens.Editors
                 RelativeSizeAxes = Axes.X;
                 AutoSizeAxes = Axes.Y;
 
-                PlayerEditor playerEditor = new PlayerEditor(Model)
-                {
-                    Width = 0.95f
-                };
+                PlayerEditor playerEditor = new PlayerEditor(Model);
 
                 InternalChildren = new Drawable[]
                 {
@@ -89,14 +85,15 @@ namespace osu.Game.Tournament.Screens.Editors
                     },
                     new GroupTeam(team)
                     {
-                        Margin = new MarginPadding(32),
+                        Margin = new MarginPadding(16),
+                        Scale = new Vector2(2),
                         Anchor = Anchor.TopRight,
                         Origin = Anchor.TopRight,
                     },
                     new FillFlowContainer
                     {
-                        Margin = new MarginPadding(5),
                         Spacing = new Vector2(5),
+                        Padding = new MarginPadding(10),
                         Direction = FillDirection.Full,
                         RelativeSizeAxes = Axes.X,
                         AutoSizeAxes = Axes.Y,
@@ -133,25 +130,6 @@ namespace osu.Game.Tournament.Screens.Editors
                                 Current = Model.LastYearPlacing
                             },
                             new SettingsButton
-                            {
-                                Width = 0.2f,
-                                Margin = new MarginPadding(10),
-                                Text = "Add player",
-                                Action = () => playerEditor.CreateNew()
-                            },
-                            new DangerousSettingsButton
-                            {
-                                Width = 0.2f,
-                                Text = "Delete Team",
-                                Margin = new MarginPadding(10),
-                                Action = () =>
-                                {
-                                    Expire();
-                                    ladderInfo.Teams.Remove(Model);
-                                },
-                            },
-                            playerEditor,
-                            new SettingsButton
                             {
                                 Width = 0.2f,
                                 Margin = new MarginPadding(10),
@@ -161,6 +139,32 @@ namespace osu.Game.Tournament.Screens.Editors
                                     sceneManager?.SetScreen(new SeedingEditorScreen(team, parent));
                                 }
                             },
+                            playerEditor,
+                            new SettingsButton
+                            {
+                                Text = "Add player",
+                                Action = () => playerEditor.CreateNew()
+                            },
+                            new Container
+                            {
+                                RelativeSizeAxes = Axes.X,
+                                AutoSizeAxes = Axes.Y,
+                                Children = new Drawable[]
+                                {
+                                    new DangerousSettingsButton
+                                    {
+                                        Width = 0.2f,
+                                        Text = "Delete Team",
+                                        Anchor = Anchor.TopRight,
+                                        Origin = Anchor.TopRight,
+                                        Action = () =>
+                                        {
+                                            Expire();
+                                            ladderInfo.Teams.Remove(Model);
+                                        },
+                                    },
+                                }
+                            },
                         }
                     },
                 };
@@ -183,6 +187,8 @@ namespace osu.Game.Tournament.Screens.Editors
                         RelativeSizeAxes = Axes.X,
                         AutoSizeAxes = Axes.Y,
                         Direction = FillDirection.Vertical,
+                        Padding = new MarginPadding(5),
+                        Spacing = new Vector2(5),
                         ChildrenEnumerable = team.Players.Select(p => new PlayerRow(team, p))
                     };
                 }
@@ -198,9 +204,6 @@ namespace osu.Game.Tournament.Screens.Editors
                 {
                     private readonly TournamentUser user;
 
-                    [Resolved]
-                    protected IAPIProvider API { get; private set; } = null!;
-
                     [Resolved]
                     private TournamentGameBase game { get; set; } = null!;
 
@@ -212,8 +215,6 @@ namespace osu.Game.Tournament.Screens.Editors
                     {
                         this.user = user;
 
-                        Margin = new MarginPadding(10);
-
                         RelativeSizeAxes = Axes.X;
                         AutoSizeAxes = Axes.Y;
 
@@ -246,7 +247,7 @@ namespace osu.Game.Tournament.Screens.Editors
                                     },
                                     userPanelContainer = new Container
                                     {
-                                        Width = 500,
+                                        Width = 400,
                                         RelativeSizeAxes = Axes.Y,
                                     },
                                 }
@@ -292,8 +293,9 @@ namespace osu.Game.Tournament.Screens.Editors
                     {
                         userPanelContainer.Child = new UserListPanel(user.ToAPIUser())
                         {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                            Scale = new Vector2(1.7f),
                         };
                     });
                 }

From cfc4575490c17bb2cad7c971021953082770e2aa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 Jul 2023 19:51:52 +0900
Subject: [PATCH 1447/1604] Fix save changes button gone somewhere else

---
 osu.Game.Tournament/SaveChangesOverlay.cs | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tournament/SaveChangesOverlay.cs b/osu.Game.Tournament/SaveChangesOverlay.cs
index 6db8605808..7838d4ba48 100644
--- a/osu.Game.Tournament/SaveChangesOverlay.cs
+++ b/osu.Game.Tournament/SaveChangesOverlay.cs
@@ -25,12 +25,11 @@ namespace osu.Game.Tournament
         {
             RelativeSizeAxes = Axes.Both;
 
-            InternalChild = new Container
+            InternalChild = new CircularContainer
             {
                 Anchor = Anchor.BottomRight,
                 Origin = Anchor.BottomRight,
-                Position = new Vector2(5),
-                CornerRadius = 10,
+                Position = new Vector2(-5),
                 Masking = true,
                 AutoSizeAxes = Axes.Both,
                 Children = new Drawable[]
@@ -43,18 +42,10 @@ namespace osu.Game.Tournament
                     saveChangesButton = new TourneyButton
                     {
                         Text = "Save Changes",
+                        RelativeSizeAxes = Axes.None,
                         Width = 140,
                         Height = 50,
-                        Padding = new MarginPadding
-                        {
-                            Top = 10,
-                            Left = 10,
-                        },
-                        Margin = new MarginPadding
-                        {
-                            Right = 10,
-                            Bottom = 10,
-                        },
+                        Margin = new MarginPadding(10),
                         Action = saveChanges,
                         // Enabled = { Value = false },
                     },

From f9742c3c34afcb5239092e51a2bdab1ef4590d9d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 Jul 2023 19:56:32 +0900
Subject: [PATCH 1448/1604] Increase button size of setup screen buttons

---
 .../Screens/Setup/ActionableInfo.cs           | 19 ++++++++++---------
 .../Screens/Setup/TournamentSwitcher.cs       |  2 +-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Setup/ActionableInfo.cs b/osu.Game.Tournament/Screens/Setup/ActionableInfo.cs
index e3fe2170ba..62f945e50d 100644
--- a/osu.Game.Tournament/Screens/Setup/ActionableInfo.cs
+++ b/osu.Game.Tournament/Screens/Setup/ActionableInfo.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -15,7 +13,15 @@ namespace osu.Game.Tournament.Screens.Setup
 {
     internal partial class ActionableInfo : LabelledDrawable<Drawable>
     {
-        protected OsuButton Button;
+        public const float BUTTON_SIZE = 120;
+
+        public Action? Action;
+
+        protected FillFlowContainer FlowContainer = null!;
+
+        protected OsuButton Button = null!;
+
+        private TournamentSpriteText valueText = null!;
 
         public ActionableInfo()
             : base(true)
@@ -37,11 +43,6 @@ namespace osu.Game.Tournament.Screens.Setup
             set => valueText.Colour = value ? Color4.Red : Color4.White;
         }
 
-        public Action Action;
-
-        private TournamentSpriteText valueText;
-        protected FillFlowContainer FlowContainer;
-
         protected override Drawable CreateComponent() => new Container
         {
             AutoSizeAxes = Axes.Y,
@@ -63,7 +64,7 @@ namespace osu.Game.Tournament.Screens.Setup
                     {
                         Button = new RoundedButton
                         {
-                            Size = new Vector2(100, 40),
+                            Size = new Vector2(BUTTON_SIZE, 40),
                             Action = () => Action?.Invoke()
                         }
                     }
diff --git a/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs b/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs
index 01d86274d7..2d57757ad9 100644
--- a/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs
+++ b/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Tournament.Screens.Setup
             FlowContainer.Insert(-1, folderButton = new RoundedButton
             {
                 Text = "Open folder",
-                Width = 100
+                Width = BUTTON_SIZE
             });
 
             FlowContainer.Insert(-2, dropdown = new OsuDropdown<string>

From ac6a103721723552957d052cba2d2021fe5b7a7e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 Jul 2023 18:31:13 +0900
Subject: [PATCH 1449/1604] Add masking around ladder view

---
 osu.Game.Tournament/Screens/Ladder/LadderScreen.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs b/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
index 176c06c0e5..a74c9a9429 100644
--- a/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
+++ b/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
@@ -41,6 +41,7 @@ namespace osu.Game.Tournament.Screens.Ladder
             InternalChild = Content = new Container
             {
                 RelativeSizeAxes = Axes.Both,
+                Masking = true,
                 Children = new Drawable[]
                 {
                     new TourneyVideo("ladder")

From ca14b4a35fec6f95e99e6dbb53e63575c2a63419 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 Jul 2023 19:28:23 +0900
Subject: [PATCH 1450/1604] Move ladder editor controls to control panel

---
 .../Screens/Editors/LadderEditorScreen.cs     |  7 ++---
 .../Ladder/Components/LadderEditorSettings.cs | 31 ++++++++++++-------
 osu.Game.Tournament/TournamentSceneManager.cs |  2 +-
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
index 4ee3108034..e698e6e5b3 100644
--- a/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
@@ -14,6 +14,7 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Framework.Input.States;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
 using osu.Game.Tournament.Screens.Ladder;
 using osu.Game.Tournament.Screens.Ladder.Components;
@@ -35,11 +36,9 @@ namespace osu.Game.Tournament.Screens.Editors
         [BackgroundDependencyLoader]
         private void load()
         {
-            Content.Add(new LadderEditorSettings
+            AddInternal(new ControlPanel
             {
-                Anchor = Anchor.TopRight,
-                Origin = Anchor.TopRight,
-                Margin = new MarginPadding(5)
+                Child = new LadderEditorSettings(),
             });
 
             AddInternal(rightClickMessage = new WarningBox("Right click to place and link matches"));
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs b/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
index 5aea551c00..f5b6faaa3c 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
@@ -11,15 +11,17 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
 using osu.Game.Overlays.Settings;
 using osu.Game.Screens.Play.PlayerSettings;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
+using osuTK;
 
 namespace osu.Game.Tournament.Screens.Ladder.Components
 {
-    public partial class LadderEditorSettings : PlayerSettingsGroup
+    public partial class LadderEditorSettings : CompositeDrawable
     {
         private SettingsDropdown<TournamentRound> roundDropdown;
         private PlayerCheckbox losersCheckbox;
@@ -33,21 +35,26 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
         [Resolved]
         private LadderInfo ladderInfo { get; set; }
 
-        public LadderEditorSettings()
-            : base("ladder")
-        {
-        }
-
         [BackgroundDependencyLoader]
         private void load()
         {
-            Children = new Drawable[]
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+
+            InternalChild = new FillFlowContainer
             {
-                team1Dropdown = new SettingsTeamDropdown(ladderInfo.Teams) { LabelText = "Team 1" },
-                team2Dropdown = new SettingsTeamDropdown(ladderInfo.Teams) { LabelText = "Team 2" },
-                roundDropdown = new SettingsRoundDropdown(ladderInfo.Rounds) { LabelText = "Round" },
-                losersCheckbox = new PlayerCheckbox { LabelText = "Losers Bracket" },
-                dateTimeBox = new DateTextBox { LabelText = "Match Time" },
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(5),
+                Children = new Drawable[]
+                {
+                    team1Dropdown = new SettingsTeamDropdown(ladderInfo.Teams) { LabelText = "Team 1" },
+                    team2Dropdown = new SettingsTeamDropdown(ladderInfo.Teams) { LabelText = "Team 2" },
+                    roundDropdown = new SettingsRoundDropdown(ladderInfo.Rounds) { LabelText = "Round" },
+                    losersCheckbox = new PlayerCheckbox { LabelText = "Losers Bracket" },
+                    dateTimeBox = new DateTextBox { LabelText = "Match Time" },
+                },
             };
 
             editorInfo.Selected.ValueChanged += selection =>
diff --git a/osu.Game.Tournament/TournamentSceneManager.cs b/osu.Game.Tournament/TournamentSceneManager.cs
index abfe69b97b..ae39d96d5d 100644
--- a/osu.Game.Tournament/TournamentSceneManager.cs
+++ b/osu.Game.Tournament/TournamentSceneManager.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Tournament
         private Container screens;
         private TourneyVideo video;
 
-        public const float CONTROL_AREA_WIDTH = 160;
+        public const float CONTROL_AREA_WIDTH = 200;
 
         public const float STREAM_AREA_WIDTH = 1366;
 

From fb4eaaeae990aab3cff3ff5d73c4cd30f28b5159 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 Jul 2023 19:51:58 +0900
Subject: [PATCH 1451/1604] Add grid snapping to ladder editor

---
 .../Components/DrawableTournamentMatch.cs     | 30 +++++++++++++++----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
index 33e383482f..2f59415d6e 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
@@ -213,7 +213,8 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
             int instantWinAmount = Match.Round.Value.BestOf.Value / 2;
 
             Match.Completed.Value = Match.Round.Value.BestOf.Value > 0
-                                    && (Match.Team1Score.Value + Match.Team2Score.Value >= Match.Round.Value.BestOf.Value || Match.Team1Score.Value > instantWinAmount || Match.Team2Score.Value > instantWinAmount);
+                                    && (Match.Team1Score.Value + Match.Team2Score.Value >= Match.Round.Value.BestOf.Value || Match.Team1Score.Value > instantWinAmount
+                                                                                                                          || Match.Team2Score.Value > instantWinAmount);
         }
 
         protected override void LoadComplete()
@@ -265,8 +266,6 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
 
         protected override bool OnMouseDown(MouseDownEvent e) => e.Button == MouseButton.Left && editorInfo != null;
 
-        protected override bool OnDragStart(DragStartEvent e) => editorInfo != null;
-
         protected override bool OnKeyDown(KeyDownEvent e)
         {
             if (Selected && editorInfo != null && e.Key == Key.Delete)
@@ -287,17 +286,36 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
             return true;
         }
 
+        private Vector2 positionAtStartOfDrag;
+
+        protected override bool OnDragStart(DragStartEvent e)
+        {
+            if (editorInfo != null)
+            {
+                positionAtStartOfDrag = Position;
+                return true;
+            }
+
+            return false;
+        }
+
         protected override void OnDrag(DragEvent e)
         {
             base.OnDrag(e);
 
             Selected = true;
-            this.MoveToOffset(e.Delta);
 
-            var pos = Position;
-            Match.Position.Value = new Point((int)pos.X, (int)pos.Y);
+            this.MoveTo(snapToGrid(positionAtStartOfDrag + (e.MousePosition - e.MouseDownPosition)));
+
+            Match.Position.Value = new Point((int)Position.X, (int)Position.Y);
         }
 
+        private Vector2 snapToGrid(Vector2 pos) =>
+            new Vector2(
+                (int)(pos.X / 10) * 10,
+                (int)(pos.Y / 10) * 10
+            );
+
         public void Remove()
         {
             Selected = false;

From 97e572d4dad4f1e77ea1856f409cb770577f38e6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 Jul 2023 19:56:24 +0900
Subject: [PATCH 1452/1604] Make dragging ladder more snappy

---
 osu.Game.Tournament/Screens/Ladder/LadderDragContainer.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Ladder/LadderDragContainer.cs b/osu.Game.Tournament/Screens/Ladder/LadderDragContainer.cs
index 80b46007e7..3a2db4fc71 100644
--- a/osu.Game.Tournament/Screens/Ladder/LadderDragContainer.cs
+++ b/osu.Game.Tournament/Screens/Ladder/LadderDragContainer.cs
@@ -36,8 +36,8 @@ namespace osu.Game.Tournament.Screens.Ladder
         {
             float newScale = Math.Clamp(scale + e.ScrollDelta.Y / 15 * scale, min_scale, max_scale);
 
-            this.MoveTo(target -= e.MousePosition * (newScale - scale), 2000, Easing.OutQuint);
-            this.ScaleTo(scale = newScale, 2000, Easing.OutQuint);
+            this.MoveTo(target -= e.MousePosition * (newScale - scale), 1000, Easing.OutQuint);
+            this.ScaleTo(scale = newScale, 1000, Easing.OutQuint);
 
             return true;
         }

From f0cec046199c77b0768698ce8b8b3c0f54ad9fde Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Jul 2023 03:47:32 +0900
Subject: [PATCH 1453/1604] Fix nullability warning

---
 osu.Game.Tournament/Screens/Setup/SetupScreen.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Setup/SetupScreen.cs b/osu.Game.Tournament/Screens/Setup/SetupScreen.cs
index ceddd4d1a1..ff1d32516a 100644
--- a/osu.Game.Tournament/Screens/Setup/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/Setup/SetupScreen.cs
@@ -106,8 +106,8 @@ namespace osu.Game.Tournament.Screens.Setup
 
                         loginOverlay.State.Value = Visibility.Visible;
                     },
-                    Value = api?.LocalUser.Value.Username,
-                    Failing = api?.IsLoggedIn != true,
+                    Value = api.LocalUser.Value.Username,
+                    Failing = api.IsLoggedIn != true,
                     Description = "In order to access the API and display metadata, signing in is required."
                 },
                 new LabelledDropdown<RulesetInfo>

From f60a6e989385dda000087ebf0ccf0b3207bb9a5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 20 Jul 2023 20:46:58 +0200
Subject: [PATCH 1454/1604] Fix test step descriptions

---
 osu.Game.Tests/Visual/Editing/TestSceneComposerSelection.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneComposerSelection.cs b/osu.Game.Tests/Visual/Editing/TestSceneComposerSelection.cs
index 51e75939fe..75238fe728 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneComposerSelection.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneComposerSelection.cs
@@ -320,7 +320,7 @@ namespace osu.Game.Tests.Visual.Editing
 
             moveMouseToObject(() => firstObject);
 
-            AddStep("seek near first", () => EditorClock.Seek(320));
+            AddStep("seek near second", () => EditorClock.Seek(320));
 
             AddStep("left click", () => InputManager.Click(MouseButton.Left));
             AddAssert("second selected", () => EditorBeatmap.SelectedHitObjects.Single(), () => Is.EqualTo(secondObject));
@@ -347,7 +347,7 @@ namespace osu.Game.Tests.Visual.Editing
 
             moveMouseToObject(() => firstObject);
 
-            AddStep("seek near first", () => EditorClock.Seek(600));
+            AddStep("seek to third", () => EditorClock.Seek(600));
 
             AddStep("left click", () => InputManager.Click(MouseButton.Left));
             AddAssert("third selected", () => EditorBeatmap.SelectedHitObjects.Single(), () => Is.EqualTo(thirdObject));

From 48024cd17fdca527942c0092bb71881fbe31a6a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 20 Jul 2023 20:50:20 +0200
Subject: [PATCH 1455/1604] Add test coverage of double click behaviour

---
 .../Visual/Editing/TestSceneComposerSelection.cs   | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneComposerSelection.cs b/osu.Game.Tests/Visual/Editing/TestSceneComposerSelection.cs
index 75238fe728..b1a7ef976a 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneComposerSelection.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneComposerSelection.cs
@@ -363,6 +363,20 @@ namespace osu.Game.Tests.Visual.Editing
             AddAssert("third selected", () => EditorBeatmap.SelectedHitObjects.Single(), () => Is.EqualTo(thirdObject));
         }
 
+        [Test]
+        public void TestDoubleClickToSeek()
+        {
+            var hitCircle = new HitCircle { Position = new Vector2(256, 192), StartTime = 600 };
+
+            AddStep("add hitobjects", () => EditorBeatmap.AddRange(new[] { hitCircle }));
+
+            moveMouseToObject(() => hitCircle);
+
+            AddRepeatStep("double click", () => InputManager.Click(MouseButton.Left), 2);
+
+            AddUntilStep("seeked to circle", () => EditorClock.CurrentTime, () => Is.EqualTo(600));
+        }
+
         [TestCase(false)]
         [TestCase(true)]
         public void TestMultiSelectFromDrag(bool alreadySelectedBeforeDrag)

From 07e0a703d7e24fafb80ca21e746272c836b42d8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 20 Jul 2023 20:51:39 +0200
Subject: [PATCH 1456/1604] Adjust inline comment

---
 osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 407adb78dd..2ee162bf3b 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -425,7 +425,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <returns>Whether a click selection was active.</returns>
         private bool endClickSelection(MouseButtonEvent e)
         {
-            // If already handled a selection or drag, we don't want to perform a mouse up / click action.
+            // If already handled a selection, double-click, or drag, we don't want to perform a mouse up / click action.
             if (clickSelectionHandled || doubleClickHandled || isDraggingBlueprint) return true;
 
             if (e.Button != MouseButton.Left) return false;

From 2833497e5b0b1eaeb5bdbab7a500881fe9554908 Mon Sep 17 00:00:00 2001
From: Dao Heng Liu <daohengliu@gmail.com>
Date: Sun, 16 Jul 2023 22:35:20 +0100
Subject: [PATCH 1457/1604] add dialogoverlay to tournament client,
 confirmation dialog for resetting bracket teams

---
 .../Screens/BracketResetTeamsDialog.cs        | 34 +++++++++++++++++++
 .../Screens/Editors/LadderEditorScreen.cs     | 10 ++++--
 .../Screens/Ladder/LadderScreen.cs            |  2 ++
 osu.Game.Tournament/TournamentGame.cs         | 15 +++++++-
 4 files changed, 58 insertions(+), 3 deletions(-)
 create mode 100644 osu.Game.Tournament/Screens/BracketResetTeamsDialog.cs

diff --git a/osu.Game.Tournament/Screens/BracketResetTeamsDialog.cs b/osu.Game.Tournament/Screens/BracketResetTeamsDialog.cs
new file mode 100644
index 0000000000..d3197bd1e6
--- /dev/null
+++ b/osu.Game.Tournament/Screens/BracketResetTeamsDialog.cs
@@ -0,0 +1,34 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Overlays.Dialog;
+using osu.Game.Tournament.Screens.Ladder.Components;
+
+namespace osu.Game.Tournament.Screens
+{
+    public partial class BracketResetTeamsDialog : DangerousActionDialog
+    {
+        private readonly Container<DrawableTournamentMatch> matchesContainer;
+
+        public BracketResetTeamsDialog(Container<DrawableTournamentMatch> matchesContainer)
+        {
+            this.matchesContainer = matchesContainer;
+            BodyText = @"";
+            HeaderText = @"Confirm reset teams?";
+            Icon = FontAwesome.Solid.Undo;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            DangerousAction = () =>
+            {
+                foreach (var p in matchesContainer)
+                    p.Match.Reset();
+            };
+        }
+    }
+}
diff --git a/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
index e698e6e5b3..52d073068b 100644
--- a/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
@@ -6,6 +6,7 @@
 using System;
 using System.Drawing;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -13,8 +14,10 @@ using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Framework.Input.States;
+using osu.Framework.Logging;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Tournament.Components;
+using osu.Game.Overlays;
 using osu.Game.Tournament.Models;
 using osu.Game.Tournament.Screens.Ladder;
 using osu.Game.Tournament.Screens.Ladder.Components;
@@ -31,6 +34,10 @@ namespace osu.Game.Tournament.Screens.Editors
 
         private WarningBox rightClickMessage;
 
+        [Resolved]
+        [CanBeNull]
+        private IDialogOverlay dialogOverlay { get; set; }
+
         protected override bool DrawLoserPaths => true;
 
         [BackgroundDependencyLoader]
@@ -73,8 +80,7 @@ namespace osu.Game.Tournament.Screens.Editors
                     }),
                     new OsuMenuItem("Reset teams", MenuItemType.Destructive, () =>
                     {
-                        foreach (var p in MatchesContainer)
-                            p.Match.Reset();
+                        dialogOverlay?.Push(new BracketResetTeamsDialog(MatchesContainer));
                     })
                 };
             }
diff --git a/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs b/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
index a74c9a9429..fa0ac644b9 100644
--- a/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
+++ b/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
@@ -6,12 +6,14 @@
 using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Caching;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Lines;
+using osu.Game.Overlays;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
 using osu.Game.Tournament.Screens.Editors;
diff --git a/osu.Game.Tournament/TournamentGame.cs b/osu.Game.Tournament/TournamentGame.cs
index beef1e197d..601ee259af 100644
--- a/osu.Game.Tournament/TournamentGame.cs
+++ b/osu.Game.Tournament/TournamentGame.cs
@@ -11,12 +11,14 @@ using osu.Framework.Configuration;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Handlers.Mouse;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays;
 using osu.Game.Tournament.Models;
 using osuTK.Graphics;
 
@@ -39,6 +41,13 @@ namespace osu.Game.Tournament
         private Bindable<WindowMode> windowMode;
         private LoadingSpinner loadingSpinner;
 
+        private readonly DialogOverlay dialogOverlay = new DialogOverlay();
+        private DependencyContainer dependencies;
+        private Container topMostOverlayContent;
+
+        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) =>
+            dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
+
         [BackgroundDependencyLoader]
         private void load(FrameworkConfigManager frameworkConfig, GameHost host)
         {
@@ -52,6 +61,8 @@ namespace osu.Game.Tournament
                 Margin = new MarginPadding(40),
             });
 
+            dependencies.CacheAs<IDialogOverlay>(dialogOverlay);
+
             // in order to have the OS mouse cursor visible, relative mode needs to be disabled.
             // can potentially be removed when https://github.com/ppy/osu-framework/issues/4309 is resolved.
             var mouseHandler = host.AvailableInputHandlers.OfType<MouseHandler>().FirstOrDefault();
@@ -90,12 +101,14 @@ namespace osu.Game.Tournament
                     {
                         RelativeSizeAxes = Axes.Both,
                         Child = new TournamentSceneManager()
-                    }
+                    },
+                    topMostOverlayContent = new Container { RelativeSizeAxes = Axes.Both }
                 }, drawables =>
                 {
                     loadingSpinner.Hide();
                     loadingSpinner.Expire();
 
+                    topMostOverlayContent.Add(dialogOverlay);
                     AddRange(drawables);
 
                     windowSize.BindValueChanged(size => ScheduleAfterChildren(() =>

From e7795296e2e77d5b91d37251e4b0bdccba2ce1e9 Mon Sep 17 00:00:00 2001
From: Dao Heng Liu <daohengliu@gmail.com>
Date: Sun, 16 Jul 2023 22:44:41 +0100
Subject: [PATCH 1458/1604] refactor LadderResetTeamsDialog.cs

---
 .../Screens/Editors/LadderEditorScreen.cs       |  3 +--
 .../Components/LadderResetTeamsDialog.cs}       | 17 +++--------------
 .../Screens/Ladder/LadderScreen.cs              |  2 --
 3 files changed, 4 insertions(+), 18 deletions(-)
 rename osu.Game.Tournament/Screens/{BracketResetTeamsDialog.cs => Ladder/Components/LadderResetTeamsDialog.cs} (50%)

diff --git a/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
index 52d073068b..2cd5dfb513 100644
--- a/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
@@ -14,7 +14,6 @@ using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Framework.Input.States;
-using osu.Framework.Logging;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Tournament.Components;
 using osu.Game.Overlays;
@@ -80,7 +79,7 @@ namespace osu.Game.Tournament.Screens.Editors
                     }),
                     new OsuMenuItem("Reset teams", MenuItemType.Destructive, () =>
                     {
-                        dialogOverlay?.Push(new BracketResetTeamsDialog(MatchesContainer));
+                        dialogOverlay?.Push(new LadderResetTeamsDialog(MatchesContainer));
                     })
                 };
             }
diff --git a/osu.Game.Tournament/Screens/BracketResetTeamsDialog.cs b/osu.Game.Tournament/Screens/Ladder/Components/LadderResetTeamsDialog.cs
similarity index 50%
rename from osu.Game.Tournament/Screens/BracketResetTeamsDialog.cs
rename to osu.Game.Tournament/Screens/Ladder/Components/LadderResetTeamsDialog.cs
index d3197bd1e6..0ecaab9af0 100644
--- a/osu.Game.Tournament/Screens/BracketResetTeamsDialog.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/LadderResetTeamsDialog.cs
@@ -1,29 +1,18 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Overlays.Dialog;
-using osu.Game.Tournament.Screens.Ladder.Components;
 
-namespace osu.Game.Tournament.Screens
+namespace osu.Game.Tournament.Screens.Ladder.Components
 {
-    public partial class BracketResetTeamsDialog : DangerousActionDialog
+    public partial class LadderResetTeamsDialog : DangerousActionDialog
     {
-        private readonly Container<DrawableTournamentMatch> matchesContainer;
-
-        public BracketResetTeamsDialog(Container<DrawableTournamentMatch> matchesContainer)
+        public LadderResetTeamsDialog(Container<DrawableTournamentMatch> matchesContainer)
         {
-            this.matchesContainer = matchesContainer;
-            BodyText = @"";
             HeaderText = @"Confirm reset teams?";
             Icon = FontAwesome.Solid.Undo;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
             DangerousAction = () =>
             {
                 foreach (var p in matchesContainer)
diff --git a/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs b/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
index fa0ac644b9..a74c9a9429 100644
--- a/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
+++ b/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
@@ -6,14 +6,12 @@
 using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Linq;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Caching;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Lines;
-using osu.Game.Overlays;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
 using osu.Game.Tournament.Screens.Editors;

From 35103946999865a37408e38c1e4663eecc67f07a Mon Sep 17 00:00:00 2001
From: Dao Heng Liu <daohengliu@gmail.com>
Date: Mon, 17 Jul 2023 07:59:15 +0100
Subject: [PATCH 1459/1604] add ladder editor reset teams confirmation dialog
 test

---
 .../Screens/TestSceneLadderEditorScreen.cs    | 87 +++++++++++++++++--
 .../TournamentTestScene.cs                    |  8 +-
 2 files changed, 89 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs
index 839730f3ca..825a976309 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs
@@ -1,22 +1,99 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Framework.Allocation;
+#nullable disable
+
+using System.Linq;
+using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Tournament.Screens.Editors;
+using osu.Framework.Testing;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays.Dialog;
+using osu.Game.Tournament.Screens.Ladder.Components;
+using osuTK;
+using osuTK.Input;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
     public partial class TestSceneLadderEditorScreen : TournamentTestScene
     {
-        [BackgroundDependencyLoader]
-        private void load()
+        private LadderEditorScreen ladderEditorScreen;
+        private OsuContextMenuContainer osuContextMenuContainer;
+
+        [SetUp]
+        public void Setup() => Schedule(() =>
         {
-            Add(new OsuContextMenuContainer
+            Add(osuContextMenuContainer = new OsuContextMenuContainer
             {
                 RelativeSizeAxes = Axes.Both,
-                Child = new LadderEditorScreen()
+                Child = ladderEditorScreen = new LadderEditorScreen()
+            });
+        });
+
+        [Test]
+        public void TestResetBracketTeams()
+        {
+            AddStep("pull up context menu", () =>
+            {
+                InputManager.MoveMouseTo(ladderEditorScreen);
+                InputManager.Click(MouseButton.Right);
+            });
+
+            AddStep("click Reset teams button", () =>
+            {
+                InputManager.MoveMouseTo(osuContextMenuContainer.ChildrenOfType<DrawableOsuMenuItem>().Last(p =>
+                    ((OsuMenuItem)p.Item).Type == MenuItemType.Destructive), new Vector2(5, 0));
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddAssert("dialog displayed", () => dialogOverlay.CurrentDialog is LadderResetTeamsDialog);
+
+            AddStep("click confirmation", () =>
+            {
+                InputManager.MoveMouseTo(dialogOverlay.CurrentDialog.ChildrenOfType<PopupDialogButton>().First());
+                InputManager.PressButton(MouseButton.Left);
+            });
+
+            AddUntilStep("dialog dismissed", () => dialogOverlay.CurrentDialog is not LadderResetTeamsDialog);
+
+            AddStep("release mouse button", () => InputManager.ReleaseButton(MouseButton.Left));
+
+            AddAssert("assert ladder teams reset", () =>
+            {
+                return Ladder.Matches.All(m => m.Team1.Value == null && m.Team2.Value == null);
+            });
+        }
+
+        [Test]
+        public void TestResetBracketTeamsCancelled()
+        {
+            AddStep("pull up context menu", () =>
+            {
+                InputManager.MoveMouseTo(ladderEditorScreen);
+                InputManager.Click(MouseButton.Right);
+            });
+
+            AddStep("click Reset teams button", () =>
+            {
+                InputManager.MoveMouseTo(osuContextMenuContainer.ChildrenOfType<DrawableOsuMenuItem>().Last(p =>
+                    ((OsuMenuItem)p.Item).Type == MenuItemType.Destructive), new Vector2(5, 0));
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddAssert("dialog displayed", () => dialogOverlay.CurrentDialog is LadderResetTeamsDialog);
+            AddStep("click cancel", () =>
+            {
+                InputManager.MoveMouseTo(dialogOverlay.CurrentDialog.ChildrenOfType<PopupDialogButton>().Last());
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddUntilStep("dialog dismissed", () => dialogOverlay.CurrentDialog is not LadderResetTeamsDialog);
+
+            AddAssert("assert ladder teams unchanged", () =>
+            {
+                return !Ladder.Matches.Any(m => m.Team1.Value == null && m.Team2.Value == null);
             });
         }
     }
diff --git a/osu.Game.Tournament.Tests/TournamentTestScene.cs b/osu.Game.Tournament.Tests/TournamentTestScene.cs
index cab78422a2..2c59b28a7c 100644
--- a/osu.Game.Tournament.Tests/TournamentTestScene.cs
+++ b/osu.Game.Tournament.Tests/TournamentTestScene.cs
@@ -10,6 +10,7 @@ using osu.Framework.Platform;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Overlays;
 using osu.Game.Rulesets;
 using osu.Game.Tests.Visual;
 using osu.Game.Tournament.IO;
@@ -18,9 +19,10 @@ using osu.Game.Tournament.Models;
 
 namespace osu.Game.Tournament.Tests
 {
-    public abstract partial class TournamentTestScene : OsuTestScene
+    public abstract partial class TournamentTestScene : OsuManualInputManagerTestScene
     {
         private TournamentMatch match;
+        protected DialogOverlay dialogOverlay;
 
         [Cached]
         protected LadderInfo Ladder { get; private set; } = new LadderInfo();
@@ -45,6 +47,10 @@ namespace osu.Game.Tournament.Tests
 
             Ruleset.BindTo(Ladder.Ruleset);
             Dependencies.CacheAs(new StableInfo(storage));
+
+            Add(dialogOverlay = new DialogOverlay { Depth = -1 });
+
+            Dependencies.CacheAs<IDialogOverlay>(dialogOverlay);
         }
 
         [SetUpSteps]

From 8cd81681b2ca823b7562e3d95e1f9171587410d7 Mon Sep 17 00:00:00 2001
From: Dao Heng Liu <daohengliu@gmail.com>
Date: Mon, 17 Jul 2023 08:11:28 +0100
Subject: [PATCH 1460/1604] reorder LadderEditorScreen tests

---
 .../Screens/TestSceneLadderEditorScreen.cs    | 62 +++++++++----------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs
index 825a976309..1bcf6334ec 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs
@@ -32,6 +32,37 @@ namespace osu.Game.Tournament.Tests.Screens
             });
         });
 
+        [Test]
+        public void TestResetBracketTeamsCancelled()
+        {
+            AddStep("pull up context menu", () =>
+            {
+                InputManager.MoveMouseTo(ladderEditorScreen);
+                InputManager.Click(MouseButton.Right);
+            });
+
+            AddStep("click Reset teams button", () =>
+            {
+                InputManager.MoveMouseTo(osuContextMenuContainer.ChildrenOfType<DrawableOsuMenuItem>().Last(p =>
+                    ((OsuMenuItem)p.Item).Type == MenuItemType.Destructive), new Vector2(5, 0));
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddAssert("dialog displayed", () => dialogOverlay.CurrentDialog is LadderResetTeamsDialog);
+            AddStep("click cancel", () =>
+            {
+                InputManager.MoveMouseTo(dialogOverlay.CurrentDialog.ChildrenOfType<PopupDialogButton>().Last());
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddUntilStep("dialog dismissed", () => dialogOverlay.CurrentDialog is not LadderResetTeamsDialog);
+
+            AddAssert("assert ladder teams unchanged", () =>
+            {
+                return !Ladder.Matches.Any(m => m.Team1.Value == null && m.Team2.Value == null);
+            });
+        }
+
         [Test]
         public void TestResetBracketTeams()
         {
@@ -65,36 +96,5 @@ namespace osu.Game.Tournament.Tests.Screens
                 return Ladder.Matches.All(m => m.Team1.Value == null && m.Team2.Value == null);
             });
         }
-
-        [Test]
-        public void TestResetBracketTeamsCancelled()
-        {
-            AddStep("pull up context menu", () =>
-            {
-                InputManager.MoveMouseTo(ladderEditorScreen);
-                InputManager.Click(MouseButton.Right);
-            });
-
-            AddStep("click Reset teams button", () =>
-            {
-                InputManager.MoveMouseTo(osuContextMenuContainer.ChildrenOfType<DrawableOsuMenuItem>().Last(p =>
-                    ((OsuMenuItem)p.Item).Type == MenuItemType.Destructive), new Vector2(5, 0));
-                InputManager.Click(MouseButton.Left);
-            });
-
-            AddAssert("dialog displayed", () => dialogOverlay.CurrentDialog is LadderResetTeamsDialog);
-            AddStep("click cancel", () =>
-            {
-                InputManager.MoveMouseTo(dialogOverlay.CurrentDialog.ChildrenOfType<PopupDialogButton>().Last());
-                InputManager.Click(MouseButton.Left);
-            });
-
-            AddUntilStep("dialog dismissed", () => dialogOverlay.CurrentDialog is not LadderResetTeamsDialog);
-
-            AddAssert("assert ladder teams unchanged", () =>
-            {
-                return !Ladder.Matches.Any(m => m.Team1.Value == null && m.Team2.Value == null);
-            });
-        }
     }
 }

From 41638ff4b7a89064d9521c14d7f30335176ac31c Mon Sep 17 00:00:00 2001
From: Dao Heng Liu <daohengliu@gmail.com>
Date: Tue, 18 Jul 2023 23:44:53 +0100
Subject: [PATCH 1461/1604] move LadderResetTeamsDialog.cs into editor screens
 components

---
 .../Screens/TestSceneLadderEditorScreen.cs                     | 2 +-
 .../{Ladder => Editors}/Components/LadderResetTeamsDialog.cs   | 3 ++-
 osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs      | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)
 rename osu.Game.Tournament/Screens/{Ladder => Editors}/Components/LadderResetTeamsDialog.cs (86%)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs
index 1bcf6334ec..f41289a28f 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs
@@ -11,7 +11,7 @@ using osu.Game.Tournament.Screens.Editors;
 using osu.Framework.Testing;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays.Dialog;
-using osu.Game.Tournament.Screens.Ladder.Components;
+using osu.Game.Tournament.Screens.Editors.Components;
 using osuTK;
 using osuTK.Input;
 
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/LadderResetTeamsDialog.cs b/osu.Game.Tournament/Screens/Editors/Components/LadderResetTeamsDialog.cs
similarity index 86%
rename from osu.Game.Tournament/Screens/Ladder/Components/LadderResetTeamsDialog.cs
rename to osu.Game.Tournament/Screens/Editors/Components/LadderResetTeamsDialog.cs
index 0ecaab9af0..5fd5ae365e 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/LadderResetTeamsDialog.cs
+++ b/osu.Game.Tournament/Screens/Editors/Components/LadderResetTeamsDialog.cs
@@ -4,8 +4,9 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Overlays.Dialog;
+using osu.Game.Tournament.Screens.Ladder.Components;
 
-namespace osu.Game.Tournament.Screens.Ladder.Components
+namespace osu.Game.Tournament.Screens.Editors.Components
 {
     public partial class LadderResetTeamsDialog : DangerousActionDialog
     {
diff --git a/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
index 2cd5dfb513..86805b767f 100644
--- a/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
@@ -18,6 +18,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Tournament.Components;
 using osu.Game.Overlays;
 using osu.Game.Tournament.Models;
+using osu.Game.Tournament.Screens.Editors.Components;
 using osu.Game.Tournament.Screens.Ladder;
 using osu.Game.Tournament.Screens.Ladder.Components;
 using osuTK;

From e3a7b6969af55dfc05568bb492bb16941161102e Mon Sep 17 00:00:00 2001
From: Dao Heng Liu <daohengliu@gmail.com>
Date: Wed, 19 Jul 2023 00:24:34 +0100
Subject: [PATCH 1462/1604] add confirmation dialog for Clear All button in
 TournamentEditorScreen

---
 .../Screens/TestSceneRoundEditorScreen.cs     |  4 +-
 .../Screens/TestSceneSeedingEditorScreen.cs   |  3 +-
 .../Screens/TestSceneTeamEditorScreen.cs      |  4 +-
 .../Components/TournamentClearAllDialog.cs    | 46 +++++++++++++++++++
 .../Screens/Editors/RoundEditorScreen.cs      | 36 +++++++++++++++
 .../Screens/Editors/TournamentEditorScreen.cs | 12 ++++-
 6 files changed, 101 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game.Tournament/Screens/Editors/Components/TournamentClearAllDialog.cs

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneRoundEditorScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneRoundEditorScreen.cs
index 2e7bf364f7..2b67193249 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneRoundEditorScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneRoundEditorScreen.cs
@@ -1,13 +1,15 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Framework.Allocation;
 using osu.Game.Tournament.Screens.Editors;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
     public partial class TestSceneRoundEditorScreen : TournamentTestScene
     {
-        public TestSceneRoundEditorScreen()
+        [BackgroundDependencyLoader]
+        private void load()
         {
             Add(new RoundEditorScreen
             {
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneSeedingEditorScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneSeedingEditorScreen.cs
index 0d06b0352f..797b7cfd69 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneSeedingEditorScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneSeedingEditorScreen.cs
@@ -12,7 +12,8 @@ namespace osu.Game.Tournament.Tests.Screens
         [Cached]
         private readonly LadderInfo ladder = new LadderInfo();
 
-        public TestSceneSeedingEditorScreen()
+        [BackgroundDependencyLoader]
+        private void load()
         {
             var match = CreateSampleMatch();
 
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneTeamEditorScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneTeamEditorScreen.cs
index 7b371ed78b..e22967eda2 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneTeamEditorScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneTeamEditorScreen.cs
@@ -1,13 +1,15 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Framework.Allocation;
 using osu.Game.Tournament.Screens.Editors;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
     public partial class TestSceneTeamEditorScreen : TournamentTestScene
     {
-        public TestSceneTeamEditorScreen()
+        [BackgroundDependencyLoader]
+        private void load()
         {
             Add(new TeamEditorScreen
             {
diff --git a/osu.Game.Tournament/Screens/Editors/Components/TournamentClearAllDialog.cs b/osu.Game.Tournament/Screens/Editors/Components/TournamentClearAllDialog.cs
new file mode 100644
index 0000000000..d1d6c65982
--- /dev/null
+++ b/osu.Game.Tournament/Screens/Editors/Components/TournamentClearAllDialog.cs
@@ -0,0 +1,46 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Overlays.Dialog;
+
+namespace osu.Game.Tournament.Screens.Editors.Components
+{
+    public partial class TournamentClearAllDialog : DangerousActionDialog
+
+    {
+        public TournamentClearAllDialog(IList storage)
+        {
+            HeaderText = @"Confirm clear all?";
+            Icon = FontAwesome.Solid.Trash;
+            DangerousAction = storage.Clear;
+        }
+
+    // // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+    // // See the LICENCE file in the repository root for full licence text.
+    //
+    // using osu.Framework.Graphics.Containers;
+    // using osu.Framework.Graphics.Sprites;
+    // using osu.Game.Overlays.Dialog;
+    // using osu.Game.Tournament.Screens.Ladder.Components;
+    //
+    // namespace osu.Game.Tournament.Screens.Editors.Components
+    // {
+    //     public partial class LadderResetTeamsDialog : DangerousActionDialog
+    //     {
+    //         public LadderResetTeamsDialog(Container<DrawableTournamentMatch> matchesContainer)
+    //         {
+    //             HeaderText = @"Confirm reset teams?";
+    //             Icon = FontAwesome.Solid.Undo;
+    //             DangerousAction = () =>
+    //             {
+    //                 foreach (var p in matchesContainer)
+    //                     p.Match.Reset();
+    //             };
+    //         }
+    //     }
+    // }
+
+    }
+}
diff --git a/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs
index 4a3b5c0846..846e84ebda 100644
--- a/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs
@@ -7,13 +7,17 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Logging;
+using osu.Framework.Testing;
 using osu.Game.Graphics;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Overlays;
 using osu.Game.Overlays.Settings;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
+using osu.Game.Tournament.Screens.Editors.Components;
 using osuTK;
 
 namespace osu.Game.Tournament.Screens.Editors
@@ -21,6 +25,38 @@ namespace osu.Game.Tournament.Screens.Editors
     public partial class RoundEditorScreen : TournamentEditorScreen<RoundEditorScreen.RoundRow, TournamentRound>
     {
         protected override BindableList<TournamentRound> Storage => LadderInfo.Rounds;
+        //
+        // [Resolved]
+        // private IDialogOverlay? dialogOverlay { get; set; }
+        //
+        // [BackgroundDependencyLoader]
+        // private void load()
+        // {
+        //     // ControlPanel.Add(new TourneyButton
+        //     // {
+        //     //     RelativeSizeAxes = Axes.X,
+        //     //     Text = "aaaaaa",
+        //     //     Action = () =>
+        //     //     {
+        //     //         Logger.Log("asdaf", LoggingTarget.Runtime, LogLevel.Important);
+        //     //     }
+        //     // });
+        //     // Logger.Log($"Current action is {.Action}", LoggingTarget.Runtime, LogLevel.Important);
+        //
+        //     dialogOverlay?.Push(new TournamentClearAllDialog(Storage));
+        //
+        //     var clearAllButton = ControlPanel.ChildrenOfType<DangerousSettingsButton>().FirstOrDefault();
+        //
+        //     if (clearAllButton != null)
+        //     {
+        //         clearAllButton.Action = () =>
+        //         {
+        //             Logger.Log("doing the thing!", LoggingTarget.Runtime, LogLevel.Important);
+        //             Logger.Log($"currently, dialogOverlay is {dialogOverlay}", LoggingTarget.Runtime, LogLevel.Important);
+        //             dialogOverlay?.Push(new TournamentClearAllDialog(Storage));
+        //         };
+        //     }
+        // }
 
         public partial class RoundRow : CompositeDrawable, IModelBacked<TournamentRound>
         {
diff --git a/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
index 0fb6c1367b..a6b2a9b1ab 100644
--- a/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
@@ -6,6 +6,7 @@
 using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
@@ -15,8 +16,10 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
+using osu.Game.Overlays;
 using osu.Game.Overlays.Settings;
 using osu.Game.Tournament.Components;
+using osu.Game.Tournament.Screens.Editors.Components;
 using osuTK;
 
 namespace osu.Game.Tournament.Screens.Editors
@@ -27,6 +30,10 @@ namespace osu.Game.Tournament.Screens.Editors
     {
         protected abstract BindableList<TModel> Storage { get; }
 
+        [Resolved]
+        [CanBeNull]
+        private IDialogOverlay dialogOverlay { get; set; }
+
         private FillFlowContainer<TDrawable> flow;
 
         [Resolved(canBeNull: true)]
@@ -79,7 +86,10 @@ namespace osu.Game.Tournament.Screens.Editors
                         {
                             RelativeSizeAxes = Axes.X,
                             Text = "Clear all",
-                            Action = Storage.Clear
+                            Action = () =>
+                            {
+                                dialogOverlay?.Push(new TournamentClearAllDialog(Storage));
+                            }
                         },
                     }
                 }

From e67253ed1e6b70dd2c6a6e89dd60c5f8df97270d Mon Sep 17 00:00:00 2001
From: Dao Heng Liu <daohengliu@gmail.com>
Date: Wed, 19 Jul 2023 00:25:07 +0100
Subject: [PATCH 1463/1604] remove unused code

---
 .../Components/TournamentClearAllDialog.cs    | 26 --------------
 .../Screens/Editors/RoundEditorScreen.cs      | 36 -------------------
 2 files changed, 62 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Editors/Components/TournamentClearAllDialog.cs b/osu.Game.Tournament/Screens/Editors/Components/TournamentClearAllDialog.cs
index d1d6c65982..06b1071ce9 100644
--- a/osu.Game.Tournament/Screens/Editors/Components/TournamentClearAllDialog.cs
+++ b/osu.Game.Tournament/Screens/Editors/Components/TournamentClearAllDialog.cs
@@ -16,31 +16,5 @@ namespace osu.Game.Tournament.Screens.Editors.Components
             Icon = FontAwesome.Solid.Trash;
             DangerousAction = storage.Clear;
         }
-
-    // // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-    // // See the LICENCE file in the repository root for full licence text.
-    //
-    // using osu.Framework.Graphics.Containers;
-    // using osu.Framework.Graphics.Sprites;
-    // using osu.Game.Overlays.Dialog;
-    // using osu.Game.Tournament.Screens.Ladder.Components;
-    //
-    // namespace osu.Game.Tournament.Screens.Editors.Components
-    // {
-    //     public partial class LadderResetTeamsDialog : DangerousActionDialog
-    //     {
-    //         public LadderResetTeamsDialog(Container<DrawableTournamentMatch> matchesContainer)
-    //         {
-    //             HeaderText = @"Confirm reset teams?";
-    //             Icon = FontAwesome.Solid.Undo;
-    //             DangerousAction = () =>
-    //             {
-    //                 foreach (var p in matchesContainer)
-    //                     p.Match.Reset();
-    //             };
-    //         }
-    //     }
-    // }
-
     }
 }
diff --git a/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs
index 846e84ebda..4a3b5c0846 100644
--- a/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs
@@ -7,17 +7,13 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Logging;
-using osu.Framework.Testing;
 using osu.Game.Graphics;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Overlays;
 using osu.Game.Overlays.Settings;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
-using osu.Game.Tournament.Screens.Editors.Components;
 using osuTK;
 
 namespace osu.Game.Tournament.Screens.Editors
@@ -25,38 +21,6 @@ namespace osu.Game.Tournament.Screens.Editors
     public partial class RoundEditorScreen : TournamentEditorScreen<RoundEditorScreen.RoundRow, TournamentRound>
     {
         protected override BindableList<TournamentRound> Storage => LadderInfo.Rounds;
-        //
-        // [Resolved]
-        // private IDialogOverlay? dialogOverlay { get; set; }
-        //
-        // [BackgroundDependencyLoader]
-        // private void load()
-        // {
-        //     // ControlPanel.Add(new TourneyButton
-        //     // {
-        //     //     RelativeSizeAxes = Axes.X,
-        //     //     Text = "aaaaaa",
-        //     //     Action = () =>
-        //     //     {
-        //     //         Logger.Log("asdaf", LoggingTarget.Runtime, LogLevel.Important);
-        //     //     }
-        //     // });
-        //     // Logger.Log($"Current action is {.Action}", LoggingTarget.Runtime, LogLevel.Important);
-        //
-        //     dialogOverlay?.Push(new TournamentClearAllDialog(Storage));
-        //
-        //     var clearAllButton = ControlPanel.ChildrenOfType<DangerousSettingsButton>().FirstOrDefault();
-        //
-        //     if (clearAllButton != null)
-        //     {
-        //         clearAllButton.Action = () =>
-        //         {
-        //             Logger.Log("doing the thing!", LoggingTarget.Runtime, LogLevel.Important);
-        //             Logger.Log($"currently, dialogOverlay is {dialogOverlay}", LoggingTarget.Runtime, LogLevel.Important);
-        //             dialogOverlay?.Push(new TournamentClearAllDialog(Storage));
-        //         };
-        //     }
-        // }
 
         public partial class RoundRow : CompositeDrawable, IModelBacked<TournamentRound>
         {

From 68495c937d975ff23052bb1c029a08ace9537847 Mon Sep 17 00:00:00 2001
From: Dao Heng Liu <daohengliu@gmail.com>
Date: Wed, 19 Jul 2023 01:59:40 +0100
Subject: [PATCH 1464/1604] fix ResetBracketTeams tests

also fixes formatting and var naming issues
---
 .../Screens/TestSceneLadderEditorScreen.cs    | 32 ++++++++++---------
 .../TournamentTestScene.cs                    |  6 ++--
 .../Components/TournamentClearAllDialog.cs    |  1 -
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs
index f41289a28f..bbf4da803e 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs
@@ -3,9 +3,13 @@
 
 #nullable disable
 
+using System;
 using System.Linq;
+using Newtonsoft.Json;
 using NUnit.Framework;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Logging;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Tournament.Screens.Editors;
 using osu.Framework.Testing;
@@ -35,12 +39,16 @@ namespace osu.Game.Tournament.Tests.Screens
         [Test]
         public void TestResetBracketTeamsCancelled()
         {
+            Bindable<string> matchBeforeReset = new Bindable<string>();
+            AddStep("save current match state", () =>
+            {
+                matchBeforeReset.Value = JsonConvert.SerializeObject(Ladder.CurrentMatch.Value);
+            });
             AddStep("pull up context menu", () =>
             {
                 InputManager.MoveMouseTo(ladderEditorScreen);
                 InputManager.Click(MouseButton.Right);
             });
-
             AddStep("click Reset teams button", () =>
             {
                 InputManager.MoveMouseTo(osuContextMenuContainer.ChildrenOfType<DrawableOsuMenuItem>().Last(p =>
@@ -48,19 +56,16 @@ namespace osu.Game.Tournament.Tests.Screens
                 InputManager.Click(MouseButton.Left);
             });
 
-            AddAssert("dialog displayed", () => dialogOverlay.CurrentDialog is LadderResetTeamsDialog);
+            AddAssert("dialog displayed", () => DialogOverlay.CurrentDialog is LadderResetTeamsDialog);
             AddStep("click cancel", () =>
             {
-                InputManager.MoveMouseTo(dialogOverlay.CurrentDialog.ChildrenOfType<PopupDialogButton>().Last());
+                InputManager.MoveMouseTo(DialogOverlay.CurrentDialog.ChildrenOfType<PopupDialogButton>().Last());
                 InputManager.Click(MouseButton.Left);
             });
 
-            AddUntilStep("dialog dismissed", () => dialogOverlay.CurrentDialog is not LadderResetTeamsDialog);
+            AddUntilStep("dialog dismissed", () => DialogOverlay.CurrentDialog is not LadderResetTeamsDialog);
 
-            AddAssert("assert ladder teams unchanged", () =>
-            {
-                return !Ladder.Matches.Any(m => m.Team1.Value == null && m.Team2.Value == null);
-            });
+            AddAssert("assert ladder teams unchanged", () => string.Equals(matchBeforeReset.Value, JsonConvert.SerializeObject(Ladder.CurrentMatch.Value), StringComparison.Ordinal));
         }
 
         [Test]
@@ -79,22 +84,19 @@ namespace osu.Game.Tournament.Tests.Screens
                 InputManager.Click(MouseButton.Left);
             });
 
-            AddAssert("dialog displayed", () => dialogOverlay.CurrentDialog is LadderResetTeamsDialog);
+            AddAssert("dialog displayed", () => DialogOverlay.CurrentDialog is LadderResetTeamsDialog);
 
             AddStep("click confirmation", () =>
             {
-                InputManager.MoveMouseTo(dialogOverlay.CurrentDialog.ChildrenOfType<PopupDialogButton>().First());
+                InputManager.MoveMouseTo(DialogOverlay.CurrentDialog.ChildrenOfType<PopupDialogButton>().First());
                 InputManager.PressButton(MouseButton.Left);
             });
 
-            AddUntilStep("dialog dismissed", () => dialogOverlay.CurrentDialog is not LadderResetTeamsDialog);
+            AddUntilStep("dialog dismissed", () => DialogOverlay.CurrentDialog is not LadderResetTeamsDialog);
 
             AddStep("release mouse button", () => InputManager.ReleaseButton(MouseButton.Left));
 
-            AddAssert("assert ladder teams reset", () =>
-            {
-                return Ladder.Matches.All(m => m.Team1.Value == null && m.Team2.Value == null);
-            });
+            AddAssert("assert ladder teams reset", () => Ladder.CurrentMatch.Value.Team1.Value == null && Ladder.CurrentMatch.Value.Team2.Value == null);
         }
     }
 }
diff --git a/osu.Game.Tournament.Tests/TournamentTestScene.cs b/osu.Game.Tournament.Tests/TournamentTestScene.cs
index 2c59b28a7c..740145074e 100644
--- a/osu.Game.Tournament.Tests/TournamentTestScene.cs
+++ b/osu.Game.Tournament.Tests/TournamentTestScene.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Tournament.Tests
     public abstract partial class TournamentTestScene : OsuManualInputManagerTestScene
     {
         private TournamentMatch match;
-        protected DialogOverlay dialogOverlay;
+        protected DialogOverlay DialogOverlay;
 
         [Cached]
         protected LadderInfo Ladder { get; private set; } = new LadderInfo();
@@ -48,9 +48,9 @@ namespace osu.Game.Tournament.Tests
             Ruleset.BindTo(Ladder.Ruleset);
             Dependencies.CacheAs(new StableInfo(storage));
 
-            Add(dialogOverlay = new DialogOverlay { Depth = -1 });
+            Add(DialogOverlay = new DialogOverlay { Depth = -1 });
 
-            Dependencies.CacheAs<IDialogOverlay>(dialogOverlay);
+            Dependencies.CacheAs<IDialogOverlay>(DialogOverlay);
         }
 
         [SetUpSteps]
diff --git a/osu.Game.Tournament/Screens/Editors/Components/TournamentClearAllDialog.cs b/osu.Game.Tournament/Screens/Editors/Components/TournamentClearAllDialog.cs
index 06b1071ce9..036a81dc62 100644
--- a/osu.Game.Tournament/Screens/Editors/Components/TournamentClearAllDialog.cs
+++ b/osu.Game.Tournament/Screens/Editors/Components/TournamentClearAllDialog.cs
@@ -8,7 +8,6 @@ using osu.Game.Overlays.Dialog;
 namespace osu.Game.Tournament.Screens.Editors.Components
 {
     public partial class TournamentClearAllDialog : DangerousActionDialog
-
     {
         public TournamentClearAllDialog(IList storage)
         {

From fa480cc27bbcdf67a5ce4da55c4bd45bc63ed20d Mon Sep 17 00:00:00 2001
From: Dao Heng Liu <daohengliu@gmail.com>
Date: Thu, 20 Jul 2023 22:33:43 +0100
Subject: [PATCH 1465/1604] remove #nullable disable, pass action instead of
 container to DangerousActionDialog

---
 .../Screens/TestSceneLadderEditorScreen.cs          |  8 +++-----
 .../Editors/Components/LadderResetTeamsDialog.cs    | 13 ++++---------
 .../Editors/Components/TournamentClearAllDialog.cs  |  2 +-
 .../Screens/Editors/LadderEditorScreen.cs           |  8 ++++++--
 .../Screens/Editors/TournamentEditorScreen.cs       |  2 +-
 5 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs
index bbf4da803e..c383e93e7f 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs
@@ -1,15 +1,12 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Linq;
 using Newtonsoft.Json;
 using NUnit.Framework;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Logging;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Tournament.Screens.Editors;
 using osu.Framework.Testing;
@@ -23,12 +20,13 @@ namespace osu.Game.Tournament.Tests.Screens
 {
     public partial class TestSceneLadderEditorScreen : TournamentTestScene
     {
-        private LadderEditorScreen ladderEditorScreen;
-        private OsuContextMenuContainer osuContextMenuContainer;
+        private LadderEditorScreen ladderEditorScreen = null!;
+        private OsuContextMenuContainer? osuContextMenuContainer;
 
         [SetUp]
         public void Setup() => Schedule(() =>
         {
+            ladderEditorScreen = new LadderEditorScreen();
             Add(osuContextMenuContainer = new OsuContextMenuContainer
             {
                 RelativeSizeAxes = Axes.Both,
diff --git a/osu.Game.Tournament/Screens/Editors/Components/LadderResetTeamsDialog.cs b/osu.Game.Tournament/Screens/Editors/Components/LadderResetTeamsDialog.cs
index 5fd5ae365e..8ed1b381f6 100644
--- a/osu.Game.Tournament/Screens/Editors/Components/LadderResetTeamsDialog.cs
+++ b/osu.Game.Tournament/Screens/Editors/Components/LadderResetTeamsDialog.cs
@@ -1,24 +1,19 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Framework.Graphics.Containers;
+using System;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Overlays.Dialog;
-using osu.Game.Tournament.Screens.Ladder.Components;
 
 namespace osu.Game.Tournament.Screens.Editors.Components
 {
     public partial class LadderResetTeamsDialog : DangerousActionDialog
     {
-        public LadderResetTeamsDialog(Container<DrawableTournamentMatch> matchesContainer)
+        public LadderResetTeamsDialog(Action action)
         {
-            HeaderText = @"Confirm reset teams?";
+            HeaderText = @"Reset teams?";
             Icon = FontAwesome.Solid.Undo;
-            DangerousAction = () =>
-            {
-                foreach (var p in matchesContainer)
-                    p.Match.Reset();
-            };
+            DangerousAction = action;
         }
     }
 }
diff --git a/osu.Game.Tournament/Screens/Editors/Components/TournamentClearAllDialog.cs b/osu.Game.Tournament/Screens/Editors/Components/TournamentClearAllDialog.cs
index 036a81dc62..050549fe76 100644
--- a/osu.Game.Tournament/Screens/Editors/Components/TournamentClearAllDialog.cs
+++ b/osu.Game.Tournament/Screens/Editors/Components/TournamentClearAllDialog.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Tournament.Screens.Editors.Components
     {
         public TournamentClearAllDialog(IList storage)
         {
-            HeaderText = @"Confirm clear all?";
+            HeaderText = @"Clear all?";
             Icon = FontAwesome.Solid.Trash;
             DangerousAction = storage.Clear;
         }
diff --git a/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
index 86805b767f..32685ace36 100644
--- a/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Tournament.Screens.Editors
 
         private WarningBox rightClickMessage;
 
-        [Resolved]
+        [Resolved(canBeNull: true)]
         [CanBeNull]
         private IDialogOverlay dialogOverlay { get; set; }
 
@@ -80,7 +80,11 @@ namespace osu.Game.Tournament.Screens.Editors
                     }),
                     new OsuMenuItem("Reset teams", MenuItemType.Destructive, () =>
                     {
-                        dialogOverlay?.Push(new LadderResetTeamsDialog(MatchesContainer));
+                        dialogOverlay?.Push(new LadderResetTeamsDialog(() =>
+                        {
+                            foreach (var p in MatchesContainer)
+                                p.Match.Reset();
+                        }));
                     })
                 };
             }
diff --git a/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
index a6b2a9b1ab..cd6127f1ce 100644
--- a/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Tournament.Screens.Editors
     {
         protected abstract BindableList<TModel> Storage { get; }
 
-        [Resolved]
+        [Resolved(canBeNull: true)]
         [CanBeNull]
         private IDialogOverlay dialogOverlay { get; set; }
 

From 3c05246baf536249507f6fad924d9b6de4150398 Mon Sep 17 00:00:00 2001
From: Dao Heng Liu <daohengliu@gmail.com>
Date: Thu, 20 Jul 2023 22:47:29 +0100
Subject: [PATCH 1466/1604] fix weird handling of dialogOverlay in tourney
 client

---
 osu.Game.Tournament/TournamentGame.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game.Tournament/TournamentGame.cs b/osu.Game.Tournament/TournamentGame.cs
index 601ee259af..97292c09aa 100644
--- a/osu.Game.Tournament/TournamentGame.cs
+++ b/osu.Game.Tournament/TournamentGame.cs
@@ -43,7 +43,6 @@ namespace osu.Game.Tournament
 
         private readonly DialogOverlay dialogOverlay = new DialogOverlay();
         private DependencyContainer dependencies;
-        private Container topMostOverlayContent;
 
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) =>
             dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
@@ -102,13 +101,11 @@ namespace osu.Game.Tournament
                         RelativeSizeAxes = Axes.Both,
                         Child = new TournamentSceneManager()
                     },
-                    topMostOverlayContent = new Container { RelativeSizeAxes = Axes.Both }
+                    new Container { RelativeSizeAxes = Axes.Both, Child = dialogOverlay }
                 }, drawables =>
                 {
                     loadingSpinner.Hide();
                     loadingSpinner.Expire();
-
-                    topMostOverlayContent.Add(dialogOverlay);
                     AddRange(drawables);
 
                     windowSize.BindValueChanged(size => ScheduleAfterChildren(() =>

From 2825671e28c7dad949a4f95c234e929617f71968 Mon Sep 17 00:00:00 2001
From: Dao Heng Liu <daohengliu@gmail.com>
Date: Thu, 20 Jul 2023 23:01:14 +0100
Subject: [PATCH 1467/1604] pass action instead of storage to
 TournamentClearAllDialog

---
 .../Screens/Editors/Components/TournamentClearAllDialog.cs  | 6 +++---
 .../Screens/Editors/TournamentEditorScreen.cs               | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Editors/Components/TournamentClearAllDialog.cs b/osu.Game.Tournament/Screens/Editors/Components/TournamentClearAllDialog.cs
index 050549fe76..1dc7c8231d 100644
--- a/osu.Game.Tournament/Screens/Editors/Components/TournamentClearAllDialog.cs
+++ b/osu.Game.Tournament/Screens/Editors/Components/TournamentClearAllDialog.cs
@@ -1,7 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Collections;
+using System;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Overlays.Dialog;
 
@@ -9,11 +9,11 @@ namespace osu.Game.Tournament.Screens.Editors.Components
 {
     public partial class TournamentClearAllDialog : DangerousActionDialog
     {
-        public TournamentClearAllDialog(IList storage)
+        public TournamentClearAllDialog(Action action)
         {
             HeaderText = @"Clear all?";
             Icon = FontAwesome.Solid.Trash;
-            DangerousAction = storage.Clear;
+            DangerousAction = action;
         }
     }
 }
diff --git a/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
index cd6127f1ce..bc0d25a238 100644
--- a/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
@@ -88,7 +88,7 @@ namespace osu.Game.Tournament.Screens.Editors
                             Text = "Clear all",
                             Action = () =>
                             {
-                                dialogOverlay?.Push(new TournamentClearAllDialog(Storage));
+                                dialogOverlay?.Push(new TournamentClearAllDialog(() => Storage.Clear()));
                             }
                         },
                     }

From bf9c25f429130942be2b69627da3c7afb803bbc8 Mon Sep 17 00:00:00 2001
From: Dao Heng Liu <daohengliu@gmail.com>
Date: Thu, 20 Jul 2023 23:28:31 +0100
Subject: [PATCH 1468/1604] add confirmation dialog to delete team/round
 buttons in tourney editor screens

---
 .../RoundEditorDeleteRoundDialog.cs           | 19 +++++++++++++++++
 .../Components/TeamEditorDeleteTeamDialog.cs  | 21 +++++++++++++++++++
 .../Screens/Editors/RoundEditorScreen.cs      | 17 ++++++++++-----
 .../Screens/Editors/TeamEditorScreen.cs       | 20 +++++++++++++-----
 4 files changed, 67 insertions(+), 10 deletions(-)
 create mode 100644 osu.Game.Tournament/Screens/Editors/Components/RoundEditorDeleteRoundDialog.cs
 create mode 100644 osu.Game.Tournament/Screens/Editors/Components/TeamEditorDeleteTeamDialog.cs

diff --git a/osu.Game.Tournament/Screens/Editors/Components/RoundEditorDeleteRoundDialog.cs b/osu.Game.Tournament/Screens/Editors/Components/RoundEditorDeleteRoundDialog.cs
new file mode 100644
index 0000000000..629cd4e135
--- /dev/null
+++ b/osu.Game.Tournament/Screens/Editors/Components/RoundEditorDeleteRoundDialog.cs
@@ -0,0 +1,19 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Overlays.Dialog;
+
+namespace osu.Game.Tournament.Screens.Editors.Components
+{
+    public partial class RoundEditorDeleteRoundDialog : DangerousActionDialog
+    {
+        public RoundEditorDeleteRoundDialog(string roundName, Action action)
+        {
+            HeaderText = roundName.Length > 0 ? $@"Delete round ""{roundName}""?" : @"Delete unnamed round?";
+            Icon = FontAwesome.Solid.Trash;
+            DangerousAction = action;
+        }
+    }
+}
diff --git a/osu.Game.Tournament/Screens/Editors/Components/TeamEditorDeleteTeamDialog.cs b/osu.Game.Tournament/Screens/Editors/Components/TeamEditorDeleteTeamDialog.cs
new file mode 100644
index 0000000000..f91b58e185
--- /dev/null
+++ b/osu.Game.Tournament/Screens/Editors/Components/TeamEditorDeleteTeamDialog.cs
@@ -0,0 +1,21 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Overlays.Dialog;
+
+namespace osu.Game.Tournament.Screens.Editors.Components
+{
+    public partial class TeamEditorDeleteTeamDialog : DangerousActionDialog
+    {
+        public TeamEditorDeleteTeamDialog(string fullTeamName, string acronym, Action action)
+        {
+            HeaderText = fullTeamName.Length > 0 ? $@"Delete team ""{fullTeamName}""?" :
+                acronym.Length > 0 ? $@"Delete team ""{acronym}""?" :
+                @"Delete unnamed team?";
+            Icon = FontAwesome.Solid.Trash;
+            DangerousAction = action;
+        }
+    }
+}
diff --git a/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs
index 4a3b5c0846..712a724d4d 100644
--- a/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs
@@ -11,9 +11,11 @@ using osu.Game.Graphics;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Overlays;
 using osu.Game.Overlays.Settings;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
+using osu.Game.Tournament.Screens.Editors.Components;
 using osuTK;
 
 namespace osu.Game.Tournament.Screens.Editors
@@ -29,6 +31,9 @@ namespace osu.Game.Tournament.Screens.Editors
             [Resolved]
             private LadderInfo ladderInfo { get; set; } = null!;
 
+            [Resolved(canBeNull: true)]
+            private IDialogOverlay? dialogOverlay { get; set; }
+
             public RoundRow(TournamentRound round)
             {
                 Model = round;
@@ -99,11 +104,13 @@ namespace osu.Game.Tournament.Screens.Editors
                         RelativeSizeAxes = Axes.None,
                         Width = 150,
                         Text = "Delete Round",
-                        Action = () =>
-                        {
-                            Expire();
-                            ladderInfo.Rounds.Remove(Model);
-                        },
+                        Action = () => dialogOverlay?.Push(
+                            new RoundEditorDeleteRoundDialog(
+                                Model.Name.Value, () =>
+                                {
+                                    Expire();
+                                    ladderInfo.Rounds.Remove(Model);
+                                }))
                     }
                 };
 
diff --git a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
index 93fbfba0e3..584e947b1f 100644
--- a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
@@ -12,9 +12,11 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Online.API;
+using osu.Game.Overlays;
 using osu.Game.Overlays.Settings;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
+using osu.Game.Tournament.Screens.Editors.Components;
 using osu.Game.Users;
 using osuTK;
 
@@ -64,6 +66,9 @@ namespace osu.Game.Tournament.Screens.Editors
             [Resolved]
             private TournamentSceneManager? sceneManager { get; set; }
 
+            [Resolved(canBeNull: true)]
+            private IDialogOverlay? dialogOverlay { get; set; }
+
             [Resolved]
             private LadderInfo ladderInfo { get; set; } = null!;
 
@@ -144,11 +149,16 @@ namespace osu.Game.Tournament.Screens.Editors
                                 Width = 0.11f,
                                 Text = "Delete Team",
                                 Margin = new MarginPadding(10),
-                                Action = () =>
-                                {
-                                    Expire();
-                                    ladderInfo.Teams.Remove(Model);
-                                },
+                                Action = () => dialogOverlay?.Push(
+                                    new TeamEditorDeleteTeamDialog(Model.FullName.Value,
+                                        Model.Acronym.Value,
+                                        () =>
+                                        {
+                                            Expire();
+                                            ladderInfo.Teams.Remove(Model);
+                                        }
+                                    )
+                                )
                             },
                             playerEditor,
                             new SettingsButton

From 2cb1a6fdaabe4eb9a4696358f93cfa271f902553 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Jul 2023 14:23:53 +0900
Subject: [PATCH 1469/1604] Adjust metrics further

---
 osu.Game/Screens/Menu/StarFountain.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Menu/StarFountain.cs b/osu.Game/Screens/Menu/StarFountain.cs
index debf0007eb..0d35f6e0e0 100644
--- a/osu.Game/Screens/Menu/StarFountain.cs
+++ b/osu.Game/Screens/Menu/StarFountain.cs
@@ -68,8 +68,8 @@ namespace osu.Game.Screens.Menu
                     Duration = RNG.NextSingle(particle_duration_min, particle_duration_max),
                     StartAngle = getRandomVariance(4),
                     EndAngle = getRandomVariance(2),
-                    EndScale = 1.4f + getRandomVariance(0.4f),
-                    Velocity = new Vector2(getCurrentAngle(), -1200 + getRandomVariance(100)),
+                    EndScale = 2.2f + getRandomVariance(0.4f),
+                    Velocity = new Vector2(getCurrentAngle(), -1400 + getRandomVariance(100)),
                 };
             }
 

From 870f3e324a6e7737ae9240a1bd5cecdca4424bf5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Jul 2023 14:26:23 +0900
Subject: [PATCH 1470/1604] Adjust "test" button to better align with rest of
 interface

---
 osu.Game/Screens/Edit/BottomBar.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/BottomBar.cs b/osu.Game/Screens/Edit/BottomBar.cs
index b8fed4b935..9a32d5d968 100644
--- a/osu.Game/Screens/Edit/BottomBar.cs
+++ b/osu.Game/Screens/Edit/BottomBar.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Screens.Edit
                             new Dimension(GridSizeMode.Absolute, 170),
                             new Dimension(),
                             new Dimension(GridSizeMode.Absolute, 220),
-                            new Dimension(GridSizeMode.Absolute, 120),
+                            new Dimension(GridSizeMode.Absolute, 140),
                         },
                         Content = new[]
                         {

From f489dbd7a9c1a3baea4063cc79e2cc6fc7edc0db Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Jul 2023 14:39:15 +0900
Subject: [PATCH 1471/1604] Reduce width of right toolbar ever so slightly (and
 use more shared constants)

---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs              | 2 +-
 osu.Game/Screens/Edit/BottomBar.cs                       | 4 ++--
 .../Edit/Compose/Components/Timeline/TimelineArea.cs     | 9 ++++++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 6fcb8f62ee..d379242e3b 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -472,7 +472,7 @@ namespace osu.Game.Rulesets.Edit
     public abstract partial class HitObjectComposer : CompositeDrawable, IPositionSnapProvider
     {
         public const float TOOLBOX_CONTRACTED_SIZE_LEFT = 60;
-        public const float TOOLBOX_CONTRACTED_SIZE_RIGHT = 130;
+        public const float TOOLBOX_CONTRACTED_SIZE_RIGHT = 120;
 
         public readonly Ruleset Ruleset;
 
diff --git a/osu.Game/Screens/Edit/BottomBar.cs b/osu.Game/Screens/Edit/BottomBar.cs
index 9a32d5d968..aa3c4ba0d0 100644
--- a/osu.Game/Screens/Edit/BottomBar.cs
+++ b/osu.Game/Screens/Edit/BottomBar.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Overlays;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Screens.Edit.Components;
 using osu.Game.Screens.Edit.Components.Timelines.Summary;
 using osuTK;
@@ -57,7 +58,7 @@ namespace osu.Game.Screens.Edit
                             new Dimension(GridSizeMode.Absolute, 170),
                             new Dimension(),
                             new Dimension(GridSizeMode.Absolute, 220),
-                            new Dimension(GridSizeMode.Absolute, 140),
+                            new Dimension(GridSizeMode.Absolute, HitObjectComposer.TOOLBOX_CONTRACTED_SIZE_RIGHT),
                         },
                         Content = new[]
                         {
@@ -69,7 +70,6 @@ namespace osu.Game.Screens.Edit
                                 TestGameplayButton = new TestGameplayButton
                                 {
                                     RelativeSizeAxes = Axes.Both,
-                                    Padding = new MarginPadding { Left = 10 },
                                     Size = new Vector2(1),
                                     Action = editor.TestGameplay,
                                 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
index fb7ce8e423..88c5d0104b 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
@@ -11,6 +11,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Localisation;
 using osu.Game.Overlays;
 using osu.Game.Resources.Localisation.Web;
+using osu.Game.Rulesets.Edit;
 using osuTK;
 
 namespace osu.Game.Screens.Edit.Compose.Components.Timeline
@@ -36,6 +37,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             OsuCheckbox controlPointsCheckbox;
             OsuCheckbox ticksCheckbox;
 
+            const float padding = 10;
+
             InternalChildren = new Drawable[]
             {
                 new GridContainer
@@ -51,7 +54,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                         new Dimension(GridSizeMode.Absolute, 140),
                         new Dimension(),
                         new Dimension(GridSizeMode.Absolute, 35),
-                        new Dimension(GridSizeMode.Absolute, 110),
+                        new Dimension(GridSizeMode.Absolute, HitObjectComposer.TOOLBOX_CONTRACTED_SIZE_RIGHT - padding * 2),
                     },
                     Content = new[]
                     {
@@ -71,7 +74,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                                     new FillFlowContainer
                                     {
                                         RelativeSizeAxes = Axes.Both,
-                                        Padding = new MarginPadding(10),
+                                        Padding = new MarginPadding(padding),
                                         Direction = FillDirection.Vertical,
                                         Spacing = new Vector2(0, 4),
                                         Children = new[]
@@ -124,7 +127,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                             {
                                 RelativeSizeAxes = Axes.Both,
                                 Name = @"Zoom controls",
-                                Padding = new MarginPadding { Right = 10 },
+                                Padding = new MarginPadding { Right = padding },
                                 Children = new Drawable[]
                                 {
                                     new Box

From b58354ac641cf92d9f80b83279054852f4bb4a38 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Jul 2023 15:20:19 +0900
Subject: [PATCH 1472/1604] Fix playfield getting cut off (again) at tall
 aspect ratios

---
 .../Edit/OsuHitObjectComposer.cs              |  7 +------
 osu.Game/Rulesets/Edit/HitObjectComposer.cs   | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index 8d93613156..0b80750a02 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -62,12 +62,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         private void load()
         {
             // Give a bit of breathing room around the playfield content.
-            PlayfieldContentContainer.Padding = new MarginPadding
-            {
-                Vertical = 10,
-                // Intentionally use the left toolbox size for both sides to vertically centre the playfield.
-                Horizontal = TOOLBOX_CONTRACTED_SIZE_LEFT + 10,
-            };
+            PlayfieldContentContainer.Padding = new MarginPadding(10);
 
             LayerBelowRuleset.AddRange(new Drawable[]
             {
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index d379242e3b..bad7c55883 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -117,13 +117,10 @@ namespace osu.Game.Rulesets.Edit
             {
                 PlayfieldContentContainer = new Container
                 {
-                    Name = "Content",
-                    Padding = new MarginPadding
-                    {
-                        Left = TOOLBOX_CONTRACTED_SIZE_LEFT,
-                        Right = TOOLBOX_CONTRACTED_SIZE_RIGHT,
-                    },
-                    RelativeSizeAxes = Axes.Both,
+                    Name = "Playfield content",
+                    RelativeSizeAxes = Axes.Y,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
                     Children = new Drawable[]
                     {
                         // layers below playfield
@@ -240,6 +237,14 @@ namespace osu.Game.Rulesets.Edit
             });
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            // Ensure that the playfield is always centered but also doesn't get cut off by toolboxes.
+            PlayfieldContentContainer.Width = Math.Max(1024, DrawWidth) - TOOLBOX_CONTRACTED_SIZE_RIGHT * 2;
+        }
+
         public override Playfield Playfield => drawableRulesetWrapper.Playfield;
 
         public override IEnumerable<DrawableHitObject> HitObjects => drawableRulesetWrapper.Playfield.AllHitObjects;

From cdcb10e0e7d278749ad2d97e326326ed94cf11a9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Jul 2023 15:26:41 +0900
Subject: [PATCH 1473/1604] Fix timeline centre point being ever-so-slight off

---
 .../Screens/Edit/Compose/Components/Timeline/TimelineArea.cs    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
index 88c5d0104b..b973ac3731 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                     },
                     ColumnDimensions = new[]
                     {
-                        new Dimension(GridSizeMode.Absolute, 140),
+                        new Dimension(GridSizeMode.Absolute, 135),
                         new Dimension(),
                         new Dimension(GridSizeMode.Absolute, 35),
                         new Dimension(GridSizeMode.Absolute, HitObjectComposer.TOOLBOX_CONTRACTED_SIZE_RIGHT - padding * 2),

From 82a5ba66e1f25049702e8ed2470fa29af7622d06 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Jul 2023 15:27:42 +0900
Subject: [PATCH 1474/1604] Align mode switcher with rest of interface

---
 osu.Game/Screens/Edit/Editor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 41c11ce5c1..951c73b169 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -359,7 +359,7 @@ namespace osu.Game.Screens.Edit
                             {
                                 Anchor = Anchor.BottomRight,
                                 Origin = Anchor.BottomRight,
-                                X = -15,
+                                X = -10,
                                 Current = Mode,
                             },
                         },

From ac4ad1e78ce7ed33398b0b9e4cbdb24487b19800 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Jul 2023 15:35:03 +0900
Subject: [PATCH 1475/1604] Change tournament tests to use development folder

Unsure there was a reason for this not to be the case (looks to have
been an oversight).
---
 osu.Game.Tournament.Tests/TournamentTestRunner.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tournament.Tests/TournamentTestRunner.cs b/osu.Game.Tournament.Tests/TournamentTestRunner.cs
index f6aef53514..5f642b14f5 100644
--- a/osu.Game.Tournament.Tests/TournamentTestRunner.cs
+++ b/osu.Game.Tournament.Tests/TournamentTestRunner.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Tournament.Tests
         [STAThread]
         public static int Main(string[] args)
         {
-            using (DesktopGameHost host = Host.GetSuitableDesktopHost(@"osu", new HostOptions { BindIPC = true }))
+            using (DesktopGameHost host = Host.GetSuitableDesktopHost(@"osu-development", new HostOptions { BindIPC = true }))
             {
                 host.Run(new TournamentTestBrowser());
                 return 0;

From 741c3b8d212e1a0df93675de3ef913735142890e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Jul 2023 15:39:40 +0900
Subject: [PATCH 1476/1604] Reduce spacing in settings items

---
 osu.Game/Overlays/Settings/SettingsItem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/SettingsItem.cs b/osu.Game/Overlays/Settings/SettingsItem.cs
index 9085b6c911..9c6bb5ae60 100644
--- a/osu.Game/Overlays/Settings/SettingsItem.cs
+++ b/osu.Game/Overlays/Settings/SettingsItem.cs
@@ -196,7 +196,7 @@ namespace osu.Game.Overlays.Settings
                     {
                         RelativeSizeAxes = Axes.X,
                         AutoSizeAxes = Axes.Y,
-                        Spacing = new Vector2(0, 10),
+                        Spacing = new Vector2(0, 5),
                         Child = Control = CreateControl(),
                     }
                 }

From b5c3231feb95c93d3ced0be400ceccdb98e103b6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Jul 2023 15:43:48 +0900
Subject: [PATCH 1477/1604] Fix `SettingsNumberBox` having additional margin

---
 osu.Game/Overlays/Settings/SettingsNumberBox.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/SettingsNumberBox.cs b/osu.Game/Overlays/Settings/SettingsNumberBox.cs
index 7912890528..a0f85eda31 100644
--- a/osu.Game/Overlays/Settings/SettingsNumberBox.cs
+++ b/osu.Game/Overlays/Settings/SettingsNumberBox.cs
@@ -36,7 +36,6 @@ namespace osu.Game.Overlays.Settings
                 {
                     numberBox = new OutlinedNumberBox
                     {
-                        Margin = new MarginPadding { Top = 5 },
                         RelativeSizeAxes = Axes.X,
                         CommitOnFocusLost = true
                     }

From cfcfe202217011a1d8b7dab4f0f0e71572e10762 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Jul 2023 15:46:14 +0900
Subject: [PATCH 1478/1604] Reduce scale and better align user panel

---
 osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
index 161ba71f7a..f8d839d2fc 100644
--- a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
@@ -293,9 +293,9 @@ namespace osu.Game.Tournament.Screens.Editors
                     {
                         userPanelContainer.Child = new UserListPanel(user.ToAPIUser())
                         {
-                            Anchor = Anchor.CentreLeft,
-                            Origin = Anchor.CentreLeft,
-                            Scale = new Vector2(1.7f),
+                            Anchor = Anchor.BottomLeft,
+                            Origin = Anchor.BottomLeft,
+                            Scale = new Vector2(1f),
                         };
                     });
                 }

From d23c73a2f1ed9eb1d4f143671956819981fb6c70 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Jul 2023 17:25:38 +0900
Subject: [PATCH 1479/1604] Adjust with better numbers based off 1920x1080
 resolution
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 osu.Game/Skinning/LegacySkin.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index b72a757e6c..7a8c490e4d 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -368,7 +368,7 @@ namespace osu.Game.Skinning
                                 {
                                     songProgress.Anchor = Anchor.TopRight;
                                     songProgress.Origin = Anchor.CentreRight;
-                                    songProgress.X = -accuracy.ScreenSpaceDeltaToParentSpace(accuracy.ScreenSpaceDrawQuad.Size).X - 20;
+                                    songProgress.X = -accuracy.ScreenSpaceDeltaToParentSpace(accuracy.ScreenSpaceDrawQuad.Size).X - 18;
                                     songProgress.Y = container.ToLocalSpace(accuracy.ScreenSpaceDrawQuad.TopLeft).Y + (accuracy.ScreenSpaceDeltaToParentSpace(accuracy.ScreenSpaceDrawQuad.Size).Y / 2);
                                 }
 

From fd2bdc10c7d1106e01552f48018f9e80622c6e76 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Jul 2023 18:52:19 +0900
Subject: [PATCH 1480/1604] Fix "key count" setting showing as "circle size" in
 osu!mania editor

Closes https://github.com/ppy/osu/issues/12904.
---
 .../Edit/Setup/ManiaDifficultySection.cs      | 19 ++++++++++
 osu.Game.Rulesets.Mania/ManiaRuleset.cs       |  2 +
 osu.Game/Rulesets/Ruleset.cs                  |  5 +++
 .../Screens/Edit/Setup/DifficultySection.cs   | 38 +++++++++----------
 osu.Game/Screens/Edit/Setup/SetupScreen.cs    |  6 ++-
 5 files changed, 49 insertions(+), 21 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania/Edit/Setup/ManiaDifficultySection.cs

diff --git a/osu.Game.Rulesets.Mania/Edit/Setup/ManiaDifficultySection.cs b/osu.Game.Rulesets.Mania/Edit/Setup/ManiaDifficultySection.cs
new file mode 100644
index 0000000000..82ec66a28a
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Edit/Setup/ManiaDifficultySection.cs
@@ -0,0 +1,19 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Game.Resources.Localisation.Web;
+using osu.Game.Screens.Edit.Setup;
+
+namespace osu.Game.Rulesets.Mania.Edit.Setup
+{
+    public partial class ManiaDifficultySection : DifficultySection
+    {
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            CircleSizeSlider.Label = BeatmapsetsStrings.ShowStatsCsMania;
+            CircleSizeSlider.Description = "The number of columns in the beatmap";
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 802399e247..4507015169 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -425,6 +425,8 @@ namespace osu.Game.Rulesets.Mania
         }
 
         public override RulesetSetupSection CreateEditorSetupSection() => new ManiaSetupSection();
+
+        public override DifficultySection CreateEditorDifficultySection() => new ManiaDifficultySection();
     }
 
     public enum PlayfieldType
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index cd432e050b..be0d757e06 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -384,5 +384,10 @@ namespace osu.Game.Rulesets
         /// Can be overridden to add a ruleset-specific section to the editor beatmap setup screen.
         /// </summary>
         public virtual RulesetSetupSection? CreateEditorSetupSection() => null;
+
+        /// <summary>
+        /// Can be overridden to alter the difficulty section to the editor beatmap setup screen.
+        /// </summary>
+        public virtual DifficultySection? CreateEditorDifficultySection() => null;
     }
 }
diff --git a/osu.Game/Screens/Edit/Setup/DifficultySection.cs b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
index 4c062b0cb7..3954271290 100644
--- a/osu.Game/Screens/Edit/Setup/DifficultySection.cs
+++ b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
@@ -13,14 +13,14 @@ using osu.Game.Localisation;
 
 namespace osu.Game.Screens.Edit.Setup
 {
-    internal partial class DifficultySection : SetupSection
+    public partial class DifficultySection : SetupSection
     {
-        private LabelledSliderBar<float> circleSizeSlider = null!;
-        private LabelledSliderBar<float> healthDrainSlider = null!;
-        private LabelledSliderBar<float> approachRateSlider = null!;
-        private LabelledSliderBar<float> overallDifficultySlider = null!;
-        private LabelledSliderBar<double> baseVelocitySlider = null!;
-        private LabelledSliderBar<double> tickRateSlider = null!;
+        protected LabelledSliderBar<float> CircleSizeSlider = null!;
+        protected LabelledSliderBar<float> HealthDrainSlider = null!;
+        protected LabelledSliderBar<float> ApproachRateSlider = null!;
+        protected LabelledSliderBar<float> OverallDifficultySlider = null!;
+        protected LabelledSliderBar<double> BaseVelocitySlider = null!;
+        protected LabelledSliderBar<double> TickRateSlider = null!;
 
         public override LocalisableString Title => EditorSetupStrings.DifficultyHeader;
 
@@ -29,7 +29,7 @@ namespace osu.Game.Screens.Edit.Setup
         {
             Children = new Drawable[]
             {
-                circleSizeSlider = new LabelledSliderBar<float>
+                CircleSizeSlider = new LabelledSliderBar<float>
                 {
                     Label = BeatmapsetsStrings.ShowStatsCs,
                     FixedLabelWidth = LABEL_WIDTH,
@@ -42,7 +42,7 @@ namespace osu.Game.Screens.Edit.Setup
                         Precision = 0.1f,
                     }
                 },
-                healthDrainSlider = new LabelledSliderBar<float>
+                HealthDrainSlider = new LabelledSliderBar<float>
                 {
                     Label = BeatmapsetsStrings.ShowStatsDrain,
                     FixedLabelWidth = LABEL_WIDTH,
@@ -55,7 +55,7 @@ namespace osu.Game.Screens.Edit.Setup
                         Precision = 0.1f,
                     }
                 },
-                approachRateSlider = new LabelledSliderBar<float>
+                ApproachRateSlider = new LabelledSliderBar<float>
                 {
                     Label = BeatmapsetsStrings.ShowStatsAr,
                     FixedLabelWidth = LABEL_WIDTH,
@@ -68,7 +68,7 @@ namespace osu.Game.Screens.Edit.Setup
                         Precision = 0.1f,
                     }
                 },
-                overallDifficultySlider = new LabelledSliderBar<float>
+                OverallDifficultySlider = new LabelledSliderBar<float>
                 {
                     Label = BeatmapsetsStrings.ShowStatsAccuracy,
                     FixedLabelWidth = LABEL_WIDTH,
@@ -81,7 +81,7 @@ namespace osu.Game.Screens.Edit.Setup
                         Precision = 0.1f,
                     }
                 },
-                baseVelocitySlider = new LabelledSliderBar<double>
+                BaseVelocitySlider = new LabelledSliderBar<double>
                 {
                     Label = EditorSetupStrings.BaseVelocity,
                     FixedLabelWidth = LABEL_WIDTH,
@@ -94,7 +94,7 @@ namespace osu.Game.Screens.Edit.Setup
                         Precision = 0.01f,
                     }
                 },
-                tickRateSlider = new LabelledSliderBar<double>
+                TickRateSlider = new LabelledSliderBar<double>
                 {
                     Label = EditorSetupStrings.TickRate,
                     FixedLabelWidth = LABEL_WIDTH,
@@ -120,12 +120,12 @@ namespace osu.Game.Screens.Edit.Setup
         {
             // for now, update these on commit rather than making BeatmapMetadata bindables.
             // after switching database engines we can reconsider if switching to bindables is a good direction.
-            Beatmap.Difficulty.CircleSize = circleSizeSlider.Current.Value;
-            Beatmap.Difficulty.DrainRate = healthDrainSlider.Current.Value;
-            Beatmap.Difficulty.ApproachRate = approachRateSlider.Current.Value;
-            Beatmap.Difficulty.OverallDifficulty = overallDifficultySlider.Current.Value;
-            Beatmap.Difficulty.SliderMultiplier = baseVelocitySlider.Current.Value;
-            Beatmap.Difficulty.SliderTickRate = tickRateSlider.Current.Value;
+            Beatmap.Difficulty.CircleSize = CircleSizeSlider.Current.Value;
+            Beatmap.Difficulty.DrainRate = HealthDrainSlider.Current.Value;
+            Beatmap.Difficulty.ApproachRate = ApproachRateSlider.Current.Value;
+            Beatmap.Difficulty.OverallDifficulty = OverallDifficultySlider.Current.Value;
+            Beatmap.Difficulty.SliderMultiplier = BaseVelocitySlider.Current.Value;
+            Beatmap.Difficulty.SliderTickRate = TickRateSlider.Current.Value;
 
             Beatmap.UpdateAllHitObjects();
             Beatmap.SaveState();
diff --git a/osu.Game/Screens/Edit/Setup/SetupScreen.cs b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
index ab4299a2f0..266ea1f929 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreen.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
@@ -26,16 +26,18 @@ namespace osu.Game.Screens.Edit.Setup
         [BackgroundDependencyLoader]
         private void load(EditorBeatmap beatmap, OverlayColourProvider colourProvider)
         {
+            var ruleset = beatmap.BeatmapInfo.Ruleset.CreateInstance();
+
             var sectionsEnumerable = new List<SetupSection>
             {
                 new ResourcesSection(),
                 new MetadataSection(),
-                new DifficultySection(),
+                ruleset.CreateEditorDifficultySection() ?? new DifficultySection(),
                 new ColoursSection(),
                 new DesignSection(),
             };
 
-            var rulesetSpecificSection = beatmap.BeatmapInfo.Ruleset.CreateInstance().CreateEditorSetupSection();
+            var rulesetSpecificSection = ruleset.CreateEditorSetupSection();
             if (rulesetSpecificSection != null)
                 sectionsEnumerable.Add(rulesetSpecificSection);
 

From 2ef843261ba3a9176394c86bfe50f12d84ca4320 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 21 Jul 2023 19:08:40 +0200
Subject: [PATCH 1481/1604] Adjust failing test after metrics changes

---
 .../Visual/Editing/TestSceneHitObjectComposer.cs       | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs
index 9bdb9a513c..a38c481003 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs
@@ -117,9 +117,9 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("move mouse to overlapping toggle button", () =>
             {
                 var playfield = hitObjectComposer.Playfield.ScreenSpaceDrawQuad;
-                var button = toolboxContainer.ChildrenOfType<DrawableTernaryButton>().First(b => playfield.Contains(b.ScreenSpaceDrawQuad.Centre));
+                var button = toolboxContainer.ChildrenOfType<DrawableTernaryButton>().First(b => playfield.Contains(getOverlapPoint(b)));
 
-                InputManager.MoveMouseTo(button);
+                InputManager.MoveMouseTo(getOverlapPoint(button));
             });
 
             AddAssert("no circles placed", () => editorBeatmap.HitObjects.Count == 0);
@@ -127,6 +127,12 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("attempt place circle", () => InputManager.Click(MouseButton.Left));
 
             AddAssert("no circles placed", () => editorBeatmap.HitObjects.Count == 0);
+
+            Vector2 getOverlapPoint(DrawableTernaryButton ternaryButton)
+            {
+                var quad = ternaryButton.ScreenSpaceDrawQuad;
+                return quad.TopLeft + new Vector2(quad.Width * 9 / 10, quad.Height / 2);
+            }
         }
 
         [Test]

From 7ace50f442c460845c3d1b8c736bc6160678c34d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 21 Jul 2023 21:17:14 +0200
Subject: [PATCH 1482/1604] Touch up dialogs a bit

---
 ...itorDeleteRoundDialog.cs => DeleteRoundDialog.cs} |  7 ++++---
 ...EditorDeleteTeamDialog.cs => DeleteTeamDialog.cs} |  9 +++++----
 .../Screens/Editors/RoundEditorScreen.cs             | 12 +++++-------
 .../Screens/Editors/TeamEditorScreen.cs              |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)
 rename osu.Game.Tournament/Screens/Editors/Components/{RoundEditorDeleteRoundDialog.cs => DeleteRoundDialog.cs} (58%)
 rename osu.Game.Tournament/Screens/Editors/Components/{TeamEditorDeleteTeamDialog.cs => DeleteTeamDialog.cs} (55%)

diff --git a/osu.Game.Tournament/Screens/Editors/Components/RoundEditorDeleteRoundDialog.cs b/osu.Game.Tournament/Screens/Editors/Components/DeleteRoundDialog.cs
similarity index 58%
rename from osu.Game.Tournament/Screens/Editors/Components/RoundEditorDeleteRoundDialog.cs
rename to osu.Game.Tournament/Screens/Editors/Components/DeleteRoundDialog.cs
index 629cd4e135..769412bf94 100644
--- a/osu.Game.Tournament/Screens/Editors/Components/RoundEditorDeleteRoundDialog.cs
+++ b/osu.Game.Tournament/Screens/Editors/Components/DeleteRoundDialog.cs
@@ -4,14 +4,15 @@
 using System;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Overlays.Dialog;
+using osu.Game.Tournament.Models;
 
 namespace osu.Game.Tournament.Screens.Editors.Components
 {
-    public partial class RoundEditorDeleteRoundDialog : DangerousActionDialog
+    public partial class DeleteRoundDialog : DangerousActionDialog
     {
-        public RoundEditorDeleteRoundDialog(string roundName, Action action)
+        public DeleteRoundDialog(TournamentRound round, Action action)
         {
-            HeaderText = roundName.Length > 0 ? $@"Delete round ""{roundName}""?" : @"Delete unnamed round?";
+            HeaderText = round.Name.Value.Length > 0 ? $@"Delete round ""{round.Name.Value}""?" : @"Delete unnamed round?";
             Icon = FontAwesome.Solid.Trash;
             DangerousAction = action;
         }
diff --git a/osu.Game.Tournament/Screens/Editors/Components/TeamEditorDeleteTeamDialog.cs b/osu.Game.Tournament/Screens/Editors/Components/DeleteTeamDialog.cs
similarity index 55%
rename from osu.Game.Tournament/Screens/Editors/Components/TeamEditorDeleteTeamDialog.cs
rename to osu.Game.Tournament/Screens/Editors/Components/DeleteTeamDialog.cs
index f91b58e185..65fb47cf94 100644
--- a/osu.Game.Tournament/Screens/Editors/Components/TeamEditorDeleteTeamDialog.cs
+++ b/osu.Game.Tournament/Screens/Editors/Components/DeleteTeamDialog.cs
@@ -4,15 +4,16 @@
 using System;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Overlays.Dialog;
+using osu.Game.Tournament.Models;
 
 namespace osu.Game.Tournament.Screens.Editors.Components
 {
-    public partial class TeamEditorDeleteTeamDialog : DangerousActionDialog
+    public partial class DeleteTeamDialog : DangerousActionDialog
     {
-        public TeamEditorDeleteTeamDialog(string fullTeamName, string acronym, Action action)
+        public DeleteTeamDialog(TournamentTeam team, Action action)
         {
-            HeaderText = fullTeamName.Length > 0 ? $@"Delete team ""{fullTeamName}""?" :
-                acronym.Length > 0 ? $@"Delete team ""{acronym}""?" :
+            HeaderText = team.FullName.Value.Length > 0 ? $@"Delete team ""{team.FullName.Value}""?" :
+                team.Acronym.Value.Length > 0 ? $@"Delete team ""{team.Acronym.Value}""?" :
                 @"Delete unnamed team?";
             Icon = FontAwesome.Solid.Trash;
             DangerousAction = action;
diff --git a/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs
index 712a724d4d..6c1e7d9200 100644
--- a/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs
@@ -104,13 +104,11 @@ namespace osu.Game.Tournament.Screens.Editors
                         RelativeSizeAxes = Axes.None,
                         Width = 150,
                         Text = "Delete Round",
-                        Action = () => dialogOverlay?.Push(
-                            new RoundEditorDeleteRoundDialog(
-                                Model.Name.Value, () =>
-                                {
-                                    Expire();
-                                    ladderInfo.Rounds.Remove(Model);
-                                }))
+                        Action = () => dialogOverlay?.Push(new DeleteRoundDialog(Model, () =>
+                        {
+                            Expire();
+                            ladderInfo.Rounds.Remove(Model);
+                        }))
                     }
                 };
 
diff --git a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
index aa55c75483..29616292ee 100644
--- a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
@@ -162,7 +162,7 @@ namespace osu.Game.Tournament.Screens.Editors
                                         Text = "Delete Team",
                                         Anchor = Anchor.TopRight,
                                         Origin = Anchor.TopRight,
-                                        Action = () => dialogOverlay?.Push(new TeamEditorDeleteTeamDialog(Model.FullName.Value, Model.Acronym.Value, () =>
+                                        Action = () => dialogOverlay?.Push(new DeleteTeamDialog(Model, () =>
                                         {
                                             Expire();
                                             ladderInfo.Teams.Remove(Model);

From d055d16ba78f24854bb3722f2d101106b29f0520 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 21 Jul 2023 21:18:49 +0200
Subject: [PATCH 1483/1604] Remove superfluous `CanBeNull` dependency specs

As stated before, not required in NRT-annotated files if auto-properties
are already marked nullable.
---
 osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs      | 2 +-
 osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs       | 2 +-
 osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs
index 6c1e7d9200..ff6657324d 100644
--- a/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Tournament.Screens.Editors
             [Resolved]
             private LadderInfo ladderInfo { get; set; } = null!;
 
-            [Resolved(canBeNull: true)]
+            [Resolved]
             private IDialogOverlay? dialogOverlay { get; set; }
 
             public RoundRow(TournamentRound round)
diff --git a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
index 29616292ee..241692d515 100644
--- a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Tournament.Screens.Editors
             [Resolved]
             private TournamentSceneManager? sceneManager { get; set; }
 
-            [Resolved(canBeNull: true)]
+            [Resolved]
             private IDialogOverlay? dialogOverlay { get; set; }
 
             [Resolved]
diff --git a/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
index aa9f83ba21..9dd028fa79 100644
--- a/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Tournament.Screens.Editors
     {
         protected abstract BindableList<TModel> Storage { get; }
 
-        [Resolved(canBeNull: true)]
+        [Resolved]
         private IDialogOverlay? dialogOverlay { get; set; }
 
         private FillFlowContainer<TDrawable> flow = null!;

From 92c40c9cedd506e369f5059819c35e19aac5b144 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 21 Jul 2023 21:20:22 +0200
Subject: [PATCH 1484/1604] Remove superfluous container

---
 osu.Game.Tournament/TournamentGame.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/TournamentGame.cs b/osu.Game.Tournament/TournamentGame.cs
index 97292c09aa..39d19261e6 100644
--- a/osu.Game.Tournament/TournamentGame.cs
+++ b/osu.Game.Tournament/TournamentGame.cs
@@ -11,7 +11,6 @@ using osu.Framework.Configuration;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Handlers.Mouse;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
@@ -101,7 +100,7 @@ namespace osu.Game.Tournament
                         RelativeSizeAxes = Axes.Both,
                         Child = new TournamentSceneManager()
                     },
-                    new Container { RelativeSizeAxes = Axes.Both, Child = dialogOverlay }
+                    dialogOverlay
                 }, drawables =>
                 {
                     loadingSpinner.Hide();

From e0fe5c77d56722ef93afbcab6f2769dc9841e835 Mon Sep 17 00:00:00 2001
From: Dao Heng Liu <daohengliu@gmail.com>
Date: Sat, 22 Jul 2023 09:44:02 +0100
Subject: [PATCH 1485/1604] add reload tournaments list button to tourney setup
 screen

---
 .../Screens/Setup/TournamentSwitcher.cs              | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs b/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs
index 2d57757ad9..0852161db8 100644
--- a/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs
+++ b/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs
@@ -15,6 +15,7 @@ namespace osu.Game.Tournament.Screens.Setup
     {
         private OsuDropdown<string> dropdown;
         private OsuButton folderButton;
+        private OsuButton reloadTournamentsButton;
 
         [Resolved]
         private TournamentGameBase game { get; set; }
@@ -28,6 +29,9 @@ namespace osu.Game.Tournament.Screens.Setup
             dropdown.Items = storage.ListTournaments();
             dropdown.Current.BindValueChanged(v => Button.Enabled.Value = v.NewValue != startupTournament, true);
 
+            reloadTournamentsButton.Enabled.Value = true;
+            reloadTournamentsButton.Action = () => dropdown.Items = storage.ListTournaments();
+
             Action = () =>
             {
                 game.RestartAppWhenExited();
@@ -48,7 +52,13 @@ namespace osu.Game.Tournament.Screens.Setup
                 Width = BUTTON_SIZE
             });
 
-            FlowContainer.Insert(-2, dropdown = new OsuDropdown<string>
+            FlowContainer.Insert(-2, reloadTournamentsButton = new RoundedButton
+            {
+                Text = "Reload list",
+                Width = BUTTON_SIZE
+            });
+
+            FlowContainer.Insert(-3, dropdown = new OsuDropdown<string>
             {
                 Width = 510
             });

From ef74084a2ed11ef9bb1b0e393b2bc646532739e1 Mon Sep 17 00:00:00 2001
From: Dao Heng Liu <daohengliu@gmail.com>
Date: Sat, 22 Jul 2023 09:59:00 +0100
Subject: [PATCH 1486/1604] make list of tournaments in SetupScreen dropdown
 alphabetically sorted

---
 osu.Game.Tournament/IO/TournamentStorage.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/IO/TournamentStorage.cs b/osu.Game.Tournament/IO/TournamentStorage.cs
index e59f90a45e..7c5f3e44a7 100644
--- a/osu.Game.Tournament/IO/TournamentStorage.cs
+++ b/osu.Game.Tournament/IO/TournamentStorage.cs
@@ -1,7 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
@@ -43,6 +45,6 @@ namespace osu.Game.Tournament.IO
             Logger.Log("Changing tournament storage: " + GetFullPath(string.Empty));
         }
 
-        public IEnumerable<string> ListTournaments() => AllTournaments.GetDirectories(string.Empty);
+        public IEnumerable<string> ListTournaments() => AllTournaments.GetDirectories(string.Empty).OrderBy(directory => directory, StringComparer.CurrentCultureIgnoreCase);
     }
 }

From 101f3eca2546d60e02a3b7ab22382045f4234869 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 22 Jul 2023 21:01:32 +0900
Subject: [PATCH 1487/1604] Rename button slightly

---
 osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs b/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs
index 0852161db8..bf3e410aca 100644
--- a/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs
+++ b/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Tournament.Screens.Setup
 
             FlowContainer.Insert(-2, reloadTournamentsButton = new RoundedButton
             {
-                Text = "Reload list",
+                Text = "Refresh",
                 Width = BUTTON_SIZE
             });
 

From a59876ce13b4c16c374eb2b1b151d0ec54ae4e7f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 22 Jul 2023 21:03:13 +0900
Subject: [PATCH 1488/1604] Remove unnecessary enable call

---
 osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs b/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs
index bf3e410aca..ae49ccb63b 100644
--- a/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs
+++ b/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs
@@ -29,7 +29,6 @@ namespace osu.Game.Tournament.Screens.Setup
             dropdown.Items = storage.ListTournaments();
             dropdown.Current.BindValueChanged(v => Button.Enabled.Value = v.NewValue != startupTournament, true);
 
-            reloadTournamentsButton.Enabled.Value = true;
             reloadTournamentsButton.Action = () => dropdown.Items = storage.ListTournaments();
 
             Action = () =>

From f985bdc10f5e5f26f3fb3011030d99cae6fb1926 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 22 Jul 2023 15:55:20 +0200
Subject: [PATCH 1489/1604] Make difficulty sliders `private set`

---
 osu.Game/Screens/Edit/Setup/DifficultySection.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Edit/Setup/DifficultySection.cs b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
index 3954271290..1915b0cfd1 100644
--- a/osu.Game/Screens/Edit/Setup/DifficultySection.cs
+++ b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
@@ -15,12 +15,12 @@ namespace osu.Game.Screens.Edit.Setup
 {
     public partial class DifficultySection : SetupSection
     {
-        protected LabelledSliderBar<float> CircleSizeSlider = null!;
-        protected LabelledSliderBar<float> HealthDrainSlider = null!;
-        protected LabelledSliderBar<float> ApproachRateSlider = null!;
-        protected LabelledSliderBar<float> OverallDifficultySlider = null!;
-        protected LabelledSliderBar<double> BaseVelocitySlider = null!;
-        protected LabelledSliderBar<double> TickRateSlider = null!;
+        protected LabelledSliderBar<float> CircleSizeSlider { get; private set; } = null!;
+        protected LabelledSliderBar<float> HealthDrainSlider { get; private set; } = null!;
+        protected LabelledSliderBar<float> ApproachRateSlider { get; private set; } = null!;
+        protected LabelledSliderBar<float> OverallDifficultySlider { get; private set; } = null!;
+        protected LabelledSliderBar<double> BaseVelocitySlider { get; private set; } = null!;
+        protected LabelledSliderBar<double> TickRateSlider { get; private set; } = null!;
 
         public override LocalisableString Title => EditorSetupStrings.DifficultyHeader;
 

From 157aec5144e5030486193821f18335cc329c3637 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 22 Jul 2023 16:10:58 +0200
Subject: [PATCH 1490/1604] Fix mania key count slider still using circle size
 precision

---
 osu.Game.Rulesets.Mania/Edit/Setup/ManiaDifficultySection.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Edit/Setup/ManiaDifficultySection.cs b/osu.Game.Rulesets.Mania/Edit/Setup/ManiaDifficultySection.cs
index 82ec66a28a..4f983debea 100644
--- a/osu.Game.Rulesets.Mania/Edit/Setup/ManiaDifficultySection.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Setup/ManiaDifficultySection.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Game.Resources.Localisation.Web;
 using osu.Game.Screens.Edit.Setup;
 
@@ -14,6 +15,8 @@ namespace osu.Game.Rulesets.Mania.Edit.Setup
         {
             CircleSizeSlider.Label = BeatmapsetsStrings.ShowStatsCsMania;
             CircleSizeSlider.Description = "The number of columns in the beatmap";
+            if (CircleSizeSlider.Current is BindableNumber<float> circleSizeFloat)
+                circleSizeFloat.Precision = 1;
         }
     }
 }

From 699b66be4228d220325e63c9361fdef34141a7f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 22 Jul 2023 17:12:21 +0200
Subject: [PATCH 1491/1604] Do not reimplement binary sort manually

---
 osu.Game/Rulesets/Edit/Checks/CheckBreaks.cs | 55 +++++---------------
 1 file changed, 13 insertions(+), 42 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBreaks.cs b/osu.Game/Rulesets/Edit/Checks/CheckBreaks.cs
index 44d2c18dad..94369443c2 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBreaks.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBreaks.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using System.Linq;
 using osu.Game.Beatmaps.Timing;
 using osu.Game.Rulesets.Edit.Checks.Components;
 using osu.Game.Rulesets.Objects;
@@ -30,66 +31,36 @@ namespace osu.Game.Rulesets.Edit.Checks
 
         public IEnumerable<Issue> Run(BeatmapVerifierContext context)
         {
+            var startTimes = context.Beatmap.HitObjects.Select(ho => ho.StartTime).OrderBy(x => x).ToList();
+            var endTimes = context.Beatmap.HitObjects.Select(ho => ho.GetEndTime()).OrderBy(x => x).ToList();
+
             foreach (var breakPeriod in context.Beatmap.Breaks)
             {
                 if (breakPeriod.Duration < BreakPeriod.MIN_BREAK_DURATION)
                     yield return new IssueTemplateTooShort(this).Create(breakPeriod.StartTime);
 
-                var previousObject = getPreviousObject(breakPeriod.StartTime, context.Beatmap.HitObjects);
-                var nextObject = getNextObject(breakPeriod.EndTime, context.Beatmap.HitObjects);
+                int previousObjectEndTimeIndex = endTimes.BinarySearch(breakPeriod.StartTime);
+                if (previousObjectEndTimeIndex < 0) previousObjectEndTimeIndex = ~previousObjectEndTimeIndex - 1;
 
-                if (previousObject != null)
+                if (previousObjectEndTimeIndex >= 0)
                 {
-                    double gapBeforeBreak = breakPeriod.StartTime - previousObject.GetEndTime();
+                    double gapBeforeBreak = breakPeriod.StartTime - endTimes[previousObjectEndTimeIndex];
                     if (gapBeforeBreak < minimum_gap_before_break - leniency_threshold)
                         yield return new IssueTemplateEarlyStart(this).Create(breakPeriod.StartTime, minimum_gap_before_break - gapBeforeBreak);
                 }
 
-                if (nextObject != null)
+                int nextObjectStartTimeIndex = startTimes.BinarySearch(breakPeriod.EndTime);
+                if (nextObjectStartTimeIndex < 0) nextObjectStartTimeIndex = ~nextObjectStartTimeIndex;
+
+                if (nextObjectStartTimeIndex < startTimes.Count)
                 {
-                    double gapAfterBreak = nextObject.StartTime - breakPeriod.EndTime;
+                    double gapAfterBreak = startTimes[nextObjectStartTimeIndex] - breakPeriod.EndTime;
                     if (gapAfterBreak < min_end_threshold - leniency_threshold)
                         yield return new IssueTemplateLateEnd(this).Create(breakPeriod.StartTime, min_end_threshold - gapAfterBreak);
                 }
             }
         }
 
-        private HitObject? getPreviousObject(double time, IReadOnlyList<HitObject> hitObjects)
-        {
-            int left = 0;
-            int right = hitObjects.Count - 1;
-
-            while (left <= right)
-            {
-                int mid = left + (right - left) / 2;
-
-                if (hitObjects[mid].GetEndTime() < time)
-                    left = mid + 1;
-                else
-                    right = mid - 1;
-            }
-
-            return right >= 0 ? hitObjects[right] : null;
-        }
-
-        private HitObject? getNextObject(double time, IReadOnlyList<HitObject> hitObjects)
-        {
-            int left = 0;
-            int right = hitObjects.Count - 1;
-
-            while (left <= right)
-            {
-                int mid = left + (right - left) / 2;
-
-                if (hitObjects[mid].StartTime <= time)
-                    left = mid + 1;
-                else
-                    right = mid - 1;
-            }
-
-            return left < hitObjects.Count ? hitObjects[left] : null;
-        }
-
         public class IssueTemplateEarlyStart : IssueTemplate
         {
             public IssueTemplateEarlyStart(ICheck check)

From 2df6e91176a91b391f14461ff8f01396f1ba0725 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 22 Jul 2023 17:12:35 +0200
Subject: [PATCH 1492/1604] Add extra test coverage for breaks before
 first/after last object

---
 .../Editing/Checks/CheckBreaksTest.cs         | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/osu.Game.Tests/Editing/Checks/CheckBreaksTest.cs b/osu.Game.Tests/Editing/Checks/CheckBreaksTest.cs
index aaa536f9b9..28556566ba 100644
--- a/osu.Game.Tests/Editing/Checks/CheckBreaksTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckBreaksTest.cs
@@ -88,6 +88,52 @@ namespace osu.Game.Tests.Editing.Checks
             Assert.That(issues.Single().Template is CheckBreaks.IssueTemplateLateEnd);
         }
 
+        [Test]
+        public void TestBreakAfterLastObjectStartsEarly()
+        {
+            var beatmap = new Beatmap<HitObject>
+            {
+                HitObjects =
+                {
+                    new HitCircle { StartTime = 0 },
+                    new HitCircle { StartTime = 1200 }
+                },
+                Breaks = new List<BreakPeriod>
+                {
+                    new BreakPeriod(1398, 2300)
+                }
+            };
+            var context = new BeatmapVerifierContext(beatmap, new TestWorkingBeatmap(beatmap));
+
+            var issues = check.Run(context).ToList();
+
+            Assert.That(issues, Has.Count.EqualTo(1));
+            Assert.That(issues.Single().Template is CheckBreaks.IssueTemplateEarlyStart);
+        }
+
+        [Test]
+        public void TestBreakBeforeFirstObjectEndsLate()
+        {
+            var beatmap = new Beatmap<HitObject>
+            {
+                HitObjects =
+                {
+                    new HitCircle { StartTime = 1100 },
+                    new HitCircle { StartTime = 1500 }
+                },
+                Breaks = new List<BreakPeriod>
+                {
+                    new BreakPeriod(0, 652)
+                }
+            };
+            var context = new BeatmapVerifierContext(beatmap, new TestWorkingBeatmap(beatmap));
+
+            var issues = check.Run(context).ToList();
+
+            Assert.That(issues, Has.Count.EqualTo(1));
+            Assert.That(issues.Single().Template is CheckBreaks.IssueTemplateLateEnd);
+        }
+
         [Test]
         public void TestBreakMultipleObjectsEarly()
         {

From 647f2b67153f1ee0bb172c390421eb34eaa64607 Mon Sep 17 00:00:00 2001
From: Dao Heng Liu <daohengliu@gmail.com>
Date: Sat, 22 Jul 2023 23:08:20 +0100
Subject: [PATCH 1493/1604] fix auto advance screens sometimes not working

---
 osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs | 6 ++++++
 osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs   | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
index f2a2e97bcc..a921a29abd 100644
--- a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
@@ -232,6 +232,12 @@ namespace osu.Game.Tournament.Screens.Gameplay
             }
         }
 
+        public override void Hide()
+        {
+            scheduledOperation?.Cancel();
+            base.Hide();
+        }
+
         private partial class ChromaArea : CompositeDrawable
         {
             [Resolved]
diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index cb6c5902ec..f0e65e3158 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
@@ -222,6 +222,12 @@ namespace osu.Game.Tournament.Screens.MapPool
             }
         }
 
+        public override void Hide()
+        {
+            scheduledChange?.Cancel();
+            base.Hide();
+        }
+
         protected override void CurrentMatchChanged(ValueChangedEvent<TournamentMatch> match)
         {
             base.CurrentMatchChanged(match);

From d11e56b8bb6ade5c4f6e47de5fa288a909f6bc66 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 23 Jul 2023 14:03:35 +0900
Subject: [PATCH 1494/1604] Add common `Export` string and use in editor

---
 osu.Game/Localisation/CommonStrings.cs           | 5 +++++
 osu.Game/Localisation/EditorStrings.cs           | 5 -----
 osu.Game/Online/Leaderboards/LeaderboardScore.cs | 2 +-
 osu.Game/Screens/Edit/Editor.cs                  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Localisation/CommonStrings.cs b/osu.Game/Localisation/CommonStrings.cs
index c9223db246..480d68619d 100644
--- a/osu.Game/Localisation/CommonStrings.cs
+++ b/osu.Game/Localisation/CommonStrings.cs
@@ -39,6 +39,11 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString Default => new TranslatableString(getKey(@"default"), @"Default");
 
+        /// <summary>
+        /// "Export"
+        /// </summary>
+        public static LocalisableString Export => new TranslatableString(getKey(@"export"), @"Export");
+
         /// <summary>
         /// "Width"
         /// </summary>
diff --git a/osu.Game/Localisation/EditorStrings.cs b/osu.Game/Localisation/EditorStrings.cs
index 07b4dddc05..7ff4d9a7ca 100644
--- a/osu.Game/Localisation/EditorStrings.cs
+++ b/osu.Game/Localisation/EditorStrings.cs
@@ -34,11 +34,6 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString SetPreviewPointToCurrent => new TranslatableString(getKey(@"set_preview_point_to_current"), @"Set preview point to current time");
 
-        /// <summary>
-        /// "Export package"
-        /// </summary>
-        public static LocalisableString ExportPackage => new TranslatableString(getKey(@"export_package"), @"Export package");
-
         /// <summary>
         /// "Legacy format (.osz)"
         /// </summary>
diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index e4ea277756..229cfd2aa6 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -425,7 +425,7 @@ namespace osu.Game.Online.Leaderboards
 
                 if (Score.Files.Count > 0)
                 {
-                    items.Add(new OsuMenuItem("Export", MenuItemType.Standard, () => scoreManager.Export(Score)));
+                    items.Add(new OsuMenuItem(Localisation.CommonStrings.Export, MenuItemType.Standard, () => scoreManager.Export(Score)));
                     items.Add(new OsuMenuItem(CommonStrings.ButtonsDelete, MenuItemType.Destructive, () => dialogOverlay?.Push(new LocalScoreDeleteDialog(Score))));
                 }
 
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 16cd7768fa..0ec6abbc63 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -1016,7 +1016,7 @@ namespace osu.Game.Screens.Edit
                 new EditorMenuItem(EditorStrings.ExportLegacyFormat, MenuItemType.Standard, exportLegacyBeatmap) { Action = { Disabled = !RuntimeInfo.IsDesktop } },
             };
 
-            return new EditorMenuItem(EditorStrings.ExportPackage) { Items = exportItems };
+            return new EditorMenuItem(CommonStrings.Export) { Items = exportItems };
         }
 
         private void exportBeatmap()

From 20359c90bc589b149dc7f827c253b6e28539115a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 23 Jul 2023 14:05:44 +0900
Subject: [PATCH 1495/1604] Adjust localisations slightly

---
 osu.Game/Localisation/EditorStrings.cs | 8 ++++----
 osu.Game/Screens/Edit/Editor.cs        | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Localisation/EditorStrings.cs b/osu.Game/Localisation/EditorStrings.cs
index 7ff4d9a7ca..93e52746c5 100644
--- a/osu.Game/Localisation/EditorStrings.cs
+++ b/osu.Game/Localisation/EditorStrings.cs
@@ -35,14 +35,14 @@ namespace osu.Game.Localisation
         public static LocalisableString SetPreviewPointToCurrent => new TranslatableString(getKey(@"set_preview_point_to_current"), @"Set preview point to current time");
 
         /// <summary>
-        /// "Legacy format (.osz)"
+        /// "For editing (.olz)"
         /// </summary>
-        public static LocalisableString ExportLegacyFormat => new TranslatableString(getKey(@"export_legacy_format"), @"Legacy format (.osz)");
+        public static LocalisableString ExportForEditing => new TranslatableString(getKey(@"export_for_editing"), @"For editing (.olz)");
 
         /// <summary>
-        /// "New format (.olz)"
+        /// "For compatibility (.osz)"
         /// </summary>
-        public static LocalisableString ExportNewFormat => new TranslatableString(getKey(@"export_new_format"), @"New format (.olz)");
+        public static LocalisableString ExportForCompatibility => new TranslatableString(getKey(@"export_for_compatibility"), @"For compatibility (.osz)");
 
         /// <summary>
         /// "Create new difficulty"
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 0ec6abbc63..6558554b01 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -998,7 +998,7 @@ namespace osu.Game.Screens.Edit
         private List<MenuItem> createFileMenuItems() => new List<MenuItem>
         {
             new EditorMenuItem(WebCommonStrings.ButtonsSave, MenuItemType.Standard, () => Save()),
-            createExportPackageMenu(),
+            createExportMenu(),
             new EditorMenuItemSpacer(),
             createDifficultyCreationMenu(),
             createDifficultySwitchMenu(),
@@ -1008,12 +1008,12 @@ namespace osu.Game.Screens.Edit
             new EditorMenuItem(CommonStrings.Exit, MenuItemType.Standard, this.Exit)
         };
 
-        private EditorMenuItem createExportPackageMenu()
+        private EditorMenuItem createExportMenu()
         {
             var exportItems = new List<MenuItem>
             {
-                new EditorMenuItem(EditorStrings.ExportNewFormat, MenuItemType.Standard, exportBeatmap) { Action = { Disabled = !RuntimeInfo.IsDesktop } },
-                new EditorMenuItem(EditorStrings.ExportLegacyFormat, MenuItemType.Standard, exportLegacyBeatmap) { Action = { Disabled = !RuntimeInfo.IsDesktop } },
+                new EditorMenuItem(EditorStrings.ExportForEditing, MenuItemType.Standard, exportBeatmap) { Action = { Disabled = !RuntimeInfo.IsDesktop } },
+                new EditorMenuItem(EditorStrings.ExportForCompatibility, MenuItemType.Standard, exportLegacyBeatmap) { Action = { Disabled = !RuntimeInfo.IsDesktop } },
             };
 
             return new EditorMenuItem(CommonStrings.Export) { Items = exportItems };

From fb34ee94c2f451c4fa5ffe4749f970da75d4154a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 23 Jul 2023 14:07:31 +0900
Subject: [PATCH 1496/1604] Move export/save options to bottom of menu

---
 osu.Game/Screens/Edit/Editor.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 6558554b01..672551e088 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -997,14 +997,14 @@ namespace osu.Game.Screens.Edit
 
         private List<MenuItem> createFileMenuItems() => new List<MenuItem>
         {
-            new EditorMenuItem(WebCommonStrings.ButtonsSave, MenuItemType.Standard, () => Save()),
-            createExportMenu(),
-            new EditorMenuItemSpacer(),
             createDifficultyCreationMenu(),
             createDifficultySwitchMenu(),
             new EditorMenuItemSpacer(),
             new EditorMenuItem(EditorStrings.DeleteDifficulty, MenuItemType.Standard, deleteDifficulty) { Action = { Disabled = Beatmap.Value.BeatmapSetInfo.Beatmaps.Count < 2 } },
             new EditorMenuItemSpacer(),
+            new EditorMenuItem(WebCommonStrings.ButtonsSave, MenuItemType.Standard, () => Save()),
+            createExportMenu(),
+            new EditorMenuItemSpacer(),
             new EditorMenuItem(CommonStrings.Exit, MenuItemType.Standard, this.Exit)
         };
 

From 4ea8495c610cd91d66f0afce8cf00edd74d95ad1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 23 Jul 2023 14:12:37 +0900
Subject: [PATCH 1497/1604] Adjust metrics of editor menu spacers (and make
 visible)

---
 .../Screens/Edit/Components/Menus/EditorMenuBar.cs  | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs b/osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs
index b9385ff0c3..fb0ae2df73 100644
--- a/osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs
+++ b/osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Graphics.UserInterface;
@@ -200,7 +201,17 @@ namespace osu.Game.Screens.Edit.Components.Menus
                 public DrawableSpacer(MenuItem item)
                     : base(item)
                 {
-                    Scale = new Vector2(1, 0.3f);
+                    Scale = new Vector2(1, 0.6f);
+
+                    AddInternal(new Box
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Colour = BackgroundColourHover,
+                        RelativeSizeAxes = Axes.X,
+                        Height = 2f,
+                        Width = 0.8f,
+                    });
                 }
 
                 protected override bool OnHover(HoverEvent e) => true;

From 1a76f6441a67a2d189d2ea3898f83d9a596964e4 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 23 Jul 2023 15:32:12 +0900
Subject: [PATCH 1498/1604] add MatchScoreDiffCounter

Intuitively show the score difference between the two teams
---
 .../Components/TournamentMatchScoreDisplay.cs | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TournamentMatchScoreDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TournamentMatchScoreDisplay.cs
index bd1f3a2dd0..bc7886eb7e 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TournamentMatchScoreDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TournamentMatchScoreDisplay.cs
@@ -28,6 +28,8 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
         private readonly MatchScoreCounter score1Text;
         private readonly MatchScoreCounter score2Text;
 
+        private readonly MatchScoreDiffCounter scoreDiffText;
+
         private readonly Drawable score1Bar;
         private readonly Drawable score2Bar;
 
@@ -88,6 +90,11 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre
                 },
+                scoreDiffText = new MatchScoreDiffCounter
+                {
+                    Anchor = Anchor.TopCentre,
+                    Alpha = 0
+                }
             };
         }
 
@@ -119,6 +126,16 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
 
             losingBar.ResizeWidthTo(0, 400, Easing.OutQuint);
             winningBar.ResizeWidthTo(Math.Min(0.4f, MathF.Pow(diff / 1500000f, 0.5f) / 2), 400, Easing.OutQuint);
+
+            if (diff == 0)
+            {
+                scoreDiffText.Hide();
+                return;
+            }
+
+            scoreDiffText.Show();
+            scoreDiffText.Current.Value = -diff;
+            scoreDiffText.Origin = score1.Value > score2.Value ? Anchor.TopLeft : Anchor.TopRight;
         }
 
         protected override void UpdateAfterChildren()
@@ -154,5 +171,19 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
                     ? OsuFont.Torus.With(weight: FontWeight.Bold, size: 50, fixedWidth: true)
                     : OsuFont.Torus.With(weight: FontWeight.Regular, size: 40, fixedWidth: true);
         }
+
+        private partial class MatchScoreDiffCounter : CommaSeparatedScoreCounter
+        {
+            public MatchScoreDiffCounter()
+            {
+                Margin = new MarginPadding { Top = bar_height / 4, Horizontal = 10 };
+            }
+
+            protected override OsuSpriteText CreateSpriteText() => base.CreateSpriteText().With(s =>
+            {
+                s.Spacing = new Vector2(-1);
+                s.Font = OsuFont.Torus.With(weight: FontWeight.Regular, size: bar_height, fixedWidth: true);
+            });
+        }
     }
 }

From 3b47949ace8a36cea6ca364334421fc810b7ac60 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 23 Jul 2023 17:04:57 +0900
Subject: [PATCH 1499/1604] Avoid transform overhead on every frame

---
 .../Gameplay/Components/TournamentMatchScoreDisplay.cs    | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TournamentMatchScoreDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TournamentMatchScoreDisplay.cs
index bc7886eb7e..e8a5396a37 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TournamentMatchScoreDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TournamentMatchScoreDisplay.cs
@@ -127,13 +127,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
             losingBar.ResizeWidthTo(0, 400, Easing.OutQuint);
             winningBar.ResizeWidthTo(Math.Min(0.4f, MathF.Pow(diff / 1500000f, 0.5f) / 2), 400, Easing.OutQuint);
 
-            if (diff == 0)
-            {
-                scoreDiffText.Hide();
-                return;
-            }
-
-            scoreDiffText.Show();
+            scoreDiffText.Alpha = diff != 0 ? 1 : 0;
             scoreDiffText.Current.Value = -diff;
             scoreDiffText.Origin = score1.Value > score2.Value ? Anchor.TopLeft : Anchor.TopRight;
         }

From 7e4e96a4a95dbdbb59effd21b55f9e36310283ed Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 23 Jul 2023 17:05:04 +0900
Subject: [PATCH 1500/1604] Adjust spacing and clean up code

---
 .../Components/TournamentMatchScoreDisplay.cs        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TournamentMatchScoreDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TournamentMatchScoreDisplay.cs
index e8a5396a37..838e5fa071 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TournamentMatchScoreDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TournamentMatchScoreDisplay.cs
@@ -93,6 +93,11 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
                 scoreDiffText = new MatchScoreDiffCounter
                 {
                     Anchor = Anchor.TopCentre,
+                    Margin = new MarginPadding
+                    {
+                        Top = bar_height / 4,
+                        Horizontal = 8
+                    },
                     Alpha = 0
                 }
             };
@@ -168,14 +173,9 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
 
         private partial class MatchScoreDiffCounter : CommaSeparatedScoreCounter
         {
-            public MatchScoreDiffCounter()
-            {
-                Margin = new MarginPadding { Top = bar_height / 4, Horizontal = 10 };
-            }
-
             protected override OsuSpriteText CreateSpriteText() => base.CreateSpriteText().With(s =>
             {
-                s.Spacing = new Vector2(-1);
+                s.Spacing = new Vector2(-2);
                 s.Font = OsuFont.Torus.With(weight: FontWeight.Regular, size: bar_height, fixedWidth: true);
             });
         }

From 3049d159d8bca2340ca89853ced370abf3919678 Mon Sep 17 00:00:00 2001
From: Dao Heng Liu <daohengliu@gmail.com>
Date: Sun, 23 Jul 2023 10:39:47 +0100
Subject: [PATCH 1501/1604] avoid potentially cancelling `contract` when
 switching away from GameplayScreen

---
 .../Screens/Gameplay/GameplayScreen.cs        | 48 +++++++++++--------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
index a921a29abd..7a54c6fe90 100644
--- a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using System.Diagnostics.Contracts;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -159,6 +160,25 @@ namespace osu.Game.Tournament.Screens.Gameplay
         private TourneyState lastState;
         private MatchHeader header;
 
+        private void contract()
+        {
+            SongBar.Expanded = false;
+            scoreDisplay.FadeOut(100);
+            using (chat?.BeginDelayedSequence(500))
+                chat?.Expand();
+        }
+
+        private void expand()
+        {
+            chat?.Contract();
+
+            using (BeginDelayedSequence(300))
+            {
+                scoreDisplay.FadeIn(100);
+                SongBar.Expanded = true;
+            }
+        }
+
         private void stateChanged(ValueChangedEvent<TourneyState> state)
         {
             try
@@ -175,25 +195,6 @@ namespace osu.Game.Tournament.Screens.Gameplay
 
                 scheduledOperation?.Cancel();
 
-                void expand()
-                {
-                    chat?.Contract();
-
-                    using (BeginDelayedSequence(300))
-                    {
-                        scoreDisplay.FadeIn(100);
-                        SongBar.Expanded = true;
-                    }
-                }
-
-                void contract()
-                {
-                    SongBar.Expanded = false;
-                    scoreDisplay.FadeOut(100);
-                    using (chat?.BeginDelayedSequence(500))
-                        chat?.Expand();
-                }
-
                 switch (state.NewValue)
                 {
                     case TourneyState.Idle:
@@ -234,7 +235,14 @@ namespace osu.Game.Tournament.Screens.Gameplay
 
         public override void Hide()
         {
-            scheduledOperation?.Cancel();
+            if (scheduledOperation != null)
+            {
+                scheduledOperation.Cancel();
+
+                if (State.Value == TourneyState.Ranking)
+                    contract();
+            }
+
             base.Hide();
         }
 

From 5a568eacb637d78eac4b11405a5e6a94bb735d45 Mon Sep 17 00:00:00 2001
From: Dao Heng Liu <daohengliu@gmail.com>
Date: Sun, 23 Jul 2023 10:44:00 +0100
Subject: [PATCH 1502/1604] remove unused `using` directive

---
 osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
index 7a54c6fe90..73193e6dbd 100644
--- a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
@@ -3,7 +3,6 @@
 
 #nullable disable
 
-using System.Diagnostics.Contracts;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;

From 7813a3162b7a0d678d3ee5184fd3522a952ad6c7 Mon Sep 17 00:00:00 2001
From: Dao Heng Liu <daohengliu@gmail.com>
Date: Sun, 23 Jul 2023 12:01:58 +0100
Subject: [PATCH 1503/1604] run stateChanged upon unhiding of GameplayScreen

---
 .../Screens/Gameplay/GameplayScreen.cs             | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
index 73193e6dbd..ae05517385 100644
--- a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
@@ -234,17 +234,17 @@ namespace osu.Game.Tournament.Screens.Gameplay
 
         public override void Hide()
         {
-            if (scheduledOperation != null)
-            {
-                scheduledOperation.Cancel();
-
-                if (State.Value == TourneyState.Ranking)
-                    contract();
-            }
+            scheduledOperation?.Cancel();
 
             base.Hide();
         }
 
+        public override void Show()
+        {
+            stateChanged(new ValueChangedEvent<TourneyState>(TourneyState.Idle, State.Value));
+            base.Show();
+        }
+
         private partial class ChromaArea : CompositeDrawable
         {
             [Resolved]

From 4622255cc7a3d20487fce6378ce4d6dc0f487a00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 23 Jul 2023 18:24:15 +0200
Subject: [PATCH 1504/1604] Move out helper methods to static class

---
 .../Edit/OsuSelectionHandler.cs               |  45 ++-----
 .../SkinEditor/SkinSelectionHandler.cs        |   7 +-
 .../Compose/Components/SelectionHandler.cs    |  94 -------------
 osu.Game/Utils/GeometryUtils.cs               | 126 ++++++++++++++++++
 4 files changed, 143 insertions(+), 129 deletions(-)
 create mode 100644 osu.Game/Utils/GeometryUtils.cs

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 2a6d6ce4c3..468d8ae9f5 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -17,6 +17,7 @@ using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Screens.Edit.Compose.Components;
+using osu.Game.Utils;
 using osuTK;
 using osuTK.Input;
 
@@ -42,7 +43,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
             base.OnSelectionChanged();
 
-            Quad quad = selectedMovableObjects.Length > 0 ? getSurroundingQuad(selectedMovableObjects) : new Quad();
+            Quad quad = selectedMovableObjects.Length > 0 ? GeometryUtils.GetSurroundingQuad(selectedMovableObjects) : new Quad();
 
             SelectionBox.CanRotate = quad.Width > 0 || quad.Height > 0;
             SelectionBox.CanFlipX = SelectionBox.CanScaleX = quad.Width > 0;
@@ -109,13 +110,13 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
             var hitObjects = selectedMovableObjects;
 
-            var flipQuad = flipOverOrigin ? new Quad(0, 0, OsuPlayfield.BASE_SIZE.X, OsuPlayfield.BASE_SIZE.Y) : getSurroundingQuad(hitObjects);
+            var flipQuad = flipOverOrigin ? new Quad(0, 0, OsuPlayfield.BASE_SIZE.X, OsuPlayfield.BASE_SIZE.Y) : GeometryUtils.GetSurroundingQuad(hitObjects);
 
             bool didFlip = false;
 
             foreach (var h in hitObjects)
             {
-                var flippedPosition = GetFlippedPosition(direction, flipQuad, h.Position);
+                var flippedPosition = GeometryUtils.GetFlippedPosition(direction, flipQuad, h.Position);
 
                 if (!Precision.AlmostEquals(flippedPosition, h.Position))
                 {
@@ -173,18 +174,18 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
             var hitObjects = selectedMovableObjects;
 
-            Quad quad = getSurroundingQuad(hitObjects);
+            Quad quad = GeometryUtils.GetSurroundingQuad(hitObjects);
 
             referenceOrigin ??= quad.Centre;
 
             foreach (var h in hitObjects)
             {
-                h.Position = RotatePointAroundOrigin(h.Position, referenceOrigin.Value, delta);
+                h.Position = GeometryUtils.RotatePointAroundOrigin(h.Position, referenceOrigin.Value, delta);
 
                 if (h is IHasPath path)
                 {
                     foreach (PathControlPoint cp in path.Path.ControlPoints)
-                        cp.Position = RotatePointAroundOrigin(cp.Position, Vector2.Zero, delta);
+                        cp.Position = GeometryUtils.RotatePointAroundOrigin(cp.Position, Vector2.Zero, delta);
                 }
             }
 
@@ -196,7 +197,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
             referencePathTypes ??= slider.Path.ControlPoints.Select(p => p.Type).ToList();
 
-            Quad sliderQuad = GetSurroundingQuad(slider.Path.ControlPoints.Select(p => p.Position));
+            Quad sliderQuad = GeometryUtils.GetSurroundingQuad(slider.Path.ControlPoints.Select(p => p.Position));
 
             // Limit minimum distance between control points after scaling to almost 0. Less than 0 causes the slider to flip, exactly 0 causes a crash through division by 0.
             scale = Vector2.ComponentMax(new Vector2(Precision.FLOAT_EPSILON), sliderQuad.Size + scale) - sliderQuad.Size;
@@ -222,7 +223,7 @@ namespace osu.Game.Rulesets.Osu.Edit
             slider.SnapTo(snapProvider);
 
             //if sliderhead or sliderend end up outside playfield, revert scaling.
-            Quad scaledQuad = getSurroundingQuad(new OsuHitObject[] { slider });
+            Quad scaledQuad = GeometryUtils.GetSurroundingQuad(new OsuHitObject[] { slider });
             (bool xInBounds, bool yInBounds) = isQuadInBounds(scaledQuad);
 
             if (xInBounds && yInBounds && slider.Path.HasValidLength)
@@ -238,10 +239,10 @@ namespace osu.Game.Rulesets.Osu.Edit
         private void scaleHitObjects(OsuHitObject[] hitObjects, Anchor reference, Vector2 scale)
         {
             scale = getClampedScale(hitObjects, reference, scale);
-            Quad selectionQuad = getSurroundingQuad(hitObjects);
+            Quad selectionQuad = GeometryUtils.GetSurroundingQuad(hitObjects);
 
             foreach (var h in hitObjects)
-                h.Position = GetScaledPosition(reference, scale, selectionQuad, h.Position);
+                h.Position = GeometryUtils.GetScaledPosition(reference, scale, selectionQuad, h.Position);
         }
 
         private (bool X, bool Y) isQuadInBounds(Quad quad)
@@ -256,7 +257,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
             var hitObjects = selectedMovableObjects;
 
-            Quad quad = getSurroundingQuad(hitObjects);
+            Quad quad = GeometryUtils.GetSurroundingQuad(hitObjects);
 
             Vector2 delta = Vector2.Zero;
 
@@ -286,7 +287,7 @@ namespace osu.Game.Rulesets.Osu.Edit
             float xOffset = ((reference & Anchor.x0) > 0) ? -scale.X : 0;
             float yOffset = ((reference & Anchor.y0) > 0) ? -scale.Y : 0;
 
-            Quad selectionQuad = getSurroundingQuad(hitObjects);
+            Quad selectionQuad = GeometryUtils.GetSurroundingQuad(hitObjects);
 
             //todo: this is not always correct for selections involving sliders. This approximation assumes each point is scaled independently, but sliderends move with the sliderhead.
             Quad scaledQuad = new Quad(selectionQuad.TopLeft.X + xOffset, selectionQuad.TopLeft.Y + yOffset, selectionQuad.Width + scale.X, selectionQuad.Height + scale.Y);
@@ -311,26 +312,6 @@ namespace osu.Game.Rulesets.Osu.Edit
             return scale;
         }
 
-        /// <summary>
-        /// Returns a gamefield-space quad surrounding the provided hit objects.
-        /// </summary>
-        /// <param name="hitObjects">The hit objects to calculate a quad for.</param>
-        private Quad getSurroundingQuad(OsuHitObject[] hitObjects) =>
-            GetSurroundingQuad(hitObjects.SelectMany(h =>
-            {
-                if (h is IHasPath path)
-                {
-                    return new[]
-                    {
-                        h.Position,
-                        // can't use EndPosition for reverse slider cases.
-                        h.Position + path.Path.PositionAt(1)
-                    };
-                }
-
-                return new[] { h.Position };
-            }));
-
         /// <summary>
         /// All osu! hitobjects which can be moved/rotated/scaled.
         /// </summary>
diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
index b43f4eeb00..4a1ddd9d69 100644
--- a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
@@ -16,6 +16,7 @@ using osu.Game.Rulesets.Edit;
 using osu.Game.Screens.Edit.Components.Menus;
 using osu.Game.Screens.Edit.Compose.Components;
 using osu.Game.Skinning;
+using osu.Game.Utils;
 using osuTK;
 
 namespace osu.Game.Overlays.SkinEditor
@@ -40,7 +41,7 @@ namespace osu.Game.Overlays.SkinEditor
                 {
                     var drawableItem = (Drawable)b.Item;
 
-                    var rotatedPosition = RotatePointAroundOrigin(b.ScreenSpaceSelectionPoint, selectionQuad.Centre, angle);
+                    var rotatedPosition = GeometryUtils.RotatePointAroundOrigin(b.ScreenSpaceSelectionPoint, selectionQuad.Centre, angle);
                     updateDrawablePosition(drawableItem, rotatedPosition);
 
                     drawableItem.Rotation += angle;
@@ -137,7 +138,7 @@ namespace osu.Game.Overlays.SkinEditor
             {
                 var drawableItem = (Drawable)b.Item;
 
-                var flippedPosition = GetFlippedPosition(direction, flipOverOrigin ? drawableItem.Parent.ScreenSpaceDrawQuad : selectionQuad, b.ScreenSpaceSelectionPoint);
+                var flippedPosition = GeometryUtils.GetFlippedPosition(direction, flipOverOrigin ? drawableItem.Parent.ScreenSpaceDrawQuad : selectionQuad, b.ScreenSpaceSelectionPoint);
 
                 updateDrawablePosition(drawableItem, flippedPosition);
 
@@ -275,7 +276,7 @@ namespace osu.Game.Overlays.SkinEditor
         /// </summary>
         /// <returns></returns>
         private Quad getSelectionQuad() =>
-            GetSurroundingQuad(SelectedBlueprints.SelectMany(b => b.Item.ScreenSpaceDrawQuad.GetVertices().ToArray()));
+            GeometryUtils.GetSurroundingQuad(SelectedBlueprints.SelectMany(b => b.Item.ScreenSpaceDrawQuad.GetVertices().ToArray()));
 
         private void applyFixedAnchors(Anchor anchor)
         {
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 052cb18a5d..9b44b15fe4 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -16,7 +16,6 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
-using osu.Framework.Utils;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
 using osu.Game.Resources.Localisation.Web;
@@ -401,98 +400,5 @@ namespace osu.Game.Screens.Edit.Compose.Components
             => Enumerable.Empty<MenuItem>();
 
         #endregion
-
-        #region Helper Methods
-
-        /// <summary>
-        /// Rotate a point around an arbitrary origin.
-        /// </summary>
-        /// <param name="point">The point.</param>
-        /// <param name="origin">The centre origin to rotate around.</param>
-        /// <param name="angle">The angle to rotate (in degrees).</param>
-        protected static Vector2 RotatePointAroundOrigin(Vector2 point, Vector2 origin, float angle)
-        {
-            angle = -angle;
-
-            point.X -= origin.X;
-            point.Y -= origin.Y;
-
-            Vector2 ret;
-            ret.X = point.X * MathF.Cos(MathUtils.DegreesToRadians(angle)) + point.Y * MathF.Sin(MathUtils.DegreesToRadians(angle));
-            ret.Y = point.X * -MathF.Sin(MathUtils.DegreesToRadians(angle)) + point.Y * MathF.Cos(MathUtils.DegreesToRadians(angle));
-
-            ret.X += origin.X;
-            ret.Y += origin.Y;
-
-            return ret;
-        }
-
-        /// <summary>
-        /// Given a flip direction, a surrounding quad for all selected objects, and a position,
-        /// will return the flipped position in screen space coordinates.
-        /// </summary>
-        protected static Vector2 GetFlippedPosition(Direction direction, Quad quad, Vector2 position)
-        {
-            var centre = quad.Centre;
-
-            switch (direction)
-            {
-                case Direction.Horizontal:
-                    position.X = centre.X - (position.X - centre.X);
-                    break;
-
-                case Direction.Vertical:
-                    position.Y = centre.Y - (position.Y - centre.Y);
-                    break;
-            }
-
-            return position;
-        }
-
-        /// <summary>
-        /// Given a scale vector, a surrounding quad for all selected objects, and a position,
-        /// will return the scaled position in screen space coordinates.
-        /// </summary>
-        protected static Vector2 GetScaledPosition(Anchor reference, Vector2 scale, Quad selectionQuad, Vector2 position)
-        {
-            // adjust the direction of scale depending on which side the user is dragging.
-            float xOffset = ((reference & Anchor.x0) > 0) ? -scale.X : 0;
-            float yOffset = ((reference & Anchor.y0) > 0) ? -scale.Y : 0;
-
-            // guard against no-ops and NaN.
-            if (scale.X != 0 && selectionQuad.Width > 0)
-                position.X = selectionQuad.TopLeft.X + xOffset + (position.X - selectionQuad.TopLeft.X) / selectionQuad.Width * (selectionQuad.Width + scale.X);
-
-            if (scale.Y != 0 && selectionQuad.Height > 0)
-                position.Y = selectionQuad.TopLeft.Y + yOffset + (position.Y - selectionQuad.TopLeft.Y) / selectionQuad.Height * (selectionQuad.Height + scale.Y);
-
-            return position;
-        }
-
-        /// <summary>
-        /// Returns a quad surrounding the provided points.
-        /// </summary>
-        /// <param name="points">The points to calculate a quad for.</param>
-        protected static Quad GetSurroundingQuad(IEnumerable<Vector2> points)
-        {
-            if (!points.Any())
-                return new Quad();
-
-            Vector2 minPosition = new Vector2(float.MaxValue, float.MaxValue);
-            Vector2 maxPosition = new Vector2(float.MinValue, float.MinValue);
-
-            // Go through all hitobjects to make sure they would remain in the bounds of the editor after movement, before any movement is attempted
-            foreach (var p in points)
-            {
-                minPosition = Vector2.ComponentMin(minPosition, p);
-                maxPosition = Vector2.ComponentMax(maxPosition, p);
-            }
-
-            Vector2 size = maxPosition - minPosition;
-
-            return new Quad(minPosition.X, minPosition.Y, size.X, size.Y);
-        }
-
-        #endregion
     }
 }
diff --git a/osu.Game/Utils/GeometryUtils.cs b/osu.Game/Utils/GeometryUtils.cs
new file mode 100644
index 0000000000..725e93d098
--- /dev/null
+++ b/osu.Game/Utils/GeometryUtils.cs
@@ -0,0 +1,126 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Primitives;
+using osu.Framework.Utils;
+using osu.Game.Rulesets.Objects.Types;
+using osuTK;
+
+namespace osu.Game.Utils
+{
+    public static class GeometryUtils
+    {
+        /// <summary>
+        /// Rotate a point around an arbitrary origin.
+        /// </summary>
+        /// <param name="point">The point.</param>
+        /// <param name="origin">The centre origin to rotate around.</param>
+        /// <param name="angle">The angle to rotate (in degrees).</param>
+        public static Vector2 RotatePointAroundOrigin(Vector2 point, Vector2 origin, float angle)
+        {
+            angle = -angle;
+
+            point.X -= origin.X;
+            point.Y -= origin.Y;
+
+            Vector2 ret;
+            ret.X = point.X * MathF.Cos(MathUtils.DegreesToRadians(angle)) + point.Y * MathF.Sin(MathUtils.DegreesToRadians(angle));
+            ret.Y = point.X * -MathF.Sin(MathUtils.DegreesToRadians(angle)) + point.Y * MathF.Cos(MathUtils.DegreesToRadians(angle));
+
+            ret.X += origin.X;
+            ret.Y += origin.Y;
+
+            return ret;
+        }
+
+        /// <summary>
+        /// Given a flip direction, a surrounding quad for all selected objects, and a position,
+        /// will return the flipped position in screen space coordinates.
+        /// </summary>
+        public static Vector2 GetFlippedPosition(Direction direction, Quad quad, Vector2 position)
+        {
+            var centre = quad.Centre;
+
+            switch (direction)
+            {
+                case Direction.Horizontal:
+                    position.X = centre.X - (position.X - centre.X);
+                    break;
+
+                case Direction.Vertical:
+                    position.Y = centre.Y - (position.Y - centre.Y);
+                    break;
+            }
+
+            return position;
+        }
+
+        /// <summary>
+        /// Given a scale vector, a surrounding quad for all selected objects, and a position,
+        /// will return the scaled position in screen space coordinates.
+        /// </summary>
+        public static Vector2 GetScaledPosition(Anchor reference, Vector2 scale, Quad selectionQuad, Vector2 position)
+        {
+            // adjust the direction of scale depending on which side the user is dragging.
+            float xOffset = ((reference & Anchor.x0) > 0) ? -scale.X : 0;
+            float yOffset = ((reference & Anchor.y0) > 0) ? -scale.Y : 0;
+
+            // guard against no-ops and NaN.
+            if (scale.X != 0 && selectionQuad.Width > 0)
+                position.X = selectionQuad.TopLeft.X + xOffset + (position.X - selectionQuad.TopLeft.X) / selectionQuad.Width * (selectionQuad.Width + scale.X);
+
+            if (scale.Y != 0 && selectionQuad.Height > 0)
+                position.Y = selectionQuad.TopLeft.Y + yOffset + (position.Y - selectionQuad.TopLeft.Y) / selectionQuad.Height * (selectionQuad.Height + scale.Y);
+
+            return position;
+        }
+
+        /// <summary>
+        /// Returns a quad surrounding the provided points.
+        /// </summary>
+        /// <param name="points">The points to calculate a quad for.</param>
+        public static Quad GetSurroundingQuad(IEnumerable<Vector2> points)
+        {
+            if (!points.Any())
+                return new Quad();
+
+            Vector2 minPosition = new Vector2(float.MaxValue, float.MaxValue);
+            Vector2 maxPosition = new Vector2(float.MinValue, float.MinValue);
+
+            // Go through all hitobjects to make sure they would remain in the bounds of the editor after movement, before any movement is attempted
+            foreach (var p in points)
+            {
+                minPosition = Vector2.ComponentMin(minPosition, p);
+                maxPosition = Vector2.ComponentMax(maxPosition, p);
+            }
+
+            Vector2 size = maxPosition - minPosition;
+
+            return new Quad(minPosition.X, minPosition.Y, size.X, size.Y);
+        }
+
+        /// <summary>
+        /// Returns a gamefield-space quad surrounding the provided hit objects.
+        /// </summary>
+        /// <param name="hitObjects">The hit objects to calculate a quad for.</param>
+        public static Quad GetSurroundingQuad(IEnumerable<IHasPosition> hitObjects) =>
+            GetSurroundingQuad(hitObjects.SelectMany(h =>
+            {
+                if (h is IHasPath path)
+                {
+                    return new[]
+                    {
+                        h.Position,
+                        // can't use EndPosition for reverse slider cases.
+                        h.Position + path.Path.PositionAt(1)
+                    };
+                }
+
+                return new[] { h.Position };
+            }));
+    }
+}

From a7f08358660f684a74764c34f28b027f2c132c33 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 23 Jul 2023 20:24:12 +0300
Subject: [PATCH 1505/1604] Enable AOT compilation on iOS release builds

---
 osu.iOS.props | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.iOS.props b/osu.iOS.props
index 272e17a288..40873a1c6b 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -2,13 +2,20 @@
   <PropertyGroup>
     <CodesignKey>iPhone Developer</CodesignKey>
     <NullabilityInfoContextSupport>true</NullabilityInfoContextSupport>
-    <!-- Workaround for an upstream issue which Realm suffers from (https://github.com/dotnet/runtime/issues/69410). -->
-    <UseInterpreter>true</UseInterpreter>
     <!-- MT7091 occurs when referencing a .framework bundle that consists of a static library.
          It only warns about not copying the library to the app bundle to save space,
          so there's nothing to be worried about. -->
     <NoWarn>$(NoWarn);MT7091</NoWarn>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+    <!-- On debug configurations, we use Mono interpreter for faster compilation. -->
+    <UseInterpreter>true</UseInterpreter>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
+    <!-- On release configurations, we use AOT compiler for optimal performance, along with Mono Interpreter as a fallback for libraries such as AutoMapper. -->
+    <UseInterpreter>false</UseInterpreter>
+    <MtouchInterpreter>-all</MtouchInterpreter>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Platform)' == 'iPhone'">
     <RuntimeIdentifier>ios-arm64</RuntimeIdentifier>
   </PropertyGroup>

From 97075b0726f82cec03e4bb5a533e9e6d11bc8c1b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 23 Jul 2023 20:31:26 +0300
Subject: [PATCH 1506/1604] Fix iOS visual tests having unusual bundle
 identifiers

---
 osu.Game.Rulesets.Catch.Tests.iOS/Info.plist | 4 ++--
 osu.Game.Rulesets.Mania.Tests.iOS/Info.plist | 4 ++--
 osu.Game.Rulesets.Osu.Tests.iOS/Info.plist   | 4 ++--
 osu.Game.Rulesets.Taiko.Tests.iOS/Info.plist | 4 ++--
 osu.Game.Tests.iOS/Info.plist                | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests.iOS/Info.plist b/osu.Game.Rulesets.Catch.Tests.iOS/Info.plist
index 5ace6c07f5..f87043e1d1 100644
--- a/osu.Game.Rulesets.Catch.Tests.iOS/Info.plist
+++ b/osu.Game.Rulesets.Catch.Tests.iOS/Info.plist
@@ -5,7 +5,7 @@
 	<key>CFBundleName</key>
 	<string>osu.Game.Rulesets.Catch.Tests.iOS</string>
 	<key>CFBundleIdentifier</key>
-	<string>ppy.osu-Game-Rulesets-Catch-Tests-iOS</string>
+	<string>sh.ppy.catch-ruleset-tests</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
@@ -42,4 +42,4 @@
 	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>
 </dict>
-</plist>
+</plist>
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Mania.Tests.iOS/Info.plist b/osu.Game.Rulesets.Mania.Tests.iOS/Info.plist
index ff5dde856e..740036309f 100644
--- a/osu.Game.Rulesets.Mania.Tests.iOS/Info.plist
+++ b/osu.Game.Rulesets.Mania.Tests.iOS/Info.plist
@@ -5,7 +5,7 @@
 	<key>CFBundleName</key>
 	<string>osu.Game.Rulesets.Mania.Tests.iOS</string>
 	<key>CFBundleIdentifier</key>
-	<string>ppy.osu-Game-Rulesets-Mania-Tests-iOS</string>
+	<string>sh.ppy.mania-ruleset-tests</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
@@ -42,4 +42,4 @@
 	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>
 </dict>
-</plist>
+</plist>
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Osu.Tests.iOS/Info.plist b/osu.Game.Rulesets.Osu.Tests.iOS/Info.plist
index 1e33f2ff16..7f489874e7 100644
--- a/osu.Game.Rulesets.Osu.Tests.iOS/Info.plist
+++ b/osu.Game.Rulesets.Osu.Tests.iOS/Info.plist
@@ -5,7 +5,7 @@
 	<key>CFBundleName</key>
 	<string>osu.Game.Rulesets.Osu.Tests.iOS</string>
 	<key>CFBundleIdentifier</key>
-	<string>ppy.osu-Game-Rulesets-Osu-Tests-iOS</string>
+	<string>sh.ppy.osu-ruleset-tests</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
@@ -42,4 +42,4 @@
 	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>
 </dict>
-</plist>
+</plist>
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Taiko.Tests.iOS/Info.plist b/osu.Game.Rulesets.Taiko.Tests.iOS/Info.plist
index 76cb3c0db0..162ee75c22 100644
--- a/osu.Game.Rulesets.Taiko.Tests.iOS/Info.plist
+++ b/osu.Game.Rulesets.Taiko.Tests.iOS/Info.plist
@@ -5,7 +5,7 @@
 	<key>CFBundleName</key>
 	<string>osu.Game.Rulesets.Taiko.Tests.iOS</string>
 	<key>CFBundleIdentifier</key>
-	<string>ppy.osu-Game-Rulesets-Taiko-Tests-iOS</string>
+	<string>sh.ppy.taiko-ruleset-tests</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
@@ -42,4 +42,4 @@
 	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>
 </dict>
-</plist>
+</plist>
\ No newline at end of file
diff --git a/osu.Game.Tests.iOS/Info.plist b/osu.Game.Tests.iOS/Info.plist
index ac661f6263..d2d0583e46 100644
--- a/osu.Game.Tests.iOS/Info.plist
+++ b/osu.Game.Tests.iOS/Info.plist
@@ -5,7 +5,7 @@
 	<key>CFBundleName</key>
 	<string>osu.Game.Tests.iOS</string>
 	<key>CFBundleIdentifier</key>
-	<string>ppy.osu-Game-Tests-iOS</string>
+	<string>sh.ppy.osu-tests</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
@@ -42,4 +42,4 @@
 	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>
 </dict>
-</plist>
+</plist>
\ No newline at end of file

From ba8ebefb50dca3a31462ecf4b282036ada782991 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 23 Jul 2023 18:09:07 +0200
Subject: [PATCH 1507/1604] Add basic structure for new rotation handler

---
 .../Compose/Components/SelectionHandler.cs    |  9 ++++++
 .../Components/SelectionRotationHandler.cs    | 31 +++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 osu.Game/Screens/Edit/Compose/Components/SelectionRotationHandler.cs

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 9b44b15fe4..80df796fd7 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -55,6 +55,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [Resolved(CanBeNull = true)]
         protected IEditorChangeHandler ChangeHandler { get; private set; }
 
+        protected SelectionRotationHandler RotationHandler { get; private set; }
+
         protected SelectionHandler()
         {
             selectedBlueprints = new List<SelectionBlueprint<T>>();
@@ -66,6 +68,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [BackgroundDependencyLoader]
         private void load()
         {
+            RotationHandler = CreateRotationHandler();
+
             InternalChild = SelectionBox = CreateSelectionBox();
 
             SelectedItems.CollectionChanged += (_, _) =>
@@ -132,6 +136,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <returns>Whether any items could be rotated.</returns>
         public virtual bool HandleRotation(float angle) => false;
 
+        /// <summary>
+        /// Creates the handler to use for rotation operations.
+        /// </summary>
+        public virtual SelectionRotationHandler CreateRotationHandler() => new SelectionRotationHandler();
+
         /// <summary>
         /// Handles the selected items being scaled.
         /// </summary>
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionRotationHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionRotationHandler.cs
new file mode 100644
index 0000000000..595edbb4fc
--- /dev/null
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionRotationHandler.cs
@@ -0,0 +1,31 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Bindables;
+using osuTK;
+
+namespace osu.Game.Screens.Edit.Compose.Components
+{
+    /// <summary>
+    /// Base handler for editor rotation operations.
+    /// </summary>
+    public class SelectionRotationHandler
+    {
+        /// <summary>
+        /// Whether the rotation can currently be performed.
+        /// </summary>
+        public Bindable<bool> CanRotate { get; private set; } = new BindableBool();
+
+        public virtual void Begin()
+        {
+        }
+
+        public virtual void Update(float rotation, Vector2 origin)
+        {
+        }
+
+        public virtual void Commit()
+        {
+        }
+    }
+}

From ba904fd77bbb530b505817b32dbb31ac0e5baa1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 23 Jul 2023 19:18:38 +0200
Subject: [PATCH 1508/1604] Migrate osu! rotation handling to
 `SelectionRotationHandler`

---
 .../Edit/OsuSelectionHandler.cs               | 30 +-----
 .../Edit/OsuSelectionRotationHandler.cs       | 98 +++++++++++++++++++
 2 files changed, 101 insertions(+), 27 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/Edit/OsuSelectionRotationHandler.cs

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 468d8ae9f5..1d46b8ff8a 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -28,11 +28,6 @@ namespace osu.Game.Rulesets.Osu.Edit
         [Resolved(CanBeNull = true)]
         private IDistanceSnapProvider? snapProvider { get; set; }
 
-        /// <summary>
-        /// During a transform, the initial origin is stored so it can be used throughout the operation.
-        /// </summary>
-        private Vector2? referenceOrigin;
-
         /// <summary>
         /// During a transform, the initial path types of a single selected slider are stored so they
         /// can be maintained throughout the operation.
@@ -54,7 +49,6 @@ namespace osu.Game.Rulesets.Osu.Edit
         protected override void OnOperationEnded()
         {
             base.OnOperationEnded();
-            referenceOrigin = null;
             referencePathTypes = null;
         }
 
@@ -170,28 +164,10 @@ namespace osu.Game.Rulesets.Osu.Edit
             if ((reference & Anchor.y0) > 0) scale.Y = -scale.Y;
         }
 
-        public override bool HandleRotation(float delta)
+        public override SelectionRotationHandler CreateRotationHandler() => new OsuSelectionRotationHandler(ChangeHandler)
         {
-            var hitObjects = selectedMovableObjects;
-
-            Quad quad = GeometryUtils.GetSurroundingQuad(hitObjects);
-
-            referenceOrigin ??= quad.Centre;
-
-            foreach (var h in hitObjects)
-            {
-                h.Position = GeometryUtils.RotatePointAroundOrigin(h.Position, referenceOrigin.Value, delta);
-
-                if (h is IHasPath path)
-                {
-                    foreach (PathControlPoint cp in path.Path.ControlPoints)
-                        cp.Position = GeometryUtils.RotatePointAroundOrigin(cp.Position, Vector2.Zero, delta);
-                }
-            }
-
-            // this isn't always the case but let's be lenient for now.
-            return true;
-        }
+            SelectedItems = { BindTarget = SelectedItems }
+        };
 
         private void scaleSlider(Slider slider, Vector2 scale)
         {
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionRotationHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionRotationHandler.cs
new file mode 100644
index 0000000000..0eb7637786
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionRotationHandler.cs
@@ -0,0 +1,98 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using osu.Framework.Bindables;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Screens.Edit;
+using osu.Game.Screens.Edit.Compose.Components;
+using osu.Game.Utils;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Edit
+{
+    public class OsuSelectionRotationHandler : SelectionRotationHandler
+    {
+        private readonly IEditorChangeHandler? changeHandler;
+
+        public BindableList<HitObject> SelectedItems { get; } = new BindableList<HitObject>();
+
+        public OsuSelectionRotationHandler(IEditorChangeHandler? changeHandler)
+        {
+            this.changeHandler = changeHandler;
+
+            SelectedItems.CollectionChanged += (_, __) => updateState();
+        }
+
+        private void updateState()
+        {
+            var quad = GeometryUtils.GetSurroundingQuad(selectedMovableObjects);
+            CanRotate.Value = quad.Width > 0 || quad.Height > 0;
+        }
+
+        private OsuHitObject[]? objectsInRotation;
+
+        private Vector2? defaultOrigin;
+        private Dictionary<OsuHitObject, Vector2>? originalPositions;
+        private Dictionary<IHasPath, Vector2[]>? originalPathControlPointPositions;
+
+        public override void Begin()
+        {
+            if (objectsInRotation != null)
+                throw new InvalidOperationException($"Cannot {nameof(Begin)} a rotate operation while another is in progress!");
+
+            changeHandler?.BeginChange();
+
+            objectsInRotation = selectedMovableObjects.ToArray();
+            defaultOrigin = GeometryUtils.GetSurroundingQuad(objectsInRotation).Centre;
+            originalPositions = objectsInRotation.ToDictionary(obj => obj, obj => obj.Position);
+            originalPathControlPointPositions = objectsInRotation.OfType<IHasPath>().ToDictionary(
+                obj => obj,
+                obj => obj.Path.ControlPoints.Select(point => point.Position).ToArray());
+        }
+
+        public override void Update(float rotation, Vector2? origin = null)
+        {
+            if (objectsInRotation == null)
+                throw new InvalidOperationException($"Cannot {nameof(Update)} a rotate operation without calling {nameof(Begin)} first!");
+
+            Debug.Assert(originalPositions != null && originalPathControlPointPositions != null && defaultOrigin != null);
+
+            Vector2 actualOrigin = origin ?? defaultOrigin.Value;
+
+            foreach (var ho in objectsInRotation)
+            {
+                ho.Position = GeometryUtils.RotatePointAroundOrigin(originalPositions[ho], actualOrigin, rotation);
+
+                if (ho is IHasPath withPath)
+                {
+                    var originalPath = originalPathControlPointPositions[withPath];
+
+                    for (int i = 0; i < withPath.Path.ControlPoints.Count; ++i)
+                        withPath.Path.ControlPoints[i].Position = GeometryUtils.RotatePointAroundOrigin(originalPath[i], Vector2.Zero, rotation);
+                }
+            }
+        }
+
+        public override void Commit()
+        {
+            if (objectsInRotation == null)
+                throw new InvalidOperationException($"Cannot {nameof(Commit)} a rotate operation without calling {nameof(Begin)} first!");
+
+            changeHandler?.EndChange();
+
+            objectsInRotation = null;
+            originalPositions = null;
+            originalPathControlPointPositions = null;
+            defaultOrigin = null;
+        }
+
+        private IEnumerable<OsuHitObject> selectedMovableObjects => SelectedItems.Cast<OsuHitObject>()
+                                                                                 .Where(h => h is not Spinner);
+    }
+}

From f8047d6ab6d96bf9c7b87fcf50b93e2b084da2b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 23 Jul 2023 19:48:39 +0200
Subject: [PATCH 1509/1604] Migrate skin element rotation handling to
 `SelectionRotationHandler`

---
 .../SkinEditor/SkinSelectionHandler.cs        | 29 +-----
 .../SkinSelectionRotationHandler.cs           | 94 +++++++++++++++++++
 2 files changed, 98 insertions(+), 25 deletions(-)
 create mode 100644 osu.Game/Overlays/SkinEditor/SkinSelectionRotationHandler.cs

diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
index 4a1ddd9d69..bee973bea0 100644
--- a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
@@ -26,31 +26,11 @@ namespace osu.Game.Overlays.SkinEditor
         [Resolved]
         private SkinEditor skinEditor { get; set; } = null!;
 
-        public override bool HandleRotation(float angle)
+        public override SelectionRotationHandler CreateRotationHandler() => new SkinSelectionRotationHandler(ChangeHandler)
         {
-            if (SelectedBlueprints.Count == 1)
-            {
-                // for single items, rotate around the origin rather than the selection centre.
-                ((Drawable)SelectedBlueprints.First().Item).Rotation += angle;
-            }
-            else
-            {
-                var selectionQuad = getSelectionQuad();
-
-                foreach (var b in SelectedBlueprints)
-                {
-                    var drawableItem = (Drawable)b.Item;
-
-                    var rotatedPosition = GeometryUtils.RotatePointAroundOrigin(b.ScreenSpaceSelectionPoint, selectionQuad.Centre, angle);
-                    updateDrawablePosition(drawableItem, rotatedPosition);
-
-                    drawableItem.Rotation += angle;
-                }
-            }
-
-            // this isn't always the case but let's be lenient for now.
-            return true;
-        }
+            SelectedItems = { BindTarget = SelectedItems },
+            UpdatePosition = updateDrawablePosition
+        };
 
         public override bool HandleScale(Vector2 scale, Anchor anchor)
         {
@@ -172,7 +152,6 @@ namespace osu.Game.Overlays.SkinEditor
         {
             base.OnSelectionChanged();
 
-            SelectionBox.CanRotate = true;
             SelectionBox.CanScaleX = true;
             SelectionBox.CanScaleY = true;
             SelectionBox.CanFlipX = true;
diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionRotationHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionRotationHandler.cs
new file mode 100644
index 0000000000..e60e2b1e12
--- /dev/null
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionRotationHandler.cs
@@ -0,0 +1,94 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Screens.Edit;
+using osu.Game.Screens.Edit.Compose.Components;
+using osu.Game.Skinning;
+using osu.Game.Utils;
+using osuTK;
+
+namespace osu.Game.Overlays.SkinEditor
+{
+    public class SkinSelectionRotationHandler : SelectionRotationHandler
+    {
+        private readonly IEditorChangeHandler? changeHandler;
+
+        public BindableList<ISerialisableDrawable> SelectedItems { get; } = new BindableList<ISerialisableDrawable>();
+        public Action<Drawable, Vector2> UpdatePosition { get; init; } = null!;
+
+        public SkinSelectionRotationHandler(IEditorChangeHandler? changeHandler)
+        {
+            this.changeHandler = changeHandler;
+
+            SelectedItems.CollectionChanged += (_, __) => updateState();
+        }
+
+        private void updateState()
+        {
+            CanRotate.Value = SelectedItems.Count > 0;
+        }
+
+        private Drawable[]? objectsInRotation;
+
+        private Vector2? defaultOrigin;
+        private Dictionary<Drawable, float>? originalRotations;
+        private Dictionary<Drawable, Vector2>? originalPositions;
+
+        public override void Begin()
+        {
+            if (objectsInRotation != null)
+                throw new InvalidOperationException($"Cannot {nameof(Begin)} a rotate operation while another is in progress!");
+
+            changeHandler?.BeginChange();
+
+            objectsInRotation = SelectedItems.Cast<Drawable>().ToArray();
+            originalRotations = objectsInRotation.ToDictionary(d => d, d => d.Rotation);
+            originalPositions = objectsInRotation.ToDictionary(d => d, d => d.ToScreenSpace(d.OriginPosition));
+            defaultOrigin = GeometryUtils.GetSurroundingQuad(objectsInRotation.SelectMany(d => d.ScreenSpaceDrawQuad.GetVertices().ToArray())).Centre;
+        }
+
+        public override void Update(float rotation, Vector2? origin = null)
+        {
+            if (objectsInRotation == null)
+                throw new InvalidOperationException($"Cannot {nameof(Update)} a rotate operation without calling {nameof(Begin)} first!");
+
+            Debug.Assert(originalRotations != null && originalPositions != null && defaultOrigin != null);
+
+            if (objectsInRotation.Length == 1 && origin == null)
+            {
+                // for single items, rotate around the origin rather than the selection centre by default.
+                objectsInRotation[0].Rotation = originalRotations.Single().Value + rotation;
+                return;
+            }
+
+            var actualOrigin = origin ?? defaultOrigin.Value;
+
+            foreach (var drawableItem in objectsInRotation)
+            {
+                var rotatedPosition = GeometryUtils.RotatePointAroundOrigin(originalPositions[drawableItem], actualOrigin, rotation);
+                UpdatePosition(drawableItem, rotatedPosition);
+
+                drawableItem.Rotation = originalRotations[drawableItem] + rotation;
+            }
+        }
+
+        public override void Commit()
+        {
+            if (objectsInRotation == null)
+                throw new InvalidOperationException($"Cannot {nameof(Commit)} a rotate operation without calling {nameof(Begin)} first!");
+
+            changeHandler?.EndChange();
+
+            objectsInRotation = null;
+            originalPositions = null;
+            originalRotations = null;
+            defaultOrigin = null;
+        }
+    }
+}

From 21df0e2d60824ea1e34cd88f60741484d251d049 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 23 Jul 2023 19:57:31 +0200
Subject: [PATCH 1510/1604] Migrate test to `SelectionRotationHandler`

---
 .../Editing/TestSceneComposeSelectBox.cs      | 50 ++++++++++++++++---
 1 file changed, 44 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
index 7a0b3d0c1a..147488812e 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
@@ -3,7 +3,9 @@
 
 #nullable disable
 
+using System;
 using System.Linq;
+using JetBrains.Annotations;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -34,13 +36,12 @@ namespace osu.Game.Tests.Visual.Editing
                     {
                         RelativeSizeAxes = Axes.Both,
 
-                        CanRotate = true,
                         CanScaleX = true,
                         CanScaleY = true,
                         CanFlipX = true,
                         CanFlipY = true,
 
-                        OnRotation = handleRotation,
+                        RotationHandler = new TestSelectionRotationHandler(() => selectionArea),
                         OnScale = handleScale
                     }
                 }
@@ -71,11 +72,48 @@ namespace osu.Game.Tests.Visual.Editing
             return true;
         }
 
-        private bool handleRotation(float angle)
+        private class TestSelectionRotationHandler : SelectionRotationHandler
         {
-            // kinda silly and wrong, but just showing that the drag handles work.
-            selectionArea.Rotation += angle;
-            return true;
+            private readonly Func<Container> getTargetContainer;
+
+            public TestSelectionRotationHandler(Func<Container> getTargetContainer)
+            {
+                this.getTargetContainer = getTargetContainer;
+
+                CanRotate.Value = true;
+            }
+
+            [CanBeNull]
+            private Container targetContainer;
+
+            private float? initialRotation;
+
+            public override void Begin()
+            {
+                if (targetContainer != null)
+                    throw new InvalidOperationException($"Cannot {nameof(Begin)} a rotate operation while another is in progress!");
+
+                targetContainer = getTargetContainer();
+                initialRotation = targetContainer!.Rotation;
+            }
+
+            public override void Update(float rotation, Vector2? origin = null)
+            {
+                if (targetContainer == null)
+                    throw new InvalidOperationException($"Cannot {nameof(Update)} a rotate operation without calling {nameof(Begin)} first!");
+
+                // kinda silly and wrong, but just showing that the drag handles work.
+                targetContainer.Rotation = initialRotation!.Value + rotation;
+            }
+
+            public override void Commit()
+            {
+                if (targetContainer == null)
+                    throw new InvalidOperationException($"Cannot {nameof(Commit)} a rotate operation without calling {nameof(Begin)} first!");
+
+                targetContainer = null;
+                initialRotation = null;
+            }
         }
 
         [Test]

From aec3ca250cc3301415d0ba38bc0058b2a2463205 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 23 Jul 2023 20:01:30 +0200
Subject: [PATCH 1511/1604] Migrate `SelectionHandler` to use
 `SelectionRotationHandler`

---
 .../Edit/OsuSelectionHandler.cs               |  1 -
 .../Edit/Compose/Components/SelectionBox.cs   | 41 ++++++++-----------
 .../Components/SelectionBoxRotationHandle.cs  | 20 +++++----
 .../Compose/Components/SelectionHandler.cs    |  2 +-
 .../Components/SelectionRotationHandler.cs    |  9 +++-
 5 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 1d46b8ff8a..1dfbf4179b 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -40,7 +40,6 @@ namespace osu.Game.Rulesets.Osu.Edit
 
             Quad quad = selectedMovableObjects.Length > 0 ? GeometryUtils.GetSurroundingQuad(selectedMovableObjects) : new Quad();
 
-            SelectionBox.CanRotate = quad.Width > 0 || quad.Height > 0;
             SelectionBox.CanFlipX = SelectionBox.CanScaleX = quad.Width > 0;
             SelectionBox.CanFlipY = SelectionBox.CanScaleY = quad.Height > 0;
             SelectionBox.CanReverse = EditorBeatmap.SelectedHitObjects.Count > 1 || EditorBeatmap.SelectedHitObjects.Any(s => s is Slider);
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index 5d9fac739c..53442071b5 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -3,6 +3,7 @@
 
 using System;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -22,7 +23,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private const float button_padding = 5;
 
-        public Func<float, bool>? OnRotation;
+        public SelectionRotationHandler? RotationHandler { get; init; }
         public Func<Vector2, Anchor, bool>? OnScale;
         public Func<Direction, bool, bool>? OnFlip;
         public Func<bool>? OnReverse;
@@ -51,22 +52,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             }
         }
 
-        private bool canRotate;
-
-        /// <summary>
-        /// Whether rotation support should be enabled.
-        /// </summary>
-        public bool CanRotate
-        {
-            get => canRotate;
-            set
-            {
-                if (canRotate == value) return;
-
-                canRotate = value;
-                recreate();
-            }
-        }
+        private IBindable<bool> canRotate = new BindableBool();
 
         private bool canScaleX;
 
@@ -161,7 +147,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
         private OsuColour colours { get; set; } = null!;
 
         [BackgroundDependencyLoader]
-        private void load() => recreate();
+        private void load()
+        {
+            if (RotationHandler != null)
+                canRotate.BindTo(RotationHandler.CanRotate);
+
+            canRotate.BindValueChanged(_ => recreate());
+            recreate();
+        }
 
         protected override bool OnKeyDown(KeyDownEvent e)
         {
@@ -174,10 +167,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
                     return CanReverse && reverseButton?.TriggerClick() == true;
 
                 case Key.Comma:
-                    return CanRotate && rotateCounterClockwiseButton?.TriggerClick() == true;
+                    return canRotate.Value && rotateCounterClockwiseButton?.TriggerClick() == true;
 
                 case Key.Period:
-                    return CanRotate && rotateClockwiseButton?.TriggerClick() == true;
+                    return canRotate.Value && rotateClockwiseButton?.TriggerClick() == true;
             }
 
             return base.OnKeyDown(e);
@@ -254,14 +247,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (CanScaleY) addYScaleComponents();
             if (CanFlipX) addXFlipComponents();
             if (CanFlipY) addYFlipComponents();
-            if (CanRotate) addRotationComponents();
+            if (canRotate.Value) addRotationComponents();
             if (CanReverse) reverseButton = addButton(FontAwesome.Solid.Backward, "Reverse pattern (Ctrl-G)", () => OnReverse?.Invoke());
         }
 
         private void addRotationComponents()
         {
-            rotateCounterClockwiseButton = addButton(FontAwesome.Solid.Undo, "Rotate 90 degrees counter-clockwise (Ctrl-<)", () => OnRotation?.Invoke(-90));
-            rotateClockwiseButton = addButton(FontAwesome.Solid.Redo, "Rotate 90 degrees clockwise (Ctrl->)", () => OnRotation?.Invoke(90));
+            rotateCounterClockwiseButton = addButton(FontAwesome.Solid.Undo, "Rotate 90 degrees counter-clockwise (Ctrl-<)", () => RotationHandler?.Rotate(-90));
+            rotateClockwiseButton = addButton(FontAwesome.Solid.Redo, "Rotate 90 degrees clockwise (Ctrl->)", () => RotationHandler?.Rotate(90));
 
             addRotateHandle(Anchor.TopLeft);
             addRotateHandle(Anchor.TopRight);
@@ -331,7 +324,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             var handle = new SelectionBoxRotationHandle
             {
                 Anchor = anchor,
-                HandleRotate = angle => OnRotation?.Invoke(angle)
+                RotationHandler = RotationHandler
             };
 
             handle.OperationStarted += operationStarted;
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
index c2a3f12efd..4107a09692 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
@@ -4,6 +4,7 @@
 #nullable disable
 
 using System;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.EnumExtensions;
@@ -21,7 +22,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
 {
     public partial class SelectionBoxRotationHandle : SelectionBoxDragHandle, IHasTooltip
     {
-        public Action<float> HandleRotate { get; set; }
+        [CanBeNull]
+        public SelectionRotationHandler RotationHandler { get; init; }
 
         public LocalisableString TooltipText { get; private set; }
 
@@ -63,10 +65,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected override bool OnDragStart(DragStartEvent e)
         {
-            bool handle = base.OnDragStart(e);
-            if (handle)
-                cumulativeRotation.Value = 0;
-            return handle;
+            if (RotationHandler == null) return false;
+
+            RotationHandler.Begin();
+            return true;
         }
 
         protected override void OnDrag(DragEvent e)
@@ -99,7 +101,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected override void OnDragEnd(DragEndEvent e)
         {
-            base.OnDragEnd(e);
+            RotationHandler?.Commit();
+            UpdateHoverState();
+
             cumulativeRotation.Value = null;
             rawCumulativeRotation = 0;
             TooltipText = default;
@@ -116,14 +120,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private void applyRotation(bool shouldSnap)
         {
-            float oldRotation = cumulativeRotation.Value ?? 0;
-
             float newRotation = shouldSnap ? snap(rawCumulativeRotation, snap_step) : MathF.Round(rawCumulativeRotation);
             newRotation = (newRotation - 180) % 360 + 180;
 
             cumulativeRotation.Value = newRotation;
 
-            HandleRotate?.Invoke(newRotation - oldRotation);
+            RotationHandler?.Update(newRotation);
             TooltipText = shouldSnap ? EditorStrings.RotationSnapped(newRotation) : EditorStrings.RotationUnsnapped(newRotation);
         }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 80df796fd7..31ad8fa3d7 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -84,7 +84,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 OperationStarted = OnOperationBegan,
                 OperationEnded = OnOperationEnded,
 
-                OnRotation = HandleRotation,
+                RotationHandler = RotationHandler,
                 OnScale = HandleScale,
                 OnFlip = HandleFlip,
                 OnReverse = HandleReverse,
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionRotationHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionRotationHandler.cs
index 595edbb4fc..d5dd1d38d4 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionRotationHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionRotationHandler.cs
@@ -16,11 +16,18 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </summary>
         public Bindable<bool> CanRotate { get; private set; } = new BindableBool();
 
+        public void Rotate(float rotation, Vector2? origin = null)
+        {
+            Begin();
+            Update(rotation, origin);
+            Commit();
+        }
+
         public virtual void Begin()
         {
         }
 
-        public virtual void Update(float rotation, Vector2 origin)
+        public virtual void Update(float rotation, Vector2? origin = null)
         {
         }
 

From a201152b042e0dfb13a4abaca85def6b5fc23577 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 23 Jul 2023 20:09:31 +0200
Subject: [PATCH 1512/1604] Add xmldoc to `SelectionRotationHandler`

---
 .../Components/SelectionRotationHandler.cs    | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionRotationHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionRotationHandler.cs
index d5dd1d38d4..6524f7fa35 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionRotationHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionRotationHandler.cs
@@ -16,6 +16,18 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </summary>
         public Bindable<bool> CanRotate { get; private set; } = new BindableBool();
 
+        /// <summary>
+        /// Performs a single, instant, atomic rotation operation.
+        /// </summary>
+        /// <remarks>
+        /// This method is intended to be used in atomic contexts (such as when pressing a single button).
+        /// For continuous operations, see the <see cref="Begin"/>-<see cref="Update"/>-<see cref="Commit"/> flow.
+        /// </remarks>
+        /// <param name="rotation">Rotation to apply in degrees.</param>
+        /// <param name="origin">
+        /// The origin point to rotate around.
+        /// If the default <see langword="null"/> value is supplied, a sane implementation-defined default will be used.
+        /// </param>
         public void Rotate(float rotation, Vector2? origin = null)
         {
             Begin();
@@ -23,14 +35,48 @@ namespace osu.Game.Screens.Edit.Compose.Components
             Commit();
         }
 
+        /// <summary>
+        /// Begins a continuous rotation operation.
+        /// </summary>
+        /// <remarks>
+        /// This flow is intended to be used when a rotation operation is made incrementally (such as when dragging a rotation handle or slider).
+        /// For instantaneous, atomic operations, use the convenience <see cref="Rotate"/> method.
+        /// </remarks>
         public virtual void Begin()
         {
         }
 
+        /// <summary>
+        /// Updates a continuous rotation operation.
+        /// Must be preceded by a <see cref="Begin"/> call.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// This flow is intended to be used when a rotation operation is made incrementally (such as when dragging a rotation handle or slider).
+        /// As such, the values of <paramref name="rotation"/> and <paramref name="origin"/> supplied should be relative to the state of the objects being rotated
+        /// when <see cref="Begin"/> was called, rather than instantaneous deltas.
+        /// </para>
+        /// <para>
+        /// For instantaneous, atomic operations, use the convenience <see cref="Rotate"/> method.
+        /// </para>
+        /// </remarks>
+        /// <param name="rotation">Rotation to apply in degrees.</param>
+        /// <param name="origin">
+        /// The origin point to rotate around.
+        /// If the default <see langword="null"/> value is supplied, a sane implementation-defined default will be used.
+        /// </param>
         public virtual void Update(float rotation, Vector2? origin = null)
         {
         }
 
+        /// <summary>
+        /// Ends a continuous rotation operation.
+        /// Must be preceded by a <see cref="Begin"/> call.
+        /// </summary>
+        /// <remarks>
+        /// This flow is intended to be used when a rotation operation is made incrementally (such as when dragging a rotation handle or slider).
+        /// For instantaneous, atomic operations, use the convenience <see cref="Rotate"/> method.
+        /// </remarks>
         public virtual void Commit()
         {
         }

From bf89fbcd817aab251797b40d8a4942103c360109 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 Jul 2023 16:38:37 +0900
Subject: [PATCH 1513/1604] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index ed97f609cc..7f15d9fafd 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.720.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.724.0" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index eed5cfb69d..99b509837f 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,7 +36,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="11.1.2" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.720.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.724.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.707.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 40873a1c6b..8b8680d02c 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -23,6 +23,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.720.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.724.0" />
   </ItemGroup>
 </Project>

From fd4d3a6d66c9e59ad66eb6a6464a1897df3ca949 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Mon, 24 Jul 2023 02:48:01 +0900
Subject: [PATCH 1514/1604] Use DelayedLoadWrapper to avoid beatmap cover
 unload in map pool

---
 .../Components/TournamentBeatmapPanel.cs               | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
index 1157b50377..09c87a2010 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Tournament.Components
                     RelativeSizeAxes = Axes.Both,
                     Colour = Color4.Black,
                 },
-                new UpdateableOnlineBeatmapSetCover
+                new TournamentUpdateableOnlineBeatmapSetCover
                 {
                     RelativeSizeAxes = Axes.Both,
                     Colour = OsuColour.Gray(0.5f),
@@ -180,5 +180,13 @@ namespace osu.Game.Tournament.Components
                 Alpha = 1;
             }
         }
+
+        private partial class TournamentUpdateableOnlineBeatmapSetCover : UpdateableOnlineBeatmapSetCover
+        {
+            // Use DelayedLoadWrapper to avoid beatmap cover unload in map pool.
+            // see https://github.com/ppy/osu/discussions/24337
+            protected override DelayedLoadWrapper CreateDelayedLoadWrapper(Func<Drawable> createContentFunc, double timeBeforeLoad)
+                => new DelayedLoadWrapper(createContentFunc, timeBeforeLoad);
+        }
     }
 }

From 0b55fc3197ef1aa6a004f8b5af5bf85113cae059 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 Jul 2023 19:49:11 +0900
Subject: [PATCH 1515/1604] Refactor `DrawableTournamentMatch` tests to suck
 less

---
 .../TestSceneDrawableTournamentMatch.cs       | 97 +++++++++++--------
 1 file changed, 55 insertions(+), 42 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentMatch.cs b/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentMatch.cs
index 3dac550bd6..18c42b3086 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentMatch.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentMatch.cs
@@ -1,8 +1,11 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Linq;
+using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
 using osu.Game.Tournament.Models;
 using osu.Game.Tournament.Screens.Ladder.Components;
 
@@ -10,60 +13,67 @@ namespace osu.Game.Tournament.Tests.Components
 {
     public partial class TestSceneDrawableTournamentMatch : TournamentTestScene
     {
-        public TestSceneDrawableTournamentMatch()
+        [Test]
+        public void TestBasic()
         {
-            Container<DrawableTournamentMatch> level1;
-            Container<DrawableTournamentMatch> level2;
+            Container<DrawableTournamentMatch> level1 = null!;
+            Container<DrawableTournamentMatch> level2 = null!;
 
-            var match1 = new TournamentMatch(
-                new TournamentTeam { FlagName = { Value = "AU" }, FullName = { Value = "Australia" }, },
-                new TournamentTeam { FlagName = { Value = "JP" }, FullName = { Value = "Japan" }, Acronym = { Value = "JPN" } })
+            TournamentMatch match1 = null!;
+            TournamentMatch match2 = null!;
+
+            AddStep("setup test", () =>
             {
-                Team1Score = { Value = 4 },
-                Team2Score = { Value = 1 },
-            };
-
-            var match2 = new TournamentMatch(
-                new TournamentTeam
+                match1 = new TournamentMatch(
+                    new TournamentTeam { FlagName = { Value = "AU" }, FullName = { Value = "Australia" }, },
+                    new TournamentTeam { FlagName = { Value = "JP" }, FullName = { Value = "Japan" }, Acronym = { Value = "JPN" } })
                 {
-                    FlagName = { Value = "RO" },
-                    FullName = { Value = "Romania" },
-                }
-            );
+                    Team1Score = { Value = 4 },
+                    Team2Score = { Value = 1 },
+                };
 
-            Child = new FillFlowContainer
-            {
-                RelativeSizeAxes = Axes.Both,
-                Direction = FillDirection.Horizontal,
-                Children = new Drawable[]
+                match2 = new TournamentMatch(
+                    new TournamentTeam
+                    {
+                        FlagName = { Value = "RO" },
+                        FullName = { Value = "Romania" },
+                    }
+                );
+
+                Child = new FillFlowContainer
                 {
-                    level1 = new FillFlowContainer<DrawableTournamentMatch>
+                    RelativeSizeAxes = Axes.Both,
+                    Direction = FillDirection.Horizontal,
+                    Children = new Drawable[]
                     {
-                        AutoSizeAxes = Axes.X,
-                        Direction = FillDirection.Vertical,
-                        Children = new[]
+                        level1 = new FillFlowContainer<DrawableTournamentMatch>
                         {
-                            new DrawableTournamentMatch(match1),
-                            new DrawableTournamentMatch(match2),
-                            new DrawableTournamentMatch(new TournamentMatch()),
-                        }
-                    },
-                    level2 = new FillFlowContainer<DrawableTournamentMatch>
-                    {
-                        AutoSizeAxes = Axes.X,
-                        Direction = FillDirection.Vertical,
-                        Margin = new MarginPadding(20),
-                        Children = new[]
+                            AutoSizeAxes = Axes.X,
+                            Direction = FillDirection.Vertical,
+                            Children = new[]
+                            {
+                                new DrawableTournamentMatch(match1),
+                                new DrawableTournamentMatch(match2),
+                                new DrawableTournamentMatch(new TournamentMatch()),
+                            }
+                        },
+                        level2 = new FillFlowContainer<DrawableTournamentMatch>
                         {
-                            new DrawableTournamentMatch(new TournamentMatch()),
-                            new DrawableTournamentMatch(new TournamentMatch())
+                            AutoSizeAxes = Axes.X,
+                            Direction = FillDirection.Vertical,
+                            Margin = new MarginPadding(20),
+                            Children = new[]
+                            {
+                                new DrawableTournamentMatch(new TournamentMatch()),
+                                new DrawableTournamentMatch(new TournamentMatch())
+                            }
                         }
                     }
-                }
-            };
+                };
 
-            level1.Children[0].Match.Progression.Value = level2.Children[0].Match;
-            level1.Children[1].Match.Progression.Value = level2.Children[0].Match;
+                level1.Children[0].Match.Progression.Value = level2.Children[0].Match;
+                level1.Children[1].Match.Progression.Value = level2.Children[0].Match;
+            });
 
             AddRepeatStep("change scores", () => match1.Team2Score.Value++, 4);
             AddStep("add new team", () => match2.Team2.Value = new TournamentTeam { FlagName = { Value = "PT" }, FullName = { Value = "Portugal" } });
@@ -78,6 +88,9 @@ namespace osu.Game.Tournament.Tests.Components
             AddRepeatStep("change scores", () => level2.Children[0].Match.Team1Score.Value++, 5);
 
             AddRepeatStep("change scores", () => level2.Children[0].Match.Team2Score.Value++, 4);
+
+            AddStep("select as current", () => match1.Current.Value = true);
+            AddStep("select as editing", () => this.ChildrenOfType<DrawableTournamentMatch>().Last().Selected = true);
         }
     }
 }

From b1484e69739cfcdd1e8c65fe760d9fc5a6eb2429 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 Jul 2023 19:20:23 +0900
Subject: [PATCH 1516/1604] Improve bracket selection box visuals

Fix border around selected match being uneven
---
 .../Components/DrawableTournamentMatch.cs     | 69 ++++++++++++-------
 1 file changed, 45 insertions(+), 24 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
index 2f59415d6e..d9e19ac2e5 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
@@ -41,36 +41,57 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
 
             AutoSizeAxes = Axes.Both;
 
-            Margin = new MarginPadding(5);
+            const float border_thickness = 4;
+            const float spacing = 2;
 
-            InternalChildren = new[]
+            Margin = new MarginPadding(border_thickness);
+
+            InternalChildren = new Drawable[]
             {
-                selectionBox = new Container
-                {
-                    Scale = new Vector2(1.1f),
-                    RelativeSizeAxes = Axes.Both,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Alpha = 0,
-                    Colour = Color4.YellowGreen,
-                    Child = new Box { RelativeSizeAxes = Axes.Both }
-                },
-                CurrentMatchSelectionBox = new Container
-                {
-                    Scale = new Vector2(1.05f, 1.1f),
-                    RelativeSizeAxes = Axes.Both,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Alpha = 0,
-                    Colour = Color4.White,
-                    Child = new Box { RelativeSizeAxes = Axes.Both }
-                },
                 Flow = new FillFlowContainer<DrawableMatchTeam>
                 {
                     AutoSizeAxes = Axes.Both,
                     Direction = FillDirection.Vertical,
-                    Spacing = new Vector2(2)
-                }
+                    Spacing = new Vector2(spacing)
+                },
+                new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Padding = new MarginPadding(-(border_thickness + spacing)),
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Children = new[]
+                    {
+                        selectionBox = new Container
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Alpha = 0,
+                            Masking = true,
+                            BorderColour = Color4.YellowGreen,
+                            BorderThickness = border_thickness,
+                            Child = new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                AlwaysPresent = true,
+                                Alpha = 0,
+                            }
+                        },
+                        CurrentMatchSelectionBox = new Container
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Alpha = 0,
+                            BorderColour = Color4.White,
+                            BorderThickness = border_thickness,
+                            Masking = true,
+                            Child = new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                AlwaysPresent = true,
+                                Alpha = 0,
+                            }
+                        },
+                    }
+                },
             };
 
             boundReference(match.Team1).BindValueChanged(_ => updateTeams());

From fd1bd0c88a6f705f3196688126b5876442ed8231 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 Jul 2023 20:05:58 +0900
Subject: [PATCH 1517/1604] Add grid to show ladder editor snapping

---
 .../Screens/Editors/LadderEditorScreen.cs              | 10 ++++++++++
 .../Ladder/Components/DrawableTournamentMatch.cs       |  7 +++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
index e698e6e5b3..54aa83942d 100644
--- a/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
@@ -14,6 +14,7 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Framework.Input.States;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Screens.Edit.Compose.Components;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
 using osu.Game.Tournament.Screens.Ladder;
@@ -26,6 +27,8 @@ namespace osu.Game.Tournament.Screens.Editors
     [Cached]
     public partial class LadderEditorScreen : LadderScreen, IHasContextMenu
     {
+        public const float GRID_SPACING = 10;
+
         [Cached]
         private LadderEditorInfo editorInfo = new LadderEditorInfo();
 
@@ -43,6 +46,13 @@ namespace osu.Game.Tournament.Screens.Editors
 
             AddInternal(rightClickMessage = new WarningBox("Right click to place and link matches"));
 
+            ScrollContent.Add(new RectangularPositionSnapGrid(Vector2.Zero)
+            {
+                Spacing = new Vector2(GRID_SPACING),
+                RelativeSizeAxes = Axes.Both,
+                Depth = float.MaxValue
+            });
+
             LadderInfo.Matches.CollectionChanged += (_, _) => updateMessage();
             updateMessage();
         }
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
index d9e19ac2e5..4959f9ad29 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
@@ -13,6 +13,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Game.Tournament.Models;
+using osu.Game.Tournament.Screens.Editors;
 using osuTK;
 using osuTK.Graphics;
 using osuTK.Input;
@@ -44,8 +45,6 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
             const float border_thickness = 4;
             const float spacing = 2;
 
-            Margin = new MarginPadding(border_thickness);
-
             InternalChildren = new Drawable[]
             {
                 Flow = new FillFlowContainer<DrawableMatchTeam>
@@ -333,8 +332,8 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
 
         private Vector2 snapToGrid(Vector2 pos) =>
             new Vector2(
-                (int)(pos.X / 10) * 10,
-                (int)(pos.Y / 10) * 10
+                (int)(pos.X / LadderEditorScreen.GRID_SPACING) * LadderEditorScreen.GRID_SPACING,
+                (int)(pos.Y / LadderEditorScreen.GRID_SPACING) * LadderEditorScreen.GRID_SPACING
             );
 
         public void Remove()

From dd32b771cff434bccc63fb79be66191e2702966c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 Jul 2023 20:20:08 +0900
Subject: [PATCH 1518/1604] Adjust borders/layout to better align with grid

---
 .../Components/DrawableTournamentMatch.cs     | 65 ++++++++++---------
 1 file changed, 35 insertions(+), 30 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
index 4959f9ad29..7be9b5b26a 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
@@ -42,9 +42,11 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
 
             AutoSizeAxes = Axes.Both;
 
-            const float border_thickness = 4;
+            const float border_thickness = 5;
             const float spacing = 2;
 
+            Margin = new MarginPadding(10);
+
             InternalChildren = new Drawable[]
             {
                 Flow = new FillFlowContainer<DrawableMatchTeam>
@@ -56,41 +58,45 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
                 new Container
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Padding = new MarginPadding(-(border_thickness + spacing)),
+                    Padding = new MarginPadding(-10),
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Children = new[]
+                    Child = selectionBox = new Container
                     {
-                        selectionBox = new Container
+                        RelativeSizeAxes = Axes.Both,
+                        Alpha = 0,
+                        Masking = true,
+                        BorderColour = Color4.YellowGreen,
+                        BorderThickness = border_thickness,
+                        Child = new Box
                         {
                             RelativeSizeAxes = Axes.Both,
+                            AlwaysPresent = true,
                             Alpha = 0,
-                            Masking = true,
-                            BorderColour = Color4.YellowGreen,
-                            BorderThickness = border_thickness,
-                            Child = new Box
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                AlwaysPresent = true,
-                                Alpha = 0,
-                            }
-                        },
-                        CurrentMatchSelectionBox = new Container
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Alpha = 0,
-                            BorderColour = Color4.White,
-                            BorderThickness = border_thickness,
-                            Masking = true,
-                            Child = new Box
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                AlwaysPresent = true,
-                                Alpha = 0,
-                            }
-                        },
-                    }
+                        }
+                    },
                 },
+                new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Padding = new MarginPadding(-(spacing + border_thickness)),
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Child = CurrentMatchSelectionBox = new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Alpha = 0,
+                        BorderColour = Color4.White,
+                        BorderThickness = border_thickness,
+                        Masking = true,
+                        Child = new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            AlwaysPresent = true,
+                            Alpha = 0,
+                        }
+                    },
+                }
             };
 
             boundReference(match.Team1).BindValueChanged(_ => updateTeams());
@@ -117,7 +123,6 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
                     Position = new Vector2(pos.NewValue.X, pos.NewValue.Y);
                 Changed?.Invoke();
             }, true);
-
             updateTeams();
         }
 

From e46385ee6a4d06166a3fd2d603a17c322074ddab Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 Jul 2023 20:45:01 +0900
Subject: [PATCH 1519/1604] Automatically select new match in ladder editor
 after adding

---
 osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs | 8 ++++++--
 .../Screens/Ladder/Components/DrawableTournamentMatch.cs  | 5 +----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
index 54aa83942d..e35dbaefc9 100644
--- a/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
@@ -78,8 +78,12 @@ namespace osu.Game.Tournament.Screens.Editors
                 {
                     new OsuMenuItem("Create new match", MenuItemType.Highlighted, () =>
                     {
-                        var pos = MatchesContainer.ToLocalSpace(GetContainingInputManager().CurrentState.Mouse.Position);
-                        LadderInfo.Matches.Add(new TournamentMatch { Position = { Value = new Point((int)pos.X, (int)pos.Y) } });
+                        Vector2 pos = MatchesContainer.ToLocalSpace(GetContainingInputManager().CurrentState.Mouse.Position);
+                        TournamentMatch newMatch = new TournamentMatch { Position = { Value = new Point((int)pos.X, (int)pos.Y) } };
+
+                        LadderInfo.Matches.Add(newMatch);
+
+                        editorInfo.Selected.Value = newMatch;
                     }),
                     new OsuMenuItem("Reset teams", MenuItemType.Destructive, () =>
                     {
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
index 7be9b5b26a..a3d85e117b 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
@@ -250,10 +250,7 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
             if (editorInfo != null)
             {
                 globalSelection = editorInfo.Selected.GetBoundCopy();
-                globalSelection.BindValueChanged(s =>
-                {
-                    if (s.NewValue != Match) Selected = false;
-                });
+                globalSelection.BindValueChanged(s => Selected = s.NewValue == Match, true);
             }
         }
 

From 2658161605763e78f51e5474d3024a6e90092ad2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 Jul 2023 18:20:50 +0900
Subject: [PATCH 1520/1604] Move easily testable test scene to top of
 `TestSceneGameplayScreen`

---
 .../Screens/TestSceneGameplayScreen.cs        | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
index f127a930a6..36bb401a25 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
@@ -20,6 +20,20 @@ namespace osu.Game.Tournament.Tests.Screens
         [Cached]
         private TournamentMatchChatDisplay chat = new TournamentMatchChatDisplay { Width = 0.5f };
 
+        [Test]
+        public void TestWarmup()
+        {
+            createScreen();
+
+            checkScoreVisibility(false);
+
+            toggleWarmup();
+            checkScoreVisibility(true);
+
+            toggleWarmup();
+            checkScoreVisibility(false);
+        }
+
         [Test]
         public void TestStartupState([Values] TourneyState state)
         {
@@ -35,20 +49,6 @@ namespace osu.Game.Tournament.Tests.Screens
             createScreen();
         }
 
-        [Test]
-        public void TestWarmup()
-        {
-            createScreen();
-
-            checkScoreVisibility(false);
-
-            toggleWarmup();
-            checkScoreVisibility(true);
-
-            toggleWarmup();
-            checkScoreVisibility(false);
-        }
-
         private void createScreen()
         {
             AddStep("setup screen", () =>

From f837c0a43ce9117870ea5b03a3496dbb80d70854 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 Jul 2023 18:22:32 +0900
Subject: [PATCH 1521/1604] Fix tournament tests not fitting to lower
 resolutions correctly

---
 .../Screens/TestSceneDrawingsScreen.cs        |  2 +-
 .../Screens/TestSceneGameplayScreen.cs        |  2 +-
 .../Screens/TestSceneLadderEditorScreen.cs    |  2 +-
 .../Screens/TestSceneLadderScreen.cs          |  2 +-
 .../Screens/TestSceneMapPoolScreen.cs         |  2 +-
 .../Screens/TestSceneRoundEditorScreen.cs     |  2 +-
 .../Screens/TestSceneScheduleScreen.cs        |  2 +-
 .../Screens/TestSceneSeedingEditorScreen.cs   |  2 +-
 .../Screens/TestSceneSeedingScreen.cs         |  2 +-
 .../Screens/TestSceneSetupScreen.cs           |  2 +-
 .../Screens/TestSceneShowcaseScreen.cs        |  2 +-
 .../TestSceneStablePathSelectScreen.cs        |  2 +-
 .../Screens/TestSceneTeamEditorScreen.cs      |  2 +-
 .../Screens/TestSceneTeamIntroScreen.cs       |  2 +-
 .../Screens/TestSceneTeamWinScreen.cs         |  2 +-
 .../TournamentScreenTestScene.cs              | 19 +++++++++++++++++++
 .../TournamentTestScene.cs                    | 16 ++++++++--------
 17 files changed, 42 insertions(+), 23 deletions(-)
 create mode 100644 osu.Game.Tournament.Tests/TournamentScreenTestScene.cs

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneDrawingsScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneDrawingsScreen.cs
index cd15550931..df11859b71 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneDrawingsScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneDrawingsScreen.cs
@@ -10,7 +10,7 @@ using osu.Game.Tournament.Screens.Drawings;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
-    public partial class TestSceneDrawingsScreen : TournamentTestScene
+    public partial class TestSceneDrawingsScreen : TournamentScreenTestScene
     {
         [BackgroundDependencyLoader]
         private void load(Storage storage)
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
index 36bb401a25..abf0905647 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
@@ -15,7 +15,7 @@ using osu.Game.Tournament.Screens.Gameplay.Components;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
-    public partial class TestSceneGameplayScreen : TournamentTestScene
+    public partial class TestSceneGameplayScreen : TournamentScreenTestScene
     {
         [Cached]
         private TournamentMatchChatDisplay chat = new TournamentMatchChatDisplay { Width = 0.5f };
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs
index 839730f3ca..e1447af9c5 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs
@@ -8,7 +8,7 @@ using osu.Game.Tournament.Screens.Editors;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
-    public partial class TestSceneLadderEditorScreen : TournamentTestScene
+    public partial class TestSceneLadderEditorScreen : TournamentScreenTestScene
     {
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneLadderScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneLadderScreen.cs
index ecc741ddc1..6605e055f8 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneLadderScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneLadderScreen.cs
@@ -8,7 +8,7 @@ using osu.Game.Tournament.Screens.Ladder;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
-    public partial class TestSceneLadderScreen : TournamentTestScene
+    public partial class TestSceneLadderScreen : TournamentScreenTestScene
     {
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
index 94086f10f2..2c17cd0d52 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
@@ -14,7 +14,7 @@ using osu.Game.Tournament.Screens.MapPool;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
-    public partial class TestSceneMapPoolScreen : TournamentTestScene
+    public partial class TestSceneMapPoolScreen : TournamentScreenTestScene
     {
         private MapPoolScreen screen;
 
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneRoundEditorScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneRoundEditorScreen.cs
index 2e7bf364f7..4faaa3dd75 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneRoundEditorScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneRoundEditorScreen.cs
@@ -5,7 +5,7 @@ using osu.Game.Tournament.Screens.Editors;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
-    public partial class TestSceneRoundEditorScreen : TournamentTestScene
+    public partial class TestSceneRoundEditorScreen : TournamentScreenTestScene
     {
         public TestSceneRoundEditorScreen()
         {
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs
index fd0de3d63a..5071fbbfe3 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs
@@ -12,7 +12,7 @@ using osu.Game.Tournament.Screens.Schedule;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
-    public partial class TestSceneScheduleScreen : TournamentTestScene
+    public partial class TestSceneScheduleScreen : TournamentScreenTestScene
     {
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneSeedingEditorScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneSeedingEditorScreen.cs
index 0d06b0352f..add66ff83e 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneSeedingEditorScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneSeedingEditorScreen.cs
@@ -7,7 +7,7 @@ using osu.Game.Tournament.Screens.Editors;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
-    public partial class TestSceneSeedingEditorScreen : TournamentTestScene
+    public partial class TestSceneSeedingEditorScreen : TournamentScreenTestScene
     {
         [Cached]
         private readonly LadderInfo ladder = new LadderInfo();
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneSeedingScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneSeedingScreen.cs
index f656934239..a3890bbff0 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneSeedingScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneSeedingScreen.cs
@@ -12,7 +12,7 @@ using osu.Game.Tournament.Screens.TeamIntro;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
-    public partial class TestSceneSeedingScreen : TournamentTestScene
+    public partial class TestSceneSeedingScreen : TournamentScreenTestScene
     {
         [Cached]
         private readonly LadderInfo ladder = new LadderInfo
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneSetupScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneSetupScreen.cs
index 6af2af7732..71ae17d3eb 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneSetupScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneSetupScreen.cs
@@ -6,7 +6,7 @@ using osu.Game.Tournament.Screens.Setup;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
-    public partial class TestSceneSetupScreen : TournamentTestScene
+    public partial class TestSceneSetupScreen : TournamentScreenTestScene
     {
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneShowcaseScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneShowcaseScreen.cs
index e50a2a0c07..21e4d0267f 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneShowcaseScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneShowcaseScreen.cs
@@ -6,7 +6,7 @@ using osu.Game.Tournament.Screens.Showcase;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
-    public partial class TestSceneShowcaseScreen : TournamentTestScene
+    public partial class TestSceneShowcaseScreen : TournamentScreenTestScene
     {
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneStablePathSelectScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneStablePathSelectScreen.cs
index db49bc960a..3dc595cbb2 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneStablePathSelectScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneStablePathSelectScreen.cs
@@ -5,7 +5,7 @@ using osu.Game.Tournament.Screens.Setup;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
-    public partial class TestSceneStablePathSelectScreen : TournamentTestScene
+    public partial class TestSceneStablePathSelectScreen : TournamentScreenTestScene
     {
         public TestSceneStablePathSelectScreen()
         {
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneTeamEditorScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneTeamEditorScreen.cs
index 7b371ed78b..9e999eaf9d 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneTeamEditorScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneTeamEditorScreen.cs
@@ -5,7 +5,7 @@ using osu.Game.Tournament.Screens.Editors;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
-    public partial class TestSceneTeamEditorScreen : TournamentTestScene
+    public partial class TestSceneTeamEditorScreen : TournamentScreenTestScene
     {
         public TestSceneTeamEditorScreen()
         {
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneTeamIntroScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneTeamIntroScreen.cs
index 02762ab5c7..b76e0d7521 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneTeamIntroScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneTeamIntroScreen.cs
@@ -9,7 +9,7 @@ using osu.Game.Tournament.Screens.TeamIntro;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
-    public partial class TestSceneTeamIntroScreen : TournamentTestScene
+    public partial class TestSceneTeamIntroScreen : TournamentScreenTestScene
     {
         [Cached]
         private readonly LadderInfo ladder = new LadderInfo();
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs
index 2ed87cdcd5..05c21fa0b1 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs
@@ -8,7 +8,7 @@ using osu.Game.Tournament.Screens.TeamWin;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
-    public partial class TestSceneTeamWinScreen : TournamentTestScene
+    public partial class TestSceneTeamWinScreen : TournamentScreenTestScene
     {
         [Test]
         public void TestBasic()
diff --git a/osu.Game.Tournament.Tests/TournamentScreenTestScene.cs b/osu.Game.Tournament.Tests/TournamentScreenTestScene.cs
new file mode 100644
index 0000000000..76cc598af4
--- /dev/null
+++ b/osu.Game.Tournament.Tests/TournamentScreenTestScene.cs
@@ -0,0 +1,19 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osuTK;
+
+namespace osu.Game.Tournament.Tests
+{
+    public abstract partial class TournamentScreenTestScene : TournamentTestScene
+    {
+        protected override Container<Drawable> Content { get; } = new DrawSizePreservingFillContainer
+        {
+            TargetDrawSize = new Vector2(1920, 1080),
+            Scale = new Vector2(1920 / (float)(1920 + TournamentSceneManager.CONTROL_AREA_WIDTH)),
+            RelativeSizeAxes = Axes.Both
+        };
+    }
+}
diff --git a/osu.Game.Tournament.Tests/TournamentTestScene.cs b/osu.Game.Tournament.Tests/TournamentTestScene.cs
index cab78422a2..5b56946ba3 100644
--- a/osu.Game.Tournament.Tests/TournamentTestScene.cs
+++ b/osu.Game.Tournament.Tests/TournamentTestScene.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using System.Threading;
 using osu.Framework.Allocation;
@@ -20,17 +18,17 @@ namespace osu.Game.Tournament.Tests
 {
     public abstract partial class TournamentTestScene : OsuTestScene
     {
-        private TournamentMatch match;
-
         [Cached]
         protected LadderInfo Ladder { get; private set; } = new LadderInfo();
 
-        [Resolved]
-        private RulesetStore rulesetStore { get; set; }
-
         [Cached]
         protected MatchIPCInfo IPCInfo { get; private set; } = new MatchIPCInfo();
 
+        [Resolved]
+        private RulesetStore rulesetStore { get; set; } = null!;
+
+        private TournamentMatch match = null!;
+
         [BackgroundDependencyLoader]
         private void load(TournamentStorage storage)
         {
@@ -45,6 +43,8 @@ namespace osu.Game.Tournament.Tests
 
             Ruleset.BindTo(Ladder.Ruleset);
             Dependencies.CacheAs(new StableInfo(storage));
+
+            base.Content.Add(Content);
         }
 
         [SetUpSteps]
@@ -167,7 +167,7 @@ namespace osu.Game.Tournament.Tests
 
         public partial class TournamentTestSceneTestRunner : TournamentGameBase, ITestSceneTestRunner
         {
-            private TestSceneTestRunner.TestRunner runner;
+            private TestSceneTestRunner.TestRunner runner = null!;
 
             protected override void LoadAsyncComplete()
             {

From b7f706ad2b0debba553ed3ab072ec90c2c4fa31a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 Jul 2023 18:42:16 +0900
Subject: [PATCH 1522/1604] Set a fixed minimum window size for the tournament
 client

---
 osu.Game.Tournament/TournamentGame.cs         |  9 +++++++--
 osu.Game.Tournament/TournamentSceneManager.cs | 11 +++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tournament/TournamentGame.cs b/osu.Game.Tournament/TournamentGame.cs
index beef1e197d..4d7dd97e96 100644
--- a/osu.Game.Tournament/TournamentGame.cs
+++ b/osu.Game.Tournament/TournamentGame.cs
@@ -35,14 +35,19 @@ namespace osu.Game.Tournament
 
         public static readonly Color4 TEXT_COLOUR = Color4Extensions.FromHex("#fff");
         private Drawable heightWarning;
-        private Bindable<Size> windowSize;
+
         private Bindable<WindowMode> windowMode;
+        private readonly BindableSize windowSize = new BindableSize();
+
         private LoadingSpinner loadingSpinner;
 
         [BackgroundDependencyLoader]
         private void load(FrameworkConfigManager frameworkConfig, GameHost host)
         {
-            windowSize = frameworkConfig.GetBindable<Size>(FrameworkSetting.WindowedSize);
+            frameworkConfig.BindWith(FrameworkSetting.WindowedSize, windowSize);
+
+            windowSize.MinValue = new Size(TournamentSceneManager.REQUIRED_WIDTH, TournamentSceneManager.STREAM_AREA_HEIGHT);
+
             windowMode = frameworkConfig.GetBindable<WindowMode>(FrameworkSetting.WindowMode);
 
             Add(loadingSpinner = new LoadingSpinner(true, true)
diff --git a/osu.Game.Tournament/TournamentSceneManager.cs b/osu.Game.Tournament/TournamentSceneManager.cs
index 945593ba32..123b0f4d44 100644
--- a/osu.Game.Tournament/TournamentSceneManager.cs
+++ b/osu.Game.Tournament/TournamentSceneManager.cs
@@ -38,11 +38,14 @@ namespace osu.Game.Tournament
         private Container screens;
         private TourneyVideo video;
 
-        public const float CONTROL_AREA_WIDTH = 200;
+        public const int CONTROL_AREA_WIDTH = 200;
 
-        public const float STREAM_AREA_WIDTH = 1366;
+        public const int STREAM_AREA_WIDTH = 1366;
+        public const int STREAM_AREA_HEIGHT = (int)(STREAM_AREA_WIDTH / ASPECT_RATIO);
 
-        public const double REQUIRED_WIDTH = CONTROL_AREA_WIDTH * 2 + STREAM_AREA_WIDTH;
+        public const float ASPECT_RATIO = 16 / 9f;
+
+        public const int REQUIRED_WIDTH = CONTROL_AREA_WIDTH * 2 + STREAM_AREA_WIDTH;
 
         [Cached]
         private TournamentMatchChatDisplay chat = new TournamentMatchChatDisplay();
@@ -65,7 +68,7 @@ namespace osu.Game.Tournament
                     RelativeSizeAxes = Axes.Y,
                     X = CONTROL_AREA_WIDTH,
                     FillMode = FillMode.Fit,
-                    FillAspectRatio = 16 / 9f,
+                    FillAspectRatio = ASPECT_RATIO,
                     Anchor = Anchor.TopLeft,
                     Origin = Anchor.TopLeft,
                     Width = STREAM_AREA_WIDTH,

From 62121ea14c2d353cfb4a73733a43af3322fae082 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 Jul 2023 19:20:12 +0900
Subject: [PATCH 1523/1604] Add non-black background to right of tournament
 system

---
 osu.Game.Tournament/TournamentSceneManager.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game.Tournament/TournamentSceneManager.cs b/osu.Game.Tournament/TournamentSceneManager.cs
index 123b0f4d44..9ac5a9de12 100644
--- a/osu.Game.Tournament/TournamentSceneManager.cs
+++ b/osu.Game.Tournament/TournamentSceneManager.cs
@@ -75,6 +75,13 @@ namespace osu.Game.Tournament
                     //Masking = true,
                     Children = new Drawable[]
                     {
+                        new Box
+                        {
+                            Colour = new Color4(20, 20, 20, 255),
+                            Anchor = Anchor.TopRight,
+                            RelativeSizeAxes = Axes.Both,
+                            Width = 10,
+                        },
                         video = new TourneyVideo("main", true)
                         {
                             Loop = true,

From e0c0797f55cadb7e00833a91afc5151253f0936b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 Jul 2023 20:20:52 +0900
Subject: [PATCH 1524/1604] Fix dodgy implementation of current bindable in
 `DateTextBox`

---
 osu.Game.Tournament/Components/DateTextBox.cs | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tournament/Components/DateTextBox.cs b/osu.Game.Tournament/Components/DateTextBox.cs
index f23ad20a67..0993a4c05e 100644
--- a/osu.Game.Tournament/Components/DateTextBox.cs
+++ b/osu.Game.Tournament/Components/DateTextBox.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Bindables;
 using osu.Game.Graphics.UserInterface;
@@ -12,24 +10,21 @@ namespace osu.Game.Tournament.Components
 {
     public partial class DateTextBox : SettingsTextBox
     {
-        public new Bindable<DateTimeOffset> Current
+        private readonly BindableWithCurrent<DateTimeOffset> current = new BindableWithCurrent<DateTimeOffset>();
+
+        public new Bindable<DateTimeOffset>? Current
         {
             get => current;
-            set
-            {
-                current = value.GetBoundCopy();
-                current.BindValueChanged(dto =>
-                    base.Current.Value = dto.NewValue.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ"), true);
-            }
+            set => current.Current = value;
         }
 
-        // hold a reference to the provided bindable so we don't have to in every settings section.
-        private Bindable<DateTimeOffset> current = new Bindable<DateTimeOffset>();
-
         public DateTextBox()
         {
             base.Current = new Bindable<string>(string.Empty);
 
+            current.BindValueChanged(dto =>
+                base.Current.Value = dto.NewValue.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ"), true);
+
             ((OsuTextBox)Control).OnCommit += (sender, _) =>
             {
                 try

From 4fdf88595950038b7a7905edc956c521dfe0dfa4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 Jul 2023 20:44:50 +0900
Subject: [PATCH 1525/1604] Fix crash when switching ladder match selection
 multiple times

---
 .../Ladder/Components/LadderEditorSettings.cs | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs b/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
index f5b6faaa3c..5c9c14cc30 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
@@ -62,22 +62,28 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
                 // ensure any ongoing edits are committed out to the *current* selection before changing to a new one.
                 GetContainingInputManager().TriggerFocusContention(null);
 
-                roundDropdown.Current = selection.NewValue?.Round;
-                losersCheckbox.Current = selection.NewValue?.Losers;
-                dateTimeBox.Current = selection.NewValue?.Date;
+                // Required to avoid cyclic failure in BindableWithCurrent (TriggerChange called during the Current_Set process).
+                // Arguable a framework issue but since we haven't hit it anywhere else a local workaround seems best.
+                roundDropdown.Current.ValueChanged -= roundDropdownChanged;
 
-                team1Dropdown.Current = selection.NewValue?.Team1;
-                team2Dropdown.Current = selection.NewValue?.Team2;
+                roundDropdown.Current = selection.NewValue.Round;
+                losersCheckbox.Current = selection.NewValue.Losers;
+                dateTimeBox.Current = selection.NewValue.Date;
+
+                team1Dropdown.Current = selection.NewValue.Team1;
+                team2Dropdown.Current = selection.NewValue.Team2;
+
+                roundDropdown.Current.ValueChanged += roundDropdownChanged;
             };
+        }
 
-            roundDropdown.Current.ValueChanged += round =>
+        private void roundDropdownChanged(ValueChangedEvent<TournamentRound> round)
+        {
+            if (editorInfo.Selected.Value?.Date.Value < round.NewValue?.StartDate.Value)
             {
-                if (editorInfo.Selected.Value?.Date.Value < round.NewValue?.StartDate.Value)
-                {
-                    editorInfo.Selected.Value.Date.Value = round.NewValue.StartDate.Value;
-                    editorInfo.Selected.TriggerChange();
-                }
-            };
+                editorInfo.Selected.Value.Date.Value = round.NewValue.StartDate.Value;
+                editorInfo.Selected.TriggerChange();
+            }
         }
 
         protected override void LoadComplete()

From bc671f8ac626b32ac1b6bf9588507b187012c2fe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 25 Jul 2023 03:15:17 +0900
Subject: [PATCH 1526/1604] Fix beatmaps being queued for reprocessing every
 startup when logged out

---
 osu.Game/BackgroundBeatmapProcessor.cs | 27 +++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/osu.Game/BackgroundBeatmapProcessor.cs b/osu.Game/BackgroundBeatmapProcessor.cs
index 9f62dae1f5..b553fee503 100644
--- a/osu.Game/BackgroundBeatmapProcessor.cs
+++ b/osu.Game/BackgroundBeatmapProcessor.cs
@@ -14,6 +14,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
+using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Rulesets;
@@ -49,6 +50,9 @@ namespace osu.Game
         [Resolved]
         private INotificationOverlay? notificationOverlay { get; set; }
 
+        [Resolved]
+        private IAPIProvider api { get; set; } = null!;
+
         protected virtual int TimeToSleepDuringGameplay => 30000;
 
         protected override void LoadComplete()
@@ -118,10 +122,27 @@ namespace osu.Game
 
             realmAccess.Run(r =>
             {
-                foreach (var b in r.All<BeatmapInfo>().Where(b => b.StarRating < 0 || (b.OnlineID > 0 && b.LastOnlineUpdate == null)))
+                // BeatmapProcessor is responsible for both online and local processing.
+                // In the case a user isn't logged in, it won't update LastOnlineUpdate and therefore re-queue,
+                // causing overhead from the non-online processing to redundantly run every startup.
+                //
+                // We may eventually consider making the Process call more specific (or avoid this in any number
+                // of other possible ways), but for now avoid queueing if the user isn't logged in at startup.
+                if (api.IsLoggedIn)
                 {
-                    Debug.Assert(b.BeatmapSet != null);
-                    beatmapSetIds.Add(b.BeatmapSet.ID);
+                    foreach (var b in r.All<BeatmapInfo>().Where(b => b.StarRating < 0 || (b.OnlineID > 0 && b.LastOnlineUpdate == null)))
+                    {
+                        Debug.Assert(b.BeatmapSet != null);
+                        beatmapSetIds.Add(b.BeatmapSet.ID);
+                    }
+                }
+                else
+                {
+                    foreach (var b in r.All<BeatmapInfo>().Where(b => b.StarRating < 0))
+                    {
+                        Debug.Assert(b.BeatmapSet != null);
+                        beatmapSetIds.Add(b.BeatmapSet.ID);
+                    }
                 }
             });
 

From 09ee500f62dfdf1fda46bf38c082626351f81163 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 24 Jul 2023 21:32:05 +0200
Subject: [PATCH 1527/1604] Fix test failures due to `Content` override being
 applied in two places weirdly

---
 osu.Game.Tournament.Tests/TournamentScreenTestScene.cs | 7 +++++++
 osu.Game.Tournament.Tests/TournamentTestScene.cs       | 2 --
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament.Tests/TournamentScreenTestScene.cs b/osu.Game.Tournament.Tests/TournamentScreenTestScene.cs
index 76cc598af4..123fb5c2f9 100644
--- a/osu.Game.Tournament.Tests/TournamentScreenTestScene.cs
+++ b/osu.Game.Tournament.Tests/TournamentScreenTestScene.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osuTK;
@@ -15,5 +16,11 @@ namespace osu.Game.Tournament.Tests
             Scale = new Vector2(1920 / (float)(1920 + TournamentSceneManager.CONTROL_AREA_WIDTH)),
             RelativeSizeAxes = Axes.Both
         };
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            base.Content.Add(Content);
+        }
     }
 }
diff --git a/osu.Game.Tournament.Tests/TournamentTestScene.cs b/osu.Game.Tournament.Tests/TournamentTestScene.cs
index 5b56946ba3..a00a0a6e5a 100644
--- a/osu.Game.Tournament.Tests/TournamentTestScene.cs
+++ b/osu.Game.Tournament.Tests/TournamentTestScene.cs
@@ -43,8 +43,6 @@ namespace osu.Game.Tournament.Tests
 
             Ruleset.BindTo(Ladder.Ruleset);
             Dependencies.CacheAs(new StableInfo(storage));
-
-            base.Content.Add(Content);
         }
 
         [SetUpSteps]

From e7c1664adbeedcc4f2721482a0fe484b26c01f5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 24 Jul 2023 22:07:11 +0200
Subject: [PATCH 1528/1604] Fix blank space under tournament screen test scenes
 on very wide screens

---
 .../TournamentScreenTestScene.cs              | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tournament.Tests/TournamentScreenTestScene.cs b/osu.Game.Tournament.Tests/TournamentScreenTestScene.cs
index 123fb5c2f9..8adffe1468 100644
--- a/osu.Game.Tournament.Tests/TournamentScreenTestScene.cs
+++ b/osu.Game.Tournament.Tests/TournamentScreenTestScene.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -10,17 +11,28 @@ namespace osu.Game.Tournament.Tests
 {
     public abstract partial class TournamentScreenTestScene : TournamentTestScene
     {
-        protected override Container<Drawable> Content { get; } = new DrawSizePreservingFillContainer
-        {
-            TargetDrawSize = new Vector2(1920, 1080),
-            Scale = new Vector2(1920 / (float)(1920 + TournamentSceneManager.CONTROL_AREA_WIDTH)),
-            RelativeSizeAxes = Axes.Both
-        };
+        protected override Container<Drawable> Content { get; } = new TournamentScalingContainer();
 
         [BackgroundDependencyLoader]
         private void load()
         {
             base.Content.Add(Content);
         }
+
+        private partial class TournamentScalingContainer : DrawSizePreservingFillContainer
+        {
+            public TournamentScalingContainer()
+            {
+                TargetDrawSize = new Vector2(1920, 1080);
+                RelativeSizeAxes = Axes.Both;
+            }
+
+            protected override void Update()
+            {
+                base.Update();
+
+                Scale = new Vector2(Math.Min(1, Content.DrawWidth / (1920 + TournamentSceneManager.CONTROL_AREA_WIDTH)));
+            }
+        }
     }
 }

From e3560d2a10db13694a06dae32304cac2abb01545 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 24 Jul 2023 22:56:04 +0200
Subject: [PATCH 1529/1604] Fix uneven spacing on match connectors in
 tournament ladder screen

Noticed in passing during review of #24347.
---
 osu.Game.Tournament/Screens/Ladder/Components/ProgressionPath.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tournament/Screens/Ladder/Components/ProgressionPath.cs b/osu.Game.Tournament/Screens/Ladder/Components/ProgressionPath.cs
index 3d59bd8349..eae11dd8f1 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/ProgressionPath.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/ProgressionPath.cs
@@ -60,6 +60,7 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
 
             var topLeft = new Vector2(minX, minY);
 
+            OriginPosition = new Vector2(PathRadius);
             Position = Parent.ToLocalSpace(topLeft);
             Vertices = points.Select(p => Parent.ToLocalSpace(p) - Parent.ToLocalSpace(topLeft)).ToList();
         }

From 6f66e2fdd7f5ab72bee3bc1176b691e682ce2054 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Tue, 25 Jul 2023 07:45:48 +0900
Subject: [PATCH 1530/1604] set `LoadDelay` to 0

---
 osu.Game.Tournament/Components/TournamentBeatmapPanel.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
index 09c87a2010..e364a3c27d 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -183,6 +183,9 @@ namespace osu.Game.Tournament.Components
 
         private partial class TournamentUpdateableOnlineBeatmapSetCover : UpdateableOnlineBeatmapSetCover
         {
+            // no need to wait for Load because beatmap cover information does not change.
+            protected override double LoadDelay => 0;
+
             // Use DelayedLoadWrapper to avoid beatmap cover unload in map pool.
             // see https://github.com/ppy/osu/discussions/24337
             protected override DelayedLoadWrapper CreateDelayedLoadWrapper(Func<Drawable> createContentFunc, double timeBeforeLoad)

From 718d94a9371a5710bc445f79a8a4f6c6c157ad6e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 25 Jul 2023 14:51:51 +0900
Subject: [PATCH 1531/1604] Fix typo in xmldoc

---
 .../Screens/Ladder/Components/DrawableTournamentMatch.cs        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
index a3d85e117b..acf9ff76ab 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
@@ -127,7 +127,7 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
         }
 
         /// <summary>
-        /// Fired when somethign changed that requires a ladder redraw.
+        /// Fired when something changed that requires a ladder redraw.
         /// </summary>
         public Action Changed;
 

From 7b3bd0b04245f16ba4695235b29134871a5a1c96 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 25 Jul 2023 16:15:16 +0900
Subject: [PATCH 1532/1604] Reword comments to make more sense

---
 osu.Game.Tournament/Components/TournamentBeatmapPanel.cs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
index e364a3c27d..64148fa0cb 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Tournament.Components
                     RelativeSizeAxes = Axes.Both,
                     Colour = Color4.Black,
                 },
-                new TournamentUpdateableOnlineBeatmapSetCover
+                new NoUnloadBeatmapSetCover
                 {
                     RelativeSizeAxes = Axes.Both,
                     Colour = OsuColour.Gray(0.5f),
@@ -181,13 +181,12 @@ namespace osu.Game.Tournament.Components
             }
         }
 
-        private partial class TournamentUpdateableOnlineBeatmapSetCover : UpdateableOnlineBeatmapSetCover
+        private partial class NoUnloadBeatmapSetCover : UpdateableOnlineBeatmapSetCover
         {
-            // no need to wait for Load because beatmap cover information does not change.
+            // As covers are displayed on stream, we want them to load as soon as possible.
             protected override double LoadDelay => 0;
 
-            // Use DelayedLoadWrapper to avoid beatmap cover unload in map pool.
-            // see https://github.com/ppy/osu/discussions/24337
+            // Use DelayedLoadWrapper to avoid content unloading when switching away to another screen.
             protected override DelayedLoadWrapper CreateDelayedLoadWrapper(Func<Drawable> createContentFunc, double timeBeforeLoad)
                 => new DelayedLoadWrapper(createContentFunc, timeBeforeLoad);
         }

From d41fb9835039cceb3cbed5b483272efa8d860c17 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 25 Jul 2023 16:32:48 +0900
Subject: [PATCH 1533/1604] Fix misalignment of selection box on schedule
 screen

---
 osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
index 6b35102014..9232b4c689 100644
--- a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
+++ b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
@@ -218,8 +218,6 @@ namespace osu.Game.Tournament.Screens.Schedule
 
                 Scale = new Vector2(0.8f);
 
-                CurrentMatchSelectionBox.Scale = new Vector2(1.02f, 1.15f);
-
                 bool conditional = match is ConditionalTournamentMatch;
 
                 if (conditional)

From 219ba00fb2a7eb8b1357c6e0a51b5241215b5eab Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 25 Jul 2023 16:25:55 +0900
Subject: [PATCH 1534/1604] Fix startup tournament population not recovering
 from null beatmaps

---
 osu.Game.Tournament/TournamentGameBase.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 29f0f4f356..9007ac98ed 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -236,7 +236,7 @@ namespace osu.Game.Tournament
         {
             var beatmapsRequiringPopulation = ladder.Rounds
                                                     .SelectMany(r => r.Beatmaps)
-                                                    .Where(b => b.Beatmap?.OnlineID == 0 && b.ID > 0).ToList();
+                                                    .Where(b => (b.Beatmap == null || b.Beatmap?.OnlineID == 0) && b.ID > 0).ToList();
 
             if (beatmapsRequiringPopulation.Count == 0)
                 return false;

From 9cfe9164fa544794f1e4ecc0d0536a3827fe64d4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 25 Jul 2023 16:58:41 +0900
Subject: [PATCH 1535/1604] Add helper method to get drain length (and rename
 some usages)

---
 osu.Game.Tests/Editing/Checks/CheckDrainTimeTest.cs       | 8 ++++----
 osu.Game/Beatmaps/IBeatmap.cs                             | 5 +++++
 osu.Game/Rulesets/Edit/BeatmapVerifier.cs                 | 2 +-
 .../Checks/{CheckDrainTime.cs => CheckDrainLength.cs}     | 7 ++++---
 4 files changed, 14 insertions(+), 8 deletions(-)
 rename osu.Game/Rulesets/Edit/Checks/{CheckDrainTime.cs => CheckDrainLength.cs} (86%)

diff --git a/osu.Game.Tests/Editing/Checks/CheckDrainTimeTest.cs b/osu.Game.Tests/Editing/Checks/CheckDrainTimeTest.cs
index f845d3c4c1..d4eb378222 100644
--- a/osu.Game.Tests/Editing/Checks/CheckDrainTimeTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckDrainTimeTest.cs
@@ -16,12 +16,12 @@ namespace osu.Game.Tests.Editing.Checks
 {
     public class CheckDrainTimeTest
     {
-        private CheckDrainTime check = null!;
+        private CheckDrainLength check = null!;
 
         [SetUp]
         public void Setup()
         {
-            check = new CheckDrainTime();
+            check = new CheckDrainLength();
         }
 
         [Test]
@@ -40,7 +40,7 @@ namespace osu.Game.Tests.Editing.Checks
             var issues = check.Run(context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
-            Assert.That(issues.Single().Template is CheckDrainTime.IssueTemplateTooShort);
+            Assert.That(issues.Single().Template is CheckDrainLength.IssueTemplateTooShort);
         }
 
         [Test]
@@ -63,7 +63,7 @@ namespace osu.Game.Tests.Editing.Checks
             var issues = check.Run(context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
-            Assert.That(issues.Single().Template is CheckDrainTime.IssueTemplateTooShort);
+            Assert.That(issues.Single().Template is CheckDrainLength.IssueTemplateTooShort);
         }
 
         [Test]
diff --git a/osu.Game/Beatmaps/IBeatmap.cs b/osu.Game/Beatmaps/IBeatmap.cs
index fbe1a9b462..d97eb00d7e 100644
--- a/osu.Game/Beatmaps/IBeatmap.cs
+++ b/osu.Game/Beatmaps/IBeatmap.cs
@@ -110,6 +110,11 @@ namespace osu.Game.Beatmaps
         /// </remarks>
         public static double CalculatePlayableLength(this IBeatmap beatmap) => CalculatePlayableLength(beatmap.HitObjects);
 
+        /// <summary>
+        /// Find the total milliseconds between the first and last hittable objects, excluding any break time.
+        /// </summary>
+        public static double CalculateDrainLength(this IBeatmap beatmap) => CalculatePlayableLength(beatmap.HitObjects) - beatmap.TotalBreakTime;
+
         /// <summary>
         /// Find the timestamps in milliseconds of the start and end of the playable region.
         /// </summary>
diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
index 4bcf74db45..6782c4324a 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Edit
             new CheckUnsnappedObjects(),
             new CheckConcurrentObjects(),
             new CheckZeroLengthObjects(),
-            new CheckDrainTime(),
+            new CheckDrainLength(),
 
             // Timing
             new CheckPreviewTime(),
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckDrainTime.cs b/osu.Game/Rulesets/Edit/Checks/CheckDrainLength.cs
similarity index 86%
rename from osu.Game/Rulesets/Edit/Checks/CheckDrainTime.cs
rename to osu.Game/Rulesets/Edit/Checks/CheckDrainLength.cs
index 21f053f2c2..ac65dfadff 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckDrainTime.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckDrainLength.cs
@@ -7,10 +7,11 @@ using osu.Game.Rulesets.Edit.Checks.Components;
 
 namespace osu.Game.Rulesets.Edit.Checks
 {
-    public class CheckDrainTime : ICheck
+    public class CheckDrainLength : ICheck
     {
         private const int min_drain_threshold = 30 * 1000;
-        public CheckMetadata Metadata => new CheckMetadata(CheckCategory.Compose, "Too short drain time");
+
+        public CheckMetadata Metadata => new CheckMetadata(CheckCategory.Compose, "Drain length is too short");
 
         public IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
         {
@@ -19,7 +20,7 @@ namespace osu.Game.Rulesets.Edit.Checks
 
         public IEnumerable<Issue> Run(BeatmapVerifierContext context)
         {
-            double drainTime = context.Beatmap.CalculatePlayableLength() - context.Beatmap.TotalBreakTime;
+            double drainTime = context.Beatmap.CalculateDrainLength();
 
             if (drainTime < min_drain_threshold)
                 yield return new IssueTemplateTooShort(this).Create((int)(drainTime / 1000));

From 480163ec2e3ad4b2c7fb0e9c133761492430183b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 25 Jul 2023 16:58:53 +0900
Subject: [PATCH 1536/1604] Show drain length in length tooltip at song select

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 45 +++++++++------------
 1 file changed, 19 insertions(+), 26 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 3605e3d706..81759f6787 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -352,29 +352,6 @@ namespace osu.Game.Screens.Select
                 if (working.Beatmap?.HitObjects.Any() != true)
                     return;
 
-                infoLabelContainer.Children = new Drawable[]
-                {
-                    new InfoLabel(new BeatmapStatistic
-                    {
-                        Name = "Length",
-                        CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Length),
-                        Content = working.BeatmapInfo.Length.ToFormattedDuration().ToString(),
-                    }),
-                    bpmLabelContainer = new Container
-                    {
-                        AutoSizeAxes = Axes.Both,
-                    },
-                    new FillFlowContainer
-                    {
-                        AutoSizeAxes = Axes.Both,
-                        Spacing = new Vector2(20, 0),
-                        Children = getRulesetInfoLabels()
-                    }
-                };
-            }
-
-            private InfoLabel[] getRulesetInfoLabels()
-            {
                 try
                 {
                     IBeatmap playableBeatmap;
@@ -390,14 +367,30 @@ namespace osu.Game.Screens.Select
                         playableBeatmap = working.GetPlayableBeatmap(working.BeatmapInfo.Ruleset, Array.Empty<Mod>());
                     }
 
-                    return playableBeatmap.GetStatistics().Select(s => new InfoLabel(s)).ToArray();
+                    infoLabelContainer.Children = new Drawable[]
+                    {
+                        new InfoLabel(new BeatmapStatistic
+                        {
+                            Name = $"Length (Drain: {playableBeatmap.CalculateDrainLength().ToFormattedDuration().ToString()})",
+                            CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Length),
+                            Content = working.BeatmapInfo.Length.ToFormattedDuration().ToString(),
+                        }),
+                        bpmLabelContainer = new Container
+                        {
+                            AutoSizeAxes = Axes.Both,
+                        },
+                        new FillFlowContainer
+                        {
+                            AutoSizeAxes = Axes.Both,
+                            Spacing = new Vector2(20, 0),
+                            Children = playableBeatmap.GetStatistics().Select(s => new InfoLabel(s)).ToArray()
+                        }
+                    };
                 }
                 catch (Exception e)
                 {
                     Logger.Error(e, "Could not load beatmap successfully!");
                 }
-
-                return Array.Empty<InfoLabel>();
             }
 
             private void refreshBPMLabel()

From 9edaa6909e0fd9255d6c9e16108f0a679882283c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 25 Jul 2023 17:02:27 +0900
Subject: [PATCH 1537/1604] Show only the break length instead of total minute
 breaks

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 81759f6787..495a191c95 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -371,7 +371,7 @@ namespace osu.Game.Screens.Select
                     {
                         new InfoLabel(new BeatmapStatistic
                         {
-                            Name = $"Length (Drain: {playableBeatmap.CalculateDrainLength().ToFormattedDuration().ToString()})",
+                            Name = $"Length (Breaks: {playableBeatmap.TotalBreakTime.ToFormattedDuration().ToString()})",
                             CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Length),
                             Content = working.BeatmapInfo.Length.ToFormattedDuration().ToString(),
                         }),

From c84381d8026adbf46f72d1dc93e7ea390caa1df8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 25 Jul 2023 17:18:13 +0900
Subject: [PATCH 1538/1604] Separate out each type of scheduled operation and
 refactor tidy-up code

---
 .../Screens/Gameplay/GameplayScreen.cs        | 36 ++++++++++---------
 .../Screens/MapPool/MapPoolScreen.cs          | 10 +++---
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
index ae05517385..4258522cff 100644
--- a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
@@ -139,7 +139,7 @@ namespace osu.Game.Tournament.Screens.Gameplay
             base.LoadComplete();
 
             State.BindTo(ipc.State);
-            State.BindValueChanged(stateChanged, true);
+            State.BindValueChanged(_ => updateState(), true);
         }
 
         protected override void CurrentMatchChanged(ValueChangedEvent<TournamentMatch> match)
@@ -150,10 +150,12 @@ namespace osu.Game.Tournament.Screens.Gameplay
                 return;
 
             warmup.Value = match.NewValue.Team1Score.Value + match.NewValue.Team2Score.Value == 0;
-            scheduledOperation?.Cancel();
+            scheduledScreenChange?.Cancel();
         }
 
-        private ScheduledDelegate scheduledOperation;
+        private ScheduledDelegate scheduledScreenChange;
+        private ScheduledDelegate scheduledContract;
+
         private TournamentMatchScoreDisplay scoreDisplay;
 
         private TourneyState lastState;
@@ -161,6 +163,8 @@ namespace osu.Game.Tournament.Screens.Gameplay
 
         private void contract()
         {
+            scheduledContract?.Cancel();
+
             SongBar.Expanded = false;
             scoreDisplay.FadeOut(100);
             using (chat?.BeginDelayedSequence(500))
@@ -169,6 +173,8 @@ namespace osu.Game.Tournament.Screens.Gameplay
 
         private void expand()
         {
+            scheduledContract?.Cancel();
+
             chat?.Contract();
 
             using (BeginDelayedSequence(300))
@@ -178,11 +184,13 @@ namespace osu.Game.Tournament.Screens.Gameplay
             }
         }
 
-        private void stateChanged(ValueChangedEvent<TourneyState> state)
+        private void updateState()
         {
             try
             {
-                if (state.NewValue == TourneyState.Ranking)
+                scheduledScreenChange?.Cancel();
+
+                if (State.Value == TourneyState.Ranking)
                 {
                     if (warmup.Value || CurrentMatch.Value == null) return;
 
@@ -192,9 +200,7 @@ namespace osu.Game.Tournament.Screens.Gameplay
                         CurrentMatch.Value.Team2Score.Value++;
                 }
 
-                scheduledOperation?.Cancel();
-
-                switch (state.NewValue)
+                switch (State.Value)
                 {
                     case TourneyState.Idle:
                         contract();
@@ -208,40 +214,38 @@ namespace osu.Game.Tournament.Screens.Gameplay
                             if (lastState == TourneyState.Ranking && !warmup.Value)
                             {
                                 if (CurrentMatch.Value?.Completed.Value == true)
-                                    scheduledOperation = Scheduler.AddDelayed(() => { sceneManager?.SetScreen(typeof(TeamWinScreen)); }, delay_before_progression);
+                                    scheduledScreenChange = Scheduler.AddDelayed(() => { sceneManager?.SetScreen(typeof(TeamWinScreen)); }, delay_before_progression);
                                 else if (CurrentMatch.Value?.Completed.Value == false)
-                                    scheduledOperation = Scheduler.AddDelayed(() => { sceneManager?.SetScreen(typeof(MapPoolScreen)); }, delay_before_progression);
+                                    scheduledScreenChange = Scheduler.AddDelayed(() => { sceneManager?.SetScreen(typeof(MapPoolScreen)); }, delay_before_progression);
                             }
                         }
 
                         break;
 
                     case TourneyState.Ranking:
-                        scheduledOperation = Scheduler.AddDelayed(contract, 10000);
+                        scheduledContract = Scheduler.AddDelayed(contract, 10000);
                         break;
 
                     default:
-                        chat.Contract();
                         expand();
                         break;
                 }
             }
             finally
             {
-                lastState = state.NewValue;
+                lastState = State.Value;
             }
         }
 
         public override void Hide()
         {
-            scheduledOperation?.Cancel();
-
+            scheduledScreenChange?.Cancel();
             base.Hide();
         }
 
         public override void Show()
         {
-            stateChanged(new ValueChangedEvent<TourneyState>(TourneyState.Idle, State.Value));
+            updateState();
             base.Show();
         }
 
diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index f0e65e3158..913f1ba9ef 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
@@ -37,6 +37,8 @@ namespace osu.Game.Tournament.Screens.MapPool
         private OsuButton buttonRedPick;
         private OsuButton buttonBluePick;
 
+        private ScheduledDelegate scheduledScreenChange;
+
         [BackgroundDependencyLoader]
         private void load(MatchIPCInfo ipc)
         {
@@ -188,8 +190,6 @@ namespace osu.Game.Tournament.Screens.MapPool
             setNextMode();
         }
 
-        private ScheduledDelegate scheduledChange;
-
         private void addForBeatmap(int beatmapId)
         {
             if (CurrentMatch.Value == null)
@@ -216,15 +216,15 @@ namespace osu.Game.Tournament.Screens.MapPool
             {
                 if (pickType == ChoiceType.Pick && CurrentMatch.Value.PicksBans.Any(i => i.Type == ChoiceType.Pick))
                 {
-                    scheduledChange?.Cancel();
-                    scheduledChange = Scheduler.AddDelayed(() => { sceneManager?.SetScreen(typeof(GameplayScreen)); }, 10000);
+                    scheduledScreenChange?.Cancel();
+                    scheduledScreenChange = Scheduler.AddDelayed(() => { sceneManager?.SetScreen(typeof(GameplayScreen)); }, 10000);
                 }
             }
         }
 
         public override void Hide()
         {
-            scheduledChange?.Cancel();
+            scheduledScreenChange?.Cancel();
             base.Hide();
         }
 

From 43107f8cf07619a78335fdf62aaf3157ec167cfe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 25 Jul 2023 17:46:05 +0900
Subject: [PATCH 1539/1604] Fix skin mapping not working for menu fountains

---
 osu.Game/Skinning/LegacySkin.cs            |  7 +++++++
 osu.Game/Skinning/LegacySkinTransformer.cs | 13 -------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 79f13686e8..05f59d7c3a 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -468,6 +468,13 @@ namespace osu.Game.Skinning
 
         public override Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
         {
+            switch (componentName)
+            {
+                case "Menu/fountain-star":
+                    componentName = "star2";
+                    break;
+            }
+
             foreach (string name in getFallbackNames(componentName))
             {
                 // some component names (especially user-controlled ones, like `HitX` in mania)
diff --git a/osu.Game/Skinning/LegacySkinTransformer.cs b/osu.Game/Skinning/LegacySkinTransformer.cs
index 97b0f3a9b5..367e5bae01 100644
--- a/osu.Game/Skinning/LegacySkinTransformer.cs
+++ b/osu.Game/Skinning/LegacySkinTransformer.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Audio.Sample;
-using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
 using osu.Game.Rulesets.Objects.Legacy;
 using static osu.Game.Skinning.SkinConfiguration;
@@ -24,18 +23,6 @@ namespace osu.Game.Skinning
         {
         }
 
-        public override Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
-        {
-            switch (componentName)
-            {
-                case "fountain-star":
-                    componentName = "star2";
-                    break;
-            }
-
-            return base.GetTexture(componentName, wrapModeS, wrapModeT);
-        }
-
         public override ISample? GetSample(ISampleInfo sampleInfo)
         {
             if (!(sampleInfo is ConvertHitObjectParser.LegacyHitSampleInfo legacySample))

From eac6271bd011359afbe5658e664427d09479c44c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 25 Jul 2023 18:13:35 +0900
Subject: [PATCH 1540/1604] Add new property to avoid overlapping usages

---
 .../Edit/Blueprints/OsuSelectionBlueprint.cs               | 7 ++-----
 osu.Game/Rulesets/Edit/SelectionBlueprint.cs               | 7 ++++++-
 .../Screens/Edit/Compose/Components/BlueprintContainer.cs  | 2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/OsuSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/OsuSelectionBlueprint.cs
index 178b809d8b..8e8972a665 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/OsuSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/OsuSelectionBlueprint.cs
@@ -25,12 +25,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints
                                                  || (DrawableObject is not DrawableSpinner && ShowHitMarkers.Value && editorClock.CurrentTime >= Item.StartTime
                                                      && editorClock.CurrentTime - Item.GetEndTime() < HitCircleOverlapMarker.FADE_OUT_EXTENSION);
 
-        public override bool HandlePositionalInput =>
-            // Bypass fade out extension from hit markers for input handling purposes.
+        public override bool IsSelectable =>
+            // Bypass fade out extension from hit markers for selection purposes.
             // This is to match stable, where even when the afterimage hit markers are still visible, objects are not selectable.
-            //
-            // Note that we are intentionally overriding HandlePositionalInput here and not ReceivePositionalInputAt
-            // as individual blueprint implementations override that.
             base.ShouldBeAlive;
 
         protected OsuSelectionBlueprint(T hitObject)
diff --git a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
index 3c878ffd33..158c3c102c 100644
--- a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Edit
         /// </summary>
         public event Action<SelectionBlueprint<T>> Deselected;
 
-        public override bool HandlePositionalInput => ShouldBeAlive;
+        public override bool HandlePositionalInput => IsSelectable;
         public override bool RemoveWhenNotAlive => false;
 
         protected SelectionBlueprint(T item)
@@ -125,6 +125,11 @@ namespace osu.Game.Rulesets.Edit
         /// </summary>
         public virtual MenuItem[] ContextMenuItems => Array.Empty<MenuItem>();
 
+        /// <summary>
+        /// Whether the <see cref="SelectionBlueprint{T}"/> can be currently selected via a click or a drag box.
+        /// </summary>
+        public virtual bool IsSelectable => ShouldBeAlive && IsPresent;
+
         /// <summary>
         /// The screen-space main point that causes this <see cref="HitObjectSelectionBlueprint"/> to be selected via a drag.
         /// </summary>
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 2ee162bf3b..1de6c8364c 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -487,7 +487,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                         break;
 
                     case SelectionState.NotSelected:
-                        if (blueprint.IsAlive && blueprint.IsPresent && quad.Contains(blueprint.ScreenSpaceSelectionPoint))
+                        if (blueprint.IsSelectable && quad.Contains(blueprint.ScreenSpaceSelectionPoint))
                             blueprint.Select();
                         break;
                 }

From 0130c356eda56b89c6a07c559e1234802b14dd70 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 25 Jul 2023 18:31:28 +0900
Subject: [PATCH 1541/1604] Cache `IDialogOverlay` in a simpler way

---
 osu.Game.Tournament.Tests/TournamentTestScene.cs | 7 +++----
 osu.Game.Tournament/TournamentGame.cs            | 7 +------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tournament.Tests/TournamentTestScene.cs b/osu.Game.Tournament.Tests/TournamentTestScene.cs
index d519915355..84e5da62f4 100644
--- a/osu.Game.Tournament.Tests/TournamentTestScene.cs
+++ b/osu.Game.Tournament.Tests/TournamentTestScene.cs
@@ -19,7 +19,8 @@ namespace osu.Game.Tournament.Tests
 {
     public abstract partial class TournamentTestScene : OsuManualInputManagerTestScene
     {
-        protected DialogOverlay DialogOverlay = null!;
+        [Cached(typeof(IDialogOverlay))]
+        protected readonly DialogOverlay DialogOverlay = new DialogOverlay { Depth = float.MinValue };
 
         [Cached]
         protected LadderInfo Ladder { get; private set; } = new LadderInfo();
@@ -47,9 +48,7 @@ namespace osu.Game.Tournament.Tests
             Ruleset.BindTo(Ladder.Ruleset);
             Dependencies.CacheAs(new StableInfo(storage));
 
-            Add(DialogOverlay = new DialogOverlay { Depth = -1 });
-
-            Dependencies.CacheAs<IDialogOverlay>(DialogOverlay);
+            Add(DialogOverlay);
         }
 
         [SetUpSteps]
diff --git a/osu.Game.Tournament/TournamentGame.cs b/osu.Game.Tournament/TournamentGame.cs
index ec920abbd6..c79cc9cd57 100644
--- a/osu.Game.Tournament/TournamentGame.cs
+++ b/osu.Game.Tournament/TournamentGame.cs
@@ -42,11 +42,8 @@ namespace osu.Game.Tournament
 
         private LoadingSpinner loadingSpinner;
 
+        [Cached(typeof(IDialogOverlay))]
         private readonly DialogOverlay dialogOverlay = new DialogOverlay();
-        private DependencyContainer dependencies;
-
-        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) =>
-            dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
 
         [BackgroundDependencyLoader]
         private void load(FrameworkConfigManager frameworkConfig, GameHost host)
@@ -64,8 +61,6 @@ namespace osu.Game.Tournament
                 Margin = new MarginPadding(40),
             });
 
-            dependencies.CacheAs<IDialogOverlay>(dialogOverlay);
-
             // in order to have the OS mouse cursor visible, relative mode needs to be disabled.
             // can potentially be removed when https://github.com/ppy/osu-framework/issues/4309 is resolved.
             var mouseHandler = host.AvailableInputHandlers.OfType<MouseHandler>().FirstOrDefault();

From c1d93607e042688355914fa18578307d185c2f2e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 25 Jul 2023 19:06:13 +0900
Subject: [PATCH 1542/1604] Fix `TestSceneUnknownMod` failing due to null
 reference

---
 osu.Game.Tests/Visual/Gameplay/TestSceneUnknownMod.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneUnknownMod.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneUnknownMod.cs
index 1d85643adf..b02e180715 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneUnknownMod.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneUnknownMod.cs
@@ -20,7 +20,6 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             CreateModTest(new ModTestData
             {
-                Beatmap = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo).Beatmap,
                 Mod = new UnknownMod("WNG"),
                 PassCondition = () => Player.IsLoaded && !Player.LoadedBeatmapSuccessfully
             });

From 2e9379474d70999019d0c2e38affc421db186b5c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 25 Jul 2023 19:21:20 +0900
Subject: [PATCH 1543/1604] Change spinner rotation animation to match input
 1:1

---
 .../Skinning/Default/SpinnerRotationTracker.cs                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
index bf06f513b7..719cf57d98 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
@@ -72,9 +72,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
             lastAngle = thisAngle;
 
-            IsSpinning.Value = isSpinnableTime && Math.Abs(currentRotation / 2 - Rotation) > 5f;
+            IsSpinning.Value = isSpinnableTime && Math.Abs(currentRotation - Rotation) > 10f;
 
-            Rotation = (float)Interpolation.Damp(Rotation, currentRotation / 2, 0.99, Math.Abs(Time.Elapsed));
+            Rotation = (float)Interpolation.Damp(Rotation, currentRotation, 0.99, Math.Abs(Time.Elapsed));
         }
 
         /// <summary>

From 060ad36d601d613c7f81e06e3e4ca1acca4b1d43 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 25 Jul 2023 20:19:03 +0900
Subject: [PATCH 1544/1604] Add test coverage of music control in editor from
 external

---
 .../TestSceneBeatmapEditorNavigation.cs       | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
index 5483be5676..54ee1659e1 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
@@ -170,6 +170,39 @@ namespace osu.Game.Tests.Visual.Navigation
             AddUntilStep("time is correct", () => getEditor().ChildrenOfType<EditorClock>().First().CurrentTime, () => Is.EqualTo(1234));
         }
 
+        [Test]
+        public void TestAttemptGlobalMusicOperationFromEditor()
+        {
+            BeatmapSetInfo beatmapSet = null!;
+
+            AddStep("import test beatmap", () => Game.BeatmapManager.Import(TestResources.GetTestBeatmapForImport()).WaitSafely());
+            AddStep("retrieve beatmap", () => beatmapSet = Game.BeatmapManager.QueryBeatmapSet(set => !set.Protected).AsNonNull().Value.Detach());
+
+            AddStep("present beatmap", () => Game.PresentBeatmap(beatmapSet));
+            AddUntilStep("wait for song select",
+                () => Game.Beatmap.Value.BeatmapSetInfo.Equals(beatmapSet)
+                      && Game.ScreenStack.CurrentScreen is PlaySongSelect songSelect
+                      && songSelect.IsLoaded);
+
+            AddUntilStep("wait for music playing", () => Game.MusicController.IsPlaying);
+            AddStep("user request stop", () => Game.MusicController.Stop(requestedByUser: true));
+            AddUntilStep("wait for music stopped", () => !Game.MusicController.IsPlaying);
+
+            AddStep("open editor", () => ((PlaySongSelect)Game.ScreenStack.CurrentScreen).Edit(beatmapSet.Beatmaps.First(beatmap => beatmap.Ruleset.OnlineID == 0)));
+            AddUntilStep("wait for editor open", () => Game.ScreenStack.CurrentScreen is Editor editor && editor.ReadyForUse);
+
+            AddUntilStep("music still stopped", () => !Game.MusicController.IsPlaying);
+            AddStep("user request play", () => Game.MusicController.Play(requestedByUser: true));
+            AddUntilStep("music still stopped", () => !Game.MusicController.IsPlaying);
+
+            AddStep("exit to song select", () => Game.PerformFromScreen(_ => { }, typeof(PlaySongSelect).Yield()));
+            AddUntilStep("wait for song select", () => Game.ScreenStack.CurrentScreen is PlaySongSelect);
+
+            AddUntilStep("wait for music playing", () => Game.MusicController.IsPlaying);
+            AddStep("user request stop", () => Game.MusicController.Stop(requestedByUser: true));
+            AddUntilStep("wait for music stopped", () => !Game.MusicController.IsPlaying);
+        }
+
         private EditorBeatmap getEditorBeatmap() => getEditor().ChildrenOfType<EditorBeatmap>().Single();
 
         private Editor getEditor() => (Editor)Game.ScreenStack.CurrentScreen;

From 157b1f301b11ad6887b79edbe31e386d21f2c674 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 25 Jul 2023 19:58:23 +0900
Subject: [PATCH 1545/1604] Rename `AllowTrackAdjustments` to more
 understandable `ApplyModTrackAdjustments`

---
 .../Visual/TestSceneOsuScreenStack.cs         | 26 +++++++++----------
 .../Overlays/FirstRunSetup/ScreenUIScale.cs   |  2 +-
 osu.Game/Overlays/MusicController.cs          | 14 +++++-----
 osu.Game/Screens/Edit/Editor.cs               |  2 +-
 osu.Game/Screens/IOsuScreen.cs                |  2 +-
 .../Screens/OnlinePlay/Match/RoomSubScreen.cs |  2 +-
 .../Spectate/MultiSpectatorScreen.cs          |  2 +-
 osu.Game/Screens/OsuScreen.cs                 | 14 +++++-----
 osu.Game/Screens/Play/Player.cs               |  2 +-
 osu.Game/Screens/Select/SongSelect.cs         |  2 +-
 10 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/osu.Game.Tests/Visual/TestSceneOsuScreenStack.cs b/osu.Game.Tests/Visual/TestSceneOsuScreenStack.cs
index 7f01a67903..6b39717354 100644
--- a/osu.Game.Tests/Visual/TestSceneOsuScreenStack.cs
+++ b/osu.Game.Tests/Visual/TestSceneOsuScreenStack.cs
@@ -56,38 +56,38 @@ namespace osu.Game.Tests.Visual
         public void AllowTrackAdjustmentsTest()
         {
             AddStep("push allowing screen", () => stack.Push(loadNewScreen<AllowScreen>()));
-            AddAssert("allows adjustments 1", () => musicController.AllowTrackAdjustments);
+            AddAssert("allows adjustments 1", () => musicController.ApplyModTrackAdjustments);
 
             AddStep("push inheriting screen", () => stack.Push(loadNewScreen<InheritScreen>()));
-            AddAssert("allows adjustments 2", () => musicController.AllowTrackAdjustments);
+            AddAssert("allows adjustments 2", () => musicController.ApplyModTrackAdjustments);
 
             AddStep("push disallowing screen", () => stack.Push(loadNewScreen<DisallowScreen>()));
-            AddAssert("disallows adjustments 3", () => !musicController.AllowTrackAdjustments);
+            AddAssert("disallows adjustments 3", () => !musicController.ApplyModTrackAdjustments);
 
             AddStep("push inheriting screen", () => stack.Push(loadNewScreen<InheritScreen>()));
-            AddAssert("disallows adjustments 4", () => !musicController.AllowTrackAdjustments);
+            AddAssert("disallows adjustments 4", () => !musicController.ApplyModTrackAdjustments);
 
             AddStep("push inheriting screen", () => stack.Push(loadNewScreen<InheritScreen>()));
-            AddAssert("disallows adjustments 5", () => !musicController.AllowTrackAdjustments);
+            AddAssert("disallows adjustments 5", () => !musicController.ApplyModTrackAdjustments);
 
             AddStep("push allowing screen", () => stack.Push(loadNewScreen<AllowScreen>()));
-            AddAssert("allows adjustments 6", () => musicController.AllowTrackAdjustments);
+            AddAssert("allows adjustments 6", () => musicController.ApplyModTrackAdjustments);
 
             // Now start exiting from screens
             AddStep("exit screen", () => stack.Exit());
-            AddAssert("disallows adjustments 7", () => !musicController.AllowTrackAdjustments);
+            AddAssert("disallows adjustments 7", () => !musicController.ApplyModTrackAdjustments);
 
             AddStep("exit screen", () => stack.Exit());
-            AddAssert("disallows adjustments 8", () => !musicController.AllowTrackAdjustments);
+            AddAssert("disallows adjustments 8", () => !musicController.ApplyModTrackAdjustments);
 
             AddStep("exit screen", () => stack.Exit());
-            AddAssert("disallows adjustments 9", () => !musicController.AllowTrackAdjustments);
+            AddAssert("disallows adjustments 9", () => !musicController.ApplyModTrackAdjustments);
 
             AddStep("exit screen", () => stack.Exit());
-            AddAssert("allows adjustments 10", () => musicController.AllowTrackAdjustments);
+            AddAssert("allows adjustments 10", () => musicController.ApplyModTrackAdjustments);
 
             AddStep("exit screen", () => stack.Exit());
-            AddAssert("allows adjustments 11", () => musicController.AllowTrackAdjustments);
+            AddAssert("allows adjustments 11", () => musicController.ApplyModTrackAdjustments);
         }
 
         public partial class TestScreen : ScreenWithBeatmapBackground
@@ -129,12 +129,12 @@ namespace osu.Game.Tests.Visual
 
         private partial class AllowScreen : OsuScreen
         {
-            public override bool? AllowTrackAdjustments => true;
+            public override bool? ApplyModTrackAdjustments => true;
         }
 
         public partial class DisallowScreen : OsuScreen
         {
-            public override bool? AllowTrackAdjustments => false;
+            public override bool? ApplyModTrackAdjustments => false;
         }
 
         private partial class InheritScreen : OsuScreen
diff --git a/osu.Game/Overlays/FirstRunSetup/ScreenUIScale.cs b/osu.Game/Overlays/FirstRunSetup/ScreenUIScale.cs
index e3cd2ae36c..02f0ad9506 100644
--- a/osu.Game/Overlays/FirstRunSetup/ScreenUIScale.cs
+++ b/osu.Game/Overlays/FirstRunSetup/ScreenUIScale.cs
@@ -104,7 +104,7 @@ namespace osu.Game.Overlays.FirstRunSetup
         {
             protected override bool ControlGlobalMusic => false;
 
-            public override bool? AllowTrackAdjustments => false;
+            public override bool? ApplyModTrackAdjustments => false;
         }
 
         private partial class UIScaleSlider : RoundedSliderBar<float>
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 0d175a624c..562140f5cb 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -356,20 +356,20 @@ namespace osu.Game.Overlays
                 NextTrack();
         }
 
-        private bool allowTrackAdjustments;
+        private bool applyModTrackAdjustments;
 
         /// <summary>
         /// Whether mod track adjustments are allowed to be applied.
         /// </summary>
-        public bool AllowTrackAdjustments
+        public bool ApplyModTrackAdjustments
         {
-            get => allowTrackAdjustments;
+            get => applyModTrackAdjustments;
             set
             {
-                if (allowTrackAdjustments == value)
+                if (applyModTrackAdjustments == value)
                     return;
 
-                allowTrackAdjustments = value;
+                applyModTrackAdjustments = value;
                 ResetTrackAdjustments();
             }
         }
@@ -377,7 +377,7 @@ namespace osu.Game.Overlays
         private AudioAdjustments modTrackAdjustments;
 
         /// <summary>
-        /// Resets the adjustments currently applied on <see cref="CurrentTrack"/> and applies the mod adjustments if <see cref="AllowTrackAdjustments"/> is <c>true</c>.
+        /// Resets the adjustments currently applied on <see cref="CurrentTrack"/> and applies the mod adjustments if <see cref="ApplyModTrackAdjustments"/> is <c>true</c>.
         /// </summary>
         /// <remarks>
         /// Does not reset any adjustments applied directly to the beatmap track.
@@ -390,7 +390,7 @@ namespace osu.Game.Overlays
             CurrentTrack.RemoveAllAdjustments(AdjustableProperty.Tempo);
             CurrentTrack.RemoveAllAdjustments(AdjustableProperty.Volume);
 
-            if (allowTrackAdjustments)
+            if (applyModTrackAdjustments)
             {
                 CurrentTrack.BindAdjustments(modTrackAdjustments = new AudioAdjustments());
 
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 17e5eb8ef6..b885eee46f 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Screens.Edit
 
         public override bool DisallowExternalBeatmapRulesetChanges => true;
 
-        public override bool? AllowTrackAdjustments => false;
+        public override bool? ApplyModTrackAdjustments => false;
 
         protected override bool PlayExitSound => !ExitConfirmed && !switchingDifficulty;
 
diff --git a/osu.Game/Screens/IOsuScreen.cs b/osu.Game/Screens/IOsuScreen.cs
index cceede5424..756fbb80a7 100644
--- a/osu.Game/Screens/IOsuScreen.cs
+++ b/osu.Game/Screens/IOsuScreen.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Screens
         /// Whether mod track adjustments should be applied on entering this screen.
         /// A <see langword="null"/> value means that the parent screen's value of this setting will be used.
         /// </summary>
-        bool? AllowTrackAdjustments { get; }
+        bool? ApplyModTrackAdjustments { get; }
 
         /// <summary>
         /// Invoked when the back button has been pressed to close any overlays before exiting this <see cref="IOsuScreen"/>.
diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 75b673cf1b..8d08de4168 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
         [Cached(typeof(IBindable<PlaylistItem>))]
         public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
 
-        public override bool? AllowTrackAdjustments => true;
+        public override bool? ApplyModTrackAdjustments => true;
 
         protected override BackgroundScreen CreateBackground() => new RoomBackgroundScreen(Room.Playlist.FirstOrDefault())
         {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index 2d2aa0f1d5..92ce86bef2 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         public override bool DisallowExternalBeatmapRulesetChanges => true;
 
         // We are managing our own adjustments. For now, this happens inside the Player instances themselves.
-        public override bool? AllowTrackAdjustments => false;
+        public override bool? ApplyModTrackAdjustments => false;
 
         /// <summary>
         /// Whether all spectating players have finished loading.
diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index 9c098794a6..869d14c030 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -85,7 +85,7 @@ namespace osu.Game.Screens
         [Resolved]
         private MusicController musicController { get; set; }
 
-        public virtual bool? AllowTrackAdjustments => null;
+        public virtual bool? ApplyModTrackAdjustments => null;
 
         public Bindable<WorkingBeatmap> Beatmap { get; private set; }
 
@@ -95,7 +95,7 @@ namespace osu.Game.Screens
 
         private OsuScreenDependencies screenDependencies;
 
-        private bool? trackAdjustmentStateAtSuspend;
+        private bool? modTrackAdjustmentStateAtSuspend;
 
         internal void CreateLeasedDependencies(IReadOnlyDependencyContainer dependencies) => createDependencies(dependencies);
 
@@ -178,8 +178,8 @@ namespace osu.Game.Screens
 
             // it's feasible to resume to a screen if the target screen never loaded successfully.
             // in such a case there's no need to restore this value.
-            if (trackAdjustmentStateAtSuspend != null)
-                musicController.AllowTrackAdjustments = trackAdjustmentStateAtSuspend.Value;
+            if (modTrackAdjustmentStateAtSuspend != null)
+                musicController.ApplyModTrackAdjustments = modTrackAdjustmentStateAtSuspend.Value;
 
             base.OnResuming(e);
         }
@@ -188,7 +188,7 @@ namespace osu.Game.Screens
         {
             base.OnSuspending(e);
 
-            trackAdjustmentStateAtSuspend = musicController.AllowTrackAdjustments;
+            modTrackAdjustmentStateAtSuspend = musicController.ApplyModTrackAdjustments;
 
             onSuspendingLogo();
         }
@@ -197,8 +197,8 @@ namespace osu.Game.Screens
         {
             applyArrivingDefaults(false);
 
-            if (AllowTrackAdjustments != null)
-                musicController.AllowTrackAdjustments = AllowTrackAdjustments.Value;
+            if (ApplyModTrackAdjustments != null)
+                musicController.ApplyModTrackAdjustments = ApplyModTrackAdjustments.Value;
 
             if (backgroundStack?.Push(ownedBackground = CreateBackground()) != true)
             {
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 379c10a4a4..e2e8b71c10 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Screens.Play
         protected override OverlayActivation InitialOverlayActivationMode => OverlayActivation.UserTriggered;
 
         // We are managing our own adjustments (see OnEntering/OnExiting).
-        public override bool? AllowTrackAdjustments => false;
+        public override bool? ApplyModTrackAdjustments => false;
 
         private readonly IBindable<bool> gameActive = new Bindable<bool>(true);
 
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 47e5325baf..58755878d0 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Screens.Select
 
         protected virtual bool ShowFooter => true;
 
-        public override bool? AllowTrackAdjustments => true;
+        public override bool? ApplyModTrackAdjustments => true;
 
         /// <summary>
         /// Can be null if <see cref="ShowFooter"/> is false.

From 6146f30541086bc1d9b2bb85a03194d663c7d1b4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 25 Jul 2023 20:00:18 +0900
Subject: [PATCH 1546/1604] Allow screens to change the ability to interact
 with the global track

---
 .../Overlays/Music/MusicKeyBindingHandler.cs  |  8 +-----
 osu.Game/Overlays/MusicController.cs          | 28 +++++++++++++++----
 osu.Game/Overlays/NowPlayingOverlay.cs        | 22 +++++++++------
 osu.Game/Screens/IOsuScreen.cs                |  6 ++++
 osu.Game/Screens/OsuScreen.cs                 | 10 +++++++
 5 files changed, 53 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Overlays/Music/MusicKeyBindingHandler.cs b/osu.Game/Overlays/Music/MusicKeyBindingHandler.cs
index b7d265c448..78de76b981 100644
--- a/osu.Game/Overlays/Music/MusicKeyBindingHandler.cs
+++ b/osu.Game/Overlays/Music/MusicKeyBindingHandler.cs
@@ -30,20 +30,14 @@ namespace osu.Game.Overlays.Music
         [Resolved]
         private OnScreenDisplay? onScreenDisplay { get; set; }
 
-        [Resolved]
-        private OsuGame game { get; set; } = null!;
-
         public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
         {
-            if (e.Repeat)
+            if (e.Repeat || !musicController.AllowTrackControl.Value)
                 return false;
 
             switch (e.Action)
             {
                 case GlobalAction.MusicPlay:
-                    if (game.LocalUserPlaying.Value)
-                        return false;
-
                     // use previous state as TogglePause may not update the track's state immediately (state update is run on the audio thread see https://github.com/ppy/osu/issues/9880#issuecomment-674668842)
                     bool wasPlaying = musicController.IsPlaying;
 
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 562140f5cb..665c61edf0 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -40,6 +40,11 @@ namespace osu.Game.Overlays
         /// </summary>
         public bool UserPauseRequested { get; private set; }
 
+        /// <summary>
+        /// Whether control of the global track should be allowed.
+        /// </summary>
+        public readonly BindableBool AllowTrackControl = new BindableBool(true);
+
         /// <summary>
         /// Fired when the global <see cref="WorkingBeatmap"/> has changed.
         /// Includes direction information for display purposes.
@@ -92,8 +97,10 @@ namespace osu.Game.Overlays
             seekDelegate?.Cancel();
             seekDelegate = Schedule(() =>
             {
-                if (!beatmap.Disabled)
-                    CurrentTrack.Seek(position);
+                if (beatmap.Disabled || !AllowTrackControl.Value)
+                    return;
+
+                CurrentTrack.Seek(position);
             });
         }
 
@@ -107,7 +114,7 @@ namespace osu.Game.Overlays
 
             if (CurrentTrack.IsDummyDevice || beatmap.Value.BeatmapSetInfo.DeletePending)
             {
-                if (beatmap.Disabled)
+                if (beatmap.Disabled || !AllowTrackControl.Value)
                     return;
 
                 Logger.Log($"{nameof(MusicController)} skipping next track to {nameof(EnsurePlayingSomething)}");
@@ -132,6 +139,9 @@ namespace osu.Game.Overlays
         /// <returns>Whether the operation was successful.</returns>
         public bool Play(bool restart = false, bool requestedByUser = false)
         {
+            if (requestedByUser && !AllowTrackControl.Value)
+                return false;
+
             if (requestedByUser)
                 UserPauseRequested = false;
 
@@ -153,6 +163,9 @@ namespace osu.Game.Overlays
         /// </param>
         public void Stop(bool requestedByUser = false)
         {
+            if (requestedByUser && !AllowTrackControl.Value)
+                return;
+
             UserPauseRequested |= requestedByUser;
             if (CurrentTrack.IsRunning)
                 CurrentTrack.StopAsync();
@@ -164,6 +177,9 @@ namespace osu.Game.Overlays
         /// <returns>Whether the operation was successful.</returns>
         public bool TogglePause()
         {
+            if (!AllowTrackControl.Value)
+                return false;
+
             if (CurrentTrack.IsRunning)
                 Stop(true);
             else
@@ -189,7 +205,7 @@ namespace osu.Game.Overlays
         /// <returns>The <see cref="PreviousTrackResult"/> that indicate the decided action.</returns>
         private PreviousTrackResult prev()
         {
-            if (beatmap.Disabled)
+            if (beatmap.Disabled || !AllowTrackControl.Value)
                 return PreviousTrackResult.None;
 
             double currentTrackPosition = CurrentTrack.CurrentTime;
@@ -229,7 +245,7 @@ namespace osu.Game.Overlays
 
         private bool next()
         {
-            if (beatmap.Disabled)
+            if (beatmap.Disabled || !AllowTrackControl.Value)
                 return false;
 
             queuedDirection = TrackChangeDirection.Next;
@@ -352,7 +368,7 @@ namespace osu.Game.Overlays
 
         private void onTrackCompleted()
         {
-            if (!CurrentTrack.Looping && !beatmap.Disabled)
+            if (!CurrentTrack.Looping && !beatmap.Disabled && AllowTrackControl.Value)
                 NextTrack();
         }
 
diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index 15eefb2d9f..78539fde7a 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -68,6 +68,8 @@ namespace osu.Game.Overlays
         [Resolved]
         private OsuColour colours { get; set; }
 
+        private Bindable<bool> allowTrackControl;
+
         public NowPlayingOverlay()
         {
             Width = 400;
@@ -220,8 +222,10 @@ namespace osu.Game.Overlays
         {
             base.LoadComplete();
 
-            beatmap.BindDisabledChanged(_ => Scheduler.AddOnce(beatmapDisabledChanged));
-            beatmapDisabledChanged();
+            beatmap.BindDisabledChanged(_ => Scheduler.AddOnce(updateEnabledStates));
+
+            allowTrackControl = musicController.AllowTrackControl.GetBoundCopy();
+            allowTrackControl.BindValueChanged(_ => Scheduler.AddOnce(updateEnabledStates), true);
 
             musicController.TrackChanged += trackChanged;
             trackChanged(beatmap.Value);
@@ -334,16 +338,18 @@ namespace osu.Game.Overlays
             };
         }
 
-        private void beatmapDisabledChanged()
+        private void updateEnabledStates()
         {
-            bool disabled = beatmap.Disabled;
+            bool beatmapDisabled = beatmap.Disabled;
+            bool trackControlDisabled = !musicController.AllowTrackControl.Value;
 
-            if (disabled)
+            if (beatmapDisabled || trackControlDisabled)
                 playlist?.Hide();
 
-            prevButton.Enabled.Value = !disabled;
-            nextButton.Enabled.Value = !disabled;
-            playlistButton.Enabled.Value = !disabled;
+            prevButton.Enabled.Value = !beatmapDisabled && !trackControlDisabled;
+            nextButton.Enabled.Value = !beatmapDisabled && !trackControlDisabled;
+            playlistButton.Enabled.Value = !beatmapDisabled && !trackControlDisabled;
+            playButton.Enabled.Value = !trackControlDisabled;
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Screens/IOsuScreen.cs b/osu.Game/Screens/IOsuScreen.cs
index 756fbb80a7..5b4e2d75f4 100644
--- a/osu.Game/Screens/IOsuScreen.cs
+++ b/osu.Game/Screens/IOsuScreen.cs
@@ -69,6 +69,12 @@ namespace osu.Game.Screens
         /// </summary>
         bool? ApplyModTrackAdjustments { get; }
 
+        /// <summary>
+        /// Whether control of the global track should be allowed via the music controller / now playing overlay.
+        /// A <see langword="null"/> value means that the parent screen's value of this setting will be used.
+        /// </summary>
+        bool? AllowGlobalTrackControl { get; }
+
         /// <summary>
         /// Invoked when the back button has been pressed to close any overlays before exiting this <see cref="IOsuScreen"/>.
         /// </summary>
diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index 869d14c030..2dc9d5d49d 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -87,6 +87,8 @@ namespace osu.Game.Screens
 
         public virtual bool? ApplyModTrackAdjustments => null;
 
+        public virtual bool? AllowGlobalTrackControl => null;
+
         public Bindable<WorkingBeatmap> Beatmap { get; private set; }
 
         public Bindable<RulesetInfo> Ruleset { get; private set; }
@@ -95,6 +97,8 @@ namespace osu.Game.Screens
 
         private OsuScreenDependencies screenDependencies;
 
+        private bool? globalMusicControlStateAtSuspend;
+
         private bool? modTrackAdjustmentStateAtSuspend;
 
         internal void CreateLeasedDependencies(IReadOnlyDependencyContainer dependencies) => createDependencies(dependencies);
@@ -180,6 +184,8 @@ namespace osu.Game.Screens
             // in such a case there's no need to restore this value.
             if (modTrackAdjustmentStateAtSuspend != null)
                 musicController.ApplyModTrackAdjustments = modTrackAdjustmentStateAtSuspend.Value;
+            if (globalMusicControlStateAtSuspend != null)
+                musicController.AllowTrackControl.Value = globalMusicControlStateAtSuspend.Value;
 
             base.OnResuming(e);
         }
@@ -189,6 +195,7 @@ namespace osu.Game.Screens
             base.OnSuspending(e);
 
             modTrackAdjustmentStateAtSuspend = musicController.ApplyModTrackAdjustments;
+            globalMusicControlStateAtSuspend = musicController.AllowTrackControl.Value;
 
             onSuspendingLogo();
         }
@@ -200,6 +207,9 @@ namespace osu.Game.Screens
             if (ApplyModTrackAdjustments != null)
                 musicController.ApplyModTrackAdjustments = ApplyModTrackAdjustments.Value;
 
+            if (AllowGlobalTrackControl != null)
+                musicController.AllowTrackControl.Value = AllowGlobalTrackControl.Value;
+
             if (backgroundStack?.Push(ownedBackground = CreateBackground()) != true)
             {
                 // If the constructed instance was not actually pushed to the background stack, we don't want to track it unnecessarily.

From 3485b72eaa3885d337d5b71d9fa7c3a87809270f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 25 Jul 2023 20:00:31 +0900
Subject: [PATCH 1547/1604] Disallow interacting with the global track state in
 `Player` and `Editor`

---
 osu.Game/Screens/Edit/Editor.cs           | 2 ++
 osu.Game/Screens/Play/Player.cs           | 2 ++
 osu.Game/Screens/Ranking/ResultsScreen.cs | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index b885eee46f..d11297b3b2 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -68,6 +68,8 @@ namespace osu.Game.Screens.Edit
 
         public override bool? ApplyModTrackAdjustments => false;
 
+        public override bool? AllowGlobalTrackControl => false;
+
         protected override bool PlayExitSound => !ExitConfirmed && !switchingDifficulty;
 
         protected bool HasUnsavedChanges
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index e2e8b71c10..956c4d4856 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -71,6 +71,8 @@ namespace osu.Game.Screens.Play
         // We are managing our own adjustments (see OnEntering/OnExiting).
         public override bool? ApplyModTrackAdjustments => false;
 
+        public override bool? AllowGlobalTrackControl => false;
+
         private readonly IBindable<bool> gameActive = new Bindable<bool>(true);
 
         private readonly Bindable<bool> samplePlaybackDisabled = new Bindable<bool>();
diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 96fed3e6ba..43ddcffb62 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -36,6 +36,8 @@ namespace osu.Game.Screens.Ranking
 
         public override bool DisallowExternalBeatmapRulesetChanges => true;
 
+        public override bool? AllowGlobalTrackControl => true;
+
         // Temporary for now to stop dual transitions. Should respect the current toolbar mode, but there's no way to do so currently.
         public override bool HideOverlaysOnEnter => true;
 

From 43876ba2b09a1233393691ca567a23d431875701 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 25 Jul 2023 18:41:54 +0200
Subject: [PATCH 1548/1604] Privatise `currentMatchSelectionBox`

Because nobody else should need to do anything as cursed as what
`ScheduleScreen` was doing (which is 95% of the reason why the selection
box even broke there).
---
 .../Screens/Ladder/Components/DrawableTournamentMatch.cs  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
index acf9ff76ab..c394877ae9 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
         private readonly bool editor;
         protected readonly FillFlowContainer<DrawableMatchTeam> Flow;
         private readonly Drawable selectionBox;
-        protected readonly Drawable CurrentMatchSelectionBox;
+        private readonly Drawable currentMatchSelectionBox;
         private Bindable<TournamentMatch> globalSelection;
 
         [Resolved(CanBeNull = true)]
@@ -82,7 +82,7 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
                     Padding = new MarginPadding(-(spacing + border_thickness)),
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Child = CurrentMatchSelectionBox = new Container
+                    Child = currentMatchSelectionBox = new Container
                     {
                         RelativeSizeAxes = Axes.Both,
                         Alpha = 0,
@@ -151,9 +151,9 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
         private void updateCurrentMatch()
         {
             if (Match.Current.Value)
-                CurrentMatchSelectionBox.Show();
+                currentMatchSelectionBox.Show();
             else
-                CurrentMatchSelectionBox.Hide();
+                currentMatchSelectionBox.Hide();
         }
 
         private bool selected;

From d75e6f78d6bc6f6f549591da37974b547952105c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 25 Jul 2023 18:54:13 +0200
Subject: [PATCH 1549/1604] Adjust cyclic selection test to hitcircle lifetime
 adjustments

As it turns out, the tightening of hitcircle lifetimes in editor caused
the test to fail, since the objects were too far apart and at the
starting time of the test, the first object was fully faded out and as
such not alive, therefore leading cyclic selection to fail to select it.

To fix, bring all three objects closer together time-wise so that this
does not happen and the test can continue to exercise its original
behaviour.
---
 osu.Game.Tests/Visual/Editing/TestSceneComposerSelection.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneComposerSelection.cs b/osu.Game.Tests/Visual/Editing/TestSceneComposerSelection.cs
index b1a7ef976a..3884a3108f 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneComposerSelection.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneComposerSelection.cs
@@ -340,14 +340,14 @@ namespace osu.Game.Tests.Visual.Editing
         public void TestCyclicSelectionBackwards()
         {
             var firstObject = new HitCircle { Position = new Vector2(256, 192), StartTime = 0 };
-            var secondObject = new HitCircle { Position = new Vector2(256, 192), StartTime = 300 };
-            var thirdObject = new HitCircle { Position = new Vector2(256, 192), StartTime = 600 };
+            var secondObject = new HitCircle { Position = new Vector2(256, 192), StartTime = 200 };
+            var thirdObject = new HitCircle { Position = new Vector2(256, 192), StartTime = 400 };
 
             AddStep("add hitobjects", () => EditorBeatmap.AddRange(new[] { firstObject, secondObject, thirdObject }));
 
             moveMouseToObject(() => firstObject);
 
-            AddStep("seek to third", () => EditorClock.Seek(600));
+            AddStep("seek to third", () => EditorClock.Seek(350));
 
             AddStep("left click", () => InputManager.Click(MouseButton.Left));
             AddAssert("third selected", () => EditorBeatmap.SelectedHitObjects.Single(), () => Is.EqualTo(thirdObject));

From 5cedd428bb06cbd2e256ef45fe6b5f77e110c43f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 25 Jul 2023 20:05:37 +0200
Subject: [PATCH 1550/1604] Add test covering blocking of second hit on same
 frame

---
 .../Judgements/TestSceneHitJudgements.cs      | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneHitJudgements.cs b/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneHitJudgements.cs
index 32966905c9..6fe61e78b7 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneHitJudgements.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneHitJudgements.cs
@@ -36,6 +36,28 @@ namespace osu.Game.Rulesets.Taiko.Tests.Judgements
             AssertResult<Hit>(0, HitResult.Great);
         }
 
+        [Test]
+        public void TestHitWithBothKeysOnSameFrameDoesNotFallThroughToNextObject()
+        {
+            PerformTest(new List<ReplayFrame>
+            {
+                new TaikoReplayFrame(0),
+                new TaikoReplayFrame(1000, TaikoAction.LeftCentre, TaikoAction.RightCentre),
+            }, CreateBeatmap(new Hit
+            {
+                Type = HitType.Centre,
+                StartTime = 1000,
+            }, new Hit
+            {
+                Type = HitType.Centre,
+                StartTime = 1020
+            }));
+
+            AssertJudgementCount(2);
+            AssertResult<Hit>(0, HitResult.Great);
+            AssertResult<Hit>(1, HitResult.Miss);
+        }
+
         [Test]
         public void TestHitRimHit()
         {

From 7e98d319d85daeab6a5871e397ae102efa8bd2b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 25 Jul 2023 20:07:01 +0200
Subject: [PATCH 1551/1604] Use update-invariant way of checking for second
 press on same frame

Fixes the same issue that 970ea50269f8b248b69aa458a4baa0aa41e7e45b did,
but with no `AlwaysPresent` usage.
---
 osu.Game.Rulesets.Taiko/Mods/TaikoModHidden.cs |  6 ------
 .../Objects/Drawables/DrawableHit.cs           | 18 +++++-------------
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModHidden.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModHidden.cs
index ad17955f75..2c3b4a8d18 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModHidden.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModHidden.cs
@@ -57,12 +57,6 @@ namespace osu.Game.Rulesets.Taiko.Mods
                     {
                         hitObject.FadeOut(duration);
 
-                        // Keep updating the object even after it stopped being visible.
-                        // This is required because of the custom logic in DrawableHit's Update method.
-                        // Specifically, pressHandledThisFrame wasn't reset, which caused further hits
-                        // within the object's lifetime to be rejected.
-                        hitObject.AlwaysPresent = true;
-
                         // DrawableHitObject sets LifetimeEnd to LatestTransformEndTime if it isn't manually changed.
                         // in order for the object to not be killed before its actual end time (as the latest transform ends earlier), set lifetime end explicitly.
                         hitObject.LifetimeEnd = state == ArmedState.Idle || !hitObject.AllJudged
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index 44225ab289..1ef426854e 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
         private bool validActionPressed;
 
-        private bool pressHandledThisFrame;
+        private double? lastPressHandleTime;
 
         private readonly Bindable<HitType> type = new Bindable<HitType>();
 
@@ -76,7 +76,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
             HitActions = null;
             HitAction = null;
-            validActionPressed = pressHandledThisFrame = false;
+            validActionPressed = false;
+            lastPressHandleTime = null;
         }
 
         private void updateActionsFromType()
@@ -114,7 +115,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
         public override bool OnPressed(KeyBindingPressEvent<TaikoAction> e)
         {
-            if (pressHandledThisFrame)
+            if (lastPressHandleTime == Time.Current)
                 return true;
             if (Judged)
                 return false;
@@ -128,7 +129,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
             // Regardless of whether we've hit or not, any secondary key presses in the same frame should be discarded
             // E.g. hitting a non-strong centre as a strong should not fall through and perform a hit on the next note
-            pressHandledThisFrame = true;
+            lastPressHandleTime = Time.Current;
             return result;
         }
 
@@ -139,15 +140,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             base.OnReleased(e);
         }
 
-        protected override void Update()
-        {
-            base.Update();
-
-            // The input manager processes all input prior to us updating, so this is the perfect time
-            // for us to remove the extra press blocking, before input is handled in the next frame
-            pressHandledThisFrame = false;
-        }
-
         protected override void UpdateHitStateTransforms(ArmedState state)
         {
             Debug.Assert(HitObject.HitWindows != null);

From 3b11559fd0812c6ca2d2efa0b7e03cf5814c2ec8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 25 Jul 2023 22:17:55 +0200
Subject: [PATCH 1552/1604] Revert "Show only the break length instead of total
 minute breaks"

This reverts commit 9edaa6909e0fd9255d6c9e16108f0a679882283c.
---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 495a191c95..81759f6787 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -371,7 +371,7 @@ namespace osu.Game.Screens.Select
                     {
                         new InfoLabel(new BeatmapStatistic
                         {
-                            Name = $"Length (Breaks: {playableBeatmap.TotalBreakTime.ToFormattedDuration().ToString()})",
+                            Name = $"Length (Drain: {playableBeatmap.CalculateDrainLength().ToFormattedDuration().ToString()})",
                             CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Length),
                             Content = working.BeatmapInfo.Length.ToFormattedDuration().ToString(),
                         }),

From c6099edb88ef483e1e2d8c20bca9ba1c9bd43774 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 25 Jul 2023 22:18:31 +0200
Subject: [PATCH 1553/1604] Rename test to match class

---
 .../Checks/{CheckDrainTimeTest.cs => CheckDrainLengthTest.cs}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename osu.Game.Tests/Editing/Checks/{CheckDrainTimeTest.cs => CheckDrainLengthTest.cs} (98%)

diff --git a/osu.Game.Tests/Editing/Checks/CheckDrainTimeTest.cs b/osu.Game.Tests/Editing/Checks/CheckDrainLengthTest.cs
similarity index 98%
rename from osu.Game.Tests/Editing/Checks/CheckDrainTimeTest.cs
rename to osu.Game.Tests/Editing/Checks/CheckDrainLengthTest.cs
index d4eb378222..1b5c5c398f 100644
--- a/osu.Game.Tests/Editing/Checks/CheckDrainTimeTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckDrainLengthTest.cs
@@ -14,7 +14,7 @@ using osu.Game.Tests.Beatmaps;
 
 namespace osu.Game.Tests.Editing.Checks
 {
-    public class CheckDrainTimeTest
+    public class CheckDrainLengthTest
     {
         private CheckDrainLength check = null!;
 

From 39c2bb240bbd53c1d241313d6160be000fd9a205 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 Jul 2023 14:03:12 +0900
Subject: [PATCH 1554/1604] Apply NRT to `SelectionBoxRotationHandle`.

---
 .../Compose/Components/SelectionBoxRotationHandle.cs | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
index 4107a09692..8665ec9b08 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
@@ -1,10 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.EnumExtensions;
@@ -16,25 +13,24 @@ using osu.Framework.Localisation;
 using osu.Game.Localisation;
 using osuTK;
 using osuTK.Graphics;
-using Key = osuTK.Input.Key;
+using osuTK.Input;
 
 namespace osu.Game.Screens.Edit.Compose.Components
 {
     public partial class SelectionBoxRotationHandle : SelectionBoxDragHandle, IHasTooltip
     {
-        [CanBeNull]
-        public SelectionRotationHandler RotationHandler { get; init; }
+        public SelectionRotationHandler? RotationHandler { get; init; }
 
         public LocalisableString TooltipText { get; private set; }
 
-        private SpriteIcon icon;
+        private SpriteIcon icon = null!;
 
         private const float snap_step = 15;
 
         private readonly Bindable<float?> cumulativeRotation = new Bindable<float?>();
 
         [Resolved]
-        private SelectionBox selectionBox { get; set; }
+        private SelectionBox selectionBox { get; set; } = null!;
 
         [BackgroundDependencyLoader]
         private void load()

From 7fd6bb9d5f98c6ba74b06f827292a5cab875d322 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 Jul 2023 14:04:16 +0900
Subject: [PATCH 1555/1604] Fix a couple of code style issues in `SelectionBox`

---
 osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index 53442071b5..ed6bbf7668 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             }
         }
 
-        private IBindable<bool> canRotate = new BindableBool();
+        private readonly IBindable<bool> canRotate = new BindableBool();
 
         private bool canScaleX;
 
@@ -152,8 +152,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (RotationHandler != null)
                 canRotate.BindTo(RotationHandler.CanRotate);
 
-            canRotate.BindValueChanged(_ => recreate());
-            recreate();
+            canRotate.BindValueChanged(_ => recreate(), true);
         }
 
         protected override bool OnKeyDown(KeyDownEvent e)

From 2dace742a3b62011a31372eb49622350695b5122 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 Jul 2023 15:21:41 +0900
Subject: [PATCH 1556/1604] Add test coverage of score arriving on disk when
 exporting from results screen after play

---
 .../TestScenePlayerLocalScoreImport.cs        | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
index b0b9d48cbe..0a372d74e7 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
@@ -21,9 +21,11 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
+using osu.Game.Screens;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking;
 using osu.Game.Tests.Resources;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
@@ -147,6 +149,37 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("score in database", () => Realm.Run(r => r.Find<ScoreInfo>(Player.Score.ScoreInfo.ID) != null));
         }
 
+        [Test]
+        public void TestReplayExport()
+        {
+            CreateTest();
+
+            AddUntilStep("wait for track to start running", () => Beatmap.Value.Track.IsRunning);
+
+            AddStep("seek to completion", () => Player.GameplayClockContainer.Seek(Player.DrawableRuleset.Objects.Last().GetEndTime()));
+
+            AddUntilStep("results displayed", () => (Player.GetChildScreen() as ResultsScreen)?.IsLoaded == true);
+            AddUntilStep("score in database", () => Realm.Run(r => r.Find<ScoreInfo>(Player.Score.ScoreInfo.ID) != null));
+
+            AddUntilStep("wait for button clickable", () => ((OsuScreen)Player.GetChildScreen())
+                                                            .ChildrenOfType<ReplayDownloadButton>().FirstOrDefault()?
+                                                            .ChildrenOfType<OsuClickableContainer>()?.FirstOrDefault()?
+                                                            .Enabled.Value == true);
+
+            AddAssert("no export files", () => !LocalStorage.GetFiles("exports").Any());
+
+            AddStep("Export replay", () => InputManager.PressKey(Key.F2));
+
+            string? filePath = null;
+
+            AddUntilStep("wait for export file", () => filePath = LocalStorage.GetFiles("exports").SingleOrDefault(), () => Is.Not.Null);
+            AddAssert("filesize is non-zero", () =>
+            {
+                using (var stream = LocalStorage.GetStream(filePath))
+                    return stream.Length;
+            }, () => Is.Not.Zero);
+        }
+
         [Test]
         public void TestScoreStoredLocallyCustomRuleset()
         {

From e26afc2b8940e6fd6d41cba30b37314dac8d3f30 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 Jul 2023 15:12:02 +0900
Subject: [PATCH 1557/1604] Fix `ReplayDownloadButton` handling key repeat

---
 osu.Game/Screens/Ranking/ReplayDownloadButton.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Ranking/ReplayDownloadButton.cs b/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
index 799041b7de..a5b33e584d 100644
--- a/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
+++ b/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
@@ -107,6 +107,9 @@ namespace osu.Game.Screens.Ranking
 
         public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
         {
+            if (e.Repeat)
+                return false;
+
             switch (e.Action)
             {
                 case GlobalAction.SaveReplay:

From 4889864478dc4e6eb448ed5022bb1ce7a4607359 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 Jul 2023 15:21:58 +0900
Subject: [PATCH 1558/1604] Fix files references not correctly being copied
 after replay import in `Player`

---
 osu.Game/Screens/Play/Player.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 379c10a4a4..00aaa5ed2a 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -22,6 +22,7 @@ using osu.Framework.Threading;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
+using osu.Game.Database;
 using osu.Game.Extensions;
 using osu.Game.Graphics.Containers;
 using osu.Game.IO.Archives;
@@ -1170,6 +1171,7 @@ namespace osu.Game.Screens.Play
                 // because of the clone above, it's required that we copy back the post-import hash/ID to use for availability matching.
                 score.ScoreInfo.Hash = s.Hash;
                 score.ScoreInfo.ID = s.ID;
+                score.ScoreInfo.Files.AddRange(s.Files.Detach());
             });
 
             return Task.CompletedTask;

From fa4992f05a0d711310c8f28588b782deecfa584f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 Jul 2023 17:43:45 +0900
Subject: [PATCH 1559/1604] Apply NRT and avoid throws from null
 `RoundBeatmap.Beatmap`s

---
 .../Components/TournamentBeatmapPanel.cs      | 47 ++++++++++---------
 osu.Game.Tournament/Models/RoundBeatmap.cs    |  7 ++-
 .../Screens/Editors/RoundEditorScreen.cs      |  8 ++--
 3 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
index 64148fa0cb..970c3b5947 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Specialized;
 using System.Linq;
@@ -11,6 +9,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
@@ -21,19 +20,18 @@ namespace osu.Game.Tournament.Components
 {
     public partial class TournamentBeatmapPanel : CompositeDrawable
     {
-        public readonly TournamentBeatmap Beatmap;
+        public readonly TournamentBeatmap? Beatmap;
 
         private readonly string mod;
 
         public const float HEIGHT = 50;
 
-        private readonly Bindable<TournamentMatch> currentMatch = new Bindable<TournamentMatch>();
-        private Box flash;
+        private readonly Bindable<TournamentMatch?> currentMatch = new Bindable<TournamentMatch?>();
 
-        public TournamentBeatmapPanel(TournamentBeatmap beatmap, string mod = null)
+        private Box flash = null!;
+
+        public TournamentBeatmapPanel(TournamentBeatmap beatmap, string mod = "")
         {
-            ArgumentNullException.ThrowIfNull(beatmap);
-
             Beatmap = beatmap;
             this.mod = mod;
 
@@ -73,7 +71,7 @@ namespace osu.Game.Tournament.Components
                     {
                         new TournamentSpriteText
                         {
-                            Text = Beatmap.GetDisplayTitleRomanisable(false, false),
+                            Text = Beatmap?.GetDisplayTitleRomanisable(false, false) ?? (LocalisableString)@"unknown",
                             Font = OsuFont.Torus.With(weight: FontWeight.Bold),
                         },
                         new FillFlowContainer
@@ -90,7 +88,7 @@ namespace osu.Game.Tournament.Components
                                 },
                                 new TournamentSpriteText
                                 {
-                                    Text = Beatmap.Metadata.Author.Username,
+                                    Text = Beatmap?.Metadata.Author.Username ?? "unknown",
                                     Padding = new MarginPadding { Right = 20 },
                                     Font = OsuFont.Torus.With(weight: FontWeight.Bold, size: 14)
                                 },
@@ -102,7 +100,7 @@ namespace osu.Game.Tournament.Components
                                 },
                                 new TournamentSpriteText
                                 {
-                                    Text = Beatmap.DifficultyName,
+                                    Text = Beatmap?.DifficultyName ?? "unknown",
                                     Font = OsuFont.Torus.With(weight: FontWeight.Bold, size: 14)
                                 },
                             }
@@ -131,36 +129,37 @@ namespace osu.Game.Tournament.Components
             }
         }
 
-        private void matchChanged(ValueChangedEvent<TournamentMatch> match)
+        private void matchChanged(ValueChangedEvent<TournamentMatch?> match)
         {
             if (match.OldValue != null)
                 match.OldValue.PicksBans.CollectionChanged -= picksBansOnCollectionChanged;
-            match.NewValue.PicksBans.CollectionChanged += picksBansOnCollectionChanged;
+            if (match.NewValue != null)
+                match.NewValue.PicksBans.CollectionChanged += picksBansOnCollectionChanged;
+
             updateState();
         }
 
-        private void picksBansOnCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        private void picksBansOnCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
             => updateState();
 
-        private BeatmapChoice choice;
+        private BeatmapChoice? choice;
 
         private void updateState()
         {
-            var found = currentMatch.Value.PicksBans.FirstOrDefault(p => p.BeatmapID == Beatmap.OnlineID);
+            var newChoice = currentMatch.Value?.PicksBans.FirstOrDefault(p => p.BeatmapID == Beatmap?.OnlineID);
 
-            bool doFlash = found != choice;
-            choice = found;
+            bool shouldFlash = newChoice != choice;
 
-            if (found != null)
+            if (newChoice != null)
             {
-                if (doFlash)
-                    flash?.FadeOutFromOne(500).Loop(0, 10);
+                if (shouldFlash)
+                    flash.FadeOutFromOne(500).Loop(0, 10);
 
                 BorderThickness = 6;
 
-                BorderColour = TournamentGame.GetTeamColour(found.Team);
+                BorderColour = TournamentGame.GetTeamColour(newChoice.Team);
 
-                switch (found.Type)
+                switch (newChoice.Type)
                 {
                     case ChoiceType.Pick:
                         Colour = Color4.White;
@@ -179,6 +178,8 @@ namespace osu.Game.Tournament.Components
                 BorderThickness = 0;
                 Alpha = 1;
             }
+
+            choice = newChoice;
         }
 
         private partial class NoUnloadBeatmapSetCover : UpdateableOnlineBeatmapSetCover
diff --git a/osu.Game.Tournament/Models/RoundBeatmap.cs b/osu.Game.Tournament/Models/RoundBeatmap.cs
index 65ef77e53d..f2ec261246 100644
--- a/osu.Game.Tournament/Models/RoundBeatmap.cs
+++ b/osu.Game.Tournament/Models/RoundBeatmap.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using Newtonsoft.Json;
 
 namespace osu.Game.Tournament.Models
@@ -10,9 +8,10 @@ namespace osu.Game.Tournament.Models
     public class RoundBeatmap
     {
         public int ID;
-        public string Mods;
+
+        public string Mods = string.Empty;
 
         [JsonProperty("BeatmapInfo")]
-        public TournamentBeatmap Beatmap;
+        public TournamentBeatmap? Beatmap;
     }
 }
diff --git a/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs
index 4a3b5c0846..1c6e59aeaa 100644
--- a/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs
@@ -134,9 +134,11 @@ namespace osu.Game.Tournament.Screens.Editors
 
                 public void CreateNew()
                 {
-                    var user = new RoundBeatmap();
-                    round.Beatmaps.Add(user);
-                    flow.Add(new RoundBeatmapRow(round, user));
+                    var b = new RoundBeatmap();
+
+                    round.Beatmaps.Add(b);
+
+                    flow.Add(new RoundBeatmapRow(round, b));
                 }
 
                 public partial class RoundBeatmapRow : CompositeDrawable

From deba6e2508359d484b63edf51236915681e69a20 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 27 Jul 2023 02:22:46 +0900
Subject: [PATCH 1560/1604] Fix osu!taiko editor playfield missing a piece

Regressed with recent centering changes in https://github.com/ppy/osu/pull/24220
---
 osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs | 2 ++
 osu.Game/Rulesets/Edit/HitObjectComposer.cs            | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs
index cff5731181..add10b0ac5 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs
@@ -11,6 +11,8 @@ namespace osu.Game.Rulesets.Taiko.Edit
 {
     public partial class TaikoHitObjectComposer : HitObjectComposer<TaikoHitObject>
     {
+        protected override bool ApplyVerticalCentering => false;
+
         public TaikoHitObjectComposer(TaikoRuleset ruleset)
             : base(ruleset)
         {
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index bad7c55883..6fbc39c8ae 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -44,6 +44,11 @@ namespace osu.Game.Rulesets.Edit
     public abstract partial class HitObjectComposer<TObject> : HitObjectComposer, IPlacementHandler
         where TObject : HitObject
     {
+        /// <summary>
+        /// Whether the playfield should be centered vertically. Should be disabled for playfields which span the full horizontal width.
+        /// </summary>
+        protected virtual bool ApplyVerticalCentering => true;
+
         protected IRulesetConfigManager Config { get; private set; }
 
         // Provides `Playfield`
@@ -242,7 +247,7 @@ namespace osu.Game.Rulesets.Edit
             base.Update();
 
             // Ensure that the playfield is always centered but also doesn't get cut off by toolboxes.
-            PlayfieldContentContainer.Width = Math.Max(1024, DrawWidth) - TOOLBOX_CONTRACTED_SIZE_RIGHT * 2;
+            PlayfieldContentContainer.Width = Math.Max(1024, DrawWidth) - (ApplyVerticalCentering ? TOOLBOX_CONTRACTED_SIZE_RIGHT : TOOLBOX_CONTRACTED_SIZE_LEFT) * 2;
         }
 
         public override Playfield Playfield => drawableRulesetWrapper.Playfield;

From 8d5efc961206b9789ded5d435c30479f0236a8c3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 27 Jul 2023 02:36:24 +0900
Subject: [PATCH 1561/1604] Add back the ability to close mod select using
 enter key

I've seen this brought up a few times (with people thinking
the fact it's not working is a bug) so we'll need to keep this
behaviour for now.
---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 7ec108e3ec..0b5f263dc7 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -638,8 +638,12 @@ namespace osu.Game.Overlays.Mods
                 case GlobalAction.Select:
                 {
                     // Pressing select should select first filtered mod if a search is in progress.
+                    // If nothing is selected, it should exit the dialog (a bit weird, but this is the expectation from stable).
                     if (string.IsNullOrEmpty(SearchTerm))
+                    {
+                        Hide();
                         return true;
+                    }
 
                     ModState? firstMod = columnFlow.Columns.OfType<ModColumn>().FirstOrDefault(m => m.IsPresent)?.AvailableMods.FirstOrDefault(x => x.Visible);
 

From 7bc3edb05ae9908d5ece8895fde18ac6cc5f5012 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 26 Jul 2023 20:52:03 +0200
Subject: [PATCH 1562/1604] Fix code quality inspection

---
 .../Visual/Gameplay/TestScenePlayerLocalScoreImport.cs          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
index 0a372d74e7..2955b98fcd 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
@@ -163,7 +163,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddUntilStep("wait for button clickable", () => ((OsuScreen)Player.GetChildScreen())
                                                             .ChildrenOfType<ReplayDownloadButton>().FirstOrDefault()?
-                                                            .ChildrenOfType<OsuClickableContainer>()?.FirstOrDefault()?
+                                                            .ChildrenOfType<OsuClickableContainer>().FirstOrDefault()?
                                                             .Enabled.Value == true);
 
             AddAssert("no export files", () => !LocalStorage.GetFiles("exports").Any());

From f66093d3cf739e267d7a8b9518455477c4830338 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 26 Jul 2023 21:49:54 +0200
Subject: [PATCH 1563/1604] Revert failing test to prior assertions too

---
 .../Visual/UserInterface/TestSceneModSelectOverlay.cs           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 124fedf93a..ad79865ad9 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -542,7 +542,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             AddStep("clear search", () => modSelectOverlay.SearchTerm = string.Empty);
             AddStep("press enter", () => InputManager.Key(Key.Enter));
-            AddAssert("mod select still visible", () => modSelectOverlay.State.Value == Visibility.Visible);
+            AddAssert("mod select hidden", () => modSelectOverlay.State.Value == Visibility.Hidden);
         }
 
         [Test]

From 992f78b1582f5fd2483e1f0eae0789a3af334661 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 26 Jul 2023 21:54:35 +0200
Subject: [PATCH 1564/1604] Use more consistent way of closing overlay

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 0b5f263dc7..4c116de3fa 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -641,7 +641,7 @@ namespace osu.Game.Overlays.Mods
                     // If nothing is selected, it should exit the dialog (a bit weird, but this is the expectation from stable).
                     if (string.IsNullOrEmpty(SearchTerm))
                     {
-                        Hide();
+                        hideOverlay(true);
                         return true;
                     }
 

From 973e6ded2a9fc54b5085beb13d6ff0b268889f1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 26 Jul 2023 21:56:04 +0200
Subject: [PATCH 1565/1604] Update wrong comment, too

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 4c116de3fa..9e92e9d959 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -638,7 +638,7 @@ namespace osu.Game.Overlays.Mods
                 case GlobalAction.Select:
                 {
                     // Pressing select should select first filtered mod if a search is in progress.
-                    // If nothing is selected, it should exit the dialog (a bit weird, but this is the expectation from stable).
+                    // If there is no search in progress, it should exit the dialog (a bit weird, but this is the expectation from stable).
                     if (string.IsNullOrEmpty(SearchTerm))
                     {
                         hideOverlay(true);

From 1e9b927b5076128f6e2a3bf0e2bbd16f70b8d774 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 27 Jul 2023 17:41:27 +0900
Subject: [PATCH 1566/1604] Fix some missed null checks

---
 osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index cb6c5902ec..40bf03ede2 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
@@ -163,11 +163,11 @@ namespace osu.Game.Tournament.Screens.MapPool
 
             if (map != null)
             {
-                if (e.Button == MouseButton.Left && map.Beatmap.OnlineID > 0)
+                if (e.Button == MouseButton.Left && map.Beatmap?.OnlineID > 0)
                     addForBeatmap(map.Beatmap.OnlineID);
                 else
                 {
-                    var existing = CurrentMatch.Value.PicksBans.FirstOrDefault(p => p.BeatmapID == map.Beatmap.OnlineID);
+                    var existing = CurrentMatch.Value.PicksBans.FirstOrDefault(p => p.BeatmapID == map.Beatmap?.OnlineID);
 
                     if (existing != null)
                     {

From e702e0a23e6dc4542504f53d5819a1d61fc4292d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 27 Jul 2023 17:44:34 +0900
Subject: [PATCH 1567/1604] Avoid intercepting temporary files in new test

---
 .../Visual/Gameplay/TestScenePlayerLocalScoreImport.cs         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
index 2955b98fcd..feda251744 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
@@ -172,7 +172,8 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             string? filePath = null;
 
-            AddUntilStep("wait for export file", () => filePath = LocalStorage.GetFiles("exports").SingleOrDefault(), () => Is.Not.Null);
+            // Files starting with _ are temporary, created by CreateFileSafely call.
+            AddUntilStep("wait for export file", () => filePath = LocalStorage.GetFiles("exports").SingleOrDefault(f => !f.StartsWith("_", StringComparison.Ordinal)), () => Is.Not.Null);
             AddAssert("filesize is non-zero", () =>
             {
                 using (var stream = LocalStorage.GetStream(filePath))

From 3c923b9e81d9d10a8709c0e017d2b9a5114781ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 27 Jul 2023 22:10:41 +0200
Subject: [PATCH 1568/1604] Fix even more missed nullability-related
 inspections

---
 osu.Game.Tournament/Components/TournamentBeatmapPanel.cs | 2 +-
 osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
index 970c3b5947..6933eafc29 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Tournament.Components
 
         private Box flash = null!;
 
-        public TournamentBeatmapPanel(TournamentBeatmap beatmap, string mod = "")
+        public TournamentBeatmapPanel(TournamentBeatmap? beatmap, string mod = "")
         {
             Beatmap = beatmap;
             this.mod = mod;
diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index 40bf03ede2..9d16c70a8b 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
@@ -195,7 +195,7 @@ namespace osu.Game.Tournament.Screens.MapPool
             if (CurrentMatch.Value == null)
                 return;
 
-            if (CurrentMatch.Value.Round.Value.Beatmaps.All(b => b.Beatmap.OnlineID != beatmapId))
+            if (CurrentMatch.Value.Round.Value.Beatmaps.All(b => b.Beatmap?.OnlineID != beatmapId))
                 // don't attempt to add if the beatmap isn't in our pool
                 return;
 

From b7ddb5c94678f7ece81c628f0a28160a98953c94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 27 Jul 2023 22:33:00 +0200
Subject: [PATCH 1569/1604] Remove fallbacks to empty `APIBeatmap` on
 population failure

Was causing there to be two kinds of missing `TournamentBeatmap`s: one
with missing `Beatmap == null`, and one with `Beatmap == new
APIBeatmap()`. In particular, they would appear differently in UI
(either as "unknown - unknown", or the intensely enigmatic " - ").
---
 osu.Game.Tournament/TournamentGameBase.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 9007ac98ed..509c8bb940 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -19,7 +19,6 @@ using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Online;
 using osu.Game.Online.API.Requests;
-using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Tournament.IO;
 using osu.Game.Tournament.IPC;
 using osu.Game.Tournament.Models;
@@ -245,7 +244,9 @@ namespace osu.Game.Tournament
             {
                 var b = beatmapsRequiringPopulation[i];
 
-                b.Beatmap = new TournamentBeatmap(await beatmapCache.GetBeatmapAsync(b.ID).ConfigureAwait(false) ?? new APIBeatmap());
+                var populated = await beatmapCache.GetBeatmapAsync(b.ID).ConfigureAwait(false);
+                if (populated != null)
+                    b.Beatmap = new TournamentBeatmap(populated);
 
                 updateLoadProgressMessage($"Populating round beatmaps ({i} / {beatmapsRequiringPopulation.Count})");
             }
@@ -270,7 +271,9 @@ namespace osu.Game.Tournament
             {
                 var b = beatmapsRequiringPopulation[i];
 
-                b.Beatmap = new TournamentBeatmap(await beatmapCache.GetBeatmapAsync(b.ID).ConfigureAwait(false) ?? new APIBeatmap());
+                var populated = await beatmapCache.GetBeatmapAsync(b.ID).ConfigureAwait(false);
+                if (populated != null)
+                    b.Beatmap = new TournamentBeatmap(populated);
 
                 updateLoadProgressMessage($"Populating seeding beatmaps ({i} / {beatmapsRequiringPopulation.Count})");
             }

From c7717da2328dac7146f7d9360e69db00b99152c8 Mon Sep 17 00:00:00 2001
From: Dao Heng Liu <daohengliu@gmail.com>
Date: Thu, 27 Jul 2023 22:43:05 +0100
Subject: [PATCH 1570/1604] make `SetupScreen` scrollable

---
 .../Screens/Setup/SetupScreen.cs              | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Setup/SetupScreen.cs b/osu.Game.Tournament/Screens/Setup/SetupScreen.cs
index ff1d32516a..5c7bbed69c 100644
--- a/osu.Game.Tournament/Screens/Setup/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/Setup/SetupScreen.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Online.API;
 using osu.Game.Overlays;
@@ -57,14 +58,18 @@ namespace osu.Game.Tournament.Screens.Setup
                     RelativeSizeAxes = Axes.Both,
                     Colour = OsuColour.Gray(0.2f),
                 },
-                fillFlow = new FillFlowContainer
+                new OsuScrollContainer
                 {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Direction = FillDirection.Vertical,
-                    Padding = new MarginPadding(10),
-                    Spacing = new Vector2(10),
-                }
+                    RelativeSizeAxes = Axes.Both,
+                    Child = fillFlow = new FillFlowContainer
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Direction = FillDirection.Vertical,
+                        Padding = new MarginPadding(10),
+                        Spacing = new Vector2(10),
+                    },
+                },
             };
 
             api.LocalUser.BindValueChanged(_ => Schedule(reload));

From 269d4d1cd6eda979cb0aa1bf42fc802e247e6886 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 28 Jul 2023 14:49:05 +0900
Subject: [PATCH 1571/1604] Add test coverage of autoplay restore not working

---
 .../Navigation/TestScenePerformFromScreen.cs  | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs b/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs
index 1c8fa775b9..c8f1f081d9 100644
--- a/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs
@@ -13,6 +13,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Overlays;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Screens;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.Play;
@@ -86,6 +87,29 @@ namespace osu.Game.Tests.Visual.Navigation
             AddAssert("did perform", () => actionPerformed);
         }
 
+        [Test]
+        public void TestPerformAtMenuFromPlayerLoaderWithAutoplayShortcut()
+        {
+            importAndWaitForSongSelect();
+
+            AddStep("press ctrl+enter", () =>
+            {
+                InputManager.PressKey(Key.ControlLeft);
+                InputManager.Key(Key.Enter);
+                InputManager.ReleaseKey(Key.ControlLeft);
+            });
+
+            AddUntilStep("Wait for new screen", () => Game.ScreenStack.CurrentScreen is PlayerLoader);
+
+            AddAssert("Mods include autoplay", () => Game.SelectedMods.Value.Any(m => m is ModAutoplay));
+
+            AddStep("try to perform", () => Game.PerformFromScreen(_ => actionPerformed = true));
+            AddUntilStep("returned to song select", () => Game.ScreenStack.CurrentScreen is MainMenu);
+            AddAssert("did perform", () => actionPerformed);
+
+            AddAssert("Mods don't include autoplay", () => !Game.SelectedMods.Value.Any(m => m is ModAutoplay));
+        }
+
         [Test]
         public void TestPerformEnsuresScreenIsLoaded()
         {

From f15394fb6d5975cb599102f7718b496997b11048 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 28 Jul 2023 14:42:43 +0900
Subject: [PATCH 1572/1604] Fix temporary auto mod (ctrl+enter at song select)
 not reverting in all scenarios

---
 osu.Game/Screens/Select/PlaySongSelect.cs | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index b99d949b43..fe13d6d5a8 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -146,12 +146,24 @@ namespace osu.Game.Screens.Select
         public override void OnResuming(ScreenTransitionEvent e)
         {
             base.OnResuming(e);
+            revertMods();
+        }
 
-            if (playerLoader != null)
-            {
-                Mods.Value = modsAtGameplayStart;
-                playerLoader = null;
-            }
+        public override bool OnExiting(ScreenExitEvent e)
+        {
+            if (base.OnExiting(e))
+                return true;
+
+            revertMods();
+            return false;
+        }
+
+        private void revertMods()
+        {
+            if (playerLoader == null) return;
+
+            Mods.Value = modsAtGameplayStart;
+            playerLoader = null;
         }
     }
 }

From 0e4db9b4390198a4619ac04399960bedcedafd14 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 28 Jul 2023 16:25:40 +0900
Subject: [PATCH 1573/1604] Add safety in `RectangularPositionSnapGrid` that
 size is greater than zero

Would crash otherwise
---
 .../Compose/Components/RectangularPositionSnapGrid.cs     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/RectangularPositionSnapGrid.cs b/osu.Game/Screens/Edit/Compose/Components/RectangularPositionSnapGrid.cs
index 063ea23281..bec1d148be 100644
--- a/osu.Game/Screens/Edit/Compose/Components/RectangularPositionSnapGrid.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/RectangularPositionSnapGrid.cs
@@ -54,8 +54,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (!gridCache.IsValid)
             {
                 ClearInternal();
-                createContent();
-                gridCache.Validate();
+
+                if (DrawSize != Vector2.Zero)
+                {
+                    createContent();
+                    gridCache.Validate();
+                }
             }
         }
 

From b5f0d739e63ce9324baa689701b0227b873f5b97 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 28 Jul 2023 16:25:52 +0900
Subject: [PATCH 1574/1604] Allow ladder editor grid to scale with content

Closes https://github.com/ppy/osu/issues/24378.
---
 .../Screens/Editors/LadderEditorScreen.cs        | 16 ++++++++++++++--
 .../Screens/Ladder/LadderScreen.cs               |  7 +++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
index 62d18ac9e5..f3c5566565 100644
--- a/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
@@ -37,6 +37,8 @@ namespace osu.Game.Tournament.Screens.Editors
 
         private WarningBox rightClickMessage;
 
+        private RectangularPositionSnapGrid grid;
+
         [Resolved(canBeNull: true)]
         [CanBeNull]
         private IDialogOverlay dialogOverlay { get; set; }
@@ -53,10 +55,12 @@ namespace osu.Game.Tournament.Screens.Editors
 
             AddInternal(rightClickMessage = new WarningBox("Right click to place and link matches"));
 
-            ScrollContent.Add(new RectangularPositionSnapGrid(Vector2.Zero)
+            ScrollContent.Add(grid = new RectangularPositionSnapGrid(Vector2.Zero)
             {
                 Spacing = new Vector2(GRID_SPACING),
-                RelativeSizeAxes = Axes.Both,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                BypassAutoSizeAxes = Axes.Both,
                 Depth = float.MaxValue
             });
 
@@ -64,6 +68,14 @@ namespace osu.Game.Tournament.Screens.Editors
             updateMessage();
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            // Expand grid with the content to allow going beyond the bounds of the screen.
+            grid.Size = ScrollContent.Size + new Vector2(GRID_SPACING * 2);
+        }
+
         private void updateMessage()
         {
             rightClickMessage.Alpha = LadderInfo.Matches.Count > 0 ? 0 : 1;
diff --git a/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs b/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
index a74c9a9429..2d5281b893 100644
--- a/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
+++ b/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
@@ -57,12 +57,15 @@ namespace osu.Game.Tournament.Screens.Ladder
                     },
                     ScrollContent = new LadderDragContainer
                     {
-                        RelativeSizeAxes = Axes.Both,
+                        AutoSizeAxes = Axes.Both,
                         Children = new Drawable[]
                         {
                             paths = new Container<Path> { RelativeSizeAxes = Axes.Both },
                             headings = new Container { RelativeSizeAxes = Axes.Both },
-                            MatchesContainer = new Container<DrawableTournamentMatch> { RelativeSizeAxes = Axes.Both },
+                            MatchesContainer = new Container<DrawableTournamentMatch>
+                            {
+                                AutoSizeAxes = Axes.Both
+                            },
                         }
                     },
                 }

From b5c3e2a648e78a62729033b8229f5360f1d176dd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 28 Jul 2023 16:29:39 +0900
Subject: [PATCH 1575/1604] Fix placing new match via right click not using
 original click position

---
 .../Screens/Editors/LadderEditorScreen.cs             | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
index f3c5566565..2ff86ab17c 100644
--- a/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
@@ -76,6 +76,14 @@ namespace osu.Game.Tournament.Screens.Editors
             grid.Size = ScrollContent.Size + new Vector2(GRID_SPACING * 2);
         }
 
+        private Vector2 lastMatchesContainerMouseDownPosition;
+
+        protected override bool OnMouseDown(MouseDownEvent e)
+        {
+            lastMatchesContainerMouseDownPosition = MatchesContainer.ToLocalSpace(e.ScreenSpaceMouseDownPosition);
+            return base.OnMouseDown(e);
+        }
+
         private void updateMessage()
         {
             rightClickMessage.Alpha = LadderInfo.Matches.Count > 0 ? 0 : 1;
@@ -97,7 +105,8 @@ namespace osu.Game.Tournament.Screens.Editors
                 {
                     new OsuMenuItem("Create new match", MenuItemType.Highlighted, () =>
                     {
-                        Vector2 pos = MatchesContainer.ToLocalSpace(GetContainingInputManager().CurrentState.Mouse.Position);
+                        Vector2 pos = lastMatchesContainerMouseDownPosition;
+
                         TournamentMatch newMatch = new TournamentMatch { Position = { Value = new Point((int)pos.X, (int)pos.Y) } };
 
                         LadderInfo.Matches.Add(newMatch);

From aa910005053d3ff51ba124cf07480e16b6642072 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 28 Jul 2023 16:29:55 +0900
Subject: [PATCH 1576/1604] Always place first match at (0,0)

---
 osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
index 2ff86ab17c..9411892dc5 100644
--- a/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
@@ -105,7 +105,7 @@ namespace osu.Game.Tournament.Screens.Editors
                 {
                     new OsuMenuItem("Create new match", MenuItemType.Highlighted, () =>
                     {
-                        Vector2 pos = lastMatchesContainerMouseDownPosition;
+                        Vector2 pos = MatchesContainer.Count == 0 ? Vector2.Zero : lastMatchesContainerMouseDownPosition;
 
                         TournamentMatch newMatch = new TournamentMatch { Position = { Value = new Point((int)pos.X, (int)pos.Y) } };
 

From c9155f85ab83d12771621dc82240320f2f09ec19 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 28 Jul 2023 16:40:14 +0900
Subject: [PATCH 1577/1604] Fix playfield not taking up full width correclty
 when not vertically centered

---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 6fbc39c8ae..dbca8694ae 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -124,8 +124,6 @@ namespace osu.Game.Rulesets.Edit
                 {
                     Name = "Playfield content",
                     RelativeSizeAxes = Axes.Y,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
                     Children = new Drawable[]
                     {
                         // layers below playfield
@@ -247,7 +245,22 @@ namespace osu.Game.Rulesets.Edit
             base.Update();
 
             // Ensure that the playfield is always centered but also doesn't get cut off by toolboxes.
-            PlayfieldContentContainer.Width = Math.Max(1024, DrawWidth) - (ApplyVerticalCentering ? TOOLBOX_CONTRACTED_SIZE_RIGHT : TOOLBOX_CONTRACTED_SIZE_LEFT) * 2;
+            if (ApplyVerticalCentering)
+            {
+                PlayfieldContentContainer.Anchor = Anchor.Centre;
+                PlayfieldContentContainer.Origin = Anchor.Centre;
+
+                PlayfieldContentContainer.Width = Math.Max(1024, DrawWidth) - TOOLBOX_CONTRACTED_SIZE_RIGHT * 2;
+                PlayfieldContentContainer.X = 0;
+            }
+            else
+            {
+                PlayfieldContentContainer.Anchor = Anchor.CentreLeft;
+                PlayfieldContentContainer.Origin = Anchor.CentreLeft;
+
+                PlayfieldContentContainer.Width = Math.Max(1024, DrawWidth) - (TOOLBOX_CONTRACTED_SIZE_LEFT + TOOLBOX_CONTRACTED_SIZE_RIGHT);
+                PlayfieldContentContainer.X = TOOLBOX_CONTRACTED_SIZE_LEFT;
+            }
         }
 
         public override Playfield Playfield => drawableRulesetWrapper.Playfield;

From f58c69e639b1bc5f72c4680f48d90cedb0d7a718 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 28 Jul 2023 17:17:14 +0900
Subject: [PATCH 1578/1604] Fix potential startup crash due to early
 application of animations

This was always haphazard code, but by luck it never triggered before
drawable load until now. With the recently nullability changes, this
would be triggered when `flash` is not yet constructed.

Switching to `AddOnce` seems safer to avoid multiple applications,
regardless.
---
 osu.Game.Tournament/Components/TournamentBeatmapPanel.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
index 6933eafc29..49478a2174 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -136,11 +136,11 @@ namespace osu.Game.Tournament.Components
             if (match.NewValue != null)
                 match.NewValue.PicksBans.CollectionChanged += picksBansOnCollectionChanged;
 
-            updateState();
+            Scheduler.AddOnce(updateState);
         }
 
         private void picksBansOnCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
-            => updateState();
+            => Scheduler.AddOnce(updateState);
 
         private BeatmapChoice? choice;
 

From 6d018c08afc1573a921e3cfb28e1e13b67f45cfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 28 Jul 2023 22:09:28 +0200
Subject: [PATCH 1579/1604] Rename `Apply{Vertical -> Horizontal}Centering` to
 match common understanding

---
 osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs | 2 +-
 osu.Game/Rulesets/Edit/HitObjectComposer.cs            | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs
index add10b0ac5..3e63d624e7 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Rulesets.Taiko.Edit
 {
     public partial class TaikoHitObjectComposer : HitObjectComposer<TaikoHitObject>
     {
-        protected override bool ApplyVerticalCentering => false;
+        protected override bool ApplyHorizontalCentering => false;
 
         public TaikoHitObjectComposer(TaikoRuleset ruleset)
             : base(ruleset)
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index dbca8694ae..71ca13e4ba 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -45,9 +45,9 @@ namespace osu.Game.Rulesets.Edit
         where TObject : HitObject
     {
         /// <summary>
-        /// Whether the playfield should be centered vertically. Should be disabled for playfields which span the full horizontal width.
+        /// Whether the playfield should be centered horizontally. Should be disabled for playfields which span the full horizontal width.
         /// </summary>
-        protected virtual bool ApplyVerticalCentering => true;
+        protected virtual bool ApplyHorizontalCentering => true;
 
         protected IRulesetConfigManager Config { get; private set; }
 
@@ -245,7 +245,7 @@ namespace osu.Game.Rulesets.Edit
             base.Update();
 
             // Ensure that the playfield is always centered but also doesn't get cut off by toolboxes.
-            if (ApplyVerticalCentering)
+            if (ApplyHorizontalCentering)
             {
                 PlayfieldContentContainer.Anchor = Anchor.Centre;
                 PlayfieldContentContainer.Origin = Anchor.Centre;

From caad931a16c3712130f01b1bc54a3c58a3728c0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 28 Jul 2023 22:10:10 +0200
Subject: [PATCH 1580/1604] Move comment to more fitting place

---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 71ca13e4ba..c967187b5c 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -244,12 +244,12 @@ namespace osu.Game.Rulesets.Edit
         {
             base.Update();
 
-            // Ensure that the playfield is always centered but also doesn't get cut off by toolboxes.
             if (ApplyHorizontalCentering)
             {
                 PlayfieldContentContainer.Anchor = Anchor.Centre;
                 PlayfieldContentContainer.Origin = Anchor.Centre;
 
+                // Ensure that the playfield is always centered but also doesn't get cut off by toolboxes.
                 PlayfieldContentContainer.Width = Math.Max(1024, DrawWidth) - TOOLBOX_CONTRACTED_SIZE_RIGHT * 2;
                 PlayfieldContentContainer.X = 0;
             }

From c6f0cf50caa0a310ff9dc3f1533302cce269ea90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 28 Jul 2023 22:57:02 +0200
Subject: [PATCH 1581/1604] Use better safety in rectangular grid

- Checking `DrawSize != Vector2.Zero` is too specific. It could also
  crash on zero-height-but-non-zero-width, or
  zero-width-but-non-zero-height.

- Take the `gridCache.Validate()` call out of the zero checks, because
  even if the width or height are zero, not generating anything is valid
  and there is no reason to validate every frame until `gridCache` gets
  invalidated again.
---
 .../Edit/Compose/Components/RectangularPositionSnapGrid.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/RectangularPositionSnapGrid.cs b/osu.Game/Screens/Edit/Compose/Components/RectangularPositionSnapGrid.cs
index bec1d148be..cfc01fe17b 100644
--- a/osu.Game/Screens/Edit/Compose/Components/RectangularPositionSnapGrid.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/RectangularPositionSnapGrid.cs
@@ -55,11 +55,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
             {
                 ClearInternal();
 
-                if (DrawSize != Vector2.Zero)
-                {
+                if (DrawWidth > 0 && DrawHeight > 0)
                     createContent();
-                    gridCache.Validate();
-                }
+
+                gridCache.Validate();
             }
         }
 

From cd416e09f9cb0e7110c79bf84c4a99c17c5dee0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 29 Jul 2023 00:36:27 +0200
Subject: [PATCH 1582/1604] Add test scene for checking spinner judgements

---
 .../TestSceneSpinnerJudgement.cs              | 147 ++++++++++++++++++
 1 file changed, 147 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerJudgement.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerJudgement.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerJudgement.cs
new file mode 100644
index 0000000000..c969cb11b4
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerJudgement.cs
@@ -0,0 +1,147 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Extensions.TypeExtensions;
+using osu.Framework.Screens;
+using osu.Game.Beatmaps;
+using osu.Game.Replays;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Replays;
+using osu.Game.Rulesets.Osu.UI;
+using osu.Game.Rulesets.Replays;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
+using osu.Game.Screens.Play;
+using osu.Game.Tests.Visual;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Tests
+{
+    public partial class TestSceneSpinnerJudgement : RateAdjustedBeatmapTestScene
+    {
+        private const double time_spinner_start = 2000;
+        private const double time_spinner_end = 4000;
+
+        private List<JudgementResult> judgementResults = new List<JudgementResult>();
+        private ScoreAccessibleReplayPlayer currentPlayer = null!;
+
+        [Test]
+        public void TestHitNothing()
+        {
+            performTest(new List<ReplayFrame>());
+
+            AddAssert("all min judgements", () => judgementResults.All(result => result.Type == result.Judgement.MinResult));
+        }
+
+        [TestCase(1)]
+        [TestCase(2)]
+        [TestCase(5)]
+        public void TestNumberOfSpins(int spins)
+        {
+            performTest(generateReplay(spins));
+
+            for (int i = 0; i < spins; ++i)
+                assertResult<SpinnerTick>(i, HitResult.SmallBonus);
+
+            assertResult<SpinnerTick>(spins, HitResult.IgnoreMiss);
+        }
+
+        [Test]
+        public void TestHitEverything()
+        {
+            performTest(generateReplay(20));
+
+            AddAssert("all max judgements", () => judgementResults.All(result => result.Type == result.Judgement.MaxResult));
+        }
+
+        private static List<ReplayFrame> generateReplay(int spins)
+        {
+            var replayFrames = new List<ReplayFrame>();
+
+            const int frames_per_spin = 30;
+
+            for (int i = 0; i < spins * frames_per_spin; ++i)
+            {
+                float totalProgress = i / (float)(spins * frames_per_spin);
+                float spinProgress = (i % frames_per_spin) / (float)frames_per_spin;
+                double time = time_spinner_start + (time_spinner_end - time_spinner_start) * totalProgress;
+                float posX = MathF.Cos(2 * MathF.PI * spinProgress);
+                float posY = MathF.Sin(2 * MathF.PI * spinProgress);
+                Vector2 finalPos = OsuPlayfield.BASE_SIZE / 2 + new Vector2(posX, posY) * 50;
+
+                replayFrames.Add(new OsuReplayFrame(time, finalPos, OsuAction.LeftButton));
+            }
+
+            return replayFrames;
+        }
+
+        private void performTest(List<ReplayFrame> frames)
+        {
+            AddStep("load player", () =>
+            {
+                Beatmap.Value = CreateWorkingBeatmap(new Beatmap<OsuHitObject>
+                {
+                    HitObjects =
+                    {
+                        new Spinner
+                        {
+                            StartTime = time_spinner_start,
+                            EndTime = time_spinner_end,
+                            Position = OsuPlayfield.BASE_SIZE / 2
+                        }
+                    },
+                    BeatmapInfo =
+                    {
+                        Difficulty = new BeatmapDifficulty(),
+                        Ruleset = new OsuRuleset().RulesetInfo
+                    },
+                });
+
+                var p = new ScoreAccessibleReplayPlayer(new Score { Replay = new Replay { Frames = frames } });
+
+                p.OnLoadComplete += _ =>
+                {
+                    p.ScoreProcessor.NewJudgement += result =>
+                    {
+                        if (currentPlayer == p) judgementResults.Add(result);
+                    };
+                };
+
+                LoadScreen(currentPlayer = p);
+                judgementResults = new List<JudgementResult>();
+            });
+
+            AddUntilStep("Beatmap at 0", () => Beatmap.Value.Track.CurrentTime == 0);
+            AddUntilStep("Wait until player is loaded", () => currentPlayer.IsCurrentScreen());
+            AddUntilStep("Wait for completion", () => currentPlayer.ScoreProcessor.HasCompleted.Value);
+        }
+
+        private void assertResult<T>(int index, HitResult expectedResult)
+        {
+            AddAssert($"{typeof(T).ReadableName()} ({index}) judged as {expectedResult}",
+                () => judgementResults.Where(j => j.HitObject is T).OrderBy(j => j.HitObject.StartTime).ElementAt(index).Type,
+                () => Is.EqualTo(expectedResult));
+        }
+
+        private partial class ScoreAccessibleReplayPlayer : ReplayPlayer
+        {
+            public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;
+
+            protected override bool PauseOnFocusLost => false;
+
+            public ScoreAccessibleReplayPlayer(Score score)
+                : base(score, new PlayerConfiguration
+                {
+                    AllowPause = false,
+                    ShowResults = false,
+                })
+            {
+            }
+        }
+    }
+}

From 43a51671ac83a9f548577037cbeb68827af192a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 29 Jul 2023 16:12:02 +0200
Subject: [PATCH 1583/1604] Fix wrong test step name

---
 osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs b/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs
index c8f1f081d9..5fe4bb9340 100644
--- a/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs
@@ -104,7 +104,7 @@ namespace osu.Game.Tests.Visual.Navigation
             AddAssert("Mods include autoplay", () => Game.SelectedMods.Value.Any(m => m is ModAutoplay));
 
             AddStep("try to perform", () => Game.PerformFromScreen(_ => actionPerformed = true));
-            AddUntilStep("returned to song select", () => Game.ScreenStack.CurrentScreen is MainMenu);
+            AddUntilStep("returned to main menu", () => Game.ScreenStack.CurrentScreen is MainMenu);
             AddAssert("did perform", () => actionPerformed);
 
             AddAssert("Mods don't include autoplay", () => !Game.SelectedMods.Value.Any(m => m is ModAutoplay));

From 5fa0a21b564890637beda25061c454573317ae9b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 Jul 2023 18:14:20 +0900
Subject: [PATCH 1584/1604] Add corner radius around player areas

---
 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
index dc4a2df9d8..54f03569de 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
@@ -68,6 +68,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
             RelativeSizeAxes = Axes.Both;
             Masking = true;
+            CornerRadius = 5;
 
             AudioContainer audioContainer;
             InternalChildren = new Drawable[]

From 1826819663776a737ab77ad2c1265266067cea2e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 Jul 2023 18:56:29 +0900
Subject: [PATCH 1585/1604] Move `Facade` to nested class

---
 .../Multiplayer/Spectate/PlayerGrid.cs        | 12 ++++++++++
 .../Multiplayer/Spectate/PlayerGrid_Facade.cs | 22 -------------------
 2 files changed, 12 insertions(+), 22 deletions(-)
 delete mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Facade.cs

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
index 771a8c0de4..87072e8d9e 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
@@ -169,5 +169,17 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             foreach (var cell in facadeContainer)
                 cell.Size = cellSize;
         }
+
+        /// <summary>
+        /// A facade of the grid which is used as a dummy object to store the required position/size of cells.
+        /// </summary>
+        public partial class Facade : Drawable
+        {
+            public Facade()
+            {
+                Anchor = Anchor.Centre;
+                Origin = Anchor.Centre;
+            }
+        }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Facade.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Facade.cs
deleted file mode 100644
index 934c22c918..0000000000
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Facade.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Framework.Graphics;
-
-namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
-{
-    public partial class PlayerGrid
-    {
-        /// <summary>
-        /// A facade of the grid which is used as a dummy object to store the required position/size of cells.
-        /// </summary>
-        private partial class Facade : Drawable
-        {
-            public Facade()
-            {
-                Anchor = Anchor.Centre;
-                Origin = Anchor.Centre;
-            }
-        }
-    }
-}

From 84bc14c1ddc1e878a0245fce39aa1252f2c398cc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 Jul 2023 18:56:41 +0900
Subject: [PATCH 1586/1604] Improve animation and sizing of maximised screen
 display

---
 .../Multiplayer/Spectate/PlayerGrid.cs        | 42 +++++++++------
 .../Multiplayer/Spectate/PlayerGrid_Cell.cs   | 52 +++++++++----------
 2 files changed, 53 insertions(+), 41 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
index 87072e8d9e..c88feb12bd 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
@@ -15,20 +16,21 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
     /// </summary>
     public partial class PlayerGrid : CompositeDrawable
     {
+        public const float ANIMATION_DELAY = 400;
+
         /// <summary>
         /// A temporary limitation on the number of players, because only layouts up to 16 players are supported for a single screen.
         /// Todo: Can be removed in the future with scrolling support + performance improvements.
         /// </summary>
         public const int MAX_PLAYERS = 16;
 
-        private const float player_spacing = 5;
+        private const float player_spacing = 6;
 
         /// <summary>
         /// The currently-maximised facade.
         /// </summary>
-        public Drawable MaximisedFacade => maximisedFacade;
+        public Facade MaximisedFacade { get; }
 
-        private readonly Facade maximisedFacade;
         private readonly Container paddingContainer;
         private readonly FillFlowContainer<Facade> facadeContainer;
         private readonly Container<Cell> cellContainer;
@@ -48,12 +50,18 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                             RelativeSizeAxes = Axes.Both,
                             Child = facadeContainer = new FillFlowContainer<Facade>
                             {
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
                                 RelativeSizeAxes = Axes.X,
                                 AutoSizeAxes = Axes.Y,
                                 Spacing = new Vector2(player_spacing),
                             }
                         },
-                        maximisedFacade = new Facade { RelativeSizeAxes = Axes.Both }
+                        MaximisedFacade = new Facade
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Size = new Vector2(0.8f),
+                        }
                     }
                 },
                 cellContainer = new Container<Cell> { RelativeSizeAxes = Axes.Both }
@@ -91,26 +99,30 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         private void toggleMaximisationState(Cell target)
         {
-            // Iterate through all cells to ensure only one is maximised at any time.
-            foreach (var i in cellContainer.ToList())
-            {
-                if (i == target)
-                    i.IsMaximised = !i.IsMaximised;
-                else
-                    i.IsMaximised = false;
+            bool anyMaximised = target.IsMaximised = !target.IsMaximised;
 
-                if (i.IsMaximised)
+            // Iterate through all cells to ensure only one is maximised at any time.
+            foreach (var cell in cellContainer.ToList())
+            {
+                if (cell != target)
+                    cell.IsMaximised = false;
+
+                if (cell.IsMaximised)
                 {
                     // Transfer cell to the maximised facade.
-                    i.SetFacade(maximisedFacade);
-                    cellContainer.ChangeChildDepth(i, maximisedInstanceDepth -= 0.001f);
+                    cell.SetFacade(MaximisedFacade);
+                    cellContainer.ChangeChildDepth(cell, maximisedInstanceDepth -= 0.001f);
                 }
                 else
                 {
                     // Transfer cell back to its original facade.
-                    i.SetFacade(facadeContainer[i.FacadeIndex]);
+                    cell.SetFacade(facadeContainer[cell.FacadeIndex]);
                 }
+
+                cell.FadeColour(anyMaximised && cell != target ? Color4.Gray : Color4.White, ANIMATION_DELAY, Easing.Out);
             }
+
+            facadeContainer.ScaleTo(anyMaximised ? 0.95f : 1, ANIMATION_DELAY, Easing.OutQuint);
         }
 
         protected override void Update()
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
index 4a8b8f49e1..d11e79d820 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
@@ -8,6 +8,7 @@ using JetBrains.Annotations;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
+using osu.Framework.Utils;
 using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
@@ -40,7 +41,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             public bool IsMaximised;
 
             private Facade facade;
-            private bool isTracking = true;
+
+            private bool isAnimating;
 
             public Cell(int facadeIndex, Drawable content)
             {
@@ -54,11 +56,23 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             {
                 base.Update();
 
-                if (isTracking)
-                {
-                    Position = getFinalPosition();
-                    Size = getFinalSize();
-                }
+                var targetPos = getFinalPosition();
+                var targetSize = getFinalSize();
+
+                double duration = isAnimating ? 60 : 0;
+
+                Position = new Vector2(
+                    (float)Interpolation.DampContinuously(Position.X, targetPos.X, duration, Time.Elapsed),
+                    (float)Interpolation.DampContinuously(Position.Y, targetPos.Y, duration, Time.Elapsed)
+                );
+
+                Size = new Vector2(
+                    (float)Interpolation.DampContinuously(Size.X, targetSize.X, duration, Time.Elapsed),
+                    (float)Interpolation.DampContinuously(Size.Y, targetSize.Y, duration, Time.Elapsed)
+                );
+
+                // If we don't track the animating state, the animation will also occur when resizing the window.
+                isAnimating &= !Precision.AlmostEquals(Position, targetPos, 0.01f);
             }
 
             /// <summary>
@@ -66,30 +80,16 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             /// </summary>
             public void SetFacade([NotNull] Facade newFacade)
             {
-                Facade lastFacade = facade;
                 facade = newFacade;
-
-                if (lastFacade == null || lastFacade == newFacade)
-                    return;
-
-                isTracking = false;
-
-                this.MoveTo(getFinalPosition(), 400, Easing.OutQuint).ResizeTo(getFinalSize(), 400, Easing.OutQuint)
-                    .Then()
-                    .OnComplete(_ =>
-                    {
-                        if (facade == newFacade)
-                            isTracking = true;
-                    });
+                isAnimating = true;
             }
 
-            private Vector2 getFinalPosition()
-            {
-                var topLeft = Parent.ToLocalSpace(facade.ToScreenSpace(Vector2.Zero));
-                return topLeft + facade.DrawSize / 2;
-            }
+            private Vector2 getFinalPosition() =>
+                Parent.ToLocalSpace(facade.ScreenSpaceDrawQuad.Centre);
 
-            private Vector2 getFinalSize() => facade.DrawSize;
+            private Vector2 getFinalSize() =>
+                Parent.ToLocalSpace(facade.ScreenSpaceDrawQuad.BottomRight)
+                - Parent.ToLocalSpace(facade.ScreenSpaceDrawQuad.TopLeft);
 
             protected override bool OnClick(ClickEvent e)
             {

From 38244c081ff942940a95df3b6a74f27bb3c24368 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 Jul 2023 19:08:46 +0900
Subject: [PATCH 1587/1604] Further refactorings along with shadow
 implementation

---
 .../Multiplayer/Spectate/PlayerArea.cs        |  2 --
 .../Multiplayer/Spectate/PlayerGrid.cs        | 19 ++++++--------
 .../Multiplayer/Spectate/PlayerGrid_Cell.cs   | 26 +++++++++++++------
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
index 54f03569de..1b03452df7 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
@@ -67,8 +67,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             SpectatorPlayerClock = clock;
 
             RelativeSizeAxes = Axes.Both;
-            Masking = true;
-            CornerRadius = 5;
 
             AudioContainer audioContainer;
             InternalChildren = new Drawable[]
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
index c88feb12bd..c162b87727 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
@@ -83,8 +83,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             var facade = new Facade();
             facadeContainer.Add(facade);
 
-            var cell = new Cell(index, content) { ToggleMaximisationState = toggleMaximisationState };
-            cell.SetFacade(facade);
+            var cell = new Cell(index, content, facade) { ToggleMaximisationState = toggleMaximisationState };
 
             cellContainer.Add(cell);
         }
@@ -99,30 +98,28 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         private void toggleMaximisationState(Cell target)
         {
-            bool anyMaximised = target.IsMaximised = !target.IsMaximised;
+            // in the case the target is the already maximised cell, no cell should be maximised.
+            bool hasMaximised = !target.IsMaximised;
 
             // Iterate through all cells to ensure only one is maximised at any time.
             foreach (var cell in cellContainer.ToList())
             {
-                if (cell != target)
-                    cell.IsMaximised = false;
-
-                if (cell.IsMaximised)
+                if (hasMaximised && cell == target)
                 {
                     // Transfer cell to the maximised facade.
-                    cell.SetFacade(MaximisedFacade);
+                    cell.SetFacade(MaximisedFacade, true);
                     cellContainer.ChangeChildDepth(cell, maximisedInstanceDepth -= 0.001f);
                 }
                 else
                 {
                     // Transfer cell back to its original facade.
-                    cell.SetFacade(facadeContainer[cell.FacadeIndex]);
+                    cell.SetFacade(facadeContainer[cell.FacadeIndex], false);
                 }
 
-                cell.FadeColour(anyMaximised && cell != target ? Color4.Gray : Color4.White, ANIMATION_DELAY, Easing.Out);
+                cell.FadeColour(hasMaximised && cell != target ? Color4.Gray : Color4.White, ANIMATION_DELAY, Easing.OutQuint);
             }
 
-            facadeContainer.ScaleTo(anyMaximised ? 0.95f : 1, ANIMATION_DELAY, Easing.OutQuint);
+            facadeContainer.ScaleTo(hasMaximised ? 0.95f : 1, ANIMATION_DELAY, Easing.OutQuint);
         }
 
         protected override void Update()
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
index d11e79d820..4e624da17f 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
@@ -1,12 +1,10 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
-using JetBrains.Annotations;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Effects;
 using osu.Framework.Input.Events;
 using osu.Framework.Utils;
 using osuTK;
@@ -33,23 +31,27 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             /// <summary>
             /// An action that toggles the maximisation state of this cell.
             /// </summary>
-            public Action<Cell> ToggleMaximisationState;
+            public Action<Cell>? ToggleMaximisationState;
 
             /// <summary>
             /// Whether this cell is currently maximised.
             /// </summary>
-            public bool IsMaximised;
+            public bool IsMaximised { get; private set; }
 
             private Facade facade;
 
             private bool isAnimating;
 
-            public Cell(int facadeIndex, Drawable content)
+            public Cell(int facadeIndex, Drawable content, Facade facade)
             {
                 FacadeIndex = facadeIndex;
+                this.facade = facade;
 
                 Origin = Anchor.Centre;
                 InternalChild = Content = content;
+
+                Masking = true;
+                CornerRadius = 5;
             }
 
             protected override void Update()
@@ -78,10 +80,18 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             /// <summary>
             /// Makes this cell track a new facade.
             /// </summary>
-            public void SetFacade([NotNull] Facade newFacade)
+            public void SetFacade(Facade newFacade, bool isMaximised)
             {
                 facade = newFacade;
+                IsMaximised = isMaximised;
                 isAnimating = true;
+
+                TweenEdgeEffectTo(new EdgeEffectParameters
+                {
+                    Type = EdgeEffectType.Shadow,
+                    Radius = isMaximised ? 30 : 10,
+                    Colour = Colour4.Black.Opacity(isMaximised ? 0.5f : 0.2f),
+                }, ANIMATION_DELAY, Easing.OutQuint);
             }
 
             private Vector2 getFinalPosition() =>
@@ -93,7 +103,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
             protected override bool OnClick(ClickEvent e)
             {
-                ToggleMaximisationState(this);
+                ToggleMaximisationState?.Invoke(this);
                 return true;
             }
         }

From 75625f089e1f8f9957bf6a7fb52bc48f552f38d4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 Jul 2023 19:22:21 +0900
Subject: [PATCH 1588/1604] Hide toolbar when entering multiplayer spectator

---
 .../OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index 2d2aa0f1d5..58eed7e85c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -31,6 +31,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         // We are managing our own adjustments. For now, this happens inside the Player instances themselves.
         public override bool? AllowTrackAdjustments => false;
 
+        public override bool HideOverlaysOnEnter => true;
+
         /// <summary>
         /// Whether all spectating players have finished loading.
         /// </summary>

From 945d89e955cb350b55b383a5cd5f90dda72ad10c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 30 Jul 2023 13:45:42 +0900
Subject: [PATCH 1589/1604] Move disables to loading screens for better
 coverage of edge cases

---
 osu.Game/Screens/Edit/Editor.cs       | 2 --
 osu.Game/Screens/Edit/EditorLoader.cs | 2 ++
 osu.Game/Screens/Play/Player.cs       | 2 --
 osu.Game/Screens/Play/PlayerLoader.cs | 2 ++
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index d11297b3b2..b885eee46f 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -68,8 +68,6 @@ namespace osu.Game.Screens.Edit
 
         public override bool? ApplyModTrackAdjustments => false;
 
-        public override bool? AllowGlobalTrackControl => false;
-
         protected override bool PlayExitSound => !ExitConfirmed && !switchingDifficulty;
 
         protected bool HasUnsavedChanges
diff --git a/osu.Game/Screens/Edit/EditorLoader.cs b/osu.Game/Screens/Edit/EditorLoader.cs
index f665b7c511..8bcfa7b9f0 100644
--- a/osu.Game/Screens/Edit/EditorLoader.cs
+++ b/osu.Game/Screens/Edit/EditorLoader.cs
@@ -42,6 +42,8 @@ namespace osu.Game.Screens.Edit
 
         public override bool DisallowExternalBeatmapRulesetChanges => true;
 
+        public override bool? AllowGlobalTrackControl => false;
+
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 956c4d4856..e2e8b71c10 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -71,8 +71,6 @@ namespace osu.Game.Screens.Play
         // We are managing our own adjustments (see OnEntering/OnExiting).
         public override bool? ApplyModTrackAdjustments => false;
 
-        public override bool? AllowGlobalTrackControl => false;
-
         private readonly IBindable<bool> gameActive = new Bindable<bool>(true);
 
         private readonly Bindable<bool> samplePlaybackDisabled = new Bindable<bool>();
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 4b15bac0f3..872425e3fd 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -46,6 +46,8 @@ namespace osu.Game.Screens.Play
 
         public override bool DisallowExternalBeatmapRulesetChanges => true;
 
+        public override bool? AllowGlobalTrackControl => false;
+
         // Here because IsHovered will not update unless we do so.
         public override bool HandlePositionalInput => true;
 

From 713829163689bea7bd053a62d5edcbc30e12097e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 30 Jul 2023 13:52:58 +0900
Subject: [PATCH 1590/1604] Adjust xmldoc to explicitly metnion it only affects
 end user control

---
 osu.Game/Overlays/MusicController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 665c61edf0..0986c0513c 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Overlays
         public bool UserPauseRequested { get; private set; }
 
         /// <summary>
-        /// Whether control of the global track should be allowed.
+        /// Whether user control of the global track should be allowed.
         /// </summary>
         public readonly BindableBool AllowTrackControl = new BindableBool(true);
 

From feea412bec6d4d015a2a4fdcc9fd373ddee817ec Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 30 Jul 2023 14:40:00 +0900
Subject: [PATCH 1591/1604] Add test with only one player

---
 .../TestSceneMultiSpectatorScreen.cs          | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
index e09496b6e9..e81dc87d4f 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
@@ -65,6 +65,19 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddStep("clear playing users", () => playingUsers.Clear());
         }
 
+        [TestCase(1)]
+        [TestCase(4)]
+        public void TestGeneral(int count)
+        {
+            int[] userIds = getPlayerIds(count);
+
+            start(userIds);
+            loadSpectateScreen();
+
+            sendFrames(userIds, 1000);
+            AddWaitStep("wait a bit", 20);
+        }
+
         [Test]
         public void TestDelayedStart()
         {
@@ -88,18 +101,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddUntilStep("two players added", () => spectatorScreen.ChildrenOfType<Player>().Count() == 2);
         }
 
-        [Test]
-        public void TestGeneral()
-        {
-            int[] userIds = getPlayerIds(4);
-
-            start(userIds);
-            loadSpectateScreen();
-
-            sendFrames(userIds, 1000);
-            AddWaitStep("wait a bit", 20);
-        }
-
         [Test]
         public void TestSpectatorPlayerInteractiveElementsHidden()
         {

From 45ceaba00d83027f679a3130bd0c269ebb24f790 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 30 Jul 2023 14:40:58 +0900
Subject: [PATCH 1592/1604] Disable multiplayer spectator zoom when there's
 only one player's screen visible

---
 .../Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
index c162b87727..6e71c010e5 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
@@ -98,8 +98,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         private void toggleMaximisationState(Cell target)
         {
-            // in the case the target is the already maximised cell, no cell should be maximised.
-            bool hasMaximised = !target.IsMaximised;
+            // in the case the target is the already maximised cell (or there is only one cell), no cell should be maximised.
+            bool hasMaximised = !target.IsMaximised && cellContainer.Count > 1;
 
             // Iterate through all cells to ensure only one is maximised at any time.
             foreach (var cell in cellContainer.ToList())

From 4f83c8661a67685f4897e99679d987f416104437 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 30 Jul 2023 16:12:55 +0900
Subject: [PATCH 1593/1604] Remove unnecessary async fetch of beatmap in
 `NowPlayingOverlay`

No idea if this was historically required for some reason, but it's
definitely not required now.
---
 osu.Game/Overlays/NowPlayingOverlay.cs | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index 15eefb2d9f..f6fad0ef6c 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -4,7 +4,6 @@
 #nullable disable
 
 using System;
-using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
@@ -293,21 +292,10 @@ namespace osu.Game.Overlays
             // avoid using scheduler as our scheduler may not be run for a long time, holding references to beatmaps.
             pendingBeatmapSwitch = delegate
             {
-                // todo: this can likely be replaced with WorkingBeatmap.GetBeatmapAsync()
-                Task.Run(() =>
-                {
-                    if (beatmap?.Beatmap == null) // this is not needed if a placeholder exists
-                    {
-                        title.Text = @"Nothing to play";
-                        artist.Text = @"Nothing to play";
-                    }
-                    else
-                    {
-                        BeatmapMetadata metadata = beatmap.Metadata;
-                        title.Text = new RomanisableString(metadata.TitleUnicode, metadata.Title);
-                        artist.Text = new RomanisableString(metadata.ArtistUnicode, metadata.Artist);
-                    }
-                });
+                BeatmapMetadata metadata = beatmap.Metadata;
+
+                title.Text = new RomanisableString(metadata.TitleUnicode, metadata.Title);
+                artist.Text = new RomanisableString(metadata.ArtistUnicode, metadata.Artist);
 
                 LoadComponentAsync(new Background(beatmap) { Depth = float.MaxValue }, newBackground =>
                 {

From 07d224ecb6bfab5f72bb8f79210a8f43bd9a39e7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 30 Jul 2023 16:17:04 +0900
Subject: [PATCH 1594/1604] Apply NRT to `NowPlayingOverlay`

---
 osu.Game/Overlays/NowPlayingOverlay.cs | 39 +++++++++++++-------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index f6fad0ef6c..37cb85983c 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -1,12 +1,11 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
@@ -39,33 +38,33 @@ namespace osu.Game.Overlays
         private const float bottom_black_area_height = 55;
         private const float margin = 10;
 
-        private Drawable background;
-        private ProgressBar progressBar;
+        private Drawable background = null!;
+        private ProgressBar progressBar = null!;
 
-        private IconButton prevButton;
-        private IconButton playButton;
-        private IconButton nextButton;
-        private IconButton playlistButton;
+        private IconButton prevButton = null!;
+        private IconButton playButton = null!;
+        private IconButton nextButton = null!;
+        private IconButton playlistButton = null!;
 
-        private SpriteText title, artist;
+        private SpriteText title = null!, artist = null!;
 
-        private PlaylistOverlay playlist;
+        private PlaylistOverlay? playlist;
 
-        private Container dragContainer;
-        private Container playerContainer;
-        private Container playlistContainer;
+        private Container dragContainer = null!;
+        private Container playerContainer = null!;
+        private Container playlistContainer = null!;
 
         protected override string PopInSampleName => "UI/now-playing-pop-in";
         protected override string PopOutSampleName => "UI/now-playing-pop-out";
 
         [Resolved]
-        private MusicController musicController { get; set; }
+        private MusicController musicController { get; set; } = null!;
 
         [Resolved]
-        private Bindable<WorkingBeatmap> beatmap { get; set; }
+        private Bindable<WorkingBeatmap> beatmap { get; set; } = null!;
 
         [Resolved]
-        private OsuColour colours { get; set; }
+        private OsuColour colours { get; set; } = null!;
 
         public NowPlayingOverlay()
         {
@@ -285,7 +284,7 @@ namespace osu.Game.Overlays
             }
         }
 
-        private Action pendingBeatmapSwitch;
+        private Action? pendingBeatmapSwitch;
 
         private void trackChanged(WorkingBeatmap beatmap, TrackChangeDirection direction = TrackChangeDirection.None)
         {
@@ -338,7 +337,7 @@ namespace osu.Game.Overlays
         {
             base.Dispose(isDisposing);
 
-            if (musicController != null)
+            if (musicController.IsNotNull())
                 musicController.TrackChanged -= trackChanged;
         }
 
@@ -371,7 +370,7 @@ namespace osu.Game.Overlays
             private readonly Sprite sprite;
             private readonly WorkingBeatmap beatmap;
 
-            public Background(WorkingBeatmap beatmap = null)
+            public Background(WorkingBeatmap beatmap)
                 : base(cachedFrameBuffer: true)
             {
                 this.beatmap = beatmap;
@@ -401,7 +400,7 @@ namespace osu.Game.Overlays
             [BackgroundDependencyLoader]
             private void load(LargeTextureStore textures)
             {
-                sprite.Texture = beatmap?.GetBackground() ?? textures.Get(@"Backgrounds/bg4");
+                sprite.Texture = beatmap.GetBackground() ?? textures.Get(@"Backgrounds/bg4");
             }
         }
 

From de61b74e910d2342a6eeafac5a804796fe8418aa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 30 Jul 2023 16:21:35 +0900
Subject: [PATCH 1595/1604] Add proper cancellation and out-of-order blocking
 logic to `NowPlayingOverlay`'s background carousel

---
 osu.Game/Overlays/NowPlayingOverlay.cs | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index 37cb85983c..89442e29bc 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Threading;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
@@ -286,8 +287,14 @@ namespace osu.Game.Overlays
 
         private Action? pendingBeatmapSwitch;
 
+        private CancellationTokenSource? backgroundLoadCancellation;
+
+        private WorkingBeatmap? currentBeatmap;
+
         private void trackChanged(WorkingBeatmap beatmap, TrackChangeDirection direction = TrackChangeDirection.None)
         {
+            currentBeatmap = beatmap;
+
             // avoid using scheduler as our scheduler may not be run for a long time, holding references to beatmaps.
             pendingBeatmapSwitch = delegate
             {
@@ -296,8 +303,16 @@ namespace osu.Game.Overlays
                 title.Text = new RomanisableString(metadata.TitleUnicode, metadata.Title);
                 artist.Text = new RomanisableString(metadata.ArtistUnicode, metadata.Artist);
 
+                backgroundLoadCancellation?.Cancel();
+
                 LoadComponentAsync(new Background(beatmap) { Depth = float.MaxValue }, newBackground =>
                 {
+                    if (beatmap != currentBeatmap)
+                    {
+                        newBackground.Dispose();
+                        return;
+                    }
+
                     switch (direction)
                     {
                         case TrackChangeDirection.Next:
@@ -317,7 +332,7 @@ namespace osu.Game.Overlays
                     background = newBackground;
 
                     playerContainer.Add(newBackground);
-                });
+                }, (backgroundLoadCancellation = new CancellationTokenSource()).Token);
             };
         }
 

From 35ec55c1f6df3d9ded611c6cd8afb3f696c101ae Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 30 Jul 2023 16:41:33 +0900
Subject: [PATCH 1596/1604] Don't queue export replay operations if button is
 disabled

---
 osu.Game/Screens/Ranking/ReplayDownloadButton.cs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Ranking/ReplayDownloadButton.cs b/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
index a5b33e584d..aa734d2077 100644
--- a/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
+++ b/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
@@ -117,11 +117,17 @@ namespace osu.Game.Screens.Ranking
                     return true;
 
                 case GlobalAction.ExportReplay:
-                    State.BindValueChanged(exportWhenReady, true);
-
-                    // start the import via button
-                    if (State.Value != DownloadState.LocallyAvailable)
+                    if (State.Value == DownloadState.LocallyAvailable)
+                    {
+                        State.BindValueChanged(exportWhenReady, true);
+                    }
+                    else
+                    {
+                        // A download needs to be performed before we can export this replay.
                         button.TriggerClick();
+                        if (button.Enabled.Value)
+                            State.BindValueChanged(exportWhenReady, true);
+                    }
 
                     return true;
             }

From 6d5b3617b3cf8af702573d0443c7f0da276834c6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 30 Jul 2023 16:41:45 +0900
Subject: [PATCH 1597/1604] Remove pending export operation if active score is
 changed

---
 osu.Game/Screens/Ranking/ReplayDownloadButton.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/Ranking/ReplayDownloadButton.cs b/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
index aa734d2077..b6166e97f6 100644
--- a/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
+++ b/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
@@ -83,6 +83,10 @@ namespace osu.Game.Screens.Ranking
 
             Score.BindValueChanged(score =>
             {
+                // An export may be pending from the last score.
+                // Reset this to meet user expectations (a new score which has just been switched to shouldn't export)
+                State.ValueChanged -= exportWhenReady;
+
                 downloadTracker?.RemoveAndDisposeImmediately();
 
                 if (score.NewValue != null)

From 1981e49a40723f16476fae208a28c693fca03c01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 30 Jul 2023 14:28:16 +0200
Subject: [PATCH 1598/1604] Fix nullability inspection

---
 osu.Game/Overlays/NowPlayingOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index 4132db42bc..6abde713b6 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Overlays
         [Resolved]
         private OsuColour colours { get; set; } = null!;
 
-        private Bindable<bool> allowTrackControl;
+        private Bindable<bool> allowTrackControl = null!;
 
         public NowPlayingOverlay()
         {

From d3435483eba7d8cd2dc113e1deeeb5ce2a13779b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 30 Jul 2023 15:50:10 +0200
Subject: [PATCH 1599/1604] Fix multiplayer match screen being exited from when
 not current

This was supposed to be fixed by #24255, but has popped up as a
regression on Sentry since:

	https://sentry.ppy.sh/organizations/ppy/issues/22749/?project=2&referrer=regression_activity-email

On a fifteen-minute check I cannot figure out how to reproduce, so
rather than spending further brain cycles on this, just apply the same
explicit guard that like fifteen other places do.
---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index f5746ca96c..f13b47c0f5 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -265,7 +265,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                     dialogOverlay.Push(new ConfirmDialog("Are you sure you want to leave this multiplayer match?", () =>
                     {
                         exitConfirmed = true;
-                        this.Exit();
+                        if (this.IsCurrentScreen())
+                            this.Exit();
                     }));
                 }
 

From 7763f3dd404afa4a1dea1039804e36ca4c469213 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 30 Jul 2023 19:05:08 +0200
Subject: [PATCH 1600/1604] Fix osu! logo suddenly disappearing during rapid
 exit

---
 osu.Game/Screens/Menu/MainMenu.cs | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 510c9a5373..22040b4f0b 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Diagnostics;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -202,6 +203,9 @@ namespace osu.Game.Screens.Menu
                 dialogOverlay?.Push(new StorageErrorDialog(osuStorage, osuStorage.Error));
         }
 
+        [CanBeNull]
+        private Drawable proxiedLogo;
+
         protected override void LogoArriving(OsuLogo logo, bool resuming)
         {
             base.LogoArriving(logo, resuming);
@@ -211,7 +215,7 @@ namespace osu.Game.Screens.Menu
             logo.FadeColour(Color4.White, 100, Easing.OutQuint);
             logo.FadeIn(100, Easing.OutQuint);
 
-            logo.ProxyToContainer(logoTarget);
+            proxiedLogo = logo.ProxyToContainer(logoTarget);
 
             if (resuming)
             {
@@ -250,12 +254,27 @@ namespace osu.Game.Screens.Menu
             var seq = logo.FadeOut(300, Easing.InSine)
                           .ScaleTo(0.2f, 300, Easing.InSine);
 
-            logo.ReturnProxy();
+            if (proxiedLogo != null)
+            {
+                logo.ReturnProxy();
+                proxiedLogo = null;
+            }
 
             seq.OnComplete(_ => Buttons.SetOsuLogo(null));
             seq.OnAbort(_ => Buttons.SetOsuLogo(null));
         }
 
+        protected override void LogoExiting(OsuLogo logo)
+        {
+            base.LogoExiting(logo);
+
+            if (proxiedLogo != null)
+            {
+                logo.ReturnProxy();
+                proxiedLogo = null;
+            }
+        }
+
         public override void OnSuspending(ScreenTransitionEvent e)
         {
             base.OnSuspending(e);

From 262f25dce826574cbfd466fbecf52e151dabe642 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 30 Jul 2023 19:39:30 +0200
Subject: [PATCH 1601/1604] Make `SelectionRotationHandler` a `Component`

---
 .../Edit/OsuSelectionHandler.cs               |  5 +---
 .../Edit/OsuSelectionRotationHandler.cs       | 23 +++++++++-----
 .../Editing/TestSceneComposeSelectBox.cs      |  2 +-
 .../SkinEditor/SkinSelectionHandler.cs        |  3 +-
 .../SkinSelectionRotationHandler.cs           | 30 ++++++++++++-------
 .../Compose/Components/SelectionHandler.cs    |  8 +++--
 .../Components/SelectionRotationHandler.cs    |  3 +-
 7 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 1dfbf4179b..e81941d254 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -163,10 +163,7 @@ namespace osu.Game.Rulesets.Osu.Edit
             if ((reference & Anchor.y0) > 0) scale.Y = -scale.Y;
         }
 
-        public override SelectionRotationHandler CreateRotationHandler() => new OsuSelectionRotationHandler(ChangeHandler)
-        {
-            SelectedItems = { BindTarget = SelectedItems }
-        };
+        public override SelectionRotationHandler CreateRotationHandler() => new OsuSelectionRotationHandler();
 
         private void scaleSlider(Slider slider, Vector2 scale)
         {
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionRotationHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionRotationHandler.cs
index 0eb7637786..21fb8a67de 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionRotationHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionRotationHandler.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
@@ -16,17 +17,25 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Edit
 {
-    public class OsuSelectionRotationHandler : SelectionRotationHandler
+    public partial class OsuSelectionRotationHandler : SelectionRotationHandler
     {
-        private readonly IEditorChangeHandler? changeHandler;
+        [Resolved]
+        private IEditorChangeHandler? changeHandler { get; set; }
 
-        public BindableList<HitObject> SelectedItems { get; } = new BindableList<HitObject>();
+        private BindableList<HitObject> selectedItems { get; } = new BindableList<HitObject>();
 
-        public OsuSelectionRotationHandler(IEditorChangeHandler? changeHandler)
+        [BackgroundDependencyLoader]
+        private void load(EditorBeatmap editorBeatmap)
         {
-            this.changeHandler = changeHandler;
+            selectedItems.BindTo(editorBeatmap.SelectedHitObjects);
+        }
 
-            SelectedItems.CollectionChanged += (_, __) => updateState();
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            selectedItems.CollectionChanged += (_, __) => updateState();
+            updateState();
         }
 
         private void updateState()
@@ -92,7 +101,7 @@ namespace osu.Game.Rulesets.Osu.Edit
             defaultOrigin = null;
         }
 
-        private IEnumerable<OsuHitObject> selectedMovableObjects => SelectedItems.Cast<OsuHitObject>()
+        private IEnumerable<OsuHitObject> selectedMovableObjects => selectedItems.Cast<OsuHitObject>()
                                                                                  .Where(h => h is not Spinner);
     }
 }
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
index 147488812e..9901118ce8 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Tests.Visual.Editing
             return true;
         }
 
-        private class TestSelectionRotationHandler : SelectionRotationHandler
+        private partial class TestSelectionRotationHandler : SelectionRotationHandler
         {
             private readonly Func<Container> getTargetContainer;
 
diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
index bee973bea0..72216f040e 100644
--- a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
@@ -26,9 +26,8 @@ namespace osu.Game.Overlays.SkinEditor
         [Resolved]
         private SkinEditor skinEditor { get; set; } = null!;
 
-        public override SelectionRotationHandler CreateRotationHandler() => new SkinSelectionRotationHandler(ChangeHandler)
+        public override SelectionRotationHandler CreateRotationHandler() => new SkinSelectionRotationHandler
         {
-            SelectedItems = { BindTarget = SelectedItems },
             UpdatePosition = updateDrawablePosition
         };
 
diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionRotationHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionRotationHandler.cs
index e60e2b1e12..60f69000a2 100644
--- a/osu.Game/Overlays/SkinEditor/SkinSelectionRotationHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionRotationHandler.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Screens.Edit;
@@ -15,23 +16,32 @@ using osuTK;
 
 namespace osu.Game.Overlays.SkinEditor
 {
-    public class SkinSelectionRotationHandler : SelectionRotationHandler
+    public partial class SkinSelectionRotationHandler : SelectionRotationHandler
     {
-        private readonly IEditorChangeHandler? changeHandler;
-
-        public BindableList<ISerialisableDrawable> SelectedItems { get; } = new BindableList<ISerialisableDrawable>();
         public Action<Drawable, Vector2> UpdatePosition { get; init; } = null!;
 
-        public SkinSelectionRotationHandler(IEditorChangeHandler? changeHandler)
-        {
-            this.changeHandler = changeHandler;
+        [Resolved]
+        private IEditorChangeHandler? changeHandler { get; set; }
 
-            SelectedItems.CollectionChanged += (_, __) => updateState();
+        private BindableList<ISerialisableDrawable> selectedItems { get; } = new BindableList<ISerialisableDrawable>();
+
+        [BackgroundDependencyLoader]
+        private void load(SkinEditor skinEditor)
+        {
+            selectedItems.BindTo(skinEditor.SelectedComponents);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            selectedItems.CollectionChanged += (_, __) => updateState();
+            updateState();
         }
 
         private void updateState()
         {
-            CanRotate.Value = SelectedItems.Count > 0;
+            CanRotate.Value = selectedItems.Count > 0;
         }
 
         private Drawable[]? objectsInRotation;
@@ -47,7 +57,7 @@ namespace osu.Game.Overlays.SkinEditor
 
             changeHandler?.BeginChange();
 
-            objectsInRotation = SelectedItems.Cast<Drawable>().ToArray();
+            objectsInRotation = selectedItems.Cast<Drawable>().ToArray();
             originalRotations = objectsInRotation.ToDictionary(d => d, d => d.Rotation);
             originalPositions = objectsInRotation.ToDictionary(d => d, d => d.ToScreenSpace(d.OriginPosition));
             defaultOrigin = GeometryUtils.GetSurroundingQuad(objectsInRotation.SelectMany(d => d.ScreenSpaceDrawQuad.GetVertices().ToArray())).Centre;
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 31ad8fa3d7..57f9513cc1 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -68,9 +68,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [BackgroundDependencyLoader]
         private void load()
         {
-            RotationHandler = CreateRotationHandler();
-
-            InternalChild = SelectionBox = CreateSelectionBox();
+            AddRangeInternal(new Drawable[]
+            {
+                RotationHandler = CreateRotationHandler(),
+                SelectionBox = CreateSelectionBox(),
+            });
 
             SelectedItems.CollectionChanged += (_, _) =>
             {
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionRotationHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionRotationHandler.cs
index 6524f7fa35..5faa4a108d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionRotationHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionRotationHandler.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
 using osuTK;
 
 namespace osu.Game.Screens.Edit.Compose.Components
@@ -9,7 +10,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
     /// <summary>
     /// Base handler for editor rotation operations.
     /// </summary>
-    public class SelectionRotationHandler
+    public partial class SelectionRotationHandler : Component
     {
         /// <summary>
         /// Whether the rotation can currently be performed.

From ebe5dd2ac97683761d1712b896235c5d53a2611e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 30 Jul 2023 20:21:41 +0200
Subject: [PATCH 1602/1604] Interface with `SelectionRotationHandler` via DI
 rather than explicit passing

---
 .../Visual/Editing/TestSceneComposeSelectBox.cs     | 10 +++++++++-
 .../Screens/Edit/Compose/Components/SelectionBox.cs | 13 +++++++------
 .../Components/SelectionBoxRotationHandle.cs        | 13 +++++++------
 .../Edit/Compose/Components/SelectionHandler.cs     | 10 ++++++++--
 4 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
index 9901118ce8..80c69aacf6 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
@@ -7,6 +7,7 @@ using System;
 using System.Linq;
 using JetBrains.Annotations;
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
@@ -22,6 +23,14 @@ namespace osu.Game.Tests.Visual.Editing
         private Container selectionArea;
         private SelectionBox selectionBox;
 
+        [Cached(typeof(SelectionRotationHandler))]
+        private TestSelectionRotationHandler rotationHandler;
+
+        public TestSceneComposeSelectBox()
+        {
+            rotationHandler = new TestSelectionRotationHandler(() => selectionArea);
+        }
+
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
@@ -41,7 +50,6 @@ namespace osu.Game.Tests.Visual.Editing
                         CanFlipX = true,
                         CanFlipY = true,
 
-                        RotationHandler = new TestSelectionRotationHandler(() => selectionArea),
                         OnScale = handleScale
                     }
                 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index ed6bbf7668..876e8ccbe9 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -23,7 +23,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private const float button_padding = 5;
 
-        public SelectionRotationHandler? RotationHandler { get; init; }
+        [Resolved]
+        private SelectionRotationHandler? rotationHandler { get; set; }
+
         public Func<Vector2, Anchor, bool>? OnScale;
         public Func<Direction, bool, bool>? OnFlip;
         public Func<bool>? OnReverse;
@@ -149,8 +151,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [BackgroundDependencyLoader]
         private void load()
         {
-            if (RotationHandler != null)
-                canRotate.BindTo(RotationHandler.CanRotate);
+            if (rotationHandler != null)
+                canRotate.BindTo(rotationHandler.CanRotate);
 
             canRotate.BindValueChanged(_ => recreate(), true);
         }
@@ -252,8 +254,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private void addRotationComponents()
         {
-            rotateCounterClockwiseButton = addButton(FontAwesome.Solid.Undo, "Rotate 90 degrees counter-clockwise (Ctrl-<)", () => RotationHandler?.Rotate(-90));
-            rotateClockwiseButton = addButton(FontAwesome.Solid.Redo, "Rotate 90 degrees clockwise (Ctrl->)", () => RotationHandler?.Rotate(90));
+            rotateCounterClockwiseButton = addButton(FontAwesome.Solid.Undo, "Rotate 90 degrees counter-clockwise (Ctrl-<)", () => rotationHandler?.Rotate(-90));
+            rotateClockwiseButton = addButton(FontAwesome.Solid.Redo, "Rotate 90 degrees clockwise (Ctrl->)", () => rotationHandler?.Rotate(90));
 
             addRotateHandle(Anchor.TopLeft);
             addRotateHandle(Anchor.TopRight);
@@ -323,7 +325,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
             var handle = new SelectionBoxRotationHandle
             {
                 Anchor = anchor,
-                RotationHandler = RotationHandler
             };
 
             handle.OperationStarted += operationStarted;
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
index 8665ec9b08..024749a701 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
@@ -19,8 +19,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
 {
     public partial class SelectionBoxRotationHandle : SelectionBoxDragHandle, IHasTooltip
     {
-        public SelectionRotationHandler? RotationHandler { get; init; }
-
         public LocalisableString TooltipText { get; private set; }
 
         private SpriteIcon icon = null!;
@@ -32,6 +30,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [Resolved]
         private SelectionBox selectionBox { get; set; } = null!;
 
+        [Resolved]
+        private SelectionRotationHandler? rotationHandler { get; set; }
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -61,9 +62,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected override bool OnDragStart(DragStartEvent e)
         {
-            if (RotationHandler == null) return false;
+            if (rotationHandler == null) return false;
 
-            RotationHandler.Begin();
+            rotationHandler.Begin();
             return true;
         }
 
@@ -97,7 +98,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected override void OnDragEnd(DragEndEvent e)
         {
-            RotationHandler?.Commit();
+            rotationHandler?.Commit();
             UpdateHoverState();
 
             cumulativeRotation.Value = null;
@@ -121,7 +122,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             cumulativeRotation.Value = newRotation;
 
-            RotationHandler?.Update(newRotation);
+            rotationHandler?.Update(newRotation);
             TooltipText = shouldSnap ? EditorStrings.RotationSnapped(newRotation) : EditorStrings.RotationUnsnapped(newRotation);
         }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 57f9513cc1..158b4066bc 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -65,12 +65,19 @@ namespace osu.Game.Screens.Edit.Compose.Components
             AlwaysPresent = true;
         }
 
+        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
+        {
+            var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
+            dependencies.CacheAs(RotationHandler = CreateRotationHandler());
+            return dependencies;
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
             AddRangeInternal(new Drawable[]
             {
-                RotationHandler = CreateRotationHandler(),
+                RotationHandler,
                 SelectionBox = CreateSelectionBox(),
             });
 
@@ -86,7 +93,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 OperationStarted = OnOperationBegan,
                 OperationEnded = OnOperationEnded,
 
-                RotationHandler = RotationHandler,
                 OnScale = HandleScale,
                 OnFlip = HandleFlip,
                 OnReverse = HandleReverse,

From d78cc6085194de5f321f8a22354f7d9ddc73696b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Aug 2023 07:12:40 +0900
Subject: [PATCH 1603/1604] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 7f15d9fafd..651e5b1fe6 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.724.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.801.0" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 909cfa57fb..1ac0f9de73 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,7 +36,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="11.1.2" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.724.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.801.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.719.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 8b8680d02c..9926d52413 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -23,6 +23,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.724.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.801.0" />
   </ItemGroup>
 </Project>

From 528298bc39a07f7f5f75f5cb3931b0f6a283b3b9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Aug 2023 07:17:12 +0900
Subject: [PATCH 1604/1604] Update test in line with framework changes

---
 .../TestSceneUpdateableBeatmapSetCover.cs      | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
index a1a546d4a7..54532001a9 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
@@ -99,16 +99,18 @@ namespace osu.Game.Tests.Visual.UserInterface
         {
             TestUpdateableOnlineBeatmapSetCover updateableCover = null;
 
-            AddStep("setup cover", () => Child = updateableCover = new TestUpdateableOnlineBeatmapSetCover
+            AddStep("setup cover", () => Child = updateableCover = new TestUpdateableOnlineBeatmapSetCover(400)
             {
                 OnlineInfo = CreateAPIBeatmapSet(),
                 RelativeSizeAxes = Axes.Both,
                 Masking = true,
             });
 
-            AddStep("change model", () => updateableCover.OnlineInfo = null);
-            AddWaitStep("wait some", 5);
-            AddAssert("no cover added", () => !updateableCover.ChildrenOfType<DelayedLoadUnloadWrapper>().Any());
+            AddStep("change model to null", () => updateableCover.OnlineInfo = null);
+
+            AddUntilStep("wait for load", () => updateableCover.DelayedLoadFinished);
+
+            AddAssert("no cover added", () => !updateableCover.ChildrenOfType<TestOnlineBeatmapSetCover>().Any());
         }
 
         [Test]
@@ -143,11 +145,19 @@ namespace osu.Game.Tests.Visual.UserInterface
         {
             private readonly int loadDelay;
 
+            public bool DelayedLoadFinished;
+
             public TestUpdateableOnlineBeatmapSetCover(int loadDelay = 10000)
             {
                 this.loadDelay = loadDelay;
             }
 
+            protected override void OnLoadFinished()
+            {
+                base.OnLoadFinished();
+                DelayedLoadFinished = true;
+            }
+
             protected override Drawable CreateDrawable(IBeatmapSetOnlineInfo model)
             {
                 if (model == null)